This commit was manufactured by cvs2svn to create tag 'R3_0_0'.
diff --git a/docs/org.eclipse.wst.validation.doc.isv/.project b/docs/org.eclipse.wst.validation.doc.isv/.project
deleted file mode 100644
index ae8f06d..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.validation.doc.isv</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.doc.isv/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.validation.doc.isv/META-INF/MANIFEST.MF
deleted file mode 100644
index 09c6699..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/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.validation.doc.isv; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help.ui;bundle-version="[3.2.0,4.0.0)"
diff --git a/docs/org.eclipse.wst.validation.doc.isv/README.TXT b/docs/org.eclipse.wst.validation.doc.isv/README.TXT
deleted file mode 100644
index 7e82c47..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/README.TXT
+++ /dev/null
@@ -1,44 +0,0 @@
-----------------------------------------------------------------------------------
--- Generating JavaDoc and Extension Point Documentation for --
--- org.eclipse.wst.validation.doc.isv plug-in --
--- 2008/05/20 (GRK) --
-----------------------------------------------------------------------------------
-
-Intro:
- This tool and readme was extracted from an example done by the JSF team. It was
- then adopted to generate the JavaDocs and Ext-Pt for validation.
-
-
-JavaDoc Generation Task
- Intro:
- The javadocBuild.xml file is used to create the reference javadocs. It hard codes the package
- names into the Ant script, so if API packages are added or removed this will need to be updated.
-
- Setup:
- - ensure that the org.eclipse.wst.validation plug-in is present in the workspace
-
- Generate:
- 1) select javadocBuild.xml file in project explorer
- 2) Run as "Ant Build..." --> JRE Tab, ensure that "Run in same JRE as Workspace" is selected
-
- Sanity Test:
- 1) Directly select the API packages in the org.eclipse.wst.validation plug-in.
- 2) Use the Export->Javadoc command to generate javadoc into a temporary directory.
- 3) Examine the Console for warnings and errors. Fix as necessary.
-
-Extension-point References Task
- Intro:
- The listed-ext-points property in buildExtDocs.properties file is used to generate
- the HTML documentation from the schemas. This list must be verified for accuracy
- and is not generated like the Javadoc API packages are.
-
- Generate:
- 1) select buildExtDocs.xml file in project explorer
- 2) Run as "Ant Build..." --> JRE Tab, ensure that "Run in same JRE as Workspace" is
- selected
-
-Checking-in:
- Check in:
- - any changes made in this project
-
-
diff --git a/docs/org.eclipse.wst.validation.doc.isv/build.properties b/docs/org.eclipse.wst.validation.doc.isv/build.properties
deleted file mode 100644
index 63a6dfe..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = plugin.xml,\
- META-INF/,\
- plugin.properties,\
- reference/,\
- toc.xml,\
- topics_ExtPoint_Reference.xml
diff --git a/docs/org.eclipse.wst.validation.doc.isv/buildExtDocs.properties b/docs/org.eclipse.wst.validation.doc.isv/buildExtDocs.properties
deleted file mode 100644
index 1a7455d..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/buildExtDocs.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-################################################################
-# Information for extension point overview document
-################################################################
-# Overview document title
-
-title = Validation Framework Extension Points
-header = Validation Framework Extension Points
-# Introduction paragraph
-overview = The following extension points can be used to add new validators:
-# A list of the extension points that should be included in the
-# extension point documentation.
-
-listed-ext-points=org.eclipse.wst.validation.validatorV2,\
-org.eclipse.wst.validation.validatorGroup
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.validation.doc.isv/buildExtDocs.xml b/docs/org.eclipse.wst.validation.doc.isv/buildExtDocs.xml
deleted file mode 100644
index c49b574..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/buildExtDocs.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Build Extension Point Documentation" default="createExtDocs" basedir=".">
-
- <property file="buildExtDocs.properties"/>
- <property name="outputDir" value="${basedir}/reference/extension-points"/>
- <property name="vfOutputDir" value="${outputDir}${file.separator}vf${file.separator}"/>
-
- <!-- <taskdef name="pde.convertSchemaToHTML" classname="org.eclipse.pde.internal.core.ant.ConvertSchemaToHTML"/> -->
-
- <target name="createExtDocs" depends="buildExtDocs, createDocListings"/>
-
- <target name="buildExtDocs" depends="buildVFExtDocs"/>
-
- <target name="buildVFExtDocs">
- <mkdir dir="${vfOutputDir}"/>
- <!-- cleanup old -->
- <delete>
- <fileset dir="${vfOutputDir}" casesensitive="yes" id="ext-docs-list-ent">
- <include name="*.html"/>
- </fileset>
- </delete>
-
- <!-- generate new html from ext-pt schemas -->
- <pde.convertSchemaToHTML manifest="../org.eclipse.wst.validation/plugin.xml" destination="${vfOutputDir}" />
-
- <!-- Get the list of extension doc files. -->
- <fileset dir="${vfOutputDir}" casesensitive="yes" id="ext-docs-list-ent">
- <include name="*.html"/>
- </fileset>
-
- <!-- Convert the list to an XML representation. -->
- <pathconvert property="ext-doc-ent" refid="ext-docs-list-ent" pathsep="</file>/n/n<file>">
- <map from="${vfOutputDir}" to=""/>
- </pathconvert>
-
- </target>
-
- <target name="createDocListings">
- <delete file="${outputDir}${file.separator}index.html"/>
- <!-- Create the overview document. -->
- <xslt basedir="${basedir}" in="extDocListings.xml" out="${outputDir}${file.separator}index.html" style="extDocOverview.xsl">
- <param name="title" expression="${title}"/>
- <param name="header" expression="${header}"/>
- <param name="overview" expression="${overview}"/>
- <param name="listed-ext-points" expression="${listed-ext-points}"/>
- </xslt>
-
- <!-- Create the extention point toc. -->
- <xslt basedir="${basedir}" in="extDocListings.xml" out="topics_ExtPoint_Reference.xml" style="extDocToc.xsl">
- <param name="listed-ext-points" expression="${listed-ext-points}"/>
- <outputproperty name="method" value="xml"/>
- <outputproperty name="indent" value="yes"/>
- </xslt>
-
- </target>
-</project>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.validation.doc.isv/extDocListings.xml b/docs/org.eclipse.wst.validation.doc.isv/extDocListings.xml
deleted file mode 100644
index 16f5ec8..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/extDocListings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<components>
- <component name="Validation Framework" id="vf" file="vfextdocs.xml"/>
-</components>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/extDocOverview.xsl b/docs/org.eclipse.wst.validation.doc.isv/extDocOverview.xsl
deleted file mode 100644
index 2ad1987..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/extDocOverview.xsl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt">
- <xsl:param name="title"/>
- <xsl:param name="header"/>
- <xsl:param name="overview"/>
- <xsl:param name="listed-ext-points"/>
-
- <xsl:template match="components">
-
- <xsl:text disable-output-escaping="yes">
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
- </xsl:text>
- <html>
- <head>
- <xsl:text disable-output-escaping="yes">
- <meta name="copyright" content="Copyright (c) Oracle Corporation and others 2000, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- </xsl:text>
- <title><xsl:value-of select="$title"/></title>
- <xsl:text disable-output-escaping="yes">
- <LINK REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
- </xsl:text>
- </head>
- <body link="#0000FF" vlink="#800080">
-
- <center>
- <h1><xsl:value-of select="$header"/></h1>
- </center>
-
- <xsl:value-of select="$overview"/>
- <xsl:for-each select="component">
- <xsl:sort select="@id"/>
- <h3><a name="{@id}"></a><xsl:value-of select="@name"/></h3>
- <ul>
- <xsl:for-each select="document(@file)/files/file">
- <xsl:sort select="text()"/>
- <xsl:if test="contains($listed-ext-points, translate(substring(text(), 0, string-length(text()) - 4),'_','.'))">
- <li>
- <a href="{../@component}/{text()}"><xsl:value-of select="translate(substring(text(), 0, string-length(text()) - 4),'_','.')"/></a>
- </li>
- </xsl:if>
- </xsl:for-each>
- </ul>
- </xsl:for-each>
- </body>
- </html>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/extDocToc.xsl b/docs/org.eclipse.wst.validation.doc.isv/extDocToc.xsl
deleted file mode 100644
index 30e54b8..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/extDocToc.xsl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt"
- exclude-result-prefixes="xalan">
- <xsl:param name="listed-ext-points"/>
-
- <xsl:template match="components">
- <xsl:text disable-output-escaping="yes">
-<?NLS TYPE="org.eclipse.help.toc"?>
- </xsl:text>
- <toc label="Extension Points Reference">
- <xsl:for-each select="document(component/@file)/files/file">
- <xsl:sort select="text()"/>
- <xsl:if test="contains($listed-ext-points, translate(substring(text(), 0, string-length(text()) - 4),'_','.'))">
- <topic label="{translate(substring(text(), 0, string-length(text()) - 4),'_','.')}" href="reference/extension-points/{../@component}/{text()}">
- </topic>
- </xsl:if>
- </xsl:for-each>
- </toc>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/javadoc.properties b/docs/org.eclipse.wst.validation.doc.isv/javadoc.properties
deleted file mode 100644
index 316b8bb..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/javadoc.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-api.title=Web Tools Platform: Validation Framework
-sourcepath=../org.eclipse.wst.validation/vf2;../org.eclipse.wst.validation/validate_core
-api.packages=org.eclipse.wst.validation,org.eclipse.wst.validation.internal.provisional.core
-
-
-
-
diff --git a/docs/org.eclipse.wst.validation.doc.isv/javadocBuild.xml b/docs/org.eclipse.wst.validation.doc.isv/javadocBuild.xml
deleted file mode 100644
index 196c515..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/javadocBuild.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="main" basedir=".">
-
- <property file="javadoc.properties" />
- <property name="outputDir" value="${basedir}"/>
- <property name="eclipse.home" value="${basedir}/.."/>
-
- <target name="main" depends="clean, javadoc" description="Builds Plugin Javadoc" />
-
- <target name="clean">
- <delete>
- <fileset dir="${outputDir}/reference/api/" >
- <include name="**/*.html"/>
- </fileset>
- </delete>
- </target>
-
- <target name="javadoc">
- <echo message="========= ${eclipse.home}"/>
- <mkdir dir="${outputDir}/reference/api" />
-
- <javadoc
- access="public"
- additionalparam="-breakiterator"
- author="false"
- classpath="${classpath}"
- destdir="${outputDir}/reference/api"
- doctitle="${api.title}"
- nodeprecated="false"
- nodeprecatedlist="false"
- noindex="true"
- nonavbar="false"
- notree="true"
- overview="${basedir}/overview.html"
- packagenames="${api.packages}"
- sourcepath="${sourcepath}"
- use="true"
- version="true"
- breakiterator="yes"
- verbose="false"
- failonerror="false">
- <tag name="ignore" description="ignore" enabled="false"/>
- <tag name="generated" description="ignore" enabled="false"/>
- <tag name="model" description="ignore" enabled="false"/>
- <tag name="modifiable" description="ignore" enabled="false"/>
- <tag name="extends" description="ignore" enabled="false"/>
- <tag name="implements" description="ignore" enabled="false"/>
- <tag name="ordered" description="ignore" enabled="false"/>
- </javadoc>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.validation.doc.isv/overview.html b/docs/org.eclipse.wst.validation.doc.isv/overview.html
deleted file mode 100644
index ce1394d..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/overview.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<html>
-<head>
-<title>Validation Framework Overview</title>
-</head>
-<body>
-<p>A framework for calling validators that are build based.</p>
-<h2>Approach</h2>
-<p>In WTP 3.4 a new validation framework has been added. This was developed at
-the request of validator owners and end users. To ease the transition to this
-new framework, that approach that has been taken is to support both the old and
-the new frameworks for a while. This means that the old validators work exactly
-like they used to. They can still plug into the old framework and will continue
-to be run by the old framework. This allows validator owners to migrate at their
-own pace.</p>
-<p>For validator owners that wish to exploit the new framework, it has been
-designed n such a way to minimize the transition from the old framework to the
-new framework. There is a new extension point that needs to be specified, and a
-new abstract class that needs to be extended.</p>
-<h3>Benefits</h3>
-<p>What benefits does the new framework have to offer? Or asked another way, as
-a validator owner, why would I want to switch?</p>
-<h4>Performance</h4>
-<h5>Tuning</h5>
-<p>The main reason for creating a new framework was to improve performance. As
-more and more validators are added, validation is consuming a bigger slice of
-the resources that it takes to perform a build.</p>
-<p>The best performance improvement is eliminating unnecessary work. We
-eliminate work, by providing significantly more tuning options. Validation
-owners can tune which resources they are called on. This is done through the use
-of filter rules. These filter rules are grouped into inclusion and exclusion
-groups. If you have multiple inclusion groups they are "anded" together, meaning
-that each of the inclusion groups must have at least one successful filter rule.
-Exclusion groups are used to specify what doesn't get validated. Exclusion
-groups have a higher precedence than inclusion groups. If an exclusion group
-excludes a resource than it is excluded no matter what the inclusion groups may
-say.</p>
-<p>They are several different types of filter rules:</p>
-<ul>
- <li><strong>File extension</strong> - Rules based on the file extension. For
- example, include all the files with extension *.xml.</li>
- <li><strong>Folder or File name</strong> - Rules based on the folder or file
- name. For example exclude all the resources in the build folder. File names
- can be fully qualified, project relative names, e.g. <strong>WebContent/WEB-INF/web.xml</strong>,
- or simple names, <strong>web.xml</strong>.</li>
- <li><strong>Project nature</strong> - Projects with certain natures can be
- either included or excluded.</li>
- <li><strong>Facet</strong> - Projects with certain facets can be either
- included or excluded.</li>
- <li><strong>Content Type </strong>- Resources of a particular content type
- can be included or excluded.</li>
-</ul>
-<p>The filter rules and groups form the building blocks of what gets validated.
-</p>
-<p>In terms of tuning however, the end user has the final say. The validator
-owners specify the default filter rules and groups for their validator, but the
-end user through the use of preferences can override these settings. </p>
-<h5>Caching</h5>
-<p>Another way that performance is improved is through more effective caching.
-With the previous framework we were noticing that different validators would be
-opening and processing the same file, but that this would happen far enough
-apart, that caches weren't effective. Even if files were being cached, the
-second (or third, or forth, ...) open would happen far enough a means that way
-that the file would have already been evicted from the cache. In the new
-framework, the processing order is more tightly controlled. The framework calls
-the validator and tells it what to validate. This way files are processed in
-order, which means that the chance of them being a cache is much higher. Every
-validator that is interested in file A processes it, and then we move on and
-every validator that is interested in file B processes it, etc.</p>
-<p>Also because state information is kept for the lifetime of the validation
-operation, validators can cache expensive operations, like model creation, that
-might be needed as part of validating several files. </p>
-<h5>Job Control</h5>
-<p>With the earlier framework, there were too many jobs/threads running
-concurrently. This is now more tightly controlled.</p>
-<h4>Dependency Support</h4>
-<p>Another new feature is dependency support. A validator can now assert that a
-resource is dependant on some other resources. For example that a XML file is
-dependant on a XSD file. Now if the XSD file changes the XML can be revalidated.
-As the user comes to trust this dependency support, they wont perform as many
-clean builds.</p>
-<h4>Primary Framework</h4>
-<p>This is the primary validation framework. At some point, the earlier
-framework will be deprecated and then removed. All the new investment will
-happen in this framework. </p>
-<p>The framework collateral will continue to be enhanced (junit testcases,
-documentation, performance improvements, ...)</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.validation.doc.isv/plugin.properties b/docs/org.eclipse.wst.validation.doc.isv/plugin.properties
deleted file mode 100644
index 353f05e..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-Bundle-Name.0 = Validation Framework - Developer Guide
-Bundle-Vendor.0 = Eclipse.org
-
diff --git a/docs/org.eclipse.wst.validation.doc.isv/plugin.xml b/docs/org.eclipse.wst.validation.doc.isv/plugin.xml
deleted file mode 100644
index 6a75a5b..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
- <extension
- point="org.eclipse.help.toc">
- <toc
- file="toc.xml">
- </toc>
- </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/allclasses-frame.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/allclasses-frame.html
deleted file mode 100644
index ebc6a49..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/allclasses-frame.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-All Classes
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation" target="classFrame">AbstractValidator</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation" target="classFrame">DependentResource</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Friend.html" title="class in org.eclipse.wst.validation" target="classFrame">Friend</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation" target="classFrame"><I>IDependencyIndex</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IMessage</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IMetaModelContext</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation" target="classFrame"><I>IPerformanceMonitor</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation" target="classFrame">IPerformanceMonitor.CollectionLevel</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IProjectValidationContext</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IReporter</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IValidationContext</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IValidator</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/IValidatorGroupListener.html" title="interface in org.eclipse.wst.validation" target="classFrame"><I>IValidatorGroupListener</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IValidatorJob</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html" title="class in org.eclipse.wst.validation.internal.provisional.core" target="classFrame">MessageLimitException</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation" target="classFrame">MessageSeveritySetting</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation" target="classFrame">MessageSeveritySetting.Severity</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation" target="classFrame">PerformanceCounters</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ReporterHelper.html" title="class in org.eclipse.wst.validation" target="classFrame">ReporterHelper</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidationFramework</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidationFramework.ResourceAdder</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidationResult</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidationResults</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidationState</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation" target="classFrame">Validator</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation" target="classFrame">Validator.Level</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation" target="classFrame">Validator.V1</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation" target="classFrame">Validator.V1.V1Copy</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation" target="classFrame">Validator.V2</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidatorMessage</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/allclasses-noframe.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/allclasses-noframe.html
deleted file mode 100644
index a8650c8..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/allclasses-noframe.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-All Classes
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation">AbstractValidator</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation">DependentResource</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Friend.html" title="class in org.eclipse.wst.validation">Friend</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation"><I>IDependencyIndex</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><I>IMessage</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><I>IMetaModelContext</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation"><I>IPerformanceMonitor</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><I>IProjectValidationContext</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><I>IReporter</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><I>IValidationContext</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><I>IValidator</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/IValidatorGroupListener.html" title="interface in org.eclipse.wst.validation"><I>IValidatorGroupListener</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><I>IValidatorJob</I></A>
-<BR>
-<A HREF="org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html" title="class in org.eclipse.wst.validation.internal.provisional.core">MessageLimitException</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ReporterHelper.html" title="class in org.eclipse.wst.validation">ReporterHelper</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation">ValidationFramework</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" title="class in org.eclipse.wst.validation">ValidationFramework.ResourceAdder</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation">ValidationResults</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation">Validator.V1.V1Copy</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A>
-<BR>
-<A HREF="org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/constant-values.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/constant-values.html
deleted file mode 100644
index e70dc8e..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/constant-values.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Constant Field Values
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Constant Field Values";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?constant-values.html" target="_top"><B>FRAMES</B></A>
- <A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Constant Field Values</H1>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-<B>Contents</B><UL>
-<LI><A HREF="#org.eclipse">org.eclipse.*</A>
-</UL>
-
-<A NAME="org.eclipse"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left"><FONT SIZE="+2">
-org.eclipse.*</FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">org.eclipse.wst.validation.<A HREF="org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.eclipse.wst.validation.ValidatorMessage.ValidationId"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public static final java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/eclipse/wst/validation/ValidatorMessage.html#ValidationId">ValidationId</A></CODE></TD>
-<TD ALIGN="right"><CODE>"ValidationId"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">org.eclipse.wst.validation.internal.provisional.core.<A HREF="org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.eclipse.wst.validation.internal.provisional.core.IMessage.ALL_MESSAGES"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/eclipse/wst/validation/internal/provisional/core/IMessage.html#ALL_MESSAGES">ALL_MESSAGES</A></CODE></TD>
-<TD ALIGN="right"><CODE>7</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.eclipse.wst.validation.internal.provisional.core.IMessage.ERROR_AND_WARNING"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/eclipse/wst/validation/internal/provisional/core/IMessage.html#ERROR_AND_WARNING">ERROR_AND_WARNING</A></CODE></TD>
-<TD ALIGN="right"><CODE>3</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.eclipse.wst.validation.internal.provisional.core.IMessage.HIGH_SEVERITY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/eclipse/wst/validation/internal/provisional/core/IMessage.html#HIGH_SEVERITY">HIGH_SEVERITY</A></CODE></TD>
-<TD ALIGN="right"><CODE>1</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.eclipse.wst.validation.internal.provisional.core.IMessage.LINENO_UNSET"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/eclipse/wst/validation/internal/provisional/core/IMessage.html#LINENO_UNSET">LINENO_UNSET</A></CODE></TD>
-<TD ALIGN="right"><CODE>0</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.eclipse.wst.validation.internal.provisional.core.IMessage.LOW_SEVERITY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/eclipse/wst/validation/internal/provisional/core/IMessage.html#LOW_SEVERITY">LOW_SEVERITY</A></CODE></TD>
-<TD ALIGN="right"><CODE>4</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.eclipse.wst.validation.internal.provisional.core.IMessage.NORMAL_SEVERITY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/eclipse/wst/validation/internal/provisional/core/IMessage.html#NORMAL_SEVERITY">NORMAL_SEVERITY</A></CODE></TD>
-<TD ALIGN="right"><CODE>2</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.eclipse.wst.validation.internal.provisional.core.IMessage.OFFSET_UNSET"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/eclipse/wst/validation/internal/provisional/core/IMessage.html#OFFSET_UNSET">OFFSET_UNSET</A></CODE></TD>
-<TD ALIGN="right"><CODE>-1</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.eclipse.wst.validation.internal.provisional.core.IMessage.TargetResource"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public static final java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/eclipse/wst/validation/internal/provisional/core/IMessage.html#TargetResource">TargetResource</A></CODE></TD>
-<TD ALIGN="right"><CODE>"TargetResource"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?constant-values.html" target="_top"><B>FRAMES</B></A>
- <A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/deprecated-list.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/deprecated-list.html
deleted file mode 100644
index 297295b..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/deprecated-list.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Deprecated List
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Deprecated List";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?deprecated-list.html" target="_top"><B>FRAMES</B></A>
- <A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Deprecated API</B></H2>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-<B>Contents</B><UL>
-<LI><A HREF="#exception">Deprecated Exceptions</A>
-<LI><A HREF="#method">Deprecated Methods</A>
-</UL>
-
-<A NAME="exception"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Deprecated Exceptions</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html" title="class in org.eclipse.wst.validation.internal.provisional.core">org.eclipse.wst.validation.internal.provisional.core.MessageLimitException</A>
-<BR>
- <I>This class is not longer used by the framework. The framework is
- not going to limit the number of messages displayed by a validator.</I> </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="method"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Deprecated Methods</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/eclipse/wst/validation/ValidationFramework.html#getValidator(java.lang.String)">org.eclipse.wst.validation.ValidationFramework.getValidator(String)</A>
-<BR>
- <I>Use getValidator(String id, IProject project) with a null project instead.</I> </TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?deprecated-list.html" target="_top"><B>FRAMES</B></A>
- <A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/help-doc.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/help-doc.html
deleted file mode 100644
index c9524b5..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/help-doc.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-API Help
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="API Help";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?help-doc.html" target="_top"><B>FRAMES</B></A>
- <A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-How This API Document Is Organized</H1>
-</CENTER>
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.<H3>
-Overview</H3>
-<BLOCKQUOTE>
-
-<P>
-The <A HREF="overview-summary.html">Overview</A> page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.</BLOCKQUOTE>
-<H3>
-Package</H3>
-<BLOCKQUOTE>
-
-<P>
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:<UL>
-<LI>Interfaces (italic)<LI>Classes<LI>Enums<LI>Exceptions<LI>Errors<LI>Annotation Types</UL>
-</BLOCKQUOTE>
-<H3>
-Class/Interface</H3>
-<BLOCKQUOTE>
-
-<P>
-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:<UL>
-<LI>Class inheritance diagram<LI>Direct Subclasses<LI>All Known Subinterfaces<LI>All Known Implementing Classes<LI>Class/interface declaration<LI>Class/interface description
-<P>
-<LI>Nested Class Summary<LI>Field Summary<LI>Constructor Summary<LI>Method Summary
-<P>
-<LI>Field Detail<LI>Constructor Detail<LI>Method Detail</UL>
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</BLOCKQUOTE>
-</BLOCKQUOTE>
-<H3>
-Annotation Type</H3>
-<BLOCKQUOTE>
-
-<P>
-Each annotation type has its own separate page with the following sections:<UL>
-<LI>Annotation Type declaration<LI>Annotation Type description<LI>Required Element Summary<LI>Optional Element Summary<LI>Element Detail</UL>
-</BLOCKQUOTE>
-</BLOCKQUOTE>
-<H3>
-Enum</H3>
-<BLOCKQUOTE>
-
-<P>
-Each enum has its own separate page with the following sections:<UL>
-<LI>Enum declaration<LI>Enum description<LI>Enum Constant Summary<LI>Enum Constant Detail</UL>
-</BLOCKQUOTE>
-<H3>
-Use</H3>
-<BLOCKQUOTE>
-Each documented package, class and interface has its own Use page. This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.</BLOCKQUOTE>
-<H3>
-Deprecated API</H3>
-<BLOCKQUOTE>
-The <A HREF="deprecated-list.html">Deprecated API</A> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</BLOCKQUOTE>
-<H3>
-Prev/Next</H3>
-These links take you to the next or previous class, interface, package, or related page.<H3>
-Frames/No Frames</H3>
-These links show and hide the HTML frames. All pages are available with or without frames.
-<P>
-<H3>
-Serialized Form</H3>
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-<P>
-<H3>
-Constant Field Values</H3>
-The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.
-<P>
-<FONT SIZE="-1">
-<EM>
-This help file applies to API documentation generated using the standard doclet.</EM>
-</FONT>
-<BR>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?help-doc.html" target="_top"><B>FRAMES</B></A>
- <A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/index.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/index.html
deleted file mode 100644
index 546f443..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Tue May 20 09:50:55 EDT 2008-->
-<TITLE>
-Generated Documentation (Untitled)
-</TITLE>
-<SCRIPT type="text/javascript">
- targetPage = "" + window.location.search;
- if (targetPage != "" && targetPage != "undefined")
- targetPage = targetPage.substring(1);
- if (targetPage.indexOf(":") != -1)
- targetPage = "undefined";
- function loadFrames() {
- if (targetPage != "" && targetPage != "undefined")
- top.classFrame.location = top.targetPage;
- }
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-</HEAD>
-<FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()">
-<FRAMESET rows="30%,70%" title="" onLoad="top.loadFrames()">
-<FRAME src="overview-frame.html" name="packageListFrame" title="All Packages">
-<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
-</FRAMESET>
-<FRAME src="overview-summary.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
-<NOFRAMES>
-<H2>
-Frame Alert</H2>
-
-<P>
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-<BR>
-Link to<A HREF="overview-summary.html">Non-frame version.</A>
-</NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/AbstractValidator.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/AbstractValidator.html
deleted file mode 100644
index d033ac1..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/AbstractValidator.html
+++ /dev/null
@@ -1,396 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-AbstractValidator
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="AbstractValidator";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/AbstractValidator.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV CLASS
- <A HREF="../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/AbstractValidator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="AbstractValidator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class AbstractValidator</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.AbstractValidator</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public abstract class <B>AbstractValidator</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-The class that all Validators that wish to use version two of the validation framework must subclass.
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html#AbstractValidator()">AbstractValidator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html#clean(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">clean</A></B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- A call back method that lets the validator know that the project is being
- cleaned.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html#getParent()">getParent</A></B>()</CODE>
-
-<BR>
- Answer the validator that you belong to.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>abstract <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html#validate(IResource, int, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validate</A></B>(IResource resource,
- int kind,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- Validate the resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html#validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationFinishing</A></B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- This method will be called when validation is complete.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html#validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationStarting</A></B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- This method is called before any validation takes place.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="AbstractValidator()"><!-- --></A><H3>
-AbstractValidator</H3>
-<PRE>
-public <B>AbstractValidator</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="validate(IResource, int, org.eclipse.wst.validation.ValidationState, IProgressMonitor)"><!-- --></A><H3>
-validate</H3>
-<PRE>
-public abstract <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A> <B>validate</B>(IResource resource,
- int kind,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD>Validate the resource. The validator is called from a WorkspaceJob, so
- the validator itself does not need to establish it's own
- IWorkspaceRunnable.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - The resource to be validated.<DD><CODE>kind</CODE> - The way the resource changed. It uses the same values as the kind
- parameter in IResourceDelta.<DD><CODE>state</CODE> - A way to pass arbitrary, validator specific, data from one
- invocation of a validator to the next, during the validation phase.
- At the end of the validation phase, this object will be cleared,
- thereby allowing any of this state information to be garbaged
- collected.<DD><CODE>monitor</CODE> - A monitor that you can use to report your progress. To be a well
- behaved validator you need to check the isCancelled() method at
- appropriate times.
-<DT><B>Returns:</B><DD>the result of the validation. This may be, but usually isn't, null.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="clean(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)"><!-- --></A><H3>
-clean</H3>
-<PRE>
-public void <B>clean</B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD>A call back method that lets the validator know that the project is being
- cleaned. This method gives the validator a chance to do any special
- cleanup. The default is to do nothing.
- <p>
- If the entire workspace is being cleaned, then the first call will have a
- null project, and then there will be subsequent calls for each open
- project in the workspace.</p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - The project being cleaned. This may be null, which is an indication
- that the workspace is being cleaned.<DD><CODE>state</CODE> - A way to pass arbitrary, validator specific, data from one
- invocation of a validator to the next, during the validation phase.<DD><CODE>monitor</CODE> - The monitor that should be used for reporting progress if the clean
- takes a long time.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)"><!-- --></A><H3>
-validationStarting</H3>
-<PRE>
-public void <B>validationStarting</B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD>This method is called before any validation takes place. It allows
- validators to perform any initialization that they might need.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - The project that is being validated. For the very first call in the
- validation phase, this will be null. A null project is the signal
- that a top level validation is starting. Subsequently, the project
- will be set, as each of the individual projects are validated.<DD><CODE>state</CODE> - A way to pass arbitrary, validator specific, data from one
- invocation of a validator to the next, during the validation phase.<DD><CODE>monitor</CODE> - The monitor that should be used for reporting progress if the initialization
- takes a long time.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)"><!-- --></A><H3>
-validationFinishing</H3>
-<PRE>
-public void <B>validationFinishing</B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD>This method will be called when validation is complete. It allows
- validators to perform any cleanup that they might need to do.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - The project that was validated. The very last call in the validation
- sets this to null so that the validator knows that all the
- projects have now been validated.<DD><CODE>state</CODE> - A way to pass arbitrary, validator specific, data from one
- invocation of a validator to the next, during the validation phase.<DD><CODE>monitor</CODE> - The monitor that should be used for reporting progress if the cleanup
- takes a long time.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getParent()"><!-- --></A><H3>
-getParent</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A> <B>getParent</B>()</PRE>
-<DL>
-<DD>Answer the validator that you belong to. The validator controls the
- filters and various other settings.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/AbstractValidator.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV CLASS
- <A HREF="../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/AbstractValidator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="AbstractValidator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/DependentResource.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/DependentResource.html
deleted file mode 100644
index 892a24b..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/DependentResource.html
+++ /dev/null
@@ -1,289 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-DependentResource
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="DependentResource";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/DependentResource.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Friend.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/DependentResource.html" target="_top"><B>FRAMES</B></A>
- <A HREF="DependentResource.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class DependentResource</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.DependentResource</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>DependentResource</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-A resource that is dependent on another resource.
- <p>
- This is returned by the IDependencyIndex.
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation"><CODE>IDependencyIndex</CODE></A></DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/DependentResource.html#DependentResource(IResource, org.eclipse.wst.validation.Validator)">DependentResource</A></B>(IResource resource,
- <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IResource</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/DependentResource.html#getResource()">getResource</A></B>()</CODE>
-
-<BR>
- Answer the resource that is depended on.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/DependentResource.html#getValidator()">getValidator</A></B>()</CODE>
-
-<BR>
- Answer the validator that asserted the dependency.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="DependentResource(IResource, org.eclipse.wst.validation.Validator)"><!-- --></A><H3>
-DependentResource</H3>
-<PRE>
-public <B>DependentResource</B>(IResource resource,
- <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getResource()"><!-- --></A><H3>
-getResource</H3>
-<PRE>
-public IResource <B>getResource</B>()</PRE>
-<DL>
-<DD>Answer the resource that is depended on.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidator()"><!-- --></A><H3>
-getValidator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> <B>getValidator</B>()</PRE>
-<DL>
-<DD>Answer the validator that asserted the dependency.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/DependentResource.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Friend.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/DependentResource.html" target="_top"><B>FRAMES</B></A>
- <A HREF="DependentResource.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Friend.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Friend.html
deleted file mode 100644
index 845921b..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Friend.html
+++ /dev/null
@@ -1,334 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-Friend
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Friend";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Friend.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Friend.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Friend.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class Friend</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.Friend</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>Friend</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-This class is only to be called by the validation framework and it's test cases.
- This class is NOT part of the API.
- <p>
- This class provides access to some internal methods.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Friend.html#Friend()">Friend</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Friend.html#isLoaded(org.eclipse.wst.validation.Validator)">isLoaded</A></B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</CODE>
-
-<BR>
- Has the validator's implementation been loaded yet?</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Friend.html#setMessages(org.eclipse.wst.validation.Validator, java.util.Map)">setMessages</A></B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator,
- java.util.Map<java.lang.String,<A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A>> map)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Friend.html#shouldValidate(org.eclipse.wst.validation.Validator, IResource, boolean, boolean, org.eclipse.wst.validation.internal.ContentTypeWrapper)">shouldValidate</A></B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator,
- IResource resource,
- boolean isManual,
- boolean isBuild,
- org.eclipse.wst.validation.internal.ContentTypeWrapper contentTypeWrapper)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Friend.html#shouldValidate(org.eclipse.wst.validation.Validator, IResource, org.eclipse.wst.validation.internal.ValType, org.eclipse.wst.validation.internal.ContentTypeWrapper)">shouldValidate</A></B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator,
- IResource resource,
- org.eclipse.wst.validation.internal.ValType valType,
- org.eclipse.wst.validation.internal.ContentTypeWrapper contentTypeWrapper)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Friend()"><!-- --></A><H3>
-Friend</H3>
-<PRE>
-public <B>Friend</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="setMessages(org.eclipse.wst.validation.Validator, java.util.Map)"><!-- --></A><H3>
-setMessages</H3>
-<PRE>
-public static void <B>setMessages</B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator,
- java.util.Map<java.lang.String,<A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A>> map)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isLoaded(org.eclipse.wst.validation.Validator)"><!-- --></A><H3>
-isLoaded</H3>
-<PRE>
-public static boolean <B>isLoaded</B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</PRE>
-<DL>
-<DD>Has the validator's implementation been loaded yet? This is used by some test cases to ensure that
- plug-ins are not loaded too early.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shouldValidate(org.eclipse.wst.validation.Validator, IResource, boolean, boolean, org.eclipse.wst.validation.internal.ContentTypeWrapper)"><!-- --></A><H3>
-shouldValidate</H3>
-<PRE>
-public static boolean <B>shouldValidate</B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator,
- IResource resource,
- boolean isManual,
- boolean isBuild,
- org.eclipse.wst.validation.internal.ContentTypeWrapper contentTypeWrapper)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shouldValidate(org.eclipse.wst.validation.Validator, IResource, org.eclipse.wst.validation.internal.ValType, org.eclipse.wst.validation.internal.ContentTypeWrapper)"><!-- --></A><H3>
-shouldValidate</H3>
-<PRE>
-public static boolean <B>shouldValidate</B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator,
- IResource resource,
- org.eclipse.wst.validation.internal.ValType valType,
- org.eclipse.wst.validation.internal.ContentTypeWrapper contentTypeWrapper)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Friend.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Friend.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Friend.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IDependencyIndex.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IDependencyIndex.html
deleted file mode 100644
index d8cfab4..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IDependencyIndex.html
+++ /dev/null
@@ -1,351 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-IDependencyIndex
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="IDependencyIndex";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IDependencyIndex.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Friend.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/IDependencyIndex.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IDependencyIndex.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Interface IDependencyIndex</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>IDependencyIndex</B></DL>
-</PRE>
-
-<P>
-This service is used to specify the resources that a particular resource depends on.
- <p>
- This is an optional service, validators do not need to use this Interface and can simply supply
- their dependency information through the ValidationResult return result.
- </p>
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation"><CODE>ValidationResult</CODE></A></DL>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html#add(java.lang.String, IResource, IResource)">add</A></B>(java.lang.String id,
- IResource dependent,
- IResource dependsOn)</CODE>
-
-<BR>
- Assert that one resource depends on another resource as part of it's validity.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html#clear(IProject)">clear</A></B>(IProject project)</CODE>
-
-<BR>
- Remove all the dependency assertions for this project.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.List<<A HREF="../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation">DependentResource</A>></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html#get(IResource)">get</A></B>(IResource resource)</CODE>
-
-<BR>
- Answer all the resources that depend on this resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IResource[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html#get(java.lang.String, IResource)">get</A></B>(java.lang.String id,
- IResource resource)</CODE>
-
-<BR>
- Answer all the resources that depend on this resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html#isDependedOn(IResource)">isDependedOn</A></B>(IResource resource)</CODE>
-
-<BR>
- Answer true if other resources depend on this resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html#set(java.lang.String, IResource, IResource[])">set</A></B>(java.lang.String id,
- IResource dependent,
- IResource[] dependsOn)</CODE>
-
-<BR>
- Replace all the resources that the dependent depends on.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="add(java.lang.String, IResource, IResource)"><!-- --></A><H3>
-add</H3>
-<PRE>
-void <B>add</B>(java.lang.String id,
- IResource dependent,
- IResource dependsOn)</PRE>
-<DL>
-<DD>Assert that one resource depends on another resource as part of it's validity.
- <p>
- For example, if an XML file is dependent on an XSD file to be valid, the
- resource that holds the XML file would be the dependent, and the resource
- that holds the XSD would be the dependsOn.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>id</CODE> - The validator id that is asserting that the dependency exists.<DD><CODE>dependent</CODE> - The resource that is dependent on the other resource. For example a XML file.<DD><CODE>dependsOn</CODE> - The resource that this being depended on. For example a XSD file.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="clear(IProject)"><!-- --></A><H3>
-clear</H3>
-<PRE>
-void <B>clear</B>(IProject project)</PRE>
-<DL>
-<DD>Remove all the dependency assertions for this project.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - The project that will have it's dependency assertions removed.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="get(IResource)"><!-- --></A><H3>
-get</H3>
-<PRE>
-java.util.List<<A HREF="../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation">DependentResource</A>> <B>get</B>(IResource resource)</PRE>
-<DL>
-<DD>Answer all the resources that depend on this resource. For example, if
- this resource was a XSD, this could answer all the XML files that
- depended on it for their validity.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - A resource that other resources may depend on.
-<DT><B>Returns:</B><DD>the dependent resources.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="get(java.lang.String, IResource)"><!-- --></A><H3>
-get</H3>
-<PRE>
-IResource[] <B>get</B>(java.lang.String id,
- IResource resource)</PRE>
-<DL>
-<DD>Answer all the resources that depend on this resource. For example, if
- this resource was a XSD, this could answer all the XML files that
- depended on it for their validity.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>id</CODE> - The validator id that asserted that the dependency exists.<DD><CODE>resource</CODE> - A resource that other resources may depend on.
-<DT><B>Returns:</B><DD>the dependent resources. This method can return null or an empty array, if
- there are no dependent resources.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isDependedOn(IResource)"><!-- --></A><H3>
-isDependedOn</H3>
-<PRE>
-boolean <B>isDependedOn</B>(IResource resource)</PRE>
-<DL>
-<DD>Answer true if other resources depend on this resource.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - The resource being tested.
-<DT><B>Returns:</B><DD>true if any of the validators asserted a dependency on this resource.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="set(java.lang.String, IResource, IResource[])"><!-- --></A><H3>
-set</H3>
-<PRE>
-void <B>set</B>(java.lang.String id,
- IResource dependent,
- IResource[] dependsOn)</PRE>
-<DL>
-<DD>Replace all the resources that the dependent depends on.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>id</CODE> - The validator id that is asserting that the dependency exists.<DD><CODE>dependent</CODE> - The resource that is dependent on the other resource.<DD><CODE>dependsOn</CODE> - All the resources that are depended on. This can be null or a zero
- length array. Null or a zero length array removes all the dependencies.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IDependencyIndex.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Friend.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/IDependencyIndex.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IDependencyIndex.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html
deleted file mode 100644
index f7728f3..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html
+++ /dev/null
@@ -1,327 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-IPerformanceMonitor.CollectionLevel
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="IPerformanceMonitor.CollectionLevel";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IPerformanceMonitor.CollectionLevel.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/IValidatorGroupListener.html" title="interface in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IPerformanceMonitor.CollectionLevel.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#enum_constant_summary">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#enum_constant_detail">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Enum IPerformanceMonitor.CollectionLevel</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by ">java.lang.Enum<<A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A>>
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.IPerformanceMonitor.CollectionLevel</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable, java.lang.Comparable<<A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A>></DD>
-</DL>
-<DL>
-<DT><B>Enclosing interface:</B><DD><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation">IPerformanceMonitor</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static enum <B>IPerformanceMonitor.CollectionLevel</B><DT>extends java.lang.Enum<<A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A>></DL>
-</PRE>
-
-<P>
-The level of information to collect.
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== ENUM CONSTANT SUMMARY =========== -->
-
-<A NAME="enum_constant_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Enum Constant Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html#Default">Default</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html#None">None</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html#valueOf(java.lang.String)">valueOf</A></B>(java.lang.String name)</CODE>
-
-<BR>
- Returns the enum constant of this type with the specified name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html#values()">values</A></B>()</CODE>
-
-<BR>
- Returns an array containing the constants of this enum type, in
-the order they are declared.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Enum"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Enum</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</CODE></TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>getClass, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ ENUM CONSTANT DETAIL =========== -->
-
-<A NAME="enum_constant_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Enum Constant Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="None"><!-- --></A><H3>
-None</H3>
-<PRE>
-public static final <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A> <B>None</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="Default"><!-- --></A><H3>
-Default</H3>
-<PRE>
-public static final <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A> <B>Default</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="values()"><!-- --></A><H3>
-values</H3>
-<PRE>
-public static <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A>[] <B>values</B>()</PRE>
-<DL>
-<DD>Returns an array containing the constants of this enum type, in
-the order they are declared. This method may be used to iterate
-over the constants as follows:
-<pre>
-for (IPerformanceMonitor.CollectionLevel c : IPerformanceMonitor.CollectionLevel.values())
- System.out.println(c);
-</pre>
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>an array containing the constants of this enum type, in
-the order they are declared</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="valueOf(java.lang.String)"><!-- --></A><H3>
-valueOf</H3>
-<PRE>
-public static <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A> <B>valueOf</B>(java.lang.String name)</PRE>
-<DL>
-<DD>Returns the enum constant of this type with the specified name.
-The string must match <I>exactly</I> an identifier used to declare an
-enum constant in this type. (Extraneous whitespace characters are
-not permitted.)
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>name</CODE> - the name of the enum constant to be returned.
-<DT><B>Returns:</B><DD>the enum constant with the specified name
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.IllegalArgumentException</CODE> - if this enum type has no constant
-with the specified name
-<DD><CODE>java.lang.NullPointerException</CODE> - if the argument is null</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IPerformanceMonitor.CollectionLevel.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/IValidatorGroupListener.html" title="interface in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IPerformanceMonitor.CollectionLevel.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#enum_constant_summary">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#enum_constant_detail">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IPerformanceMonitor.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IPerformanceMonitor.html
deleted file mode 100644
index dc226ad..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IPerformanceMonitor.html
+++ /dev/null
@@ -1,362 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-IPerformanceMonitor
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="IPerformanceMonitor";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IPerformanceMonitor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/IPerformanceMonitor.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IPerformanceMonitor.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_class_summary">NESTED</A> | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Interface IPerformanceMonitor</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>IPerformanceMonitor</B></DL>
-</PRE>
-
-<P>
-A service that collects performance information on validation operations.
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A></B></CODE>
-
-<BR>
- The level of information to collect.</TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html#add(org.eclipse.wst.validation.PerformanceCounters)">add</A></B>(<A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A> counters)</CODE>
-
-<BR>
- Add this performance counter to the monitor.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html#getCollectionLevel()">getCollectionLevel</A></B>()</CODE>
-
-<BR>
- Answer the level of performance events that are being collected by the validation framework.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.List<<A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A>></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html#getPerformanceCounters(boolean)">getPerformanceCounters</A></B>(boolean asSummary)</CODE>
-
-<BR>
- Answer the performance counters that have been collected so far.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html#isCollecting()">isCollecting</A></B>()</CODE>
-
-<BR>
- Answer true if the performance monitor is collecting performance events.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html#isSummaryOnly()">isSummaryOnly</A></B>()</CODE>
-
-<BR>
- Answer true if only summary information is requested.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html#resetPerformanceCounters()">resetPerformanceCounters</A></B>()</CODE>
-
-<BR>
- Delete the collected performance counters.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html#setCollectionLevel(org.eclipse.wst.validation.IPerformanceMonitor.CollectionLevel)">setCollectionLevel</A></B>(<A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A> level)</CODE>
-
-<BR>
- Set the performance event collection level.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="add(org.eclipse.wst.validation.PerformanceCounters)"><!-- --></A><H3>
-add</H3>
-<PRE>
-void <B>add</B>(<A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A> counters)</PRE>
-<DL>
-<DD>Add this performance counter to the monitor. The monitor will decide what to
- do with the results, it may log them to a file, or it may simply hold on to them.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>counters</CODE> - </DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isCollecting()"><!-- --></A><H3>
-isCollecting</H3>
-<PRE>
-boolean <B>isCollecting</B>()</PRE>
-<DL>
-<DD>Answer true if the performance monitor is collecting performance events.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isSummaryOnly()"><!-- --></A><H3>
-isSummaryOnly</H3>
-<PRE>
-boolean <B>isSummaryOnly</B>()</PRE>
-<DL>
-<DD>Answer true if only summary information is requested.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setCollectionLevel(org.eclipse.wst.validation.IPerformanceMonitor.CollectionLevel)"><!-- --></A><H3>
-setCollectionLevel</H3>
-<PRE>
-void <B>setCollectionLevel</B>(<A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A> level)</PRE>
-<DL>
-<DD>Set the performance event collection level. This controls which
- performance events are collected, including none of them.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>level</CODE> - The level to collect. The default is to not collect anything.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getCollectionLevel()"><!-- --></A><H3>
-getCollectionLevel</H3>
-<PRE>
-<A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A> <B>getCollectionLevel</B>()</PRE>
-<DL>
-<DD>Answer the level of performance events that are being collected by the validation framework.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPerformanceCounters(boolean)"><!-- --></A><H3>
-getPerformanceCounters</H3>
-<PRE>
-java.util.List<<A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A>> <B>getPerformanceCounters</B>(boolean asSummary)</PRE>
-<DL>
-<DD>Answer the performance counters that have been collected so far. Some
- monitors do not save counters, and they will always return an empty list.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>asSummary</CODE> - If this parameter is true, only answer a summary of the counters.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="resetPerformanceCounters()"><!-- --></A><H3>
-resetPerformanceCounters</H3>
-<PRE>
-void <B>resetPerformanceCounters</B>()</PRE>
-<DL>
-<DD>Delete the collected performance counters.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IPerformanceMonitor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/IPerformanceMonitor.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IPerformanceMonitor.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_class_summary">NESTED</A> | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IValidatorGroupListener.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IValidatorGroupListener.html
deleted file mode 100644
index 51c981f..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/IValidatorGroupListener.html
+++ /dev/null
@@ -1,263 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-IValidatorGroupListener
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="IValidatorGroupListener";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IValidatorGroupListener.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/IValidatorGroupListener.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidatorGroupListener.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Interface IValidatorGroupListener</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>IValidatorGroupListener</B></DL>
-</PRE>
-
-<P>
-Validators may wish to join validator groups for performance or other
- reasons. That way expensive operations like creating and releasing models can
- be done in a common location, and be done only once per resource. Group listeners
- are declared via the <code>org.eclipse.wst.validation.validatorGroup</code> extension point.
- <p>
- As validation proceeds, the validation framework, on a resource by resource
- bases, determines if any validators that are members of a group are
- interested in the resource. If they are, before the first validator in the
- group is called, the <code>validationStarting</code> method is called. If this method was
- called, then the <code>validationFinishing</code> method will be called once all the
- validators have processed the resource.
- </p>
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IValidatorGroupListener.html#validationFinishing(IResource, IProgressMonitor, org.eclipse.wst.validation.ValidationState)">validationFinishing</A></B>(IResource resource,
- IProgressMonitor monitor,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state)</CODE>
-
-<BR>
- If the validationStarting method was called on the resource, then this
- method will be called after the last validator has processed the
- resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/IValidatorGroupListener.html#validationStarting(IResource, IProgressMonitor, org.eclipse.wst.validation.ValidationState)">validationStarting</A></B>(IResource resource,
- IProgressMonitor monitor,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state)</CODE>
-
-<BR>
- This is called before the first validator in the group that is interested
- in the resource is called.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="validationStarting(IResource, IProgressMonitor, org.eclipse.wst.validation.ValidationState)"><!-- --></A><H3>
-validationStarting</H3>
-<PRE>
-void <B>validationStarting</B>(IResource resource,
- IProgressMonitor monitor,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state)</PRE>
-<DL>
-<DD>This is called before the first validator in the group that is interested
- in the resource is called. If no validators in the group are interested
- in the resource, then this method is not called.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - The resource that is being validated.<DD><CODE>monitor</CODE> - A progress monitor that the method should use.<DD><CODE>state</CODE> - The validation state for the current operation.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validationFinishing(IResource, IProgressMonitor, org.eclipse.wst.validation.ValidationState)"><!-- --></A><H3>
-validationFinishing</H3>
-<PRE>
-void <B>validationFinishing</B>(IResource resource,
- IProgressMonitor monitor,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state)</PRE>
-<DL>
-<DD>If the validationStarting method was called on the resource, then this
- method will be called after the last validator has processed the
- resource.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - The resource that is being validated.<DD><CODE>monitor</CODE> - A progress monitor that the method can use.<DD><CODE>state</CODE> - The validation state for the current operation.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IValidatorGroupListener.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/IValidatorGroupListener.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidatorGroupListener.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/MessageSeveritySetting.Severity.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/MessageSeveritySetting.Severity.html
deleted file mode 100644
index 12a4401..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/MessageSeveritySetting.Severity.html
+++ /dev/null
@@ -1,382 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-MessageSeveritySetting.Severity
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="MessageSeveritySetting.Severity";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/MessageSeveritySetting.Severity.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageSeveritySetting.Severity.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#enum_constant_summary">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#enum_constant_detail">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Enum MessageSeveritySetting.Severity</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by ">java.lang.Enum<<A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A>>
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.MessageSeveritySetting.Severity</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable, java.lang.Comparable<<A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A>></DD>
-</DL>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static enum <B>MessageSeveritySetting.Severity</B><DT>extends java.lang.Enum<<A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A>></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== ENUM CONSTANT SUMMARY =========== -->
-
-<A NAME="enum_constant_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Enum Constant Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html#Error">Error</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html#Ignore">Ignore</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html#Warning">Warning</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html#getMarkerSeverity()">getMarkerSeverity</A></B>()</CODE>
-
-<BR>
- Answer the associated IMarker severity.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html#toString()">toString</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html#valueOf(java.lang.String)">valueOf</A></B>(java.lang.String name)</CODE>
-
-<BR>
- Returns the enum constant of this type with the specified name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html#values()">values</A></B>()</CODE>
-
-<BR>
- Returns an array containing the constants of this enum type, in
-the order they are declared.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Enum"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Enum</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>compareTo, equals, getDeclaringClass, hashCode, name, ordinal, valueOf</CODE></TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>getClass, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ ENUM CONSTANT DETAIL =========== -->
-
-<A NAME="enum_constant_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Enum Constant Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Error"><!-- --></A><H3>
-Error</H3>
-<PRE>
-public static final <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> <B>Error</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="Warning"><!-- --></A><H3>
-Warning</H3>
-<PRE>
-public static final <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> <B>Warning</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="Ignore"><!-- --></A><H3>
-Ignore</H3>
-<PRE>
-public static final <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> <B>Ignore</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="values()"><!-- --></A><H3>
-values</H3>
-<PRE>
-public static <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A>[] <B>values</B>()</PRE>
-<DL>
-<DD>Returns an array containing the constants of this enum type, in
-the order they are declared. This method may be used to iterate
-over the constants as follows:
-<pre>
-for (MessageSeveritySetting.Severity c : MessageSeveritySetting.Severity.values())
- System.out.println(c);
-</pre>
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>an array containing the constants of this enum type, in
-the order they are declared</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="valueOf(java.lang.String)"><!-- --></A><H3>
-valueOf</H3>
-<PRE>
-public static <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> <B>valueOf</B>(java.lang.String name)</PRE>
-<DL>
-<DD>Returns the enum constant of this type with the specified name.
-The string must match <I>exactly</I> an identifier used to declare an
-enum constant in this type. (Extraneous whitespace characters are
-not permitted.)
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>name</CODE> - the name of the enum constant to be returned.
-<DT><B>Returns:</B><DD>the enum constant with the specified name
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.IllegalArgumentException</CODE> - if this enum type has no constant
-with the specified name
-<DD><CODE>java.lang.NullPointerException</CODE> - if the argument is null</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>toString</CODE> in class <CODE>java.lang.Enum<<A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A>></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMarkerSeverity()"><!-- --></A><H3>
-getMarkerSeverity</H3>
-<PRE>
-public int <B>getMarkerSeverity</B>()</PRE>
-<DL>
-<DD>Answer the associated IMarker severity.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/MessageSeveritySetting.Severity.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageSeveritySetting.Severity.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#enum_constant_summary">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#enum_constant_detail">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/MessageSeveritySetting.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/MessageSeveritySetting.html
deleted file mode 100644
index 3324bfd..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/MessageSeveritySetting.html
+++ /dev/null
@@ -1,439 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-MessageSeveritySetting
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="MessageSeveritySetting";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/MessageSeveritySetting.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/IValidatorGroupListener.html" title="interface in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/MessageSeveritySetting.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageSeveritySetting.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_class_summary">NESTED</A> | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class MessageSeveritySetting</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.MessageSeveritySetting</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>MessageSeveritySetting</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Associate a message severity with a message category.
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#MessageSeveritySetting(java.lang.String, java.lang.String, org.eclipse.wst.validation.MessageSeveritySetting.Severity)">MessageSeveritySetting</A></B>(java.lang.String id,
- java.lang.String label,
- <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> defaultSeverity)</CODE>
-
-<BR>
- Create an association between a label and a message severity.</TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#copy()">copy</A></B>()</CODE>
-
-<BR>
- Answer a copy of this object.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#getCurrent()">getCurrent</A></B>()</CODE>
-
-<BR>
- Answer the current severity for the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#getDefault()">getDefault</A></B>()</CODE>
-
-<BR>
- Answer the default severity as defined by the validator owner.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#getId()">getId</A></B>()</CODE>
-
-<BR>
- The id that the validator owner assigned to the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#getLabel()">getLabel</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#hashCode()">hashCode</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#setCurrent(org.eclipse.wst.validation.MessageSeveritySetting.Severity)">setCurrent</A></B>(<A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> severity)</CODE>
-
-<BR>
- Set the current message severity.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#toString()">toString</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="MessageSeveritySetting(java.lang.String, java.lang.String, org.eclipse.wst.validation.MessageSeveritySetting.Severity)"><!-- --></A><H3>
-MessageSeveritySetting</H3>
-<PRE>
-public <B>MessageSeveritySetting</B>(java.lang.String id,
- java.lang.String label,
- <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> defaultSeverity)</PRE>
-<DL>
-<DD>Create an association between a label and a message severity.
-<P>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>id</CODE> - An id that is used to identify this particular setting. This must be
- unique within the scope of this particular validator.<DD><CODE>label</CODE> - An end user string, that can describe either an individual message
- or a message category.<DD><CODE>defaultSeverity</CODE> - The default severity for this label. If the end user doesn't change
- anything this is what the severity will be.</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="hashCode()"><!-- --></A><H3>
-hashCode</H3>
-<PRE>
-public int <B>hashCode</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>hashCode</CODE> in class <CODE>java.lang.Object</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLabel()"><!-- --></A><H3>
-getLabel</H3>
-<PRE>
-public java.lang.String <B>getLabel</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDefault()"><!-- --></A><H3>
-getDefault</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> <B>getDefault</B>()</PRE>
-<DL>
-<DD>Answer the default severity as defined by the validator owner.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getCurrent()"><!-- --></A><H3>
-getCurrent</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> <B>getCurrent</B>()</PRE>
-<DL>
-<DD>Answer the current severity for the message. The end user may have changed this through a
- preference dialog.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getId()"><!-- --></A><H3>
-getId</H3>
-<PRE>
-public java.lang.String <B>getId</B>()</PRE>
-<DL>
-<DD>The id that the validator owner assigned to the message.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setCurrent(org.eclipse.wst.validation.MessageSeveritySetting.Severity)"><!-- --></A><H3>
-setCurrent</H3>
-<PRE>
-public boolean <B>setCurrent</B>(<A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> severity)</PRE>
-<DL>
-<DD>Set the current message severity.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>severity</CODE> -
-<DT><B>Returns:</B><DD>true if the setting changed</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>toString</CODE> in class <CODE>java.lang.Object</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="copy()"><!-- --></A><H3>
-copy</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A> <B>copy</B>()</PRE>
-<DL>
-<DD>Answer a copy of this object.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/MessageSeveritySetting.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/IValidatorGroupListener.html" title="interface in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/MessageSeveritySetting.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageSeveritySetting.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_class_summary">NESTED</A> | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/PerformanceCounters.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/PerformanceCounters.html
deleted file mode 100644
index 525b9dd..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/PerformanceCounters.html
+++ /dev/null
@@ -1,434 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-PerformanceCounters
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="PerformanceCounters";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/PerformanceCounters.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/PerformanceCounters.html" target="_top"><B>FRAMES</B></A>
- <A HREF="PerformanceCounters.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class PerformanceCounters</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.PerformanceCounters</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>PerformanceCounters</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Some performance information for a validation invocation. This object is immutable.
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html#PerformanceCounters(java.lang.String, java.lang.String, java.lang.String, int, long, long)">PerformanceCounters</A></B>(java.lang.String validatorId,
- java.lang.String validatorName,
- java.lang.String resourceName,
- int numberInvocations,
- long elapsedTime,
- long cpuTime)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> long</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html#getCpuTime()">getCpuTime</A></B>()</CODE>
-
-<BR>
- Answer the amount of CPU time in nanoseconds.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> long</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html#getElapsedTime()">getElapsedTime</A></B>()</CODE>
-
-<BR>
- Answer the elapsed time in milliseconds.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html#getNumberInvocations()">getNumberInvocations</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html#getResourceName()">getResourceName</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html#getValidatorId()">getValidatorId</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html#getValidatorName()">getValidatorName</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> long</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html#getWhen()">getWhen</A></B>()</CODE>
-
-<BR>
- Answer when was the event logged.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html#toString()">toString</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html#toString(boolean)">toString</A></B>(boolean asSummary)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PerformanceCounters(java.lang.String, java.lang.String, java.lang.String, int, long, long)"><!-- --></A><H3>
-PerformanceCounters</H3>
-<PRE>
-public <B>PerformanceCounters</B>(java.lang.String validatorId,
- java.lang.String validatorName,
- java.lang.String resourceName,
- int numberInvocations,
- long elapsedTime,
- long cpuTime)</PRE>
-<DL>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>validatorId</CODE> - <DD><CODE>validatorName</CODE> - <DD><CODE>resourceName</CODE> - <DD><CODE>numberInvocations</CODE> - number of times the validator was invoked<DD><CODE>elapsedTime</CODE> - elapsed time in milliseconds<DD><CODE>cpuTime</CODE> - CPU time in nanoseconds</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getValidatorId()"><!-- --></A><H3>
-getValidatorId</H3>
-<PRE>
-public java.lang.String <B>getValidatorId</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNumberInvocations()"><!-- --></A><H3>
-getNumberInvocations</H3>
-<PRE>
-public int <B>getNumberInvocations</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getElapsedTime()"><!-- --></A><H3>
-getElapsedTime</H3>
-<PRE>
-public long <B>getElapsedTime</B>()</PRE>
-<DL>
-<DD>Answer the elapsed time in milliseconds.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getCpuTime()"><!-- --></A><H3>
-getCpuTime</H3>
-<PRE>
-public long <B>getCpuTime</B>()</PRE>
-<DL>
-<DD>Answer the amount of CPU time in nanoseconds. If this can not be determined,
- answer -1.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>toString</CODE> in class <CODE>java.lang.Object</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString(boolean)"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>(boolean asSummary)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidatorName()"><!-- --></A><H3>
-getValidatorName</H3>
-<PRE>
-public java.lang.String <B>getValidatorName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getWhen()"><!-- --></A><H3>
-getWhen</H3>
-<PRE>
-public long <B>getWhen</B>()</PRE>
-<DL>
-<DD>Answer when was the event logged.
-<P>
-<DD><DL>
-<DT><B>See Also:</B><DD><CODE>System.currentTimeMillis()</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getResourceName()"><!-- --></A><H3>
-getResourceName</H3>
-<PRE>
-public java.lang.String <B>getResourceName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/PerformanceCounters.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/PerformanceCounters.html" target="_top"><B>FRAMES</B></A>
- <A HREF="PerformanceCounters.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ReporterHelper.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ReporterHelper.html
deleted file mode 100644
index 8e37927..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ReporterHelper.html
+++ /dev/null
@@ -1,504 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-ReporterHelper
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="ReporterHelper";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ReporterHelper.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ReporterHelper.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ReporterHelper.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class ReporterHelper</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.ReporterHelper</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>ReporterHelper</B><DT>extends java.lang.Object<DT>implements <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></DL>
-</PRE>
-
-<P>
-This is a temporary class to ease the transition from the previous validation framework.
- <p>
- This is not API.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html#ReporterHelper(IProgressMonitor)">ReporterHelper</A></B>(IProgressMonitor monitor)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">addMessage</A></B>(<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
-
- Add a locale-independent validation message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html#displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">displaySubtask</A></B>(<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
- Show a text representation of this message, formatted in the default
- Locale, to the user immediately.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.List<<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A>></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html#getMessages()">getMessages</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html#isCancelled()">isCancelled</A></B>()</CODE>
-
-<BR>
- Return true if the user canceled validation, and false otherwise.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html#makeMarkers()">makeMarkers</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator)">removeAllMessages</A></B>(<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin)</CODE>
-
-<BR>
- Remove all validation messages entered by the identified validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object)">removeAllMessages</A></B>(<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- java.lang.Object object)</CODE>
-
-<BR>
- Remove all validation messages, entered by the identified validator,
- pertaining to the Object provided.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html#removeMessageSubset(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object, java.lang.String)">removeMessageSubset</A></B>(<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- java.lang.Object obj,
- java.lang.String groupName)</CODE>
-
-<BR>
- To support removal of a subset of validation messages, an IValidator may
- assign group names to IMessages.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ReporterHelper(IProgressMonitor)"><!-- --></A><H3>
-ReporterHelper</H3>
-<PRE>
-public <B>ReporterHelper</B>(IProgressMonitor monitor)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)"><!-- --></A><H3>
-addMessage</H3>
-<PRE>
-public void <B>addMessage</B>(<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</PRE>
-<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">IReporter</A></CODE></B></DD>
-<DD><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>
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">addMessage</A></CODE> in interface <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>origin</CODE> - The validator which is the source of the message.<DD><CODE>message</CODE> - A message to be reported.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)"><!-- --></A><H3>
-displaySubtask</H3>
-<PRE>
-public void <B>displaySubtask</B>(<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</PRE>
-<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">IReporter</A></CODE></B></DD>
-<DD>Show a text representation of this message, formatted in the default
- Locale, to the user immediately. This message indicates which subtask is
- currently being processed. The message is not stored. The subtask message
- in this context is the subtask in a IProgressMontior
- <p>
- Both parameters must not be null.
- </p>
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">displaySubtask</A></CODE> in interface <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>validator</CODE> - The validator issuing the subtask message.<DD><CODE>message</CODE> - The message to be displayed to the user.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMessages()"><!-- --></A><H3>
-getMessages</H3>
-<PRE>
-public java.util.List<<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A>> <B>getMessages</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#getMessages()">getMessages</A></CODE> in interface <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></CODE></DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the message access interface to this reporter, or null if message access is not
- supported.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isCancelled()"><!-- --></A><H3>
-isCancelled</H3>
-<PRE>
-public boolean <B>isCancelled</B>()</PRE>
-<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#isCancelled()">IReporter</A></CODE></B></DD>
-<DD>Return true if the user canceled validation, and false otherwise. This method should be
- called by IValidators periodically, because no event is fired to notify IValidators that the
- user canceled validation. If a validator does not check this method, a cancellation request
- is ignored.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#isCancelled()">isCancelled</A></CODE> in interface <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></CODE></DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>true if the user canceled validation, and false otherwise.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator)"><!-- --></A><H3>
-removeAllMessages</H3>
-<PRE>
-public void <B>removeAllMessages</B>(<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin)</PRE>
-<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator)">IReporter</A></CODE></B></DD>
-<DD>Remove all validation messages entered by the identified validator. This method is provided
- for incremental validation.
- <p>
- The IValidator parameter must not be null.
- </p>
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator)">removeAllMessages</A></CODE> in interface <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>origin</CODE> - Originator validator of the message.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object)"><!-- --></A><H3>
-removeAllMessages</H3>
-<PRE>
-public void <B>removeAllMessages</B>(<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- java.lang.Object object)</PRE>
-<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object)">IReporter</A></CODE></B></DD>
-<DD>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>
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object)">removeAllMessages</A></CODE> in interface <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>origin</CODE> - Originator validator of the message.<DD><CODE>object</CODE> - Object to which the message belongs. Object is the target object
- that was set on the IMessage when adding the message as problem
- marker.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="removeMessageSubset(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object, java.lang.String)"><!-- --></A><H3>
-removeMessageSubset</H3>
-<PRE>
-public void <B>removeMessageSubset</B>(<A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- java.lang.Object obj,
- java.lang.String groupName)</PRE>
-<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeMessageSubset(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object, java.lang.String)">IReporter</A></CODE></B></DD>
-<DD>To support removal of a subset of validation messages, an IValidator may
- assign group names to IMessages. An IMessage subset will be identified by
- the name of its group. This method will remove only the IMessage's that
- are in the group identified by groupName.
- <p>
- The IValidator parameter must not be null.
- </p>
- <p>
- If <code>object</code> is null, then this method should remove all
- messages owned by the validator. (i.e., the same behaviour as the
- removeAllMessages(IValidator) method.)
- </p>
- <p>
- If groupName is null, that's the same as no group (i.e., the same
- behaviour as the <code>removeAllMessages(IValidator, Object)</code>
- method.)
- </p>
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeMessageSubset(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object, java.lang.String)">removeMessageSubset</A></CODE> in interface <CODE><A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>validator</CODE> - Originator validator of the message.<DD><CODE>obj</CODE> - Object to which the message belongs.<DD><CODE>groupName</CODE> - Name of the group to which the message belongs.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="makeMarkers()"><!-- --></A><H3>
-makeMarkers</H3>
-<PRE>
-public void <B>makeMarkers</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ReporterHelper.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ReporterHelper.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ReporterHelper.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html
deleted file mode 100644
index d824cf4..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-ValidationFramework.ResourceAdder
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="ValidationFramework.ResourceAdder";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidationFramework.ResourceAdder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationFramework.ResourceAdder.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class ValidationFramework.ResourceAdder</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.ValidationFramework.ResourceAdder</B>
-</PRE>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation">ValidationFramework</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static class <B>ValidationFramework.ResourceAdder</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html#ValidationFramework.ResourceAdder(java.util.Set)">ValidationFramework.ResourceAdder</A></B>(java.util.Set<IResource> set)</CODE>
-
-<BR>
- A class that knows how to add resources to a set.</TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html#visit(IResource)">visit</A></B>(IResource resource)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ValidationFramework.ResourceAdder(java.util.Set)"><!-- --></A><H3>
-ValidationFramework.ResourceAdder</H3>
-<PRE>
-public <B>ValidationFramework.ResourceAdder</B>(java.util.Set<IResource> set)</PRE>
-<DL>
-<DD>A class that knows how to add resources to a set.
-<P>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>set</CODE> - the set where the resources are added.</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="visit(IResource)"><!-- --></A><H3>
-visit</H3>
-<PRE>
-public boolean <B>visit</B>(IResource resource)
- throws CoreException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>CoreException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidationFramework.ResourceAdder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationFramework.ResourceAdder.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationFramework.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationFramework.html
deleted file mode 100644
index d2a4eaa..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationFramework.html
+++ /dev/null
@@ -1,795 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-ValidationFramework
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="ValidationFramework";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidationFramework.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidationFramework.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationFramework.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_class_summary">NESTED</A> | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class ValidationFramework</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.ValidationFramework</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public final class <B>ValidationFramework</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-The central class of the Validation Framework.
- <p>
- This is a singleton class that is accessed through the getDefault() method.
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" title="class in org.eclipse.wst.validation">ValidationFramework.ResourceAdder</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#clearMessages(IResource, java.lang.String)">clearMessages</A></B>(IResource resource,
- java.lang.String validatorId)</CODE>
-
-<BR>
- Clear any validation markers that may have been set by this validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#disableValidation(IResource)">disableValidation</A></B>(IResource resource)</CODE>
-
-<BR>
- Disable all validation for the given resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#enableValidation(IResource)">enableValidation</A></B>(IResource resource)</CODE>
-
-<BR>
- Enable validation for the given resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation">ValidationFramework</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#getDefault()">getDefault</A></B>()</CODE>
-
-<BR>
- Answer the singleton, default instance of this class.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation">IDependencyIndex</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#getDependencyIndex()">getDependencyIndex</A></B>()</CODE>
-
-<BR>
- Answer the dependency index.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.Set<<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#getDisabledValidatorsFor(IResource)">getDisabledValidatorsFor</A></B>(IResource resource)</CODE>
-
-<BR>
- Answer all the validators that should not validate the resource, either
- because their filters don't support the resource, or the validator has
- been disabled for both build validation and manual validation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation">IPerformanceMonitor</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#getPerformanceMonitor()">getPerformanceMonitor</A></B>()</CODE>
-
-<BR>
- Answer a performance monitor for the validators.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IEclipsePreferences</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#getPreferenceStore()">getPreferenceStore</A></B>()</CODE>
-
-<BR>
- Answer the preference store that holds the global validation settings.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#getReporter(IProject, IProgressMonitor)">getReporter</A></B>(IProject project,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#getValidator(java.lang.String)">getValidator</A></B>(java.lang.String id)</CODE>
-
-<BR>
- <B>Deprecated.</B> <I>Use getValidator(String id, IProject project) with a null project instead.</I></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#getValidator(java.lang.String, IProject)">getValidator</A></B>(java.lang.String id,
- IProject project)</CODE>
-
-<BR>
- Answer the validator with the given id that is in effect for the given
- project.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#getValidatorsFor(IResource)">getValidatorsFor</A></B>(IResource resource)</CODE>
-
-<BR>
- Answer all the validators that are applicable for the given resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#getValidatorsFor(IResource, boolean, boolean)">getValidatorsFor</A></B>(IResource resource,
- boolean isManual,
- boolean isBuild)</CODE>
-
-<BR>
- Answer all the validators that are applicable for the given resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#hasValidators(IResource, boolean, boolean)">hasValidators</A></B>(IResource resource,
- boolean isManual,
- boolean isBuild)</CODE>
-
-<BR>
- Answer true if the resource has any enabled validators.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#isProjectSuspended(IProject)">isProjectSuspended</A></B>(IProject project)</CODE>
-
-<BR>
- This method should be called by any code that is preparing to suspend validation on a
- project.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#isSuspended()">isSuspended</A></B>()</CODE>
-
-<BR>
- Return true if "suspend all" is enabled, false otherwise.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#isSuspended(IProject)">isSuspended</A></B>(IProject project)</CODE>
-
-<BR>
- Returns true if validation will not run on the project because it's been suspended.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#join(IProgressMonitor)">join</A></B>(IProgressMonitor monitor)</CODE>
-
-<BR>
- Waits until all validation jobs are finished.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#suspendAllValidation(boolean)">suspendAllValidation</A></B>(boolean suspend)</CODE>
-
-<BR>
- Suspends, or undoes the suspension of, validation on all projects in the
- workbench.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#suspendValidation(IProject, boolean)">suspendValidation</A></B>(IProject project,
- boolean suspend)</CODE>
-
-<BR>
- Suspends, or undoes the suspension of, validation on the current project.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation">ValidationResults</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#validate(IProject[], boolean, boolean, IProgressMonitor)">validate</A></B>(IProject[] projects,
- boolean isManual,
- boolean isBuild,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- Validate the projects.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getDefault()"><!-- --></A><H3>
-getDefault</H3>
-<PRE>
-public static <A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation">ValidationFramework</A> <B>getDefault</B>()</PRE>
-<DL>
-<DD>Answer the singleton, default instance of this class.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="clearMessages(IResource, java.lang.String)"><!-- --></A><H3>
-clearMessages</H3>
-<PRE>
-public void <B>clearMessages</B>(IResource resource,
- java.lang.String validatorId)
- throws CoreException</PRE>
-<DL>
-<DD>Clear any validation markers that may have been set by this validator.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - The resource that may have it's markers cleared.<DD><CODE>validatorId</CODE> - The id of validator that created the marker.
-<DT><B>Throws:</B>
-<DD><CODE>CoreException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="disableValidation(IResource)"><!-- --></A><H3>
-disableValidation</H3>
-<PRE>
-public void <B>disableValidation</B>(IResource resource)</PRE>
-<DL>
-<DD>Disable all validation for the given resource. This method instructs
- the framework to not run any validators on the given resource or any of
- it's children. This setting is persistent. Currently this only works with version 2
- validators.
- <p>
- Use the enableValidation method to restore validation.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - The resource that is having validation disabled. It must be an IFolder or an IFile.<DT><B>See Also:</B><DD><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#enableValidation(IResource)"><CODE>enableValidation(IResource)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="enableValidation(IResource)"><!-- --></A><H3>
-enableValidation</H3>
-<PRE>
-public void <B>enableValidation</B>(IResource resource)</PRE>
-<DL>
-<DD>Enable validation for the given resource. If the resource was not
- previously disabled this method call has no effect. Currently this only
- works with version 2 validators.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - The resource that is having validation re-enabled.<DT><B>See Also:</B><DD><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html#disableValidation(IResource)"><CODE>disableValidation(IResource)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDependencyIndex()"><!-- --></A><H3>
-getDependencyIndex</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation">IDependencyIndex</A> <B>getDependencyIndex</B>()</PRE>
-<DL>
-<DD>Answer the dependency index. Validators can use this to determine which resources depend on which
- other resources.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPerformanceMonitor()"><!-- --></A><H3>
-getPerformanceMonitor</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation">IPerformanceMonitor</A> <B>getPerformanceMonitor</B>()</PRE>
-<DL>
-<DD>Answer a performance monitor for the validators.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPreferenceStore()"><!-- --></A><H3>
-getPreferenceStore</H3>
-<PRE>
-public IEclipsePreferences <B>getPreferenceStore</B>()</PRE>
-<DL>
-<DD>Answer the preference store that holds the global validation settings.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getReporter(IProject, IProgressMonitor)"><!-- --></A><H3>
-getReporter</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> <B>getReporter</B>(IProject project,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidatorsFor(IResource, boolean, boolean)"><!-- --></A><H3>
-getValidatorsFor</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>[] <B>getValidatorsFor</B>(IResource resource,
- boolean isManual,
- boolean isBuild)</PRE>
-<DL>
-<DD>Answer all the validators that are applicable for the given resource. A validator is
- still returned even if it has been turned off by the user.
- <p>
- The caller may still need to test if the validator has been turned off by
- the user, by using the isBuildValidation() and isManualValidation()
- methods.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - The resource that determines which validators are applicable.<DD><CODE>isManual</CODE> - If true then the validator must be turned on for manual validation.
- If false then the isManualValidation setting isn't used to filter
- out validators.<DD><CODE>isBuild</CODE> - If true then the validator must be turned on for build based
- validation. If false then the isBuildValidation setting isn't used
- to filter out validators.<DT><B>See Also:</B><DD><A HREF="../../../../org/eclipse/wst/validation/Validator.html#isBuildValidation()"><CODE>Validator.isBuildValidation()</CODE></A>,
-<A HREF="../../../../org/eclipse/wst/validation/Validator.html#isManualValidation()"><CODE>Validator.isManualValidation()</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDisabledValidatorsFor(IResource)"><!-- --></A><H3>
-getDisabledValidatorsFor</H3>
-<PRE>
-public java.util.Set<<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>> <B>getDisabledValidatorsFor</B>(IResource resource)</PRE>
-<DL>
-<DD>Answer all the validators that should not validate the resource, either
- because their filters don't support the resource, or the validator has
- been disabled for both build validation and manual validation.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - The resource this is being tested.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidator(java.lang.String)"><!-- --></A><H3>
-getValidator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> <B>getValidator</B>(java.lang.String id)</PRE>
-<DL>
-<DD><B>Deprecated.</B> <I>Use getValidator(String id, IProject project) with a null project instead.</I>
-<P>
-<DD>Answer the global validator with the given id.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>id</CODE> -
-<DT><B>Returns:</B><DD>null if the validator is not found</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidator(java.lang.String, IProject)"><!-- --></A><H3>
-getValidator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> <B>getValidator</B>(java.lang.String id,
- IProject project)</PRE>
-<DL>
-<DD>Answer the validator with the given id that is in effect for the given
- project.
- <p>
- Individual projects may override the global validation preference
- settings. If this is allowed and if the project has it's own settings,
- then those validators are returned via this method.
- </p>
- <p>
- The following approach is used. For version 1 validators, the validator
- is only returned if it is defined to operate on this project type. This
- is the way that the previous version of the framework did it. For version
- 2 validators, they are all returned.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>id</CODE> - Validator id.<DD><CODE>project</CODE> - This can be null, in which case all the registered validators are
- checked.
-<DT><B>Returns:</B><DD>null if the validator is not found</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidatorsFor(IResource)"><!-- --></A><H3>
-getValidatorsFor</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>[] <B>getValidatorsFor</B>(IResource resource)</PRE>
-<DL>
-<DD>Answer all the validators that are applicable for the given resource.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - the resource that determines which validators are applicable.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hasValidators(IResource, boolean, boolean)"><!-- --></A><H3>
-hasValidators</H3>
-<PRE>
-public boolean <B>hasValidators</B>(IResource resource,
- boolean isManual,
- boolean isBuild)</PRE>
-<DL>
-<DD>Answer true if the resource has any enabled validators.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - A file, folder or project.<DD><CODE>isManual</CODE> - If true then the validator must be turned on for manual validation.
- If false then the isManualValidation setting isn't used to filter
- out validators.<DD><CODE>isBuild</CODE> - If true then the validator must be turned on for build based
- validation. If false then the isBuildValidation setting isn't used
- to filter out validators.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="join(IProgressMonitor)"><!-- --></A><H3>
-join</H3>
-<PRE>
-public void <B>join</B>(IProgressMonitor monitor)
- throws java.lang.InterruptedException,
- OperationCanceledException</PRE>
-<DL>
-<DD>Waits until all validation jobs are finished. This method will block the
- calling thread until all such jobs have finished executing, or until this
- thread is interrupted. If there are no validation jobs that are
- currently waiting, running, or sleeping, this method returns immediately.
- Feedback on how the join is progressing is provided to the progress
- monitor.
- <p>
- If this method is called while the job manager is suspended, only jobs
- that are currently running will be joined. Once there are no jobs in the
- family in the <CODE>Job#RUNNING</CODE> state, this method returns.
- </p>
- <p>
- Note that there is a deadlock risk when using join. If the calling thread
- owns a lock or object monitor that the joined thread is waiting for,
- deadlock will occur. This method can also result in starvation of the
- current thread if another thread continues to add jobs of the given
- family, or if a job in the given family reschedules itself in an infinite
- loop.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>monitor</CODE> - Progress monitor for reporting progress on how the wait is
- progressing, or <code>null</code> if no progress monitoring is
- required.
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE> - if this thread is interrupted while waiting
-<DD><CODE>OperationCanceledException</CODE> - if the progress monitor is canceled while waiting</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="suspendValidation(IProject, boolean)"><!-- --></A><H3>
-suspendValidation</H3>
-<PRE>
-public void <B>suspendValidation</B>(IProject project,
- boolean suspend)</PRE>
-<DL>
-<DD>Suspends, or undoes the suspension of, validation on the current project.
- If <b>suspend</b> is true then validation is suspended and if it's false
- then validation is not suspended on the project. The value of this
- variable is not persisted.
- <p>
- Be <b>very careful</b> when you use this method! Turn validation back on in a
- finally block because if the code which suspended validation crashes, the
- user has no way to reset the suspension. The user will have to shut down
- and restart the workbench to get validation to work again.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - The project that is to be suspended or unsuspended.<DD><CODE>suspend</CODE> - If true, validation on the project will be suspend. If false it will
- not be suspended.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="suspendAllValidation(boolean)"><!-- --></A><H3>
-suspendAllValidation</H3>
-<PRE>
-public void <B>suspendAllValidation</B>(boolean suspend)</PRE>
-<DL>
-<DD>Suspends, or undoes the suspension of, validation on all projects in the
- workbench. If "suspend" is true then validation is suspended and if it's
- "false" then validation is not suspended. The value of this variable is
- not persisted.
- <p>
- Be <b>very careful</b> when you use this method! Turn validation back on in a
- finally block because if the code which suspended validation crashes, the
- user has no way to reset the suspension. The user will have to shut down
- and restart the workbench to get validation to work again.
- </p>
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isSuspended()"><!-- --></A><H3>
-isSuspended</H3>
-<PRE>
-public boolean <B>isSuspended</B>()</PRE>
-<DL>
-<DD>Return true if "suspend all" is enabled, false otherwise.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isSuspended(IProject)"><!-- --></A><H3>
-isSuspended</H3>
-<PRE>
-public boolean <B>isSuspended</B>(IProject project)</PRE>
-<DL>
-<DD>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.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isProjectSuspended(IProject)"><!-- --></A><H3>
-isProjectSuspended</H3>
-<PRE>
-public boolean <B>isProjectSuspended</B>(IProject project)</PRE>
-<DL>
-<DD>This method should be called by any code that is preparing to suspend validation on a
- project. Rather than calling isSuspended(IProject), which will also return true if all validation
- has been suspended.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - the project that is being tested
-<DT><B>Returns:</B><DD>boolean true if the project has been suspended</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validate(IProject[], boolean, boolean, IProgressMonitor)"><!-- --></A><H3>
-validate</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation">ValidationResults</A> <B>validate</B>(IProject[] projects,
- boolean isManual,
- boolean isBuild,
- IProgressMonitor monitor)
- throws CoreException</PRE>
-<DL>
-<DD>Validate the projects. Exactly one of isManual or isBuild needs to be true.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>projects</CODE> - The projects to be validated.<DD><CODE>isManual</CODE> - Is this being done as part of a manual validation? i.e. did
- the user select the Validate menu item?<DD><CODE>isBuild</CODE> - Is this being done as part of a build?<DD><CODE>monitor</CODE> -
-<DT><B>Returns:</B><DD>the validation result which is the combined result for all the
- resources that were validated.
-<DT><B>Throws:</B>
-<DD><CODE>CoreException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidationFramework.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidationFramework.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationFramework.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_class_summary">NESTED</A> | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationResult.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationResult.html
deleted file mode 100644
index 15272b7..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationResult.html
+++ /dev/null
@@ -1,820 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-ValidationResult
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="ValidationResult";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidationResult.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidationResult.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationResult.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class ValidationResult</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.ValidationResult</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public final class <B>ValidationResult</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-The result of running a validate operation. Validators create and return this objects as part of
- performing their validation.
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#ValidationResult()">ValidationResult</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#add(org.eclipse.wst.validation.ValidatorMessage)">add</A></B>(<A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A> message)</CODE>
-
-<BR>
- This is an optional method, that a validator can use to return error
- messages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IResource[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#getDependsOn()">getDependsOn</A></B>()</CODE>
-
-<BR>
- Answer the resources that the validated resource depends on.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#getMessages()">getMessages</A></B>()</CODE>
-
-<BR>
- Answer any validation messages that were added by the validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#getNumberOfValidatedResources()">getNumberOfValidatedResources</A></B>()</CODE>
-
-<BR>
- Answer the number of resources that have been validated.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#getReporter(IProgressMonitor)">getReporter</A></B>(IProgressMonitor monitor)</CODE>
-
-<BR>
- Answer an IReporter for handing error messages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#getSeverityError()">getSeverityError</A></B>()</CODE>
-
-<BR>
- Answer the number of error messages that were generated as part of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#getSeverityInfo()">getSeverityInfo</A></B>()</CODE>
-
-<BR>
- Answer the number of informational messages that were generated as part of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#getSeverityWarning()">getSeverityWarning</A></B>()</CODE>
-
-<BR>
- Answer the number of warning messages that were generated as part of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IProject</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#getSuspendValidation()">getSuspendValidation</A></B>()</CODE>
-
-<BR>
- Answer the project that the validator would like to have suspended.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IResource[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#getValidated()">getValidated</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> org.eclipse.wst.validation.internal.core.ValidationException</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#getValidationException()">getValidationException</A></B>()</CODE>
-
-<BR>
- If the validation ended with an exception, answer it.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#incrementError(int)">incrementError</A></B>(int errors)</CODE>
-
-<BR>
- Increment the number of error messages that were generated as part of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#incrementInfo(int)">incrementInfo</A></B>(int info)</CODE>
-
-<BR>
- Increment the number of informational messages that were generated as part of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#incrementWarning(int)">incrementWarning</A></B>(int warnings)</CODE>
-
-<BR>
- Increment the number of warning messages that were generated as part of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#isCanceled()">isCanceled</A></B>()</CODE>
-
-<BR>
- Was the operation canceled before it completed?</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#mergeResults(org.eclipse.wst.validation.ValidationResult)">mergeResults</A></B>(<A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A> result)</CODE>
-
-<BR>
- Merge the message counts and messages from an individual validator into this result.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#setCanceled(boolean)">setCanceled</A></B>(boolean canceled)</CODE>
-
-<BR>
- Indicate if the operation was canceled.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#setDependsOn(IResource[])">setDependsOn</A></B>(IResource[] dependsOn)</CODE>
-
-<BR>
- Update the resources that the validated resource depends on.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#setSeverityError(int)">setSeverityError</A></B>(int severityError)</CODE>
-
-<BR>
- Set the number of error messages that were generated as part of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#setSeverityInfo(int)">setSeverityInfo</A></B>(int severityInfo)</CODE>
-
-<BR>
- Set the number of informational messages that were generated as part of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#setSeverityWarning(int)">setSeverityWarning</A></B>(int severityWarning)</CODE>
-
-<BR>
- Set the number of warning messages that were generated as part of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#setSuspendValidation(IProject)">setSuspendValidation</A></B>(IProject project)</CODE>
-
-<BR>
- Calling this method will inform the framework, that this validator does not wish to be
- called again for any resources in this project, for the duration of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#setValidated(IResource[])">setValidated</A></B>(IResource[] validated)</CODE>
-
-<BR>
- Indicate that additional resources have been validated as part of this
- validate operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#setValidationException(org.eclipse.wst.validation.internal.core.ValidationException)">setValidationException</A></B>(org.eclipse.wst.validation.internal.core.ValidationException validationException)</CODE>
-
-<BR>
- If the validation failed with an exception, it can be recorded here.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ValidationResult()"><!-- --></A><H3>
-ValidationResult</H3>
-<PRE>
-public <B>ValidationResult</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="add(org.eclipse.wst.validation.ValidatorMessage)"><!-- --></A><H3>
-add</H3>
-<PRE>
-public void <B>add</B>(<A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A> message)</PRE>
-<DL>
-<DD>This is an optional method, that a validator can use to return error
- messages. The validation framework converts these into IMarkers.
- <p>
- The scenario that motivated this method, is when a validator is used both
- for <b>as you type</b> validation and <b>build</b> validation. When
- called in as you type mode, the validator doesn't want to directly create IMarkers,
- because the resource hasn't been saved yet. It needs to return something
- other than an IMarker. But when called in build mode, it does ultimately
- want IMarkers. By returning ValidatorMessages, it only needs to return
- one type of message, and those messages can be either be directly used by
- the caller, or automatically converted into IMarkers by the validation
- framework.
- <p>
- To make matters even more complicated there is a third way to return
- messages. To make it easier for old validators to port to the new
- framework, they can continue to use an IReporter. If a validator calls
- the getReporter() method then it is assumed by the framework that that is
- the approach that they have chosen.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>message</CODE> - A validation message.<DT><B>See Also:</B><DD><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#getReporter(IProgressMonitor)"><CODE>getReporter(IProgressMonitor)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getReporter(IProgressMonitor)"><!-- --></A><H3>
-getReporter</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> <B>getReporter</B>(IProgressMonitor monitor)</PRE>
-<DL>
-<DD>Answer an IReporter for handing error messages.
- <p>
- This is a transition method, to help old validators port to the new validation framework. If this method
- is called it is assumed by the framework, that this IReporter will be used as the only way of passing messages
- back to the framework.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>monitor</CODE> - <DT><B>See Also:</B><DD><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html#add(org.eclipse.wst.validation.ValidatorMessage)"><CODE>add(ValidatorMessage)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="mergeResults(org.eclipse.wst.validation.ValidationResult)"><!-- --></A><H3>
-mergeResults</H3>
-<PRE>
-public void <B>mergeResults</B>(<A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A> result)</PRE>
-<DL>
-<DD>Merge the message counts and messages from an individual validator into this result.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>result</CODE> - it can be null, in which case it is ignored.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDependsOn()"><!-- --></A><H3>
-getDependsOn</H3>
-<PRE>
-public IResource[] <B>getDependsOn</B>()</PRE>
-<DL>
-<DD>Answer the resources that the validated resource depends on.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMessages()"><!-- --></A><H3>
-getMessages</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A>[] <B>getMessages</B>()</PRE>
-<DL>
-<DD>Answer any validation messages that were added by the validator.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>an array is returned even if there are no messages.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDependsOn(IResource[])"><!-- --></A><H3>
-setDependsOn</H3>
-<PRE>
-public void <B>setDependsOn</B>(IResource[] dependsOn)</PRE>
-<DL>
-<DD>Update the resources that the validated resource depends on. This can be
- left null. For example, a XML file may depend on a XSD file in order to
- know if it is valid or not. It would pass back that XSD file.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>dependsOn</CODE> - If this is null then the dependency information is not updated. To
- remove the dependency information, an empty array needs to be
- supplied. A non null parameter, <b>replaces</b> all the dependency
- information for this resource, for this validator.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidated()"><!-- --></A><H3>
-getValidated</H3>
-<PRE>
-public IResource[] <B>getValidated</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>All the resources that were validated as a side-effect of
- validating the main resource, or null if none were.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setValidated(IResource[])"><!-- --></A><H3>
-setValidated</H3>
-<PRE>
-public void <B>setValidated</B>(IResource[] validated)</PRE>
-<DL>
-<DD>Indicate that additional resources have been validated as part of this
- validate operation. Sometimes in the course of performing a validation on
- one resource it is necessary to validate other resources as well. This
- method is used to let the framework know about these additional validated
- resources, to possibly save them being validated redundantly.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>validated</CODE> - Any additional resources that were validated.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSeverityError()"><!-- --></A><H3>
-getSeverityError</H3>
-<PRE>
-public int <B>getSeverityError</B>()</PRE>
-<DL>
-<DD>Answer the number of error messages that were generated as part of this validation operation.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSeverityError(int)"><!-- --></A><H3>
-setSeverityError</H3>
-<PRE>
-public void <B>setSeverityError</B>(int severityError)</PRE>
-<DL>
-<DD>Set the number of error messages that were generated as part of this validation operation.
- <p>
- Messages added through the add(ValidationMessage) method should not be included here, as this
- information will be determined from the ValidationMessage.
- </p>
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="incrementError(int)"><!-- --></A><H3>
-incrementError</H3>
-<PRE>
-public int <B>incrementError</B>(int errors)</PRE>
-<DL>
-<DD>Increment the number of error messages that were generated as part of this validation operation.
- <p>
- Messages added through the add(ValidationMessage) method should not be included here, as this
- information will be determined from the ValidationMessage.
- </p>
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the current number of errors.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSeverityWarning()"><!-- --></A><H3>
-getSeverityWarning</H3>
-<PRE>
-public int <B>getSeverityWarning</B>()</PRE>
-<DL>
-<DD>Answer the number of warning messages that were generated as part of this validation operation.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSeverityWarning(int)"><!-- --></A><H3>
-setSeverityWarning</H3>
-<PRE>
-public void <B>setSeverityWarning</B>(int severityWarning)</PRE>
-<DL>
-<DD>Set the number of warning messages that were generated as part of this validation operation.
- <p>
- Messages added through the add(ValidationMessage) method should not be included here, as this
- information will be determined from the ValidationMessage.
- </p>
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="incrementWarning(int)"><!-- --></A><H3>
-incrementWarning</H3>
-<PRE>
-public int <B>incrementWarning</B>(int warnings)</PRE>
-<DL>
-<DD>Increment the number of warning messages that were generated as part of this validation operation.
- <p>
- Messages added through the add(ValidationMessage) method should not be included here, as this
- information will be determined from the ValidationMessage.
- </p>
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the current number of warnings.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSeverityInfo()"><!-- --></A><H3>
-getSeverityInfo</H3>
-<PRE>
-public int <B>getSeverityInfo</B>()</PRE>
-<DL>
-<DD>Answer the number of informational messages that were generated as part of this validation operation.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSeverityInfo(int)"><!-- --></A><H3>
-setSeverityInfo</H3>
-<PRE>
-public void <B>setSeverityInfo</B>(int severityInfo)</PRE>
-<DL>
-<DD>Set the number of informational messages that were generated as part of this validation operation.
- <p>
- Messages added through the add(ValidationMessage) method should not be included here, as this
- information will be determined from the ValidationMessage.
- </p>
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="incrementInfo(int)"><!-- --></A><H3>
-incrementInfo</H3>
-<PRE>
-public int <B>incrementInfo</B>(int info)</PRE>
-<DL>
-<DD>Increment the number of informational messages that were generated as part of this validation operation.
- <p>
- Messages added through the add(ValidationMessage) method should not be included here, as this
- information will be determined from the ValidationMessage.
- </p>
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the current number of informational message.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isCanceled()"><!-- --></A><H3>
-isCanceled</H3>
-<PRE>
-public boolean <B>isCanceled</B>()</PRE>
-<DL>
-<DD>Was the operation canceled before it completed? For example if the validation is being run through the
- user interface, the end user can cancel the operation through the progress monitor.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>true if the operation was canceled</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setCanceled(boolean)"><!-- --></A><H3>
-setCanceled</H3>
-<PRE>
-public void <B>setCanceled</B>(boolean canceled)</PRE>
-<DL>
-<DD>Indicate if the operation was canceled.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>canceled</CODE> - Set to true if it was canceled and false if it was not canceled.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNumberOfValidatedResources()"><!-- --></A><H3>
-getNumberOfValidatedResources</H3>
-<PRE>
-public int <B>getNumberOfValidatedResources</B>()</PRE>
-<DL>
-<DD>Answer the number of resources that have been validated.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidationException()"><!-- --></A><H3>
-getValidationException</H3>
-<PRE>
-public org.eclipse.wst.validation.internal.core.ValidationException <B>getValidationException</B>()</PRE>
-<DL>
-<DD>If the validation ended with an exception, answer it.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>null if the validator did not finish with an exception.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setValidationException(org.eclipse.wst.validation.internal.core.ValidationException)"><!-- --></A><H3>
-setValidationException</H3>
-<PRE>
-public void <B>setValidationException</B>(org.eclipse.wst.validation.internal.core.ValidationException validationException)</PRE>
-<DL>
-<DD>If the validation failed with an exception, it can be recorded here.
- <p>
- This method is provided for old validators to ease their transition to the new framework.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>validationException</CODE> - </DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSuspendValidation()"><!-- --></A><H3>
-getSuspendValidation</H3>
-<PRE>
-public IProject <B>getSuspendValidation</B>()</PRE>
-<DL>
-<DD>Answer the project that the validator would like to have suspended.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the project to suspend or null. The normal result is null, which means that
- the validator wishes to receive normal validation requests.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSuspendValidation(IProject)"><!-- --></A><H3>
-setSuspendValidation</H3>
-<PRE>
-public void <B>setSuspendValidation</B>(IProject project)</PRE>
-<DL>
-<DD>Calling this method will inform the framework, that this validator does not wish to be
- called again for any resources in this project, for the duration of this validation operation.
- <p>
- Some validators may have a rich set of triggers, but once they have been invoked once,
- do not need to be invoked again during the course of the current validation.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - The project that this validator no longer wants to be notified on.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidationResult.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidationResult.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationResult.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationResults.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationResults.html
deleted file mode 100644
index bd78ec7..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationResults.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-ValidationResults
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="ValidationResults";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidationResults.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidationResults.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationResults.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class ValidationResults</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.ValidationResults</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ValidationResults</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-The combined results of validating multiple resources.
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html#ValidationResults(org.eclipse.wst.validation.ValidationResult)">ValidationResults</A></B>(<A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A> result)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html#getMessages()">getMessages</A></B>()</CODE>
-
-<BR>
- Answer any validation messages that were added by the validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html#getSeverityError()">getSeverityError</A></B>()</CODE>
-
-<BR>
- Answer the number of error messages that were generated as part of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html#getSeverityInfo()">getSeverityInfo</A></B>()</CODE>
-
-<BR>
- Answer the number of informational messages that were generated as part of this validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html#getSeverityWarning()">getSeverityWarning</A></B>()</CODE>
-
-<BR>
- Answer the number of warning messages that were generated as part of this validation operation.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ValidationResults(org.eclipse.wst.validation.ValidationResult)"><!-- --></A><H3>
-ValidationResults</H3>
-<PRE>
-public <B>ValidationResults</B>(<A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A> result)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getMessages()"><!-- --></A><H3>
-getMessages</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A>[] <B>getMessages</B>()</PRE>
-<DL>
-<DD>Answer any validation messages that were added by the validation operation.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>an array is returned even if there are no messages.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSeverityError()"><!-- --></A><H3>
-getSeverityError</H3>
-<PRE>
-public int <B>getSeverityError</B>()</PRE>
-<DL>
-<DD>Answer the number of error messages that were generated as part of this validation operation.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSeverityInfo()"><!-- --></A><H3>
-getSeverityInfo</H3>
-<PRE>
-public int <B>getSeverityInfo</B>()</PRE>
-<DL>
-<DD>Answer the number of informational messages that were generated as part of this validation operation.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSeverityWarning()"><!-- --></A><H3>
-getSeverityWarning</H3>
-<PRE>
-public int <B>getSeverityWarning</B>()</PRE>
-<DL>
-<DD>Answer the number of warning messages that were generated as part of this validation operation.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidationResults.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidationResults.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationResults.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationState.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationState.html
deleted file mode 100644
index b01263c..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidationState.html
+++ /dev/null
@@ -1,343 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-ValidationState
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="ValidationState";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidationState.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidationState.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationState.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#field_summary">FIELD</A> | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#field_detail">FIELD</A> | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class ValidationState</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.ValidationState</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ValidationState</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Keep track of arbitrary validation data, during the course of a validation.
- <p>
- To enable more efficient caching, the validation framework, allows individual validators to cache
- arbitrary data during the validation process. Use of this object is completely optional.
- <p>
- Since some validators wish to share data with other validators, any validator can see the state data for
- any other validator, since the id is simply the validator's extension id.
- <p>
- This object is freed at the end of the validation process.
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationState.html#TriggerResource">TriggerResource</A></B></CODE>
-
-<BR>
- This is a special id.</TD>
-</TR>
-</TABLE>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationState.html#ValidationState()">ValidationState</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationState.html#get(java.lang.String)">get</A></B>(java.lang.String id)</CODE>
-
-<BR>
- Answer the state data for the given validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidationState.html#put(java.lang.String, java.lang.Object)">put</A></B>(java.lang.String id,
- java.lang.Object value)</CODE>
-
-<BR>
- Save some state information.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="TriggerResource"><!-- --></A><H3>
-TriggerResource</H3>
-<PRE>
-public static final java.lang.String <B>TriggerResource</B></PRE>
-<DL>
-<DD>This is a special id.
- <p>
- If a resource that is depended on by others is changed, then the
- dependent resources are validated. The depended on resource, which is the
- resource that actually changed, is placed into the ValidationState using
- this id.
- </p>
-<P>
-<DL>
-</DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ValidationState()"><!-- --></A><H3>
-ValidationState</H3>
-<PRE>
-public <B>ValidationState</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="put(java.lang.String, java.lang.Object)"><!-- --></A><H3>
-put</H3>
-<PRE>
-public void <B>put</B>(java.lang.String id,
- java.lang.Object value)</PRE>
-<DL>
-<DD>Save some state information.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>id</CODE> - By convention this is the fully qualified validator extension id.
- For example: org.eclipse.wst.html.ui.HTMLValidator<DD><CODE>value</CODE> - Any arbitrary data that the validator might find useful. The
- validation framework doesn't do anything with this object except
- pass it along during the validation process.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="get(java.lang.String)"><!-- --></A><H3>
-get</H3>
-<PRE>
-public java.lang.Object <B>get</B>(java.lang.String id)</PRE>
-<DL>
-<DD>Answer the state data for the given validator.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>id</CODE> - By convention this is the fully qualified validator extension point
- id. For example org.eclipse.wst.html.ui.HTMLValidator
-<DT><B>Returns:</B><DD>any arbitrary data that the validator might find useful,
- including null.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidationState.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidationState.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationState.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#field_summary">FIELD</A> | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#field_detail">FIELD</A> | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.Level.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.Level.html
deleted file mode 100644
index ab475aa..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.Level.html
+++ /dev/null
@@ -1,348 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-Validator.Level
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Validator.Level";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Validator.Level.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Validator.Level.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.Level.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#enum_constant_summary">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#enum_constant_detail">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Enum Validator.Level</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by ">java.lang.Enum<<A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A>>
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.Validator.Level</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable, java.lang.Comparable<<A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A>></DD>
-</DL>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static enum <B>Validator.Level</B><DT>extends java.lang.Enum<<A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A>></DL>
-</PRE>
-
-<P>
-The level of configuration for the validator.
- <ul>
- <li>Extension - Defined by an extension point.</li>
- <li>Global - Defined by a global preference.</li>
- <li>Project - Defined by a project property.</li>
- </ul>
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== ENUM CONSTANT SUMMARY =========== -->
-
-<A NAME="enum_constant_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Enum Constant Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html#Extension">Extension</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html#Global">Global</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html#Project">Project</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html#valueOf(java.lang.String)">valueOf</A></B>(java.lang.String name)</CODE>
-
-<BR>
- Returns the enum constant of this type with the specified name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html#values()">values</A></B>()</CODE>
-
-<BR>
- Returns an array containing the constants of this enum type, in
-the order they are declared.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Enum"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Enum</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</CODE></TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>getClass, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ ENUM CONSTANT DETAIL =========== -->
-
-<A NAME="enum_constant_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Enum Constant Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Extension"><!-- --></A><H3>
-Extension</H3>
-<PRE>
-public static final <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A> <B>Extension</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="Global"><!-- --></A><H3>
-Global</H3>
-<PRE>
-public static final <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A> <B>Global</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="Project"><!-- --></A><H3>
-Project</H3>
-<PRE>
-public static final <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A> <B>Project</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="values()"><!-- --></A><H3>
-values</H3>
-<PRE>
-public static <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A>[] <B>values</B>()</PRE>
-<DL>
-<DD>Returns an array containing the constants of this enum type, in
-the order they are declared. This method may be used to iterate
-over the constants as follows:
-<pre>
-for (Validator.Level c : Validator.Level.values())
- System.out.println(c);
-</pre>
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>an array containing the constants of this enum type, in
-the order they are declared</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="valueOf(java.lang.String)"><!-- --></A><H3>
-valueOf</H3>
-<PRE>
-public static <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A> <B>valueOf</B>(java.lang.String name)</PRE>
-<DL>
-<DD>Returns the enum constant of this type with the specified name.
-The string must match <I>exactly</I> an identifier used to declare an
-enum constant in this type. (Extraneous whitespace characters are
-not permitted.)
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>name</CODE> - the name of the enum constant to be returned.
-<DT><B>Returns:</B><DD>the enum constant with the specified name
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.IllegalArgumentException</CODE> - if this enum type has no constant
-with the specified name
-<DD><CODE>java.lang.NullPointerException</CODE> - if the argument is null</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Validator.Level.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Validator.Level.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.Level.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#enum_constant_summary">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#enum_constant_detail">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.V1.V1Copy.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.V1.V1Copy.html
deleted file mode 100644
index 53263cb..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.V1.V1Copy.html
+++ /dev/null
@@ -1,363 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-Validator.V1.V1Copy
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Validator.V1.V1Copy";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Validator.V1.V1Copy.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Validator.V1.V1Copy.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V1.V1Copy.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_classes_inherited_from_class_org.eclipse.wst.validation.Validator.V1">NESTED</A> | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class Validator.V1.V1Copy</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">org.eclipse.wst.validation.Validator</A>
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">org.eclipse.wst.validation.Validator.V1</A>
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.Validator.V1.V1Copy</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.lang.Comparable<<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>></DD>
-</DL>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static class <B>Validator.V1.V1Copy</B><DT>extends <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-</TABLE>
- <A NAME="nested_classes_inherited_from_class_org.eclipse.wst.validation.Validator.V1"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Nested classes/interfaces inherited from class org.eclipse.wst.validation.<A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation">Validator.V1.V1Copy</A></CODE></TD>
-</TR>
-</TABLE>
-
-<A NAME="nested_classes_inherited_from_class_org.eclipse.wst.validation.Validator"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Nested classes/interfaces inherited from class org.eclipse.wst.validation.<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></CODE></TD>
-</TR>
-</TABLE>
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html#Validator.V1.V1Copy(ValidatorMetaData, ValidationConfiguration)">Validator.V1.V1Copy</A></B>(ValidatorMetaData vmd,
- ValidationConfiguration vc)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html#become(org.eclipse.wst.validation.Validator)">become</A></B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> val)</CODE>
-
-<BR>
- Take the instance variables from the incoming validator and set them to yourself.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html#setBuildValidation(boolean)">setBuildValidation</A></B>(boolean bool)</CODE>
-
-<BR>
- Set whether this validator should be triggered by the build process.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html#setManualValidation(boolean)">setManualValidation</A></B>(boolean bool)</CODE>
-
-<BR>
- Set whether this validator should be triggered as part of a manual validation.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_org.eclipse.wst.validation.Validator.V1"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class org.eclipse.wst.validation.<A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#asIValidator()">asIValidator</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#asV1Validator()">asV1Validator</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#copy(boolean)">copy</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#getId()">getId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#getName()">getName</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#getValidatorClassname()">getValidatorClassname</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#getVmd()">getVmd</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)">validate</A></CODE></TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_org.eclipse.wst.validation.Validator"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class org.eclipse.wst.validation.<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asV2Validator()">asV2Validator</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#bumpChangeCountGlobal()">bumpChangeCountGlobal</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#bumpChangeCountMessages()">bumpChangeCountMessages</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#clean(IProject, IProgressMonitor)">clean</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#compareTo(org.eclipse.wst.validation.Validator)">compareTo</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#copy()">copy</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#create(IConfigurationElement, IProject)">create</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#create(ValidatorMetaData, ValidationConfiguration, IProject)">create</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getChangeCountGlobal()">getChangeCountGlobal</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getChangeCountMessages()">getChangeCountMessages</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getDelegatingId()">getDelegatingId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMarkerId()">getMarkerId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMessage(java.lang.String)">getMessage</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMessageSettings()">getMessageSettings</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getProject()">getProject</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getSourceId()">getSourceId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getVersion()">getVersion</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#hashCodeForConfig()">hashCodeForConfig</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#isBuildValidation()">isBuildValidation</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#isChanged()">isChanged</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#isManualValidation()">isManualValidation</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#resetChangeCounters()">resetChangeCounters</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#sameConfig(org.eclipse.wst.validation.Validator)">sameConfig</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setDelegatingId(java.lang.String)">setDelegatingId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setMarkerId(java.lang.String)">setMarkerId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setSourceId(java.lang.String)">setSourceId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setVersion(int)">setVersion</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidate(IResource, boolean, boolean)">shouldValidate</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidate(IResource, org.eclipse.wst.validation.internal.ValType)">shouldValidate</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidateProject(IProject, boolean, boolean)">shouldValidateProject</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidateProject(IProject, org.eclipse.wst.validation.internal.ValType)">shouldValidateProject</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#toString()">toString</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationFinishing</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationStarting</A></CODE></TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Validator.V1.V1Copy(ValidatorMetaData, ValidationConfiguration)"><!-- --></A><H3>
-Validator.V1.V1Copy</H3>
-<PRE>
-public <B>Validator.V1.V1Copy</B>(ValidatorMetaData vmd,
- ValidationConfiguration vc)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="setManualValidation(boolean)"><!-- --></A><H3>
-setManualValidation</H3>
-<PRE>
-public void <B>setManualValidation</B>(boolean bool)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setManualValidation(boolean)">Validator</A></CODE></B></DD>
-<DD>Set whether this validator should be triggered as part of a manual validation.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#setManualValidation(boolean)">setManualValidation</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBuildValidation(boolean)"><!-- --></A><H3>
-setBuildValidation</H3>
-<PRE>
-public void <B>setBuildValidation</B>(boolean bool)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setBuildValidation(boolean)">Validator</A></CODE></B></DD>
-<DD>Set whether this validator should be triggered by the build process.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#setBuildValidation(boolean)">setBuildValidation</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="become(org.eclipse.wst.validation.Validator)"><!-- --></A><H3>
-become</H3>
-<PRE>
-public void <B>become</B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> val)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#become(org.eclipse.wst.validation.Validator)">Validator</A></CODE></B></DD>
-<DD>Take the instance variables from the incoming validator and set them to yourself.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#become(org.eclipse.wst.validation.Validator)">become</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Validator.V1.V1Copy.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Validator.V1.V1Copy.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V1.V1Copy.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_classes_inherited_from_class_org.eclipse.wst.validation.Validator.V1">NESTED</A> | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.V1.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.V1.html
deleted file mode 100644
index d94f147..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.V1.html
+++ /dev/null
@@ -1,551 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-Validator.V1
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Validator.V1";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Validator.V1.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Validator.V1.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V1.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_class_summary">NESTED</A> | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class Validator.V1</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">org.eclipse.wst.validation.Validator</A>
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.Validator.V1</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.lang.Comparable<<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>></DD>
-</DL>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation">Validator.V1.V1Copy</A></DD>
-</DL>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static class <B>Validator.V1</B><DT>extends <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></DL>
-</PRE>
-
-<P>
-A validator that uses version 1 of the validation framework.
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation">Validator.V1.V1Copy</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
- <A NAME="nested_classes_inherited_from_class_org.eclipse.wst.validation.Validator"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Nested classes/interfaces inherited from class org.eclipse.wst.validation.<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></CODE></TD>
-</TR>
-</TABLE>
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#Validator.V1(ValidatorMetaData, ValidationConfiguration)">Validator.V1</A></B>(ValidatorMetaData vmd,
- ValidationConfiguration config)</CODE>
-
-<BR>
- Create a new version 1 validator.</TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#asIValidator()">asIValidator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#asV1Validator()">asV1Validator</A></B>()</CODE>
-
-<BR>
- If you are a version 1 validator, answer yourself as one, otherwise answer null.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#become(org.eclipse.wst.validation.Validator)">become</A></B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> val)</CODE>
-
-<BR>
- Take the instance variables from the incoming validator and set them to yourself.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#copy(boolean)">copy</A></B>(boolean includeChangeCounts)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#getId()">getId</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#getName()">getName</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#getValidatorClassname()">getValidatorClassname</A></B>()</CODE>
-
-<BR>
- Answer the name of the class that implements the validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> ValidatorMetaData</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#getVmd()">getVmd</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#setBuildValidation(boolean)">setBuildValidation</A></B>(boolean buildValidation)</CODE>
-
-<BR>
- Set whether this validator should be triggered by the build process.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#setManualValidation(boolean)">setManualValidation</A></B>(boolean manualValidation)</CODE>
-
-<BR>
- Set whether this validator should be triggered as part of a manual validation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html#validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)">validate</A></B>(IResource resource,
- int kind,
- org.eclipse.wst.validation.internal.ValOperation operation,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- Validate the resource.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_org.eclipse.wst.validation.Validator"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class org.eclipse.wst.validation.<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asV2Validator()">asV2Validator</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#bumpChangeCountGlobal()">bumpChangeCountGlobal</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#bumpChangeCountMessages()">bumpChangeCountMessages</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#clean(IProject, IProgressMonitor)">clean</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#compareTo(org.eclipse.wst.validation.Validator)">compareTo</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#copy()">copy</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#create(IConfigurationElement, IProject)">create</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#create(ValidatorMetaData, ValidationConfiguration, IProject)">create</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getChangeCountGlobal()">getChangeCountGlobal</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getChangeCountMessages()">getChangeCountMessages</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getDelegatingId()">getDelegatingId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMarkerId()">getMarkerId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMessage(java.lang.String)">getMessage</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMessageSettings()">getMessageSettings</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getProject()">getProject</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getSourceId()">getSourceId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getVersion()">getVersion</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#hashCodeForConfig()">hashCodeForConfig</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#isBuildValidation()">isBuildValidation</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#isChanged()">isChanged</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#isManualValidation()">isManualValidation</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#resetChangeCounters()">resetChangeCounters</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#sameConfig(org.eclipse.wst.validation.Validator)">sameConfig</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setDelegatingId(java.lang.String)">setDelegatingId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setMarkerId(java.lang.String)">setMarkerId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setSourceId(java.lang.String)">setSourceId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setVersion(int)">setVersion</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidate(IResource, boolean, boolean)">shouldValidate</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidate(IResource, org.eclipse.wst.validation.internal.ValType)">shouldValidate</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidateProject(IProject, boolean, boolean)">shouldValidateProject</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidateProject(IProject, org.eclipse.wst.validation.internal.ValType)">shouldValidateProject</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#toString()">toString</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationFinishing</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationStarting</A></CODE></TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Validator.V1(ValidatorMetaData, ValidationConfiguration)"><!-- --></A><H3>
-Validator.V1</H3>
-<PRE>
-public <B>Validator.V1</B>(ValidatorMetaData vmd,
- ValidationConfiguration config)</PRE>
-<DL>
-<DD>Create a new version 1 validator.
-<P>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>vmd</CODE> - <DD><CODE>config</CODE> - this is used to set the global enablement options. In some case this can be null.</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="asIValidator()"><!-- --></A><H3>
-asIValidator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> <B>asIValidator</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asIValidator()">asIValidator</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="asV1Validator()"><!-- --></A><H3>
-asV1Validator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A> <B>asV1Validator</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asV1Validator()">Validator</A></CODE></B></DD>
-<DD>If you are a version 1 validator, answer yourself as one, otherwise answer null.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asV1Validator()">asV1Validator</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="become(org.eclipse.wst.validation.Validator)"><!-- --></A><H3>
-become</H3>
-<PRE>
-public void <B>become</B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> val)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#become(org.eclipse.wst.validation.Validator)">Validator</A></CODE></B></DD>
-<DD>Take the instance variables from the incoming validator and set them to yourself.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#become(org.eclipse.wst.validation.Validator)">become</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="copy(boolean)"><!-- --></A><H3>
-copy</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> <B>copy</B>(boolean includeChangeCounts)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#copy(boolean)">copy</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getName()">getName</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVmd()"><!-- --></A><H3>
-getVmd</H3>
-<PRE>
-public ValidatorMetaData <B>getVmd</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidatorClassname()"><!-- --></A><H3>
-getValidatorClassname</H3>
-<PRE>
-public java.lang.String <B>getValidatorClassname</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getValidatorClassname()">Validator</A></CODE></B></DD>
-<DD>Answer the name of the class that implements the validator.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getValidatorClassname()">getValidatorClassname</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getId()"><!-- --></A><H3>
-getId</H3>
-<PRE>
-public java.lang.String <B>getId</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getId()">getId</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBuildValidation(boolean)"><!-- --></A><H3>
-setBuildValidation</H3>
-<PRE>
-public void <B>setBuildValidation</B>(boolean buildValidation)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setBuildValidation(boolean)">Validator</A></CODE></B></DD>
-<DD>Set whether this validator should be triggered by the build process.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setBuildValidation(boolean)">setBuildValidation</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setManualValidation(boolean)"><!-- --></A><H3>
-setManualValidation</H3>
-<PRE>
-public void <B>setManualValidation</B>(boolean manualValidation)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setManualValidation(boolean)">Validator</A></CODE></B></DD>
-<DD>Set whether this validator should be triggered as part of a manual validation.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setManualValidation(boolean)">setManualValidation</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)"><!-- --></A><H3>
-validate</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A> <B>validate</B>(IResource resource,
- int kind,
- org.eclipse.wst.validation.internal.ValOperation operation,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)">Validator</A></CODE></B></DD>
-<DD>Validate the resource.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)">validate</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - the resource to be validated<DD><CODE>kind</CODE> - the kind of resource change, see IResourceDelta for values.<DD><CODE>operation</CODE> - the operation that this validation is running under. This can be null.<DD><CODE>monitor</CODE> - a way to report progress. This can be null.
-<DT><B>Returns:</B><DD>the result of doing the validation, it can be, but usually isn't null.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Validator.V1.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Validator.V1.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V1.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_class_summary">NESTED</A> | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.V2.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.V2.html
deleted file mode 100644
index fcf3bd1..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.V2.html
+++ /dev/null
@@ -1,898 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-Validator.V2
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Validator.V2";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Validator.V2.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Validator.V2.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V2.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_classes_inherited_from_class_org.eclipse.wst.validation.Validator">NESTED</A> | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class Validator.V2</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">org.eclipse.wst.validation.Validator</A>
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.Validator.V2</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.lang.Comparable<<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>></DD>
-</DL>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static final class <B>Validator.V2</B><DT>extends <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></DL>
-</PRE>
-
-<P>
-A validator that uses version 2 of the validation framework.
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-</TABLE>
- <A NAME="nested_classes_inherited_from_class_org.eclipse.wst.validation.Validator"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Nested classes/interfaces inherited from class org.eclipse.wst.validation.<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></CODE></TD>
-</TR>
-</TABLE>
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#add(org.eclipse.wst.validation.internal.model.FilterGroup)">add</A></B>(org.eclipse.wst.validation.internal.model.FilterGroup fg)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#asIValidator()">asIValidator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#asV2Validator()">asV2Validator</A></B>()</CODE>
-
-<BR>
- If you are a version 2 validator, answer yourself as one, otherwise answer null.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#become(org.eclipse.wst.validation.Validator)">become</A></B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> val)</CODE>
-
-<BR>
- Take the instance variables from the incoming validator and set them to yourself.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#bumpChangeCountGroups()">bumpChangeCountGroups</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#clean(IProject, IProgressMonitor)">clean</A></B>(IProject project,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- Let the validator know that a clean is about to happen.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#copy(boolean)">copy</A></B>(boolean includeChangeCounts)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#getAdapter(java.lang.Class)">getAdapter</A></B>(java.lang.Class adapter)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#getChangeCountGroups()">getChangeCountGroups</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation">AbstractValidator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#getDelegatedValidator()">getDelegatedValidator</A></B>()</CODE>
-
-<BR>
- Answer the actual validator that is going to perform the validation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> org.eclipse.wst.validation.internal.model.FilterGroup[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#getGroups()">getGroups</A></B>()</CODE>
-
-<BR>
- Answer the validator's filter groups.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#getId()">getId</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#getLevel()">getLevel</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#getName()">getName</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation">AbstractValidator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#getValidator()">getValidator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#getValidatorClassname()">getValidatorClassname</A></B>()</CODE>
-
-<BR>
- Answer the name of the class that implements the validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#getValidatorGroups()">getValidatorGroups</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#hashCodeForConfig()">hashCodeForConfig</A></B>()</CODE>
-
-<BR>
- Answer a hash code for the configurable fields so that we can quickly determine if two
- validators are the same.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#isChanged()">isChanged</A></B>()</CODE>
-
-<BR>
- Has the validator changed since it was last created or copied?</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#remove(org.eclipse.wst.validation.internal.model.FilterGroup)">remove</A></B>(org.eclipse.wst.validation.internal.model.FilterGroup group)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#resetChangeCounters()">resetChangeCounters</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#setDelegatingId(java.lang.String)">setDelegatingId</A></B>(java.lang.String delegating)</CODE>
-
-<BR>
- Set the id of the "real" validator, that is the validator that will be called when this delegating
- validator is asked to validate something.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#setGroups(java.util.List)">setGroups</A></B>(java.util.List<org.eclipse.wst.validation.internal.model.FilterGroup> groups)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#setId(java.lang.String)">setId</A></B>(java.lang.String id)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#setLevel(org.eclipse.wst.validation.Validator.Level)">setLevel</A></B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A> level)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#setName(java.lang.String)">setName</A></B>(java.lang.String name)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)">validate</A></B>(IResource resource,
- int kind,
- org.eclipse.wst.validation.internal.ValOperation operation,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- Validate the resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationFinishing</A></B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- This method will be called when validation is complete.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html#validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationStarting</A></B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- This method will be called before any validation takes place.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_org.eclipse.wst.validation.Validator"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class org.eclipse.wst.validation.<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asV1Validator()">asV1Validator</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#bumpChangeCountGlobal()">bumpChangeCountGlobal</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#bumpChangeCountMessages()">bumpChangeCountMessages</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#compareTo(org.eclipse.wst.validation.Validator)">compareTo</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#copy()">copy</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#create(IConfigurationElement, IProject)">create</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#create(ValidatorMetaData, ValidationConfiguration, IProject)">create</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getChangeCountGlobal()">getChangeCountGlobal</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getChangeCountMessages()">getChangeCountMessages</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getDelegatingId()">getDelegatingId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMarkerId()">getMarkerId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMessage(java.lang.String)">getMessage</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMessageSettings()">getMessageSettings</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getProject()">getProject</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getSourceId()">getSourceId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#getVersion()">getVersion</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#isBuildValidation()">isBuildValidation</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#isManualValidation()">isManualValidation</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#sameConfig(org.eclipse.wst.validation.Validator)">sameConfig</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setBuildValidation(boolean)">setBuildValidation</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setManualValidation(boolean)">setManualValidation</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setMarkerId(java.lang.String)">setMarkerId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setSourceId(java.lang.String)">setSourceId</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#setVersion(int)">setVersion</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidate(IResource, boolean, boolean)">shouldValidate</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidate(IResource, org.eclipse.wst.validation.internal.ValType)">shouldValidate</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidateProject(IProject, boolean, boolean)">shouldValidateProject</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidateProject(IProject, org.eclipse.wst.validation.internal.ValType)">shouldValidateProject</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.html#toString()">toString</A></CODE></TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="add(org.eclipse.wst.validation.internal.model.FilterGroup)"><!-- --></A><H3>
-add</H3>
-<PRE>
-public void <B>add</B>(org.eclipse.wst.validation.internal.model.FilterGroup fg)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="asIValidator()"><!-- --></A><H3>
-asIValidator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> <B>asIValidator</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asIValidator()">asIValidator</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="asV2Validator()"><!-- --></A><H3>
-asV2Validator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A> <B>asV2Validator</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asV2Validator()">Validator</A></CODE></B></DD>
-<DD>If you are a version 2 validator, answer yourself as one, otherwise answer null.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asV2Validator()">asV2Validator</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="clean(IProject, IProgressMonitor)"><!-- --></A><H3>
-clean</H3>
-<PRE>
-public void <B>clean</B>(IProject project,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD>Let the validator know that a clean is about to happen.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#clean(IProject, IProgressMonitor)">clean</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - the project that is being cleaned. This can be null which means that the workspace
- is being cleaned (in which case a separate call will be made for each open project).<DD><CODE>monitor</CODE> - the monitor that should be used for reporting progress if the clean takes a long time.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="copy(boolean)"><!-- --></A><H3>
-copy</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> <B>copy</B>(boolean includeChangeCounts)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#copy(boolean)">copy</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getChangeCountGroups()"><!-- --></A><H3>
-getChangeCountGroups</H3>
-<PRE>
-public int <B>getChangeCountGroups</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bumpChangeCountGroups()"><!-- --></A><H3>
-bumpChangeCountGroups</H3>
-<PRE>
-public void <B>bumpChangeCountGroups</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLevel()"><!-- --></A><H3>
-getLevel</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A> <B>getLevel</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setLevel(org.eclipse.wst.validation.Validator.Level)"><!-- --></A><H3>
-setLevel</H3>
-<PRE>
-public void <B>setLevel</B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A> level)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDelegatedValidator()"><!-- --></A><H3>
-getDelegatedValidator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation">AbstractValidator</A> <B>getDelegatedValidator</B>()</PRE>
-<DL>
-<DD>Answer the actual validator that is going to perform the validation. If this is a normal validator this
- method will simply answer itself. However if this is a delegating validator, then this will answer the
- "real" validator.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getId()"><!-- --></A><H3>
-getId</H3>
-<PRE>
-public java.lang.String <B>getId</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getId()">getId</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getGroups()"><!-- --></A><H3>
-getGroups</H3>
-<PRE>
-public org.eclipse.wst.validation.internal.model.FilterGroup[] <B>getGroups</B>()</PRE>
-<DL>
-<DD>Answer the validator's filter groups.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>an empty array if the validator does not have any filter groups.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getName()">getName</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidator()"><!-- --></A><H3>
-getValidator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation">AbstractValidator</A> <B>getValidator</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidatorClassname()"><!-- --></A><H3>
-getValidatorClassname</H3>
-<PRE>
-public java.lang.String <B>getValidatorClassname</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getValidatorClassname()">Validator</A></CODE></B></DD>
-<DD>Answer the name of the class that implements the validator.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getValidatorClassname()">getValidatorClassname</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidatorGroups()"><!-- --></A><H3>
-getValidatorGroups</H3>
-<PRE>
-public java.lang.String[] <B>getValidatorGroups</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hashCodeForConfig()"><!-- --></A><H3>
-hashCodeForConfig</H3>
-<PRE>
-public int <B>hashCodeForConfig</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#hashCodeForConfig()">Validator</A></CODE></B></DD>
-<DD>Answer a hash code for the configurable fields so that we can quickly determine if two
- validators are the same.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#hashCodeForConfig()">hashCodeForConfig</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isChanged()"><!-- --></A><H3>
-isChanged</H3>
-<PRE>
-public boolean <B>isChanged</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#isChanged()">Validator</A></CODE></B></DD>
-<DD>Has the validator changed since it was last created or copied?
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#isChanged()">isChanged</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDelegatingId(java.lang.String)"><!-- --></A><H3>
-setDelegatingId</H3>
-<PRE>
-public void <B>setDelegatingId</B>(java.lang.String delegating)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setDelegatingId(java.lang.String)">Validator</A></CODE></B></DD>
-<DD>Set the id of the "real" validator, that is the validator that will be called when this delegating
- validator is asked to validate something.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setDelegatingId(java.lang.String)">setDelegatingId</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>delegating</CODE> - the id of the validator that is actually going to perform the validation.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setGroups(java.util.List)"><!-- --></A><H3>
-setGroups</H3>
-<PRE>
-public void <B>setGroups</B>(java.util.List<org.eclipse.wst.validation.internal.model.FilterGroup> groups)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setId(java.lang.String)"><!-- --></A><H3>
-setId</H3>
-<PRE>
-public void <B>setId</B>(java.lang.String id)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setName(java.lang.String)"><!-- --></A><H3>
-setName</H3>
-<PRE>
-public void <B>setName</B>(java.lang.String name)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)"><!-- --></A><H3>
-validate</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A> <B>validate</B>(IResource resource,
- int kind,
- org.eclipse.wst.validation.internal.ValOperation operation,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)">Validator</A></CODE></B></DD>
-<DD>Validate the resource.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)">validate</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - the resource to be validated<DD><CODE>kind</CODE> - the kind of resource change, see IResourceDelta for values.<DD><CODE>operation</CODE> - the operation that this validation is running under. This can be null.<DD><CODE>monitor</CODE> - a way to report progress. This can be null.
-<DT><B>Returns:</B><DD>the result of doing the validation, it can be, but usually isn't null.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)"><!-- --></A><H3>
-validationStarting</H3>
-<PRE>
-public void <B>validationStarting</B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">Validator</A></CODE></B></DD>
-<DD>This method will be called before any validation takes place. It allows validators to perform any
- initialization that they might need.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationStarting</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - the project that is being validated. For the very first call in the validation phase,
- this will be null. That is the signal to the validator that a top level validation is starting.
- Subsequently, the project will be set, as each of the individual projects are validated.<DD><CODE>state</CODE> - a way to pass arbitrary, validator specific, data from one invocation of a validator to
- the next, during the validation phase.<DD><CODE>monitor</CODE> - the monitor that should be used for reporting progress if the clean takes a long time.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)"><!-- --></A><H3>
-validationFinishing</H3>
-<PRE>
-public void <B>validationFinishing</B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">Validator</A></CODE></B></DD>
-<DD>This method will be called when validation is complete. It allows validators to perform any
- cleanup that they might need to do.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationFinishing</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - the project that was validated. The very last call in the validation will set this to
- null so that the validator knows that all the projects have now been validated.<DD><CODE>state</CODE> - a way to pass arbitrary, validator specific, data from one invocation of a validator to
- the next, during the validation phase.<DD><CODE>monitor</CODE> - the monitor that should be used for reporting progress if the clean takes a long time.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAdapter(java.lang.Class)"><!-- --></A><H3>
-getAdapter</H3>
-<PRE>
-public java.lang.Object <B>getAdapter</B>(java.lang.Class adapter)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="remove(org.eclipse.wst.validation.internal.model.FilterGroup)"><!-- --></A><H3>
-remove</H3>
-<PRE>
-public void <B>remove</B>(org.eclipse.wst.validation.internal.model.FilterGroup group)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="resetChangeCounters()"><!-- --></A><H3>
-resetChangeCounters</H3>
-<PRE>
-public void <B>resetChangeCounters</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#resetChangeCounters()">resetChangeCounters</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="become(org.eclipse.wst.validation.Validator)"><!-- --></A><H3>
-become</H3>
-<PRE>
-public void <B>become</B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> val)</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#become(org.eclipse.wst.validation.Validator)">Validator</A></CODE></B></DD>
-<DD>Take the instance variables from the incoming validator and set them to yourself.
-<P>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html#become(org.eclipse.wst.validation.Validator)">become</A></CODE> in class <CODE><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Validator.V2.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Validator.V2.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V2.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_classes_inherited_from_class_org.eclipse.wst.validation.Validator">NESTED</A> | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.html
deleted file mode 100644
index 29f48d9..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/Validator.html
+++ /dev/null
@@ -1,1366 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:54 EDT 2008 -->
-<TITLE>
-Validator
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Validator";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Validator.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Validator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_class_summary">NESTED</A> | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class Validator</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.Validator</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.lang.Comparable<<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>></DD>
-</DL>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A>, <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public abstract class <B>Validator</B><DT>extends java.lang.Object<DT>implements java.lang.Comparable<<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>></DL>
-</PRE>
-
-<P>
-Represents a validator. This gets instantiated through one of the validator extension points.
- <p>
- <b>This class is not API</b>.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A></B></CODE>
-
-<BR>
- The level of configuration for the validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></B></CODE>
-
-<BR>
- A validator that uses version 1 of the validation framework.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></B></CODE>
-
-<BR>
- A validator that uses version 2 of the validation framework.</TD>
-</TR>
-</TABLE>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#Validator()">Validator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asIValidator()">asIValidator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asV1Validator()">asV1Validator</A></B>()</CODE>
-
-<BR>
- If you are a version 1 validator, answer yourself as one, otherwise answer null.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#asV2Validator()">asV2Validator</A></B>()</CODE>
-
-<BR>
- If you are a version 2 validator, answer yourself as one, otherwise answer null.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#become(org.eclipse.wst.validation.Validator)">become</A></B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</CODE>
-
-<BR>
- Take the instance variables from the incoming validator and set them to yourself.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#bumpChangeCountGlobal()">bumpChangeCountGlobal</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#bumpChangeCountMessages()">bumpChangeCountMessages</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#clean(IProject, IProgressMonitor)">clean</A></B>(IProject project,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- The project is being cleaned, this method gives the validator a chance to do any special cleanup.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#compareTo(org.eclipse.wst.validation.Validator)">compareTo</A></B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</CODE>
-
-<BR>
- Compare yourself based on Validator name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#copy()">copy</A></B>()</CODE>
-
-<BR>
- Answer a deep copy of yourself.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>abstract <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#copy(boolean)">copy</A></B>(boolean includeChangeCounts)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#create(IConfigurationElement, IProject)">create</A></B>(IConfigurationElement validator,
- IProject project)</CODE>
-
-<BR>
- Create a new validator based on a abstract validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#create(ValidatorMetaData, ValidationConfiguration, IProject)">create</A></B>(ValidatorMetaData vmd,
- ValidationConfiguration config,
- IProject project)</CODE>
-
-<BR>
- Create a new validator based on validator meta data.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getChangeCountGlobal()">getChangeCountGlobal</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getChangeCountMessages()">getChangeCountMessages</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getDelegatingId()">getDelegatingId</A></B>()</CODE>
-
-<BR>
- Get the id of the "real" validator, that is the validator that will be called when this delegating
- validator is asked to validate something.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>abstract java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getId()">getId</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMarkerId()">getMarkerId</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMessage(java.lang.String)">getMessage</A></B>(java.lang.String id)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.Map<java.lang.String,<A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A>></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getMessageSettings()">getMessageSettings</A></B>()</CODE>
-
-<BR>
- Answer all the message settings that this validator has defined.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>abstract java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getName()">getName</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IProject</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getProject()">getProject</A></B>()</CODE>
-
-<BR>
- Answer the project that you were enabled on.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getSourceId()">getSourceId</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>abstract java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getValidatorClassname()">getValidatorClassname</A></B>()</CODE>
-
-<BR>
- Answer the name of the class that implements the validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#getVersion()">getVersion</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#hashCodeForConfig()">hashCodeForConfig</A></B>()</CODE>
-
-<BR>
- Answer a hash code for the configurable fields so that we can quickly determine if two
- validators are the same.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#isBuildValidation()">isBuildValidation</A></B>()</CODE>
-
-<BR>
- Is this validator currently enabled for validations that are triggered by builds?</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#isChanged()">isChanged</A></B>()</CODE>
-
-<BR>
- Has the validator changed since it was last created or copied?</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#isManualValidation()">isManualValidation</A></B>()</CODE>
-
-<BR>
- Is this validator currently enabled for validations that are triggered manually?</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#resetChangeCounters()">resetChangeCounters</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#sameConfig(org.eclipse.wst.validation.Validator)">sameConfig</A></B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</CODE>
-
-<BR>
- Answer true if you have the same configuration settings as validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setBuildValidation(boolean)">setBuildValidation</A></B>(boolean buildValidation)</CODE>
-
-<BR>
- Set whether this validator should be triggered by the build process.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setDelegatingId(java.lang.String)">setDelegatingId</A></B>(java.lang.String delegating)</CODE>
-
-<BR>
- Set the id of the "real" validator, that is the validator that will be called when this delegating
- validator is asked to validate something.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setManualValidation(boolean)">setManualValidation</A></B>(boolean manualValidation)</CODE>
-
-<BR>
- Set whether this validator should be triggered as part of a manual validation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setMarkerId(java.lang.String)">setMarkerId</A></B>(java.lang.String markerId)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setSourceId(java.lang.String)">setSourceId</A></B>(java.lang.String sourceId)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#setVersion(int)">setVersion</A></B>(int version)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidate(IResource, boolean, boolean)">shouldValidate</A></B>(IResource resource,
- boolean isManual,
- boolean isBuild)</CODE>
-
-<BR>
- Answer true if this validator, based on it's filters, should validate
- this resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidate(IResource, org.eclipse.wst.validation.internal.ValType)">shouldValidate</A></B>(IResource resource,
- org.eclipse.wst.validation.internal.ValType valType)</CODE>
-
-<BR>
- Answer true if this validator, based on it's filters, should validate
- this resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidateProject(IProject, boolean, boolean)">shouldValidateProject</A></B>(IProject project,
- boolean isManual,
- boolean isBuild)</CODE>
-
-<BR>
- Answer true if this validator, based on it's filters, should validate this project.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#shouldValidateProject(IProject, org.eclipse.wst.validation.internal.ValType)">shouldValidateProject</A></B>(IProject project,
- org.eclipse.wst.validation.internal.ValType type)</CODE>
-
-<BR>
- Answer true if this validator, based on it's filters, should validate this project.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#toString()">toString</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>abstract <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)">validate</A></B>(IResource resource,
- int kind,
- org.eclipse.wst.validation.internal.ValOperation operation,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- Validate the resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationFinishing</A></B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- This method will be called when validation is complete.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html#validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationStarting</A></B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- This method will be called before any validation takes place.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Validator()"><!-- --></A><H3>
-Validator</H3>
-<PRE>
-public <B>Validator</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="create(IConfigurationElement, IProject)"><!-- --></A><H3>
-create</H3>
-<PRE>
-public static <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> <B>create</B>(IConfigurationElement validator,
- IProject project)</PRE>
-<DL>
-<DD>Create a new validator based on a abstract validator.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>validator</CODE> - The validator that is being wrapped.<DD><CODE>project</CODE> - The project that you are defined in. This can be null which
- means that you are a global validator.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="create(ValidatorMetaData, ValidationConfiguration, IProject)"><!-- --></A><H3>
-create</H3>
-<PRE>
-public static <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> <B>create</B>(ValidatorMetaData vmd,
- ValidationConfiguration config,
- IProject project)</PRE>
-<DL>
-<DD>Create a new validator based on validator meta data.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - The project that you are defined in. This can be null which
- means that you are a global validator.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="asV1Validator()"><!-- --></A><H3>
-asV1Validator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A> <B>asV1Validator</B>()</PRE>
-<DL>
-<DD>If you are a version 1 validator, answer yourself as one, otherwise answer null.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="asV2Validator()"><!-- --></A><H3>
-asV2Validator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A> <B>asV2Validator</B>()</PRE>
-<DL>
-<DD>If you are a version 2 validator, answer yourself as one, otherwise answer null.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="clean(IProject, IProgressMonitor)"><!-- --></A><H3>
-clean</H3>
-<PRE>
-public void <B>clean</B>(IProject project,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD>The project is being cleaned, this method gives the validator a chance to do any special cleanup.
- The default is to do nothing.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - the project being built.<DD><CODE>monitor</CODE> - the monitor that should be used for reporting progress if the clean takes a long time.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="compareTo(org.eclipse.wst.validation.Validator)"><!-- --></A><H3>
-compareTo</H3>
-<PRE>
-public int <B>compareTo</B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</PRE>
-<DL>
-<DD>Compare yourself based on Validator name.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>compareTo</CODE> in interface <CODE>java.lang.Comparable<<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="copy()"><!-- --></A><H3>
-copy</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> <B>copy</B>()</PRE>
-<DL>
-<DD>Answer a deep copy of yourself.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="copy(boolean)"><!-- --></A><H3>
-copy</H3>
-<PRE>
-public abstract <A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> <B>copy</B>(boolean includeChangeCounts)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shouldValidate(IResource, boolean, boolean)"><!-- --></A><H3>
-shouldValidate</H3>
-<PRE>
-public boolean <B>shouldValidate</B>(IResource resource,
- boolean isManual,
- boolean isBuild)</PRE>
-<DL>
-<DD>Answer true if this validator, based on it's filters, should validate
- this resource. This method does not check to see if global validation or
- project validation has been suspended or not.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - The resource to be checked.<DD><CODE>isManual</CODE> - If true then this validator must also be enabled for manual
- validation.<DD><CODE>isBuild</CODE> - If true then this validator must also be enabled for builder
- based validation.
-<DT><B>Returns:</B><DD>true if the resource should be validated.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shouldValidate(IResource, org.eclipse.wst.validation.internal.ValType)"><!-- --></A><H3>
-shouldValidate</H3>
-<PRE>
-public boolean <B>shouldValidate</B>(IResource resource,
- org.eclipse.wst.validation.internal.ValType valType)</PRE>
-<DL>
-<DD>Answer true if this validator, based on it's filters, should validate
- this resource. This method does not check to see if global validation or
- project validation has been suspended or not.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - The resource to be checked.<DD><CODE>valType</CODE> - The context to use when performing the check.
-<DT><B>Returns:</B><DD>true if the resource should be validated.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shouldValidateProject(IProject, org.eclipse.wst.validation.internal.ValType)"><!-- --></A><H3>
-shouldValidateProject</H3>
-<PRE>
-public boolean <B>shouldValidateProject</B>(IProject project,
- org.eclipse.wst.validation.internal.ValType type)</PRE>
-<DL>
-<DD>Answer true if this validator, based on it's filters, should validate this project. This method
- does not check to see if global validation or project validation has been suspended or not.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - the project to be checked<DD><CODE>type</CODE> - The type of validation request
-<DT><B>Returns:</B><DD>true if the project should be validated.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shouldValidateProject(IProject, boolean, boolean)"><!-- --></A><H3>
-shouldValidateProject</H3>
-<PRE>
-public boolean <B>shouldValidateProject</B>(IProject project,
- boolean isManual,
- boolean isBuild)</PRE>
-<DL>
-<DD>Answer true if this validator, based on it's filters, should validate this project. This method
- does not check to see if global validation or project validation has been suspended or not.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - the project to be checked<DD><CODE>isManual</CODE> - if true then this validator must also be enabled for manual validation.<DD><CODE>isBuild</CODE> - if true then this validator must also be enabled for builder based validation.
-<DT><B>Returns:</B><DD>true if the project should be validated.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)"><!-- --></A><H3>
-validate</H3>
-<PRE>
-public abstract <A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A> <B>validate</B>(IResource resource,
- int kind,
- org.eclipse.wst.validation.internal.ValOperation operation,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD>Validate the resource.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>resource</CODE> - the resource to be validated<DD><CODE>kind</CODE> - the kind of resource change, see IResourceDelta for values.<DD><CODE>operation</CODE> - the operation that this validation is running under. This can be null.<DD><CODE>monitor</CODE> - a way to report progress. This can be null.
-<DT><B>Returns:</B><DD>the result of doing the validation, it can be, but usually isn't null.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)"><!-- --></A><H3>
-validationStarting</H3>
-<PRE>
-public void <B>validationStarting</B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD>This method will be called before any validation takes place. It allows validators to perform any
- initialization that they might need.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - the project that is being validated. For the very first call in the validation phase,
- this will be null. That is the signal to the validator that a top level validation is starting.
- Subsequently, the project will be set, as each of the individual projects are validated.<DD><CODE>state</CODE> - a way to pass arbitrary, validator specific, data from one invocation of a validator to
- the next, during the validation phase.<DD><CODE>monitor</CODE> - the monitor that should be used for reporting progress if the clean takes a long time.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)"><!-- --></A><H3>
-validationFinishing</H3>
-<PRE>
-public void <B>validationFinishing</B>(IProject project,
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</PRE>
-<DL>
-<DD>This method will be called when validation is complete. It allows validators to perform any
- cleanup that they might need to do.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>project</CODE> - the project that was validated. The very last call in the validation will set this to
- null so that the validator knows that all the projects have now been validated.<DD><CODE>state</CODE> - a way to pass arbitrary, validator specific, data from one invocation of a validator to
- the next, during the validation phase.<DD><CODE>monitor</CODE> - the monitor that should be used for reporting progress if the clean takes a long time.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="asIValidator()"><!-- --></A><H3>
-asIValidator</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> <B>asIValidator</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getId()"><!-- --></A><H3>
-getId</H3>
-<PRE>
-public abstract java.lang.String <B>getId</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMessage(java.lang.String)"><!-- --></A><H3>
-getMessage</H3>
-<PRE>
-public <A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A> <B>getMessage</B>(java.lang.String id)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMessageSettings()"><!-- --></A><H3>
-getMessageSettings</H3>
-<PRE>
-public java.util.Map<java.lang.String,<A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A>> <B>getMessageSettings</B>()</PRE>
-<DL>
-<DD>Answer all the message settings that this validator has defined.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>an empty map if the validator did not define any message settings.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hashCodeForConfig()"><!-- --></A><H3>
-hashCodeForConfig</H3>
-<PRE>
-public int <B>hashCodeForConfig</B>()</PRE>
-<DL>
-<DD>Answer a hash code for the configurable fields so that we can quickly determine if two
- validators are the same.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public abstract java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getProject()"><!-- --></A><H3>
-getProject</H3>
-<PRE>
-public IProject <B>getProject</B>()</PRE>
-<DL>
-<DD>Answer the project that you were enabled on.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>null if you are a global (i.e. workspace level) validator.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValidatorClassname()"><!-- --></A><H3>
-getValidatorClassname</H3>
-<PRE>
-public abstract java.lang.String <B>getValidatorClassname</B>()</PRE>
-<DL>
-<DD>Answer the name of the class that implements the validator.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isManualValidation()"><!-- --></A><H3>
-isManualValidation</H3>
-<PRE>
-public boolean <B>isManualValidation</B>()</PRE>
-<DL>
-<DD>Is this validator currently enabled for validations that are triggered manually?
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setManualValidation(boolean)"><!-- --></A><H3>
-setManualValidation</H3>
-<PRE>
-public void <B>setManualValidation</B>(boolean manualValidation)</PRE>
-<DL>
-<DD>Set whether this validator should be triggered as part of a manual validation.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>manualValidation</CODE> - </DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isBuildValidation()"><!-- --></A><H3>
-isBuildValidation</H3>
-<PRE>
-public boolean <B>isBuildValidation</B>()</PRE>
-<DL>
-<DD>Is this validator currently enabled for validations that are triggered by builds?
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isChanged()"><!-- --></A><H3>
-isChanged</H3>
-<PRE>
-public boolean <B>isChanged</B>()</PRE>
-<DL>
-<DD>Has the validator changed since it was last created or copied?
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBuildValidation(boolean)"><!-- --></A><H3>
-setBuildValidation</H3>
-<PRE>
-public void <B>setBuildValidation</B>(boolean buildValidation)</PRE>
-<DL>
-<DD>Set whether this validator should be triggered by the build process.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>buildValidation</CODE> - </DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDelegatingId()"><!-- --></A><H3>
-getDelegatingId</H3>
-<PRE>
-public java.lang.String <B>getDelegatingId</B>()</PRE>
-<DL>
-<DD>Get the id of the "real" validator, that is the validator that will be called when this delegating
- validator is asked to validate something. If this isn't a delegating validator answer null.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDelegatingId(java.lang.String)"><!-- --></A><H3>
-setDelegatingId</H3>
-<PRE>
-public void <B>setDelegatingId</B>(java.lang.String delegating)</PRE>
-<DL>
-<DD>Set the id of the "real" validator, that is the validator that will be called when this delegating
- validator is asked to validate something.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>delegating</CODE> - the id of the validator that is actually going to perform the validation.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVersion()"><!-- --></A><H3>
-getVersion</H3>
-<PRE>
-public int <B>getVersion</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setVersion(int)"><!-- --></A><H3>
-setVersion</H3>
-<PRE>
-public void <B>setVersion</B>(int version)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>toString</CODE> in class <CODE>java.lang.Object</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSourceId()"><!-- --></A><H3>
-getSourceId</H3>
-<PRE>
-public java.lang.String <B>getSourceId</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSourceId(java.lang.String)"><!-- --></A><H3>
-setSourceId</H3>
-<PRE>
-public void <B>setSourceId</B>(java.lang.String sourceId)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="become(org.eclipse.wst.validation.Validator)"><!-- --></A><H3>
-become</H3>
-<PRE>
-public void <B>become</B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</PRE>
-<DL>
-<DD>Take the instance variables from the incoming validator and set them to yourself.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>validator</CODE> - </DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getChangeCountGlobal()"><!-- --></A><H3>
-getChangeCountGlobal</H3>
-<PRE>
-public int <B>getChangeCountGlobal</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getChangeCountMessages()"><!-- --></A><H3>
-getChangeCountMessages</H3>
-<PRE>
-public int <B>getChangeCountMessages</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bumpChangeCountMessages()"><!-- --></A><H3>
-bumpChangeCountMessages</H3>
-<PRE>
-public void <B>bumpChangeCountMessages</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="resetChangeCounters()"><!-- --></A><H3>
-resetChangeCounters</H3>
-<PRE>
-public void <B>resetChangeCounters</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bumpChangeCountGlobal()"><!-- --></A><H3>
-bumpChangeCountGlobal</H3>
-<PRE>
-public void <B>bumpChangeCountGlobal</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="sameConfig(org.eclipse.wst.validation.Validator)"><!-- --></A><H3>
-sameConfig</H3>
-<PRE>
-public boolean <B>sameConfig</B>(<A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</PRE>
-<DL>
-<DD>Answer true if you have the same configuration settings as validator.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>validator</CODE> - this can be null.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMarkerId()"><!-- --></A><H3>
-getMarkerId</H3>
-<PRE>
-public java.lang.String <B>getMarkerId</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setMarkerId(java.lang.String)"><!-- --></A><H3>
-setMarkerId</H3>
-<PRE>
-public void <B>setMarkerId</B>(java.lang.String markerId)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Validator.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- <A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/Validator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: <A HREF="#nested_class_summary">NESTED</A> | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidatorMessage.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidatorMessage.html
deleted file mode 100644
index 0715c3c..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/ValidatorMessage.html
+++ /dev/null
@@ -1,603 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-ValidatorMessage
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="ValidatorMessage";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidatorMessage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidatorMessage.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidatorMessage.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#field_summary">FIELD</A> | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#field_detail">FIELD</A> | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation</FONT>
-<BR>
-Class ValidatorMessage</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.ValidatorMessage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ValidatorMessage</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-This class provides a way for a validator to return messages, that are easily
- converted into IMarkers.
- <p>
- This class is completely optional for validators. A validator can choose to
- directly manage IMarkers. However, some validators want to be used in
- multiple contexts, for example as-you-type validation and build based
- validation. For these types of validators it is not possible for them to use
- only IMarkers, because often the Resource has not been saved yet.
- </p>
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that
- is still under development and expected to change significantly before
- reaching stability. It is being made available at this early stage to solicit
- feedback from pioneering adopters on the understanding that any code that
- uses this API will almost certainly be broken (repeatedly) as the API
- evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#ValidationId">ValidationId</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#create(java.lang.String, IResource)">create</A></B>(java.lang.String message,
- IResource resource)</CODE>
-
-<BR>
- Create a new validation message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#getAttribute(java.lang.String)">getAttribute</A></B>(java.lang.String attributeName)</CODE>
-
-<BR>
- Returns the attribute with the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#getAttribute(java.lang.String, boolean)">getAttribute</A></B>(java.lang.String attributeName,
- boolean defaultValue)</CODE>
-
-<BR>
- Returns the boolean valued attribute with the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#getAttribute(java.lang.String, int)">getAttribute</A></B>(java.lang.String attributeName,
- int defaultValue)</CODE>
-
-<BR>
- Returns the integer valued attribute with the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#getAttribute(java.lang.String, java.lang.String)">getAttribute</A></B>(java.lang.String attributeName,
- java.lang.String defaultValue)</CODE>
-
-<BR>
- Returns the string valued attribute with the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.Map</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#getAttributes()">getAttributes</A></B>()</CODE>
-
-<BR>
- Returns a map with all the attributes for the marker.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IResource</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#getResource()">getResource</A></B>()</CODE>
-
-<BR>
- Returns the resource with which this marker is associated.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#getType()">getType</A></B>()</CODE>
-
-<BR>
- Returns the type of this marker.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#setAttribute(java.lang.String, boolean)">setAttribute</A></B>(java.lang.String attributeName,
- boolean value)</CODE>
-
-<BR>
- Sets the boolean valued attribute with the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#setAttribute(java.lang.String, int)">setAttribute</A></B>(java.lang.String attributeName,
- int value)</CODE>
-
-<BR>
- Sets the integer valued attribute with the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#setAttribute(java.lang.String, java.lang.Object)">setAttribute</A></B>(java.lang.String attributeName,
- java.lang.Object value)</CODE>
-
-<BR>
- Sets the attribute with the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#setAttributes(java.util.Map)">setAttributes</A></B>(java.util.Map<java.lang.String,java.lang.Object> attributes)</CODE>
-
-<BR>
- Sets the attributes for this marker to be the ones contained in the given
- table.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#setAttributes(java.lang.String[], java.lang.Object[])">setAttributes</A></B>(java.lang.String[] attributeNames,
- java.lang.Object[] values)</CODE>
-
-<BR>
- Sets the given attribute key-value pairs on this marker.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html#setType(java.lang.String)">setType</A></B>(java.lang.String type)</CODE>
-
-<BR>
- Sets the marker type.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ValidationId"><!-- --></A><H3>
-ValidationId</H3>
-<PRE>
-public static final java.lang.String <B>ValidationId</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#org.eclipse.wst.validation.ValidatorMessage.ValidationId">Constant Field Values</A></DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="create(java.lang.String, IResource)"><!-- --></A><H3>
-create</H3>
-<PRE>
-public static <A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A> <B>create</B>(java.lang.String message,
- IResource resource)</PRE>
-<DL>
-<DD>Create a new validation message.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>message</CODE> - The localized message that will be displayed to the user.<DD><CODE>resource</CODE> - The resource that the message is associated with.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAttribute(java.lang.String)"><!-- --></A><H3>
-getAttribute</H3>
-<PRE>
-public java.lang.Object <B>getAttribute</B>(java.lang.String attributeName)</PRE>
-<DL>
-<DD>Returns the attribute with the given name. The result is an instance of
- one of the following classes: <code>String</code>, <code>Integer</code>,
- or <code>Boolean</code>. Returns <code>null</code> if the attribute is
- undefined.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>attributeName</CODE> - The name of the attribute.
-<DT><B>Returns:</B><DD>the value, or <code>null</code> if the attribute is undefined.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAttribute(java.lang.String, int)"><!-- --></A><H3>
-getAttribute</H3>
-<PRE>
-public int <B>getAttribute</B>(java.lang.String attributeName,
- int defaultValue)</PRE>
-<DL>
-<DD>Returns the integer valued attribute with the given name. Returns the
- given default value if the attribute is undefined or the marker does not
- exist or is not an integer value.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>attributeName</CODE> - The name of the attribute.<DD><CODE>defaultValue</CODE> - The value to use if no integer value is found.
-<DT><B>Returns:</B><DD>the value or the default value if no integer value was found.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAttribute(java.lang.String, java.lang.String)"><!-- --></A><H3>
-getAttribute</H3>
-<PRE>
-public java.lang.String <B>getAttribute</B>(java.lang.String attributeName,
- java.lang.String defaultValue)</PRE>
-<DL>
-<DD>Returns the string valued attribute with the given name. Returns the
- given default value if the attribute is undefined or the marker does not
- exist or is not a string value.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>attributeName</CODE> - The name of the attribute.<DD><CODE>defaultValue</CODE> - The value to use if no value is found.
-<DT><B>Returns:</B><DD>the value or the default value if no value was found.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAttribute(java.lang.String, boolean)"><!-- --></A><H3>
-getAttribute</H3>
-<PRE>
-public boolean <B>getAttribute</B>(java.lang.String attributeName,
- boolean defaultValue)</PRE>
-<DL>
-<DD>Returns the boolean valued attribute with the given name. Returns the
- given default value if the attribute is undefined or the marker does not
- exist or is not a boolean value.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>attributeName</CODE> - The name of the attribute.<DD><CODE>defaultValue</CODE> - The value to use if no value is found.
-<DT><B>Returns:</B><DD>the value or the default value if no value was found.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAttributes()"><!-- --></A><H3>
-getAttributes</H3>
-<PRE>
-public java.util.Map <B>getAttributes</B>()</PRE>
-<DL>
-<DD>Returns a map with all the attributes for the marker. If the marker has
- no attributes then <code>null</code> is returned.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>a map of attribute keys and values (key type :
- <code>String</code> value type : <code>String</code>,
- <code>Integer</code>, or <code>Boolean</code>) or <code>null</code>.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getResource()"><!-- --></A><H3>
-getResource</H3>
-<PRE>
-public IResource <B>getResource</B>()</PRE>
-<DL>
-<DD>Returns the resource with which this marker is associated.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the resource with which this marker is associated</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getType()"><!-- --></A><H3>
-getType</H3>
-<PRE>
-public java.lang.String <B>getType</B>()</PRE>
-<DL>
-<DD>Returns the type of this marker. The returned marker type will not be
- <code>null</code>.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the type of this marker</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setType(java.lang.String)"><!-- --></A><H3>
-setType</H3>
-<PRE>
-public void <B>setType</B>(java.lang.String type)</PRE>
-<DL>
-<DD>Sets the marker type.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>type</CODE> - The marker id to use when creating new markers.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setAttribute(java.lang.String, int)"><!-- --></A><H3>
-setAttribute</H3>
-<PRE>
-public void <B>setAttribute</B>(java.lang.String attributeName,
- int value)</PRE>
-<DL>
-<DD>Sets the integer valued attribute with the given name.
- <p>
- This method changes resources; these changes will be reported in a
- subsequent resource change event, including an indication that this
- marker has been modified.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>attributeName</CODE> - The name of the attribute.<DD><CODE>value</CODE> - The value.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setAttribute(java.lang.String, java.lang.Object)"><!-- --></A><H3>
-setAttribute</H3>
-<PRE>
-public void <B>setAttribute</B>(java.lang.String attributeName,
- java.lang.Object value)</PRE>
-<DL>
-<DD>Sets the attribute with the given name. The value must be
- <code>null</code> or an instance of one of the following classes:
- <code>String</code>, <code>Integer</code>, or <code>Boolean</code>.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>attributeName</CODE> - The name of the attribute.<DD><CODE>value</CODE> - The value, or <code>null</code> if the attribute is to be undefined.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setAttribute(java.lang.String, boolean)"><!-- --></A><H3>
-setAttribute</H3>
-<PRE>
-public void <B>setAttribute</B>(java.lang.String attributeName,
- boolean value)</PRE>
-<DL>
-<DD>Sets the boolean valued attribute with the given name.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>attributeName</CODE> - The name of the attribute.<DD><CODE>value</CODE> - The value.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setAttributes(java.lang.String[], java.lang.Object[])"><!-- --></A><H3>
-setAttributes</H3>
-<PRE>
-public void <B>setAttributes</B>(java.lang.String[] attributeNames,
- java.lang.Object[] values)</PRE>
-<DL>
-<DD>Sets the given attribute key-value pairs on this marker. The values must
- be <code>null</code> or an instance of one of the following classes:
- <code>String</code>, <code>Integer</code>, or <code>Boolean</code>. If a
- value is <code>null</code>, the new value of the attribute is considered
- to be undefined.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>attributeNames</CODE> - An array of attribute names.<DD><CODE>values</CODE> - An array of attribute values.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setAttributes(java.util.Map)"><!-- --></A><H3>
-setAttributes</H3>
-<PRE>
-public void <B>setAttributes</B>(java.util.Map<java.lang.String,java.lang.Object> attributes)</PRE>
-<DL>
-<DD>Sets the attributes for this marker to be the ones contained in the given
- table. The values must be an instance of one of the following classes:
- <code>String</code>, <code>Integer</code>, or <code>Boolean</code>.
- Attributes previously set on the marker but not included in the given map
- are considered to be removals. Setting the given map to be
- <code>null</code> is equivalent to removing all marker attributes.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>attributes</CODE> - A map of attribute names to attribute values (key type :
- <code>String</code> value type : <code>String</code>,
- <code>Integer</code>, or <code>Boolean</code>) or <code>null</code>.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ValidatorMessage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation"><B>PREV CLASS</B></A>
- NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/ValidatorMessage.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidatorMessage.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#field_summary">FIELD</A> | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#field_detail">FIELD</A> | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/AbstractValidator.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/AbstractValidator.html
deleted file mode 100644
index 9a223c8..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/AbstractValidator.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.AbstractValidator
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.AbstractValidator";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useAbstractValidator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="AbstractValidator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.AbstractValidator</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation">AbstractValidator</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation">AbstractValidator</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation">AbstractValidator</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation">AbstractValidator</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.V2.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html#getDelegatedValidator()">getDelegatedValidator</A></B>()</CODE>
-
-<BR>
- Answer the actual validator that is going to perform the validation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation">AbstractValidator</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.V2.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html#getValidator()">getValidator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useAbstractValidator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="AbstractValidator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/DependentResource.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/DependentResource.html
deleted file mode 100644
index 38950b1..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/DependentResource.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.DependentResource
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.DependentResource";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useDependentResource.html" target="_top"><B>FRAMES</B></A>
- <A HREF="DependentResource.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.DependentResource</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation">DependentResource</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation">DependentResource</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return types with arguments of type <A HREF="../../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation">DependentResource</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.List<<A HREF="../../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation">DependentResource</A>></CODE></FONT></TD>
-<TD><CODE><B>IDependencyIndex.</B><B><A HREF="../../../../../org/eclipse/wst/validation/IDependencyIndex.html#get(IResource)">get</A></B>(IResource resource)</CODE>
-
-<BR>
- Answer all the resources that depend on this resource.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useDependentResource.html" target="_top"><B>FRAMES</B></A>
- <A HREF="DependentResource.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Friend.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Friend.html
deleted file mode 100644
index 8041ab0..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Friend.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.Friend
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.Friend";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Friend.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useFriend.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Friend.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.Friend</B></H2>
-</CENTER>
-No usage of org.eclipse.wst.validation.Friend
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Friend.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useFriend.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Friend.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IDependencyIndex.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IDependencyIndex.html
deleted file mode 100644
index 062b090..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IDependencyIndex.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Interface org.eclipse.wst.validation.IDependencyIndex
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Interface org.eclipse.wst.validation.IDependencyIndex";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useIDependencyIndex.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IDependencyIndex.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>org.eclipse.wst.validation.IDependencyIndex</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation">IDependencyIndex</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation">IDependencyIndex</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation">IDependencyIndex</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation">IDependencyIndex</A></CODE></FONT></TD>
-<TD><CODE><B>ValidationFramework.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html#getDependencyIndex()">getDependencyIndex</A></B>()</CODE>
-
-<BR>
- Answer the dependency index.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useIDependencyIndex.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IDependencyIndex.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IPerformanceMonitor.CollectionLevel.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IPerformanceMonitor.CollectionLevel.html
deleted file mode 100644
index e2e7ae4..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IPerformanceMonitor.CollectionLevel.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.IPerformanceMonitor.CollectionLevel
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.IPerformanceMonitor.CollectionLevel";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useIPerformanceMonitor.CollectionLevel.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IPerformanceMonitor.CollectionLevel.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.IPerformanceMonitor.CollectionLevel</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A></CODE></FONT></TD>
-<TD><CODE><B>IPerformanceMonitor.</B><B><A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.html#getCollectionLevel()">getCollectionLevel</A></B>()</CODE>
-
-<BR>
- Answer the level of performance events that are being collected by the validation framework.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A></CODE></FONT></TD>
-<TD><CODE><B>IPerformanceMonitor.CollectionLevel.</B><B><A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html#valueOf(java.lang.String)">valueOf</A></B>(java.lang.String name)</CODE>
-
-<BR>
- Returns the enum constant of this type with the specified name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A>[]</CODE></FONT></TD>
-<TD><CODE><B>IPerformanceMonitor.CollectionLevel.</B><B><A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html#values()">values</A></B>()</CODE>
-
-<BR>
- Returns an array containing the constants of this enum type, in
-the order they are declared.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IPerformanceMonitor.</B><B><A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.html#setCollectionLevel(org.eclipse.wst.validation.IPerformanceMonitor.CollectionLevel)">setCollectionLevel</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A> level)</CODE>
-
-<BR>
- Set the performance event collection level.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useIPerformanceMonitor.CollectionLevel.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IPerformanceMonitor.CollectionLevel.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IPerformanceMonitor.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IPerformanceMonitor.html
deleted file mode 100644
index fff6174..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IPerformanceMonitor.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Interface org.eclipse.wst.validation.IPerformanceMonitor
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Interface org.eclipse.wst.validation.IPerformanceMonitor";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useIPerformanceMonitor.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IPerformanceMonitor.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>org.eclipse.wst.validation.IPerformanceMonitor</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation">IPerformanceMonitor</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation">IPerformanceMonitor</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation">IPerformanceMonitor</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation">IPerformanceMonitor</A></CODE></FONT></TD>
-<TD><CODE><B>ValidationFramework.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html#getPerformanceMonitor()">getPerformanceMonitor</A></B>()</CODE>
-
-<BR>
- Answer a performance monitor for the validators.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useIPerformanceMonitor.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IPerformanceMonitor.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IValidatorGroupListener.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IValidatorGroupListener.html
deleted file mode 100644
index 4e6d82a..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/IValidatorGroupListener.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Interface org.eclipse.wst.validation.IValidatorGroupListener
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Interface org.eclipse.wst.validation.IValidatorGroupListener";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/IValidatorGroupListener.html" title="interface in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useIValidatorGroupListener.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidatorGroupListener.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>org.eclipse.wst.validation.IValidatorGroupListener</B></H2>
-</CENTER>
-No usage of org.eclipse.wst.validation.IValidatorGroupListener
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/IValidatorGroupListener.html" title="interface in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useIValidatorGroupListener.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidatorGroupListener.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/MessageSeveritySetting.Severity.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/MessageSeveritySetting.Severity.html
deleted file mode 100644
index a1ba239..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/MessageSeveritySetting.Severity.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.MessageSeveritySetting.Severity
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.MessageSeveritySetting.Severity";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useMessageSeveritySetting.Severity.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageSeveritySetting.Severity.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.MessageSeveritySetting.Severity</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></CODE></FONT></TD>
-<TD><CODE><B>MessageSeveritySetting.</B><B><A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#getCurrent()">getCurrent</A></B>()</CODE>
-
-<BR>
- Answer the current severity for the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></CODE></FONT></TD>
-<TD><CODE><B>MessageSeveritySetting.</B><B><A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#getDefault()">getDefault</A></B>()</CODE>
-
-<BR>
- Answer the default severity as defined by the validator owner.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></CODE></FONT></TD>
-<TD><CODE><B>MessageSeveritySetting.Severity.</B><B><A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html#valueOf(java.lang.String)">valueOf</A></B>(java.lang.String name)</CODE>
-
-<BR>
- Returns the enum constant of this type with the specified name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A>[]</CODE></FONT></TD>
-<TD><CODE><B>MessageSeveritySetting.Severity.</B><B><A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html#values()">values</A></B>()</CODE>
-
-<BR>
- Returns an array containing the constants of this enum type, in
-the order they are declared.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B>MessageSeveritySetting.</B><B><A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#setCurrent(org.eclipse.wst.validation.MessageSeveritySetting.Severity)">setCurrent</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> severity)</CODE>
-
-<BR>
- Set the current message severity.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#MessageSeveritySetting(java.lang.String, java.lang.String, org.eclipse.wst.validation.MessageSeveritySetting.Severity)">MessageSeveritySetting</A></B>(java.lang.String id,
- java.lang.String label,
- <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A> defaultSeverity)</CODE>
-
-<BR>
- Create an association between a label and a message severity.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useMessageSeveritySetting.Severity.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageSeveritySetting.Severity.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/MessageSeveritySetting.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/MessageSeveritySetting.html
deleted file mode 100644
index 71f2569..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/MessageSeveritySetting.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.MessageSeveritySetting
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.MessageSeveritySetting";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useMessageSeveritySetting.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageSeveritySetting.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.MessageSeveritySetting</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A></CODE></FONT></TD>
-<TD><CODE><B>MessageSeveritySetting.</B><B><A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html#copy()">copy</A></B>()</CODE>
-
-<BR>
- Answer a copy of this object.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#getMessage(java.lang.String)">getMessage</A></B>(java.lang.String id)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return types with arguments of type <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.Map<java.lang.String,<A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A>></CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#getMessageSettings()">getMessageSettings</A></B>()</CODE>
-
-<BR>
- Answer all the message settings that this validator has defined.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Method parameters in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with type arguments of type <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static void</CODE></FONT></TD>
-<TD><CODE><B>Friend.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Friend.html#setMessages(org.eclipse.wst.validation.Validator, java.util.Map)">setMessages</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator,
- java.util.Map<java.lang.String,<A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A>> map)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useMessageSeveritySetting.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageSeveritySetting.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/PerformanceCounters.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/PerformanceCounters.html
deleted file mode 100644
index 8e3aa96..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/PerformanceCounters.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.PerformanceCounters
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.PerformanceCounters";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-usePerformanceCounters.html" target="_top"><B>FRAMES</B></A>
- <A HREF="PerformanceCounters.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.PerformanceCounters</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return types with arguments of type <A HREF="../../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.List<<A HREF="../../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A>></CODE></FONT></TD>
-<TD><CODE><B>IPerformanceMonitor.</B><B><A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.html#getPerformanceCounters(boolean)">getPerformanceCounters</A></B>(boolean asSummary)</CODE>
-
-<BR>
- Answer the performance counters that have been collected so far.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IPerformanceMonitor.</B><B><A HREF="../../../../../org/eclipse/wst/validation/IPerformanceMonitor.html#add(org.eclipse.wst.validation.PerformanceCounters)">add</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A> counters)</CODE>
-
-<BR>
- Add this performance counter to the monitor.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-usePerformanceCounters.html" target="_top"><B>FRAMES</B></A>
- <A HREF="PerformanceCounters.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ReporterHelper.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ReporterHelper.html
deleted file mode 100644
index c844ade..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ReporterHelper.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.ReporterHelper
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.ReporterHelper";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ReporterHelper.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useReporterHelper.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ReporterHelper.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.ReporterHelper</B></H2>
-</CENTER>
-No usage of org.eclipse.wst.validation.ReporterHelper
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ReporterHelper.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useReporterHelper.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ReporterHelper.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationFramework.ResourceAdder.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationFramework.ResourceAdder.html
deleted file mode 100644
index 9db2ba7..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationFramework.ResourceAdder.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.ValidationFramework.ResourceAdder
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.ValidationFramework.ResourceAdder";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidationFramework.ResourceAdder.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationFramework.ResourceAdder.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.ValidationFramework.ResourceAdder</B></H2>
-</CENTER>
-No usage of org.eclipse.wst.validation.ValidationFramework.ResourceAdder
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidationFramework.ResourceAdder.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationFramework.ResourceAdder.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationFramework.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationFramework.html
deleted file mode 100644
index 69fd936..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationFramework.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.ValidationFramework
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.ValidationFramework";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidationFramework.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationFramework.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.ValidationFramework</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation">ValidationFramework</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation">ValidationFramework</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation">ValidationFramework</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation">ValidationFramework</A></CODE></FONT></TD>
-<TD><CODE><B>ValidationFramework.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html#getDefault()">getDefault</A></B>()</CODE>
-
-<BR>
- Answer the singleton, default instance of this class.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidationFramework.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationFramework.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationResult.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationResult.html
deleted file mode 100644
index e8fb5b8..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationResult.html
+++ /dev/null
@@ -1,244 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.ValidationResult
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.ValidationResult";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidationResult.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationResult.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.ValidationResult</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>abstract <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></CODE></FONT></TD>
-<TD><CODE><B>AbstractValidator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html#validate(IResource, int, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validate</A></B>(IResource resource,
- int kind,
- <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- Validate the resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>abstract <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)">validate</A></B>(IResource resource,
- int kind,
- org.eclipse.wst.validation.internal.ValOperation operation,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- Validate the resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.V1.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html#validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)">validate</A></B>(IResource resource,
- int kind,
- org.eclipse.wst.validation.internal.ValOperation operation,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.V2.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html#validate(IResource, int, org.eclipse.wst.validation.internal.ValOperation, IProgressMonitor)">validate</A></B>(IResource resource,
- int kind,
- org.eclipse.wst.validation.internal.ValOperation operation,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>ValidationResult.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html#mergeResults(org.eclipse.wst.validation.ValidationResult)">mergeResults</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A> result)</CODE>
-
-<BR>
- Merge the message counts and messages from an individual validator into this result.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationResults.html#ValidationResults(org.eclipse.wst.validation.ValidationResult)">ValidationResults</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A> result)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidationResult.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationResult.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationResults.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationResults.html
deleted file mode 100644
index bd6ac8c..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationResults.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.ValidationResults
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.ValidationResults";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidationResults.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationResults.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.ValidationResults</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation">ValidationResults</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation">ValidationResults</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation">ValidationResults</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation">ValidationResults</A></CODE></FONT></TD>
-<TD><CODE><B>ValidationFramework.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html#validate(IProject[], boolean, boolean, IProgressMonitor)">validate</A></B>(IProject[] projects,
- boolean isManual,
- boolean isBuild,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- Validate the projects.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidationResults.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationResults.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationState.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationState.html
deleted file mode 100644
index 8ecbda6..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidationState.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.ValidationState
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.ValidationState";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidationState.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationState.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.ValidationState</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>AbstractValidator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html#clean(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">clean</A></B>(IProject project,
- <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- A call back method that lets the validator know that the project is being
- cleaned.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>abstract <A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></CODE></FONT></TD>
-<TD><CODE><B>AbstractValidator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html#validate(IResource, int, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validate</A></B>(IResource resource,
- int kind,
- <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- Validate the resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationFinishing</A></B>(IProject project,
- <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- This method will be called when validation is complete.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>Validator.V2.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html#validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationFinishing</A></B>(IProject project,
- <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>AbstractValidator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html#validationFinishing(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationFinishing</A></B>(IProject project,
- <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- This method will be called when validation is complete.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IValidatorGroupListener.</B><B><A HREF="../../../../../org/eclipse/wst/validation/IValidatorGroupListener.html#validationFinishing(IResource, IProgressMonitor, org.eclipse.wst.validation.ValidationState)">validationFinishing</A></B>(IResource resource,
- IProgressMonitor monitor,
- <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state)</CODE>
-
-<BR>
- If the validationStarting method was called on the resource, then this
- method will be called after the last validator has processed the
- resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationStarting</A></B>(IProject project,
- <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- This method will be called before any validation takes place.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>Validator.V2.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html#validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationStarting</A></B>(IProject project,
- <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>AbstractValidator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html#validationStarting(IProject, org.eclipse.wst.validation.ValidationState, IProgressMonitor)">validationStarting</A></B>(IProject project,
- <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- This method is called before any validation takes place.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IValidatorGroupListener.</B><B><A HREF="../../../../../org/eclipse/wst/validation/IValidatorGroupListener.html#validationStarting(IResource, IProgressMonitor, org.eclipse.wst.validation.ValidationState)">validationStarting</A></B>(IResource resource,
- IProgressMonitor monitor,
- <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A> state)</CODE>
-
-<BR>
- This is called before the first validator in the group that is interested
- in the resource is called.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidationState.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidationState.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.Level.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.Level.html
deleted file mode 100644
index dccf718..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.Level.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.Validator.Level
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.Validator.Level";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidator.Level.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.Level.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.Validator.Level</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.V2.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html#getLevel()">getLevel</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.Level.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html#valueOf(java.lang.String)">valueOf</A></B>(java.lang.String name)</CODE>
-
-<BR>
- Returns the enum constant of this type with the specified name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A>[]</CODE></FONT></TD>
-<TD><CODE><B>Validator.Level.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html#values()">values</A></B>()</CODE>
-
-<BR>
- Returns an array containing the constants of this enum type, in
-the order they are declared.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>Validator.V2.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html#setLevel(org.eclipse.wst.validation.Validator.Level)">setLevel</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A> level)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidator.Level.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.Level.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.V1.V1Copy.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.V1.V1Copy.html
deleted file mode 100644
index e99c3a8..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.V1.V1Copy.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.Validator.V1.V1Copy
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.Validator.V1.V1Copy";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidator.V1.V1Copy.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V1.V1Copy.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.Validator.V1.V1Copy</B></H2>
-</CENTER>
-No usage of org.eclipse.wst.validation.Validator.V1.V1Copy
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidator.V1.V1Copy.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V1.V1Copy.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.V1.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.V1.html
deleted file mode 100644
index 6b5a42b..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.V1.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.Validator.V1
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.Validator.V1";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidator.V1.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V1.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.Validator.V1</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Subclasses of <A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation">Validator.V1.V1Copy</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#asV1Validator()">asV1Validator</A></B>()</CODE>
-
-<BR>
- If you are a version 1 validator, answer yourself as one, otherwise answer null.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.V1.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html#asV1Validator()">asV1Validator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidator.V1.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V1.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.V2.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.V2.html
deleted file mode 100644
index 58517e7..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.V2.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.Validator.V2
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.Validator.V2";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidator.V2.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V2.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.Validator.V2</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#asV2Validator()">asV2Validator</A></B>()</CODE>
-
-<BR>
- If you are a version 2 validator, answer yourself as one, otherwise answer null.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.V2.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html#asV2Validator()">asV2Validator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></CODE></FONT></TD>
-<TD><CODE><B>AbstractValidator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/AbstractValidator.html#getParent()">getParent</A></B>()</CODE>
-
-<BR>
- Answer the validator that you belong to.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidator.V2.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.V2.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.html
deleted file mode 100644
index d825c84..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/Validator.html
+++ /dev/null
@@ -1,426 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.Validator
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.Validator";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.Validator</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Subclasses of <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></B></CODE>
-
-<BR>
- A validator that uses version 1 of the validation framework.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation">Validator.V1.V1Copy</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></B></CODE>
-
-<BR>
- A validator that uses version 2 of the validation framework.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#copy()">copy</A></B>()</CODE>
-
-<BR>
- Answer a deep copy of yourself.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>abstract <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#copy(boolean)">copy</A></B>(boolean includeChangeCounts)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.V1.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html#copy(boolean)">copy</A></B>(boolean includeChangeCounts)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.V2.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html#copy(boolean)">copy</A></B>(boolean includeChangeCounts)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#create(IConfigurationElement, IProject)">create</A></B>(IConfigurationElement validator,
- IProject project)</CODE>
-
-<BR>
- Create a new validator based on a abstract validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#create(ValidatorMetaData, ValidationConfiguration, IProject)">create</A></B>(ValidatorMetaData vmd,
- ValidationConfiguration config,
- IProject project)</CODE>
-
-<BR>
- Create a new validator based on validator meta data.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B>DependentResource.</B><B><A HREF="../../../../../org/eclipse/wst/validation/DependentResource.html#getValidator()">getValidator</A></B>()</CODE>
-
-<BR>
- Answer the validator that asserted the dependency.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B>ValidationFramework.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html#getValidator(java.lang.String)">getValidator</A></B>(java.lang.String id)</CODE>
-
-<BR>
- <B>Deprecated.</B> <I>Use getValidator(String id, IProject project) with a null project instead.</I></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></CODE></FONT></TD>
-<TD><CODE><B>ValidationFramework.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html#getValidator(java.lang.String, IProject)">getValidator</A></B>(java.lang.String id,
- IProject project)</CODE>
-
-<BR>
- Answer the validator with the given id that is in effect for the given
- project.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>[]</CODE></FONT></TD>
-<TD><CODE><B>ValidationFramework.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html#getValidatorsFor(IResource)">getValidatorsFor</A></B>(IResource resource)</CODE>
-
-<BR>
- Answer all the validators that are applicable for the given resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>[]</CODE></FONT></TD>
-<TD><CODE><B>ValidationFramework.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html#getValidatorsFor(IResource, boolean, boolean)">getValidatorsFor</A></B>(IResource resource,
- boolean isManual,
- boolean isBuild)</CODE>
-
-<BR>
- Answer all the validators that are applicable for the given resource.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return types with arguments of type <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.Set<<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A>></CODE></FONT></TD>
-<TD><CODE><B>ValidationFramework.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationFramework.html#getDisabledValidatorsFor(IResource)">getDisabledValidatorsFor</A></B>(IResource resource)</CODE>
-
-<BR>
- Answer all the validators that should not validate the resource, either
- because their filters don't support the resource, or the validator has
- been disabled for both build validation and manual validation.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#become(org.eclipse.wst.validation.Validator)">become</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</CODE>
-
-<BR>
- Take the instance variables from the incoming validator and set them to yourself.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>Validator.V1.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.html#become(org.eclipse.wst.validation.Validator)">become</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> val)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>Validator.V1.V1Copy.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html#become(org.eclipse.wst.validation.Validator)">become</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> val)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>Validator.V2.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.V2.html#become(org.eclipse.wst.validation.Validator)">become</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> val)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#compareTo(org.eclipse.wst.validation.Validator)">compareTo</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</CODE>
-
-<BR>
- Compare yourself based on Validator name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static boolean</CODE></FONT></TD>
-<TD><CODE><B>Friend.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Friend.html#isLoaded(org.eclipse.wst.validation.Validator)">isLoaded</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</CODE>
-
-<BR>
- Has the validator's implementation been loaded yet?</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Validator.html#sameConfig(org.eclipse.wst.validation.Validator)">sameConfig</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</CODE>
-
-<BR>
- Answer true if you have the same configuration settings as validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static void</CODE></FONT></TD>
-<TD><CODE><B>Friend.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Friend.html#setMessages(org.eclipse.wst.validation.Validator, java.util.Map)">setMessages</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator,
- java.util.Map<java.lang.String,<A HREF="../../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A>> map)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static boolean</CODE></FONT></TD>
-<TD><CODE><B>Friend.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Friend.html#shouldValidate(org.eclipse.wst.validation.Validator, IResource, boolean, boolean, org.eclipse.wst.validation.internal.ContentTypeWrapper)">shouldValidate</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator,
- IResource resource,
- boolean isManual,
- boolean isBuild,
- org.eclipse.wst.validation.internal.ContentTypeWrapper contentTypeWrapper)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static boolean</CODE></FONT></TD>
-<TD><CODE><B>Friend.</B><B><A HREF="../../../../../org/eclipse/wst/validation/Friend.html#shouldValidate(org.eclipse.wst.validation.Validator, IResource, org.eclipse.wst.validation.internal.ValType, org.eclipse.wst.validation.internal.ContentTypeWrapper)">shouldValidate</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator,
- IResource resource,
- org.eclipse.wst.validation.internal.ValType valType,
- org.eclipse.wst.validation.internal.ContentTypeWrapper contentTypeWrapper)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/eclipse/wst/validation/DependentResource.html#DependentResource(IResource, org.eclipse.wst.validation.Validator)">DependentResource</A></B>(IResource resource,
- <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A> validator)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Validator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidatorMessage.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidatorMessage.html
deleted file mode 100644
index 874d3fa..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/class-use/ValidatorMessage.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.ValidatorMessage
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.ValidatorMessage";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidatorMessage.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidatorMessage.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.ValidatorMessage</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A> in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A></CODE></FONT></TD>
-<TD><CODE><B>ValidatorMessage.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidatorMessage.html#create(java.lang.String, IResource)">create</A></B>(java.lang.String message,
- IResource resource)</CODE>
-
-<BR>
- Create a new validation message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A>[]</CODE></FONT></TD>
-<TD><CODE><B>ValidationResults.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationResults.html#getMessages()">getMessages</A></B>()</CODE>
-
-<BR>
- Answer any validation messages that were added by the validation operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A>[]</CODE></FONT></TD>
-<TD><CODE><B>ValidationResult.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html#getMessages()">getMessages</A></B>()</CODE>
-
-<BR>
- Answer any validation messages that were added by the validator.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>ValidationResult.</B><B><A HREF="../../../../../org/eclipse/wst/validation/ValidationResult.html#add(org.eclipse.wst.validation.ValidatorMessage)">add</A></B>(<A HREF="../../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A> message)</CODE>
-
-<BR>
- This is an optional method, that a validator can use to return error
- messages.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html?org/eclipse/wst/validation/\class-useValidatorMessage.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ValidatorMessage.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IMessage.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IMessage.html
deleted file mode 100644
index 412654d..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IMessage.html
+++ /dev/null
@@ -1,1012 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-IMessage
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="IMessage";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IMessage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV CLASS
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IMessage.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IMessage.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#field_summary">FIELD</A> | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#field_detail">FIELD</A> | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation.internal.provisional.core</FONT>
-<BR>
-Interface IMessage</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>IMessage</B></DL>
-</PRE>
-
-<P>
-<p>
- This interface represents a locale-independent validation message.
- </p>
- <p>
- Given these three values as input, this interface can be queried for the final message string.
- (i.e., the message with the parameters already substituted in.) Either the default Locale can be
- used, or the caller can specify a Locale.
- </p>
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#ALL_MESSAGES">ALL_MESSAGES</A></B></CODE>
-
-<BR>
- Specify all types of messages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#ERROR_AND_WARNING">ERROR_AND_WARNING</A></B></CODE>
-
-<BR>
- Specify high (error) and normal (warning) messages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#HIGH_SEVERITY">HIGH_SEVERITY</A></B></CODE>
-
-<BR>
- Typically used to specify error messages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#LINENO_UNSET">LINENO_UNSET</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#LOW_SEVERITY">LOW_SEVERITY</A></B></CODE>
-
-<BR>
- Typically used to specify information messages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#NORMAL_SEVERITY">NORMAL_SEVERITY</A></B></CODE>
-
-<BR>
- Typically used to specify warning messages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#OFFSET_UNSET">OFFSET_UNSET</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#TargetResource">TargetResource</A></B></CODE>
-
-<BR>
- TargetResource - The key to use when associating a resource with a message via an
- attribute.</TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getAttribute(java.lang.String)">getAttribute</A></B>(java.lang.String attributeName)</CODE>
-
-<BR>
- 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.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.HashMap</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getAttributes()">getAttributes</A></B>()</CODE>
-
-<BR>
- Return all the attributes of a Message object.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getBundleName()">getBundleName</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getGroupName()">getGroupName</A></B>()</CODE>
-
-<BR>
- To support removal of a subset of validation messages, an IValidator may assign group names
- to IMessages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getId()">getId</A></B>()</CODE>
-
-<BR>
- Returns the id of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getLength()">getLength</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getLineNumber()">getLineNumber</A></B>()</CODE>
-
-<BR>
- 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.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getMarkerId()">getMarkerId</A></B>()</CODE>
-
-<BR>
- Return the marker id if one is set on this object when created.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getOffset()">getOffset</A></B>()</CODE>
-
-<BR>
- Returns the offset of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getParams()">getParams</A></B>()</CODE>
-
-<BR>
- Returns the parameters of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getSeverity()">getSeverity</A></B>()</CODE>
-
-<BR>
-
- Returns the severity level of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getTargetObject()">getTargetObject</A></B>()</CODE>
-
-<BR>
- 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".</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getText()">getText</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getText(java.lang.ClassLoader)">getText</A></B>(java.lang.ClassLoader classLoader)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getText(java.util.Locale)">getText</A></B>(java.util.Locale locale)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getText(java.util.Locale, java.lang.ClassLoader)">getText</A></B>(java.util.Locale locale,
- java.lang.ClassLoader classLoader)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setAttribute(java.lang.String, java.lang.Object)">setAttribute</A></B>(java.lang.String attributeName,
- java.lang.Object value)</CODE>
-
-<BR>
- Set the attributeName and value as key value pair.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setBundleName(java.lang.String)">setBundleName</A></B>(java.lang.String bundleName)</CODE>
-
-<BR>
- Set the name of the bundle which this message is contained in.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setGroupName(java.lang.String)">setGroupName</A></B>(java.lang.String name)</CODE>
-
-<BR>
- To support removal of a subset of validation messages, an IValidator may assign group names
- to IMessages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setId(java.lang.String)">setId</A></B>(java.lang.String newId)</CODE>
-
-<BR>
- Set the id of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setLength(int)">setLength</A></B>(int length)</CODE>
-
-<BR>
- Sets the length of the problem, starting from the offset.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setLineNo(int)">setLineNo</A></B>(int lineNumber)</CODE>
-
-<BR>
- 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.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setMarkerId(java.lang.String)">setMarkerId</A></B>(java.lang.String markerId)</CODE>
-
-<BR>
- Set the marker id on a Message object.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setOffset(int)">setOffset</A></B>(int offset)</CODE>
-
-<BR>
- Sets the offset of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setParams(java.lang.String[])">setParams</A></B>(java.lang.String[] newParams)</CODE>
-
-<BR>
- Sets the parameters of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setSeverity(int)">setSeverity</A></B>(int newSeverity)</CODE>
-
-<BR>
- Sets the severity level of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setTargetObject(java.lang.Object)">setTargetObject</A></B>(java.lang.Object obj)</CODE>
-
-<BR>
- Associate this IMessage with the object that has the problem.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="OFFSET_UNSET"><!-- --></A><H3>
-OFFSET_UNSET</H3>
-<PRE>
-static final int <B>OFFSET_UNSET</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#org.eclipse.wst.validation.internal.provisional.core.IMessage.OFFSET_UNSET">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="LINENO_UNSET"><!-- --></A><H3>
-LINENO_UNSET</H3>
-<PRE>
-static final int <B>LINENO_UNSET</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#org.eclipse.wst.validation.internal.provisional.core.IMessage.LINENO_UNSET">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="HIGH_SEVERITY"><!-- --></A><H3>
-HIGH_SEVERITY</H3>
-<PRE>
-static final int <B>HIGH_SEVERITY</B></PRE>
-<DL>
-<DD>Typically used to specify error messages.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#org.eclipse.wst.validation.internal.provisional.core.IMessage.HIGH_SEVERITY">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="NORMAL_SEVERITY"><!-- --></A><H3>
-NORMAL_SEVERITY</H3>
-<PRE>
-static final int <B>NORMAL_SEVERITY</B></PRE>
-<DL>
-<DD>Typically used to specify warning messages.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#org.eclipse.wst.validation.internal.provisional.core.IMessage.NORMAL_SEVERITY">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="LOW_SEVERITY"><!-- --></A><H3>
-LOW_SEVERITY</H3>
-<PRE>
-static final int <B>LOW_SEVERITY</B></PRE>
-<DL>
-<DD>Typically used to specify information messages.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#org.eclipse.wst.validation.internal.provisional.core.IMessage.LOW_SEVERITY">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ERROR_AND_WARNING"><!-- --></A><H3>
-ERROR_AND_WARNING</H3>
-<PRE>
-static final int <B>ERROR_AND_WARNING</B></PRE>
-<DL>
-<DD>Specify high (error) and normal (warning) messages. Typically used with a MessageFilter, to
- filter out information messages.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#org.eclipse.wst.validation.internal.provisional.core.IMessage.ERROR_AND_WARNING">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ALL_MESSAGES"><!-- --></A><H3>
-ALL_MESSAGES</H3>
-<PRE>
-static final int <B>ALL_MESSAGES</B></PRE>
-<DL>
-<DD>Specify all types of messages. Typically used with a MessageFilter.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#org.eclipse.wst.validation.internal.provisional.core.IMessage.ALL_MESSAGES">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="TargetResource"><!-- --></A><H3>
-TargetResource</H3>
-<PRE>
-static final java.lang.String <B>TargetResource</B></PRE>
-<DL>
-<DD>TargetResource - The key to use when associating a resource with a message via an
- attribute.
- <p>
- Normally, the target is stored using the setTargetObject() method, but
- some of the legacy validators used this field for objects that where not IResources.
- In order to associate the message with the proper IResource the validator can store
- the IResource as an attribute and use this string as the key.
- </p>
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#org.eclipse.wst.validation.internal.provisional.core.IMessage.TargetResource">Constant Field Values</A></DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getBundleName()"><!-- --></A><H3>
-getBundleName</H3>
-<PRE>
-java.lang.String <B>getBundleName</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the name of the bundle which this message is contained in.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getGroupName()"><!-- --></A><H3>
-getGroupName</H3>
-<PRE>
-java.lang.String <B>getGroupName</B>()</PRE>
-<DL>
-<DD>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>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the name of the group to which the message belongs.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getId()"><!-- --></A><H3>
-getId</H3>
-<PRE>
-java.lang.String <B>getId</B>()</PRE>
-<DL>
-<DD>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>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the id of the message</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLength()"><!-- --></A><H3>
-getLength</H3>
-<PRE>
-int <B>getLength</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the length of the problem area, starting from the offset. If unset, value =
- IMessage.OFFSET_UNSET.<DT><B>See Also:</B><DD><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getOffset()"><CODE>getOffset()</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLineNumber()"><!-- --></A><H3>
-getLineNumber</H3>
-<PRE>
-int <B>getLineNumber</B>()</PRE>
-<DL>
-<DD>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>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>line number of the location of the problem.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getOffset()"><!-- --></A><H3>
-getOffset</H3>
-<PRE>
-int <B>getOffset</B>()</PRE>
-<DL>
-<DD>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>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>offset of the message</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getParams()"><!-- --></A><H3>
-getParams</H3>
-<PRE>
-java.lang.String[] <B>getParams</B>()</PRE>
-<DL>
-<DD>Returns the parameters of the message. Message parameters are the values which are
- substituted into parameter slots in localized message text descriptions.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>parameters of the message</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSeverity()"><!-- --></A><H3>
-getSeverity</H3>
-<PRE>
-int <B>getSeverity</B>()</PRE>
-<DL>
-<DD><p>
- Returns the severity level of the message. One of SeverityEnum constants.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the severity level of the message<DT><B>See Also:</B><DD><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#HIGH_SEVERITY"><CODE>HIGH_SEVERITY</CODE></A>,
-<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#NORMAL_SEVERITY"><CODE>NORMAL_SEVERITY</CODE></A>,
-<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#LOW_SEVERITY"><CODE></p></CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTargetObject()"><!-- --></A><H3>
-getTargetObject</H3>
-<PRE>
-java.lang.Object <B>getTargetObject</B>()</PRE>
-<DL>
-<DD>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>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the target object for the message</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getText()"><!-- --></A><H3>
-getText</H3>
-<PRE>
-java.lang.String <B>getText</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>a text representation of this message formatted in the default Locale, with the
- bundle loaded by the default ClassLoader.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getText(java.lang.ClassLoader)"><!-- --></A><H3>
-getText</H3>
-<PRE>
-java.lang.String <B>getText</B>(java.lang.ClassLoader classLoader)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>classLoader</CODE> - The ClassLoader which will be used to load the ResourceBundle.
-<DT><B>Returns:</B><DD>a text representation of this message formatted in the default locale, with the
- bundle loaded by the specified ClassLoader.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getText(java.util.Locale)"><!-- --></A><H3>
-getText</H3>
-<PRE>
-java.lang.String <B>getText</B>(java.util.Locale locale)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>locale</CODE> - The locale to translate the message text into.
-<DT><B>Returns:</B><DD>a text representation of this message formatted in the specified locale, with the
- bundle loaded by the default ClassLoader.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getText(java.util.Locale, java.lang.ClassLoader)"><!-- --></A><H3>
-getText</H3>
-<PRE>
-java.lang.String <B>getText</B>(java.util.Locale locale,
- java.lang.ClassLoader classLoader)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>locale</CODE> - The locale to translate the message text into.<DD><CODE>classLoader</CODE> - The ClassLoader which will be used to load the ResourceBundle.
-<DT><B>Returns:</B><DD>a text representation of this message formatted in the specified locale, with the
- bundle loaded by the specified ClassLoader.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAttribute(java.lang.String)"><!-- --></A><H3>
-getAttribute</H3>
-<PRE>
-java.lang.Object <B>getAttribute</B>(java.lang.String attributeName)</PRE>
-<DL>
-<DD>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.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>attributeName</CODE> -
-<DT><B>Returns:</B><DD>an Object basically the value associated with the object name.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setAttribute(java.lang.String, java.lang.Object)"><!-- --></A><H3>
-setAttribute</H3>
-<PRE>
-void <B>setAttribute</B>(java.lang.String attributeName,
- java.lang.Object value)</PRE>
-<DL>
-<DD>Set the attributeName and value as key value pair.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>attributeName</CODE> - <DT><B>See Also:</B><DD><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#getAttribute(java.lang.String)"><CODE>getAttribute(String attributeName)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBundleName(java.lang.String)"><!-- --></A><H3>
-setBundleName</H3>
-<PRE>
-void <B>setBundleName</B>(java.lang.String bundleName)</PRE>
-<DL>
-<DD>Set the name of the bundle which this message is contained in.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>bundleName</CODE> - Name of the bundle which contains the message.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setGroupName(java.lang.String)"><!-- --></A><H3>
-setGroupName</H3>
-<PRE>
-void <B>setGroupName</B>(java.lang.String name)</PRE>
-<DL>
-<DD>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>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>name</CODE> - Name of the group.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setId(java.lang.String)"><!-- --></A><H3>
-setId</H3>
-<PRE>
-void <B>setId</B>(java.lang.String newId)</PRE>
-<DL>
-<DD>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>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>newId</CODE> - Id of the message.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setLength(int)"><!-- --></A><H3>
-setLength</H3>
-<PRE>
-void <B>setLength</B>(int length)</PRE>
-<DL>
-<DD>Sets the length of the problem, starting from the offset. If unset, value =
- IMessage.OFFSET_UNSET.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>length</CODE> - Sets the length.<DT><B>See Also:</B><DD><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#setOffset(int)"><CODE>setOffset(int)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setLineNo(int)"><!-- --></A><H3>
-setLineNo</H3>
-<PRE>
-void <B>setLineNo</B>(int lineNumber)</PRE>
-<DL>
-<DD>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>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>lineNumber</CODE> - Sets the line number.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setOffset(int)"><!-- --></A><H3>
-setOffset</H3>
-<PRE>
-void <B>setOffset</B>(int offset)</PRE>
-<DL>
-<DD>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>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>offset</CODE> - Sets the offset of the message.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setParams(java.lang.String[])"><!-- --></A><H3>
-setParams</H3>
-<PRE>
-void <B>setParams</B>(java.lang.String[] newParams)</PRE>
-<DL>
-<DD>Sets the parameters of the message. Message parameters are the values which are substituted
- into parameter slots in localized message text descriptions.
- <p>
- For example, if getId() returns "MY_ID", then the ResourceBundle identified by
- getBundleName() is searched for the message named "MY_ID", and if found,
- has it's parameters set.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>newParams</CODE> - Parameters of the message.<DT><B>See Also:</B><DD><CODE>is invoked on the message, with
- <code>newParams</code> passed in as the Object[].</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSeverity(int)"><!-- --></A><H3>
-setSeverity</H3>
-<PRE>
-void <B>setSeverity</B>(int newSeverity)</PRE>
-<DL>
-<DD>Sets the severity level of the message. One of SeverityEnum constants.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>newSeverity</CODE> - Severity level of the message.<DT><B>See Also:</B><DD><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#HIGH_SEVERITY"><CODE>HIGH_SEVERITY</CODE></A>,
-<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#NORMAL_SEVERITY"><CODE>NORMAL_SEVERITY</CODE></A>,
-<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html#LOW_SEVERITY"><CODE>LOW_SEVERITY</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTargetObject(java.lang.Object)"><!-- --></A><H3>
-setTargetObject</H3>
-<PRE>
-void <B>setTargetObject</B>(java.lang.Object obj)</PRE>
-<DL>
-<DD>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>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>obj</CODE> - The object that has the problem.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAttributes()"><!-- --></A><H3>
-getAttributes</H3>
-<PRE>
-java.util.HashMap <B>getAttributes</B>()</PRE>
-<DL>
-<DD>Return all the attributes of a Message object.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMarkerId()"><!-- --></A><H3>
-getMarkerId</H3>
-<PRE>
-java.lang.String <B>getMarkerId</B>()</PRE>
-<DL>
-<DD>Return the marker id if one is set on this object when created.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setMarkerId(java.lang.String)"><!-- --></A><H3>
-setMarkerId</H3>
-<PRE>
-void <B>setMarkerId</B>(java.lang.String markerId)</PRE>
-<DL>
-<DD>Set the marker id on a Message object.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IMessage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV CLASS
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IMessage.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IMessage.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#field_summary">FIELD</A> | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#field_detail">FIELD</A> | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html
deleted file mode 100644
index a128b13..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-IMetaModelContext
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="IMetaModelContext";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IMetaModelContext.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IMetaModelContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation.internal.provisional.core</FONT>
-<BR>
-Interface IMetaModelContext</H2>
-<DL>
-<DT><B>All Superinterfaces:</B> <DD><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public interface <B>IMetaModelContext</B><DT>extends <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A></DL>
-</PRE>
-
-<P>
-<p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html#getModel(java.lang.String)">getModel</A></B>(java.lang.String URI)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_org.eclipse.wst.validation.internal.provisional.core.IValidationContext"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from interface org.eclipse.wst.validation.internal.provisional.core.<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html#getURIs()">getURIs</A>, <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html#loadModel(java.lang.String)">loadModel</A>, <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html#loadModel(java.lang.String, java.lang.Object[])">loadModel</A></CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getModel(java.lang.String)"><!-- --></A><H3>
-getModel</H3>
-<PRE>
-java.lang.Object <B>getModel</B>(java.lang.String URI)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IMetaModelContext.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IMetaModelContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html
deleted file mode 100644
index f83580c..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html
+++ /dev/null
@@ -1,234 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-IProjectValidationContext
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="IProjectValidationContext";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IProjectValidationContext.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IProjectValidationContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation.internal.provisional.core</FONT>
-<BR>
-Interface IProjectValidationContext</H2>
-<DL>
-<DT><B>All Superinterfaces:</B> <DD><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public interface <B>IProjectValidationContext</B><DT>extends <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A></DL>
-</PRE>
-
-<P>
-IProjectValidationContext extends IValidationContext to provide access to a
- reference to the project on which a validator is being invoked.
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IProject</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html#getProject()">getProject</A></B>()</CODE>
-
-<BR>
- Provides the project on which the validator is being invoked.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_org.eclipse.wst.validation.internal.provisional.core.IValidationContext"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from interface org.eclipse.wst.validation.internal.provisional.core.<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html#getURIs()">getURIs</A>, <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html#loadModel(java.lang.String)">loadModel</A>, <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html#loadModel(java.lang.String, java.lang.Object[])">loadModel</A></CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getProject()"><!-- --></A><H3>
-getProject</H3>
-<PRE>
-IProject <B>getProject</B>()</PRE>
-<DL>
-<DD>Provides the project on which the validator is being invoked.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>an IProject reference to the project on which the validator is
- being invoked.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IProjectValidationContext.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IProjectValidationContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IReporter.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IReporter.html
deleted file mode 100644
index ce6dbbb..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IReporter.html
+++ /dev/null
@@ -1,427 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-IReporter
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="IReporter";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IReporter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IReporter.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IReporter.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation.internal.provisional.core</FONT>
-<BR>
-Interface IReporter</H2>
-<DL>
-<DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../../../../../../org/eclipse/wst/validation/ReporterHelper.html" title="class in org.eclipse.wst.validation">ReporterHelper</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public interface <B>IReporter</B></DL>
-</PRE>
-
-<P>
-The interface used by IValidator's to report messages. The implementation of the IReporter could
- simply log the messages to stdout, a file, or retain them in a buffer for later access by a user
- interface.
- <p>
- Reporter implementations should keep non-localized versions of their messages.
- </p>
- <p>
- Any messages which need to be displayed to the user are done through this class, and if the user
- cancels the current function, this class is the one which registers the cancellation.
- </p>
- <p>
- The IReporter instance is created at the time validation begins and ends when validation is complete.
- There is only one IReporter instance created for all validators that are run on a IResource. The IResource
- provides a way to get messages put out each validator and add and delete messages for one validator
- at a time.
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">addMessage</A></B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
-
- Add a locale-independent validation message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">displaySubtask</A></B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
- Show a text representation of this message, formatted in the default
- Locale, to the user immediately.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.List</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#getMessages()">getMessages</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#isCancelled()">isCancelled</A></B>()</CODE>
-
-<BR>
- Return true if the user canceled validation, and false otherwise.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator)">removeAllMessages</A></B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin)</CODE>
-
-<BR>
- Remove all validation messages entered by the identified validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object)">removeAllMessages</A></B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- java.lang.Object object)</CODE>
-
-<BR>
- Remove all validation messages, entered by the identified validator,
- pertaining to the Object provided.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeMessageSubset(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object, java.lang.String)">removeMessageSubset</A></B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- java.lang.Object obj,
- java.lang.String groupName)</CODE>
-
-<BR>
- To support removal of a subset of validation messages, an IValidator may
- assign group names to IMessages.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)"><!-- --></A><H3>
-addMessage</H3>
-<PRE>
-void <B>addMessage</B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</PRE>
-<DL>
-<DD><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>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>origin</CODE> - The validator which is the source of the message.<DD><CODE>message</CODE> - A message to be reported.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)"><!-- --></A><H3>
-displaySubtask</H3>
-<PRE>
-void <B>displaySubtask</B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</PRE>
-<DL>
-<DD>Show a text representation of this message, formatted in the default
- Locale, to the user immediately. This message indicates which subtask is
- currently being processed. The message is not stored. The subtask message
- in this context is the subtask in a IProgressMontior
- <p>
- Both parameters must not be null.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>validator</CODE> - The validator issuing the subtask message.<DD><CODE>message</CODE> - The message to be displayed to the user.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMessages()"><!-- --></A><H3>
-getMessages</H3>
-<PRE>
-java.util.List <B>getMessages</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the message access interface to this reporter, or null if message access is not
- supported.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isCancelled()"><!-- --></A><H3>
-isCancelled</H3>
-<PRE>
-boolean <B>isCancelled</B>()</PRE>
-<DL>
-<DD>Return true if the user canceled validation, and false otherwise. This method should be
- called by IValidators periodically, because no event is fired to notify IValidators that the
- user canceled validation. If a validator does not check this method, a cancellation request
- is ignored.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>true if the user canceled validation, and false otherwise.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator)"><!-- --></A><H3>
-removeAllMessages</H3>
-<PRE>
-void <B>removeAllMessages</B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin)</PRE>
-<DL>
-<DD>Remove all validation messages entered by the identified validator. This method is provided
- for incremental validation.
- <p>
- The IValidator parameter must not be null.
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>origin</CODE> - Originator validator of the message.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object)"><!-- --></A><H3>
-removeAllMessages</H3>
-<PRE>
-void <B>removeAllMessages</B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- java.lang.Object object)</PRE>
-<DL>
-<DD>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>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>origin</CODE> - Originator validator of the message.<DD><CODE>object</CODE> - Object to which the message belongs. Object is the target object
- that was set on the IMessage when adding the message as problem
- marker.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="removeMessageSubset(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object, java.lang.String)"><!-- --></A><H3>
-removeMessageSubset</H3>
-<PRE>
-void <B>removeMessageSubset</B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- java.lang.Object obj,
- java.lang.String groupName)</PRE>
-<DL>
-<DD>To support removal of a subset of validation messages, an IValidator may
- assign group names to IMessages. An IMessage subset will be identified by
- the name of its group. This method will remove only the IMessage's that
- are in the group identified by groupName.
- <p>
- The IValidator parameter must not be null.
- </p>
- <p>
- If <code>object</code> is null, then this method should remove all
- messages owned by the validator. (i.e., the same behaviour as the
- removeAllMessages(IValidator) method.)
- </p>
- <p>
- If groupName is null, that's the same as no group (i.e., the same
- behaviour as the <code>removeAllMessages(IValidator, Object)</code>
- method.)
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>validator</CODE> - Originator validator of the message.<DD><CODE>obj</CODE> - Object to which the message belongs.<DD><CODE>groupName</CODE> - Name of the group to which the message belongs.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IReporter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IReporter.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IReporter.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html
deleted file mode 100644
index fbd58e9..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html
+++ /dev/null
@@ -1,296 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-IValidationContext
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="IValidationContext";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IValidationContext.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidationContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation.internal.provisional.core</FONT>
-<BR>
-Interface IValidationContext</H2>
-<DL>
-<DT><B>All Known Subinterfaces:</B> <DD><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMetaModelContext</A>, <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IProjectValidationContext</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public interface <B>IValidationContext</B></DL>
-</PRE>
-
-<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>
- The model is loaded differently depending on whether the validator is running in
- as-you-type or builder based context. If the <code>loadModel</code> method was a method on the IValidator,
- then there would need to be two versions of validators, one for as-you-type and one for
- builder based. Because <code>loadModel</code> is separate from the IValidator, we provide
- two different IHelpers instead, and ship the one specific to the environment.
- </p>
- <p>
- Each IValidationContext implementation loads a specific model as identified by a String
- <code>symbolicName</code>. The symbolicName can be any value except null or the
- empty string. Each validator identifies the symbolic names which it needs, and the
- type of model which needs to be returned when that symbolic name is loaded via a
- <code>loadModel</code> method. An IValidationContext can support more than one IValidator;
- the helper needs to support every model that each validator needs.
- </p>
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html#getURIs()">getURIs</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html#loadModel(java.lang.String)">loadModel</A></B>(java.lang.String symbolicName)</CODE>
-
-<BR>
-
- Load the model identified by <code>symbolicName</code>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html#loadModel(java.lang.String, java.lang.Object[])">loadModel</A></B>(java.lang.String symbolicName,
- java.lang.Object[] parms)</CODE>
-
-<BR>
-
- Load the model identified by <code>symbolicName</code> and <code>parms</code>.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="loadModel(java.lang.String)"><!-- --></A><H3>
-loadModel</H3>
-<PRE>
-java.lang.Object <B>loadModel</B>(java.lang.String symbolicName)</PRE>
-<DL>
-<DD><p>
- Load the model identified by <code>symbolicName</code>. <code>symbolicName</code>
- must not be null or the empty string if the validator needs to be run in both
- as-you-type and builder based validation.
- </p>
- <p>
- The symbolicName is a string name that is registered in the implementation of the
- IValidatorContext. For an example our internal implementation of the loadModel use
- method names for symbolicNames to load the model object to be validated. Users can
- use their own model load mechanism.
- </p>
-<P>
-<DD><DL>
-<DT><B>See Also:</B><DD><code>WorkbenchContext</code></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="loadModel(java.lang.String, java.lang.Object[])"><!-- --></A><H3>
-loadModel</H3>
-<PRE>
-java.lang.Object <B>loadModel</B>(java.lang.String symbolicName,
- java.lang.Object[] parms)</PRE>
-<DL>
-<DD><p>
- Load the model identified by <code>symbolicName</code> and <code>parms</code>.
- <code>symbolicName</code> must not be null or the empty string if the validator
- needs to be run in both as-you-type and builder based validation.
- If <code>parms</code> is null then this
- method behaves the same as
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>symbolicName</CODE> - String identifier for model.<DD><CODE>parms</CODE> - List of parameters that the model takes for invocation.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getURIs()"><!-- --></A><H3>
-getURIs</H3>
-<PRE>
-java.lang.String[] <B>getURIs</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>a string array with the list of URI's that need to be validated in the
- case of Incremental build.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IValidationContext.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidationContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IValidator.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IValidator.html
deleted file mode 100644
index d24cd04..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IValidator.html
+++ /dev/null
@@ -1,264 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-IValidator
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="IValidator";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IValidator.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IValidator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation.internal.provisional.core</FONT>
-<BR>
-Interface IValidator</H2>
-<DL>
-<DT><B>All Known Subinterfaces:</B> <DD><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidatorJob</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public interface <B>IValidator</B></DL>
-</PRE>
-
-<P>
-This is the base interface for all Validators. A Validator is a class which verifies that objects
- follow some rules. For example, in a MOF model which represents an EJB jar, the EJB specification
- determines the rules.
- <p>
- A validator can perform full validation or incremental validation. All validators must implement
- full validation but incremental validation is optional.
- </p>
- <p>
- Each validator must not be tied to any particular workbench implementation.
- </p>
- <p>
- A validator's verification starts when the ValidatorLauncher singleton calls
- <code>validate</code>.
- </p>
- <p>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- (repeatedly) as the API evolves.
- </p>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html#cleanup(org.eclipse.wst.validation.internal.provisional.core.IReporter)">cleanup</A></B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> reporter)</CODE>
-
-<BR>
- Perform any resource cleanup once validation is complete.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html#validate(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)">validate</A></B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> helper,
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> reporter)</CODE>
-
-<BR>
- This is the method which performs the validation on the objects.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="cleanup(org.eclipse.wst.validation.internal.provisional.core.IReporter)"><!-- --></A><H3>
-cleanup</H3>
-<PRE>
-void <B>cleanup</B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> reporter)</PRE>
-<DL>
-<DD>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>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>reporter</CODE> - Used for the interaction with the user.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="validate(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)"><!-- --></A><H3>
-validate</H3>
-<PRE>
-void <B>validate</B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> helper,
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> reporter)
- throws org.eclipse.wst.validation.internal.core.ValidationException</PRE>
-<DL>
-<DD>This is the method which performs the validation on the objects.
- <p>
- <code>helper</code> and <code>reporter</code> may not be null. <code>changedFiles</code>
- may be null, if a full build is desired. <br>
- </p>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>helper</CODE> - Loads an object.<DD><CODE>reporter</CODE> - Is an instance of an IReporter interface, which is used for interaction with the user.
-<DT><B>Throws:</B>
-<DD><CODE>org.eclipse.wst.validation.internal.core.ValidationException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IValidator.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IValidator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html
deleted file mode 100644
index 05cf5ff..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html
+++ /dev/null
@@ -1,301 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-IValidatorJob
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="IValidatorJob";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IValidatorJob.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html" title="class in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidatorJob.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#field_summary">FIELD</A> | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#field_detail">FIELD</A> | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation.internal.provisional.core</FONT>
-<BR>
-Interface IValidatorJob</H2>
-<DL>
-<DT><B>All Superinterfaces:</B> <DD><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public interface <B>IValidatorJob</B><DT>extends <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></DL>
-</PRE>
-
-<P>
-This is the Job interface for the validator. Validators implementing this interface are executed as
- background jobs.
- Following is a sequence of calls:
- <ul>
- <li>validator.getSchedulingRule(helper)
- <li>validator.validate(reporter)
- </ul>
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static IStatus</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html#OK_STATUS">OK_STATUS</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> ISchedulingRule</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html#getSchedulingRule(org.eclipse.wst.validation.internal.provisional.core.IValidationContext)">getSchedulingRule</A></B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> helper)</CODE>
-
-<BR>
- Get the scheduling rule, which the framework applies to the Validator job.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IStatus</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html#validateInJob(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)">validateInJob</A></B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> helper,
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> reporter)</CODE>
-
-<BR>
- This is the method which performs the validation on the objects.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_org.eclipse.wst.validation.internal.provisional.core.IValidator"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from interface org.eclipse.wst.validation.internal.provisional.core.<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html#cleanup(org.eclipse.wst.validation.internal.provisional.core.IReporter)">cleanup</A>, <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html#validate(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)">validate</A></CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="OK_STATUS"><!-- --></A><H3>
-OK_STATUS</H3>
-<PRE>
-static final IStatus <B>OK_STATUS</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="validateInJob(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)"><!-- --></A><H3>
-validateInJob</H3>
-<PRE>
-IStatus <B>validateInJob</B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> helper,
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> reporter)
- throws org.eclipse.wst.validation.internal.core.ValidationException</PRE>
-<DL>
-<DD>This is the method which performs the validation on the objects.
- <p>
- <code>reporter</code> may not be null. <code>changedFiles</code>
- may be null, if a full build is desired. <br>
- </p>
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>reporter</CODE> - Is an instance of an IReporter interface, which is used for interaction with the
- user.<DD><CODE>helper</CODE> - Will not be null, loads an object.
-<DT><B>Throws:</B>
-<DD><CODE>org.eclipse.wst.validation.internal.core.ValidationException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSchedulingRule(org.eclipse.wst.validation.internal.provisional.core.IValidationContext)"><!-- --></A><H3>
-getSchedulingRule</H3>
-<PRE>
-ISchedulingRule <B>getSchedulingRule</B>(<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> helper)</PRE>
-<DL>
-<DD>Get the scheduling rule, which the framework applies to the Validator job.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>helper</CODE> - Will not be null, loads an object.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/IValidatorJob.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html" title="class in org.eclipse.wst.validation.internal.provisional.core"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidatorJob.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | <A HREF="#field_summary">FIELD</A> | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#field_detail">FIELD</A> | CONSTR | <A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html
deleted file mode 100644
index b8c0880..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html
+++ /dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-MessageLimitException
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="MessageLimitException";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/MessageLimitException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageLimitException.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#methods_inherited_from_class_java.lang.Throwable">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.eclipse.wst.validation.internal.provisional.core</FONT>
-<BR>
-Class MessageLimitException</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../../../../../resources/inherit.gif" ALT="extended by ">java.lang.Throwable
- <IMG SRC="../../../../../../../resources/inherit.gif" ALT="extended by ">java.lang.Exception
- <IMG SRC="../../../../../../../resources/inherit.gif" ALT="extended by ">java.lang.RuntimeException
- <IMG SRC="../../../../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.wst.validation.internal.provisional.core.MessageLimitException</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable</DD>
-</DL>
-<HR>
-<B>Deprecated.</B> <I>This class is not longer used by the framework. The framework is
- not going to limit the number of messages displayed by a validator.</I>
-<P>
-<DL>
-<DT><PRE>public class <B>MessageLimitException</B><DT>extends java.lang.RuntimeException</DL>
-</PRE>
-
-<P>
-This exception is thrown by
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)"><CODE>method if no more messages can be reported
- because the maximum number of messages has been reported.</CODE></A>,
-<A HREF="../../../../../../../serialized-form.html#org.eclipse.wst.validation.internal.provisional.core.MessageLimitException">Serialized Form</A></DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html#MessageLimitException()">MessageLimitException</A></B>()</CODE>
-
-<BR>
- <B>Deprecated.</B> </TD>
-</TR>
-</TABLE>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Throwable"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Throwable</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</CODE></TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="MessageLimitException()"><!-- --></A><H3>
-MessageLimitException</H3>
-<PRE>
-public <B>MessageLimitException</B>()</PRE>
-<DL>
-<DD><B>Deprecated.</B> </DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/MessageLimitException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><B>PREV CLASS</B></A>
- NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageLimitException.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#methods_inherited_from_class_java.lang.Throwable">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IMessage.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IMessage.html
deleted file mode 100644
index 7da29f6..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IMessage.html
+++ /dev/null
@@ -1,245 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IMessage
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IMessage";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIMessage.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IMessage.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>org.eclipse.wst.validation.internal.provisional.core.IMessage</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation.internal.provisional.core"><B>org.eclipse.wst.validation.internal.provisional.core</B></A></TD>
-<TD>An earlier framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> in <A HREF="../../../../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return types with arguments of type <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.util.List<<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A>></CODE></FONT></TD>
-<TD><CODE><B>ReporterHelper.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/ReporterHelper.html#getMessages()">getMessages</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>ReporterHelper.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/ReporterHelper.html#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">addMessage</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>ReporterHelper.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/ReporterHelper.html#displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">displaySubtask</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation.internal.provisional.core"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> in <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A> with parameters of type <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IReporter.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">addMessage</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
-
- Add a locale-independent validation message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IReporter.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">displaySubtask</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
- Show a text representation of this message, formatted in the default
- Locale, to the user immediately.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIMessage.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IMessage.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IMetaModelContext.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IMetaModelContext.html
deleted file mode 100644
index d5e29a0..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IMetaModelContext.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IMetaModelContext
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IMetaModelContext";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIMetaModelContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IMetaModelContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>org.eclipse.wst.validation.internal.provisional.core.IMetaModelContext</B></H2>
-</CENTER>
-No usage of org.eclipse.wst.validation.internal.provisional.core.IMetaModelContext
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIMetaModelContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IMetaModelContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IProjectValidationContext.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IProjectValidationContext.html
deleted file mode 100644
index 1cbbc44..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IProjectValidationContext.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIProjectValidationContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IProjectValidationContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext</B></H2>
-</CENTER>
-No usage of org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIProjectValidationContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IProjectValidationContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IReporter.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IReporter.html
deleted file mode 100644
index 9e17c17..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IReporter.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IReporter
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IReporter";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIReporter.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IReporter.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>org.eclipse.wst.validation.internal.provisional.core.IReporter</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation.internal.provisional.core"><B>org.eclipse.wst.validation.internal.provisional.core</B></A></TD>
-<TD>An earlier framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> in <A HREF="../../../../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Classes in <A HREF="../../../../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that implement <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../../org/eclipse/wst/validation/ReporterHelper.html" title="class in org.eclipse.wst.validation">ReporterHelper</A></B></CODE>
-
-<BR>
- This is a temporary class to ease the transition from the previous validation framework.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></CODE></FONT></TD>
-<TD><CODE><B>ValidationResult.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/ValidationResult.html#getReporter(IProgressMonitor)">getReporter</A></B>(IProgressMonitor monitor)</CODE>
-
-<BR>
- Answer an IReporter for handing error messages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></CODE></FONT></TD>
-<TD><CODE><B>ValidationFramework.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/ValidationFramework.html#getReporter(IProject, IProgressMonitor)">getReporter</A></B>(IProject project,
- IProgressMonitor monitor)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation.internal.provisional.core"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> in <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A> with parameters of type <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IValidator.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html#cleanup(org.eclipse.wst.validation.internal.provisional.core.IReporter)">cleanup</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> reporter)</CODE>
-
-<BR>
- Perform any resource cleanup once validation is complete.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IValidator.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html#validate(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)">validate</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> helper,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> reporter)</CODE>
-
-<BR>
- This is the method which performs the validation on the objects.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IStatus</CODE></FONT></TD>
-<TD><CODE><B>IValidatorJob.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html#validateInJob(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)">validateInJob</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> helper,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> reporter)</CODE>
-
-<BR>
- This is the method which performs the validation on the objects.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIReporter.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IReporter.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IValidationContext.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IValidationContext.html
deleted file mode 100644
index 35f2dd8..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IValidationContext.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IValidationContext
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IValidationContext";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIValidationContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidationContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>org.eclipse.wst.validation.internal.provisional.core.IValidationContext</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation.internal.provisional.core"><B>org.eclipse.wst.validation.internal.provisional.core</B></A></TD>
-<TD>An earlier framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation.internal.provisional.core"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> in <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Subinterfaces of <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> in <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> interface</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMetaModelContext</A></B></CODE>
-
-<BR>
-
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> interface</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IProjectValidationContext</A></B></CODE>
-
-<BR>
- IProjectValidationContext extends IValidationContext to provide access to a
- reference to the project on which a validator is being invoked.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A> with parameters of type <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> ISchedulingRule</CODE></FONT></TD>
-<TD><CODE><B>IValidatorJob.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html#getSchedulingRule(org.eclipse.wst.validation.internal.provisional.core.IValidationContext)">getSchedulingRule</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> helper)</CODE>
-
-<BR>
- Get the scheduling rule, which the framework applies to the Validator job.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IValidator.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html#validate(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)">validate</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> helper,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> reporter)</CODE>
-
-<BR>
- This is the method which performs the validation on the objects.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> IStatus</CODE></FONT></TD>
-<TD><CODE><B>IValidatorJob.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html#validateInJob(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)">validateInJob</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A> helper,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A> reporter)</CODE>
-
-<BR>
- This is the method which performs the validation on the objects.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIValidationContext.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidationContext.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IValidator.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IValidator.html
deleted file mode 100644
index cea5a3c..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IValidator.html
+++ /dev/null
@@ -1,333 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IValidator
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IValidator";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIValidator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>org.eclipse.wst.validation.internal.provisional.core.IValidator</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation.internal.provisional.core"><B>org.eclipse.wst.validation.internal.provisional.core</B></A></TD>
-<TD>An earlier framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> in <A HREF="../../../../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> that return <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/Validator.html#asIValidator()">asIValidator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.V1.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/Validator.V1.html#asIValidator()">asIValidator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></CODE></FONT></TD>
-<TD><CODE><B>Validator.V2.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/Validator.V2.html#asIValidator()">asIValidator</A></B>()</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> with parameters of type <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>ReporterHelper.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/ReporterHelper.html#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">addMessage</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>ReporterHelper.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/ReporterHelper.html#displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">displaySubtask</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>ReporterHelper.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/ReporterHelper.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator)">removeAllMessages</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>ReporterHelper.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/ReporterHelper.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object)">removeAllMessages</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- java.lang.Object object)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>ReporterHelper.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/ReporterHelper.html#removeMessageSubset(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object, java.lang.String)">removeMessageSubset</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- java.lang.Object obj,
- java.lang.String groupName)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation.internal.provisional.core"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> in <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Subinterfaces of <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> in <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> interface</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidatorJob</A></B></CODE>
-
-<BR>
- This is the Job interface for the validator.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A> with parameters of type <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IReporter.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">addMessage</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
-
- Add a locale-independent validation message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IReporter.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IMessage)">displaySubtask</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A> message)</CODE>
-
-<BR>
- Show a text representation of this message, formatted in the default
- Locale, to the user immediately.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IReporter.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator)">removeAllMessages</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin)</CODE>
-
-<BR>
- Remove all validation messages entered by the identified validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IReporter.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object)">removeAllMessages</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> origin,
- java.lang.Object object)</CODE>
-
-<BR>
- Remove all validation messages, entered by the identified validator,
- pertaining to the Object provided.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B>IReporter.</B><B><A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html#removeMessageSubset(org.eclipse.wst.validation.internal.provisional.core.IValidator, java.lang.Object, java.lang.String)">removeMessageSubset</A></B>(<A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A> validator,
- java.lang.Object obj,
- java.lang.String groupName)</CODE>
-
-<BR>
- To support removal of a subset of validation messages, an IValidator may
- assign group names to IMessages.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIValidator.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidator.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IValidatorJob.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IValidatorJob.html
deleted file mode 100644
index e560b26..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/IValidatorJob.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IValidatorJob
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Interface org.eclipse.wst.validation.internal.provisional.core.IValidatorJob";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIValidatorJob.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidatorJob.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>org.eclipse.wst.validation.internal.provisional.core.IValidatorJob</B></H2>
-</CENTER>
-No usage of org.eclipse.wst.validation.internal.provisional.core.IValidatorJob
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useIValidatorJob.html" target="_top"><B>FRAMES</B></A>
- <A HREF="IValidatorJob.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/MessageLimitException.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/MessageLimitException.html
deleted file mode 100644
index 6ca09b0..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/class-use/MessageLimitException.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Class org.eclipse.wst.validation.internal.provisional.core.MessageLimitException
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.eclipse.wst.validation.internal.provisional.core.MessageLimitException";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html" title="class in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useMessageLimitException.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageLimitException.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.eclipse.wst.validation.internal.provisional.core.MessageLimitException</B></H2>
-</CENTER>
-No usage of org.eclipse.wst.validation.internal.provisional.core.MessageLimitException
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html" title="class in org.eclipse.wst.validation.internal.provisional.core"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/\class-useMessageLimitException.html" target="_top"><B>FRAMES</B></A>
- <A HREF="MessageLimitException.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/package-frame.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/package-frame.html
deleted file mode 100644
index 448beff..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/package-frame.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-org.eclipse.wst.validation.internal.provisional.core
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html" target="classFrame">org.eclipse.wst.validation.internal.provisional.core</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IMessage</I></A>
-<BR>
-<A HREF="IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IMetaModelContext</I></A>
-<BR>
-<A HREF="IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IProjectValidationContext</I></A>
-<BR>
-<A HREF="IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IReporter</I></A>
-<BR>
-<A HREF="IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IValidationContext</I></A>
-<BR>
-<A HREF="IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IValidator</I></A>
-<BR>
-<A HREF="IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core" target="classFrame"><I>IValidatorJob</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Exceptions</FONT>
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="MessageLimitException.html" title="class in org.eclipse.wst.validation.internal.provisional.core" target="classFrame">MessageLimitException</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/package-summary.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/package-summary.html
deleted file mode 100644
index 5265b55..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/package-summary.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-org.eclipse.wst.validation.internal.provisional.core
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="org.eclipse.wst.validation.internal.provisional.core";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/package-summary.html"><B>PREV PACKAGE</B></A>
- NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/package-summary.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package org.eclipse.wst.validation.internal.provisional.core
-</H2>
-An earlier framework for calling validators that are build based.
-<P>
-<B>See:</B>
-<BR>
- <A HREF="#package_description"><B>Description</B></A>
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMessage.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMessage</A></B></TD>
-<TD>
- This interface represents a locale-independent validation message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IMetaModelContext</A></B></TD>
-<TD>
- <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- change significantly before reaching stability.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IProjectValidationContext</A></B></TD>
-<TD>IProjectValidationContext extends IValidationContext to provide access to a
- reference to the project on which a validator is being invoked.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IReporter</A></B></TD>
-<TD>The interface used by IValidator's to report messages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidationContext.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidationContext</A></B></TD>
-<TD>This class is used to to separate the IValidator from the model loading.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidator.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidator</A></B></TD>
-<TD>This is the base interface for all Validators.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.html" title="interface in org.eclipse.wst.validation.internal.provisional.core">IValidatorJob</A></B></TD>
-<TD>This is the Job interface for the validator.</TD>
-</TR>
-</TABLE>
-
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Exception Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html" title="class in org.eclipse.wst.validation.internal.provisional.core">MessageLimitException</A></B></TD>
-<TD><B>Deprecated.</B> <I>This class is not longer used by the framework.</I></TD>
-</TR>
-</TABLE>
-
-
-<P>
-<A NAME="package_description"><!-- --></A><H2>
-Package org.eclipse.wst.validation.internal.provisional.core Description
-</H2>
-
-<P>
-<p>An earlier framework for calling validators that are build based.</p>
-<p>This framework is being replaced by the <code>newer org.eclipse.wst.validation</code> framework.</p>
-<P>
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../org/eclipse/wst/validation/package-summary.html"><B>PREV PACKAGE</B></A>
- NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/package-summary.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/package-use.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/package-use.html
deleted file mode 100644
index ed0f9b8..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/internal/provisional/core/package-use.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Package org.eclipse.wst.validation.internal.provisional.core
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Package org.eclipse.wst.validation.internal.provisional.core";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/package-use.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Package<br>org.eclipse.wst.validation.internal.provisional.core</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation.internal.provisional.core"><B>org.eclipse.wst.validation.internal.provisional.core</B></A></TD>
-<TD>An earlier framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Classes in <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A> used by <A HREF="../../../../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/class-use/IMessage.html#org.eclipse.wst.validation"><B>IMessage</B></A></B>
-
-<BR>
-
- This interface represents a locale-independent validation message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/class-use/IReporter.html#org.eclipse.wst.validation"><B>IReporter</B></A></B>
-
-<BR>
- The interface used by IValidator's to report messages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/class-use/IValidator.html#org.eclipse.wst.validation"><B>IValidator</B></A></B>
-
-<BR>
- This is the base interface for all Validators.</TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation.internal.provisional.core"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Classes in <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A> used by <A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/class-use/IMessage.html#org.eclipse.wst.validation.internal.provisional.core"><B>IMessage</B></A></B>
-
-<BR>
-
- This interface represents a locale-independent validation message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/class-use/IReporter.html#org.eclipse.wst.validation.internal.provisional.core"><B>IReporter</B></A></B>
-
-<BR>
- The interface used by IValidator's to report messages.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/class-use/IValidationContext.html#org.eclipse.wst.validation.internal.provisional.core"><B>IValidationContext</B></A></B>
-
-<BR>
- This class is used to to separate the IValidator from the model loading.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../../org/eclipse/wst/validation/internal/provisional/core/class-use/IValidator.html#org.eclipse.wst.validation.internal.provisional.core"><B>IValidator</B></A></B>
-
-<BR>
- This is the base interface for all Validators.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html?org/eclipse/wst/validation/internal/provisional/core/package-use.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/package-frame.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/package-frame.html
deleted file mode 100644
index 602a944..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/package-frame.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-org.eclipse.wst.validation
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../org/eclipse/wst/validation/package-summary.html" target="classFrame">org.eclipse.wst.validation</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="IDependencyIndex.html" title="interface in org.eclipse.wst.validation" target="classFrame"><I>IDependencyIndex</I></A>
-<BR>
-<A HREF="IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation" target="classFrame"><I>IPerformanceMonitor</I></A>
-<BR>
-<A HREF="IValidatorGroupListener.html" title="interface in org.eclipse.wst.validation" target="classFrame"><I>IValidatorGroupListener</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="AbstractValidator.html" title="class in org.eclipse.wst.validation" target="classFrame">AbstractValidator</A>
-<BR>
-<A HREF="DependentResource.html" title="class in org.eclipse.wst.validation" target="classFrame">DependentResource</A>
-<BR>
-<A HREF="Friend.html" title="class in org.eclipse.wst.validation" target="classFrame">Friend</A>
-<BR>
-<A HREF="MessageSeveritySetting.html" title="class in org.eclipse.wst.validation" target="classFrame">MessageSeveritySetting</A>
-<BR>
-<A HREF="PerformanceCounters.html" title="class in org.eclipse.wst.validation" target="classFrame">PerformanceCounters</A>
-<BR>
-<A HREF="ReporterHelper.html" title="class in org.eclipse.wst.validation" target="classFrame">ReporterHelper</A>
-<BR>
-<A HREF="ValidationFramework.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidationFramework</A>
-<BR>
-<A HREF="ValidationFramework.ResourceAdder.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidationFramework.ResourceAdder</A>
-<BR>
-<A HREF="ValidationResult.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidationResult</A>
-<BR>
-<A HREF="ValidationResults.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidationResults</A>
-<BR>
-<A HREF="ValidationState.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidationState</A>
-<BR>
-<A HREF="Validator.html" title="class in org.eclipse.wst.validation" target="classFrame">Validator</A>
-<BR>
-<A HREF="Validator.V1.html" title="class in org.eclipse.wst.validation" target="classFrame">Validator.V1</A>
-<BR>
-<A HREF="Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation" target="classFrame">Validator.V1.V1Copy</A>
-<BR>
-<A HREF="Validator.V2.html" title="class in org.eclipse.wst.validation" target="classFrame">Validator.V2</A>
-<BR>
-<A HREF="ValidatorMessage.html" title="class in org.eclipse.wst.validation" target="classFrame">ValidatorMessage</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Enums</FONT>
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation" target="classFrame">IPerformanceMonitor.CollectionLevel</A>
-<BR>
-<A HREF="MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation" target="classFrame">MessageSeveritySetting.Severity</A>
-<BR>
-<A HREF="Validator.Level.html" title="enum in org.eclipse.wst.validation" target="classFrame">Validator.Level</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/package-summary.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/package-summary.html
deleted file mode 100644
index dbccd21..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/package-summary.html
+++ /dev/null
@@ -1,308 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-org.eclipse.wst.validation
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="org.eclipse.wst.validation";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV PACKAGE
- <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/package-summary.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package org.eclipse.wst.validation
-</H2>
-A framework for calling validators that are build based.
-<P>
-<B>See:</B>
-<BR>
- <A HREF="#package_description"><B>Description</B></A>
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/IDependencyIndex.html" title="interface in org.eclipse.wst.validation">IDependencyIndex</A></B></TD>
-<TD>This service is used to specify the resources that a particular resource depends on.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.html" title="interface in org.eclipse.wst.validation">IPerformanceMonitor</A></B></TD>
-<TD>A service that collects performance information on validation operations.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/IValidatorGroupListener.html" title="interface in org.eclipse.wst.validation">IValidatorGroupListener</A></B></TD>
-<TD>Validators may wish to join validator groups for performance or other
- reasons.</TD>
-</TR>
-</TABLE>
-
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/AbstractValidator.html" title="class in org.eclipse.wst.validation">AbstractValidator</A></B></TD>
-<TD>The class that all Validators that wish to use version two of the validation framework must subclass.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/DependentResource.html" title="class in org.eclipse.wst.validation">DependentResource</A></B></TD>
-<TD>A resource that is dependent on another resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/Friend.html" title="class in org.eclipse.wst.validation">Friend</A></B></TD>
-<TD>This class is only to be called by the validation framework and it's test cases.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.html" title="class in org.eclipse.wst.validation">MessageSeveritySetting</A></B></TD>
-<TD>Associate a message severity with a message category.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/PerformanceCounters.html" title="class in org.eclipse.wst.validation">PerformanceCounters</A></B></TD>
-<TD>Some performance information for a validation invocation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/ReporterHelper.html" title="class in org.eclipse.wst.validation">ReporterHelper</A></B></TD>
-<TD>This is a temporary class to ease the transition from the previous validation framework.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.html" title="class in org.eclipse.wst.validation">ValidationFramework</A></B></TD>
-<TD>The central class of the Validation Framework.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/ValidationFramework.ResourceAdder.html" title="class in org.eclipse.wst.validation">ValidationFramework.ResourceAdder</A></B></TD>
-<TD> </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResult.html" title="class in org.eclipse.wst.validation">ValidationResult</A></B></TD>
-<TD>The result of running a validate operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/ValidationResults.html" title="class in org.eclipse.wst.validation">ValidationResults</A></B></TD>
-<TD>The combined results of validating multiple resources.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/ValidationState.html" title="class in org.eclipse.wst.validation">ValidationState</A></B></TD>
-<TD>Keep track of arbitrary validation data, during the course of a validation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/Validator.html" title="class in org.eclipse.wst.validation">Validator</A></B></TD>
-<TD>Represents a validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.html" title="class in org.eclipse.wst.validation">Validator.V1</A></B></TD>
-<TD>A validator that uses version 1 of the validation framework.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V1.V1Copy.html" title="class in org.eclipse.wst.validation">Validator.V1.V1Copy</A></B></TD>
-<TD> </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/Validator.V2.html" title="class in org.eclipse.wst.validation">Validator.V2</A></B></TD>
-<TD>A validator that uses version 2 of the validation framework.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/ValidatorMessage.html" title="class in org.eclipse.wst.validation">ValidatorMessage</A></B></TD>
-<TD>This class provides a way for a validator to return messages, that are easily
- converted into IMarkers.</TD>
-</TR>
-</TABLE>
-
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Enum Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/IPerformanceMonitor.CollectionLevel.html" title="enum in org.eclipse.wst.validation">IPerformanceMonitor.CollectionLevel</A></B></TD>
-<TD>The level of information to collect.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/MessageSeveritySetting.Severity.html" title="enum in org.eclipse.wst.validation">MessageSeveritySetting.Severity</A></B></TD>
-<TD> </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../org/eclipse/wst/validation/Validator.Level.html" title="enum in org.eclipse.wst.validation">Validator.Level</A></B></TD>
-<TD>The level of configuration for the validator.</TD>
-</TR>
-</TABLE>
-
-
-<P>
-<A NAME="package_description"><!-- --></A><H2>
-Package org.eclipse.wst.validation Description
-</H2>
-
-<P>
-<p>A framework for calling validators that are build based.</p>
-<p>
-There are two main types of validation, <b>build based</b> and
-<b>as you type</b>. This framework supports build based
-validation. If auto build is turned on then the validators are called
-when the user saves their file. If auto build is not turned on then
-the validators are called when the user starts a build.</p>
-<p>This framework was added to WTP in version 3.4.</p>
-<h3>Dependency Support</h3>
-<p>Sometimes resources depend on other resources, to determine whether they are
-valid or not. An example would be that an XML resource could depend on a DTD. If at some
-point in the future the DTD changes, then the dependent XML resource should be
-revalidated to ensure that it still meets the requirements of the changed DTD
-file. In order to do this efficiently, there needs to be an association between
-the DTD and all the resources that depend on it.<p>To be as efficient as possible, the validation framework allows
-this dependency information to be returned as part of a
-<a href="AbstractValidator.html#validate(org.eclipse.core.resources.IResource, int, ValidationState, org.eclipse.core.runtime.IProgressMonitor)">
-validate operation</a>. Since the validator needed to figure this out anyways,
-why not pass this information back to the framework, so that it can be saved.
-This saves the cost of having to parse the file at some later point in time
-(when the file is probably sitting cold on disk). The fewer times that we need
-to open, read and/or parse the same file, will improve the performance of the
-product.
-<p>In particular when the validate method returns, a
-<a href="ValidationResult.html">ValidationResult</a> must be returned, inside of
-this result, all your dependencies need to be specified with the
-<a href="ValidationResult.html#setDependsOn(org.eclipse.core.resources.IResource[])">
-setDependsOn</a> method.<p>In addition to keeping the dependency information
-up-to-date through the normal course of validation, direct access is also
-provided to the dependency support through the
-<a href="ValidationFramework.html#getDependencyIndex()">getDependencyIndex</a>
-method. The <a href="IDependencyIndex.html">IDependencyIndex</a> allows you to
-directly manipulate the dependency information for a validator.
-<P>
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV PACKAGE
- <A HREF="../../../../org/eclipse/wst/validation/internal/provisional/core/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/package-summary.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/package-use.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/package-use.html
deleted file mode 100644
index 3711e20..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/org/eclipse/wst/validation/package-use.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Uses of Package org.eclipse.wst.validation
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Package org.eclipse.wst.validation";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/package-use.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Package<br>org.eclipse.wst.validation</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Packages that use <A HREF="../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.eclipse.wst.validation"><B>org.eclipse.wst.validation</B></A></TD>
-<TD>A framework for calling validators that are build based. </TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Classes in <A HREF="../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A> used by <A HREF="../../../../org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/AbstractValidator.html#org.eclipse.wst.validation"><B>AbstractValidator</B></A></B>
-
-<BR>
- The class that all Validators that wish to use version two of the validation framework must subclass.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/DependentResource.html#org.eclipse.wst.validation"><B>DependentResource</B></A></B>
-
-<BR>
- A resource that is dependent on another resource.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/IDependencyIndex.html#org.eclipse.wst.validation"><B>IDependencyIndex</B></A></B>
-
-<BR>
- This service is used to specify the resources that a particular resource depends on.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/IPerformanceMonitor.html#org.eclipse.wst.validation"><B>IPerformanceMonitor</B></A></B>
-
-<BR>
- A service that collects performance information on validation operations.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/IPerformanceMonitor.CollectionLevel.html#org.eclipse.wst.validation"><B>IPerformanceMonitor.CollectionLevel</B></A></B>
-
-<BR>
- The level of information to collect.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/MessageSeveritySetting.html#org.eclipse.wst.validation"><B>MessageSeveritySetting</B></A></B>
-
-<BR>
- Associate a message severity with a message category.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/MessageSeveritySetting.Severity.html#org.eclipse.wst.validation"><B>MessageSeveritySetting.Severity</B></A></B>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/PerformanceCounters.html#org.eclipse.wst.validation"><B>PerformanceCounters</B></A></B>
-
-<BR>
- Some performance information for a validation invocation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/ValidationFramework.html#org.eclipse.wst.validation"><B>ValidationFramework</B></A></B>
-
-<BR>
- The central class of the Validation Framework.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/ValidationResult.html#org.eclipse.wst.validation"><B>ValidationResult</B></A></B>
-
-<BR>
- The result of running a validate operation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/ValidationResults.html#org.eclipse.wst.validation"><B>ValidationResults</B></A></B>
-
-<BR>
- The combined results of validating multiple resources.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/ValidationState.html#org.eclipse.wst.validation"><B>ValidationState</B></A></B>
-
-<BR>
- Keep track of arbitrary validation data, during the course of a validation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/Validator.html#org.eclipse.wst.validation"><B>Validator</B></A></B>
-
-<BR>
- Represents a validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/Validator.Level.html#org.eclipse.wst.validation"><B>Validator.Level</B></A></B>
-
-<BR>
- The level of configuration for the validator.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/Validator.V1.html#org.eclipse.wst.validation"><B>Validator.V1</B></A></B>
-
-<BR>
- A validator that uses version 1 of the validation framework.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/Validator.V2.html#org.eclipse.wst.validation"><B>Validator.V2</B></A></B>
-
-<BR>
- A validator that uses version 2 of the validation framework.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../org/eclipse/wst/validation/class-use/ValidatorMessage.html#org.eclipse.wst.validation"><B>ValidatorMessage</B></A></B>
-
-<BR>
- This class provides a way for a validator to return messages, that are easily
- converted into IMarkers.</TD>
-</TR>
-</TABLE>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../index.html?org/eclipse/wst/validation/package-use.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/overview-frame.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/overview-frame.html
deleted file mode 100644
index c93ee38..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/overview-frame.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Overview List
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TH ALIGN="left" NOWRAP><FONT size="+1" CLASS="FrameTitleFont">
-<B></B></FONT></TH>
-</TR>
-</TABLE>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="allclasses-frame.html" target="packageFrame">All Classes</A></FONT>
-<P>
-<FONT size="+1" CLASS="FrameHeadingFont">
-Packages</FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="org/eclipse/wst/validation/package-frame.html" target="packageFrame">org.eclipse.wst.validation</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="org/eclipse/wst/validation/internal/provisional/core/package-frame.html" target="packageFrame">org.eclipse.wst.validation.internal.provisional.core</A></FONT>
-<BR>
-</TD>
-</TR>
-</TABLE>
-
-<P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/overview-summary.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/overview-summary.html
deleted file mode 100644
index 160dd5f..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/overview-summary.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Overview
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Overview";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Overview</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?overview-summary.html" target="_top"><B>FRAMES</B></A>
- <A HREF="overview-summary.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Web Tools Platform: Validation Framework
-</H1>
-</CENTER>
-A framework for calling validators that are build based.
-<P>
-<B>See:</B>
-<BR>
- <A HREF="#overview_description"><B>Description</B></A>
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Packages</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/wst/validation/package-summary.html">org.eclipse.wst.validation</A></B></TD>
-<TD>A framework for calling validators that are build based.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/wst/validation/internal/provisional/core/package-summary.html">org.eclipse.wst.validation.internal.provisional.core</A></B></TD>
-<TD>An earlier framework for calling validators that are build based.</TD>
-</TR>
-</TABLE>
-
-<P>
- <A NAME="overview_description"><!-- --></A>
-<P>
-<p>A framework for calling validators that are build based.</p>
-<h2>Approach</h2>
-<p>In WTP 3.4 a new validation framework has been added. This was developed at
-the request of validator owners and end users. To ease the transition to this
-new framework, that approach that has been taken is to support both the old and
-the new frameworks for a while. This means that the old validators work exactly
-like they used to. They can still plug into the old framework and will continue
-to be run by the old framework. This allows validator owners to migrate at their
-own pace.</p>
-<p>For validator owners that wish to exploit the new framework, it has been
-designed n such a way to minimize the transition from the old framework to the
-new framework. There is a new extension point that needs to be specified, and a
-new abstract class that needs to be extended.</p>
-<h3>Benefits</h3>
-<p>What benefits does the new framework have to offer? Or asked another way, as
-a validator owner, why would I want to switch?</p>
-<h4>Performance</h4>
-<h5>Tuning</h5>
-<p>The main reason for creating a new framework was to improve performance. As
-more and more validators are added, validation is consuming a bigger slice of
-the resources that it takes to perform a build.</p>
-<p>The best performance improvement is eliminating unnecessary work. We
-eliminate work, by providing significantly more tuning options. Validation
-owners can tune which resources they are called on. This is done through the use
-of filter rules. These filter rules are grouped into inclusion and exclusion
-groups. If you have multiple inclusion groups they are "anded" together, meaning
-that each of the inclusion groups must have at least one successful filter rule.
-Exclusion groups are used to specify what doesn't get validated. Exclusion
-groups have a higher precedence than inclusion groups. If an exclusion group
-excludes a resource than it is excluded no matter what the inclusion groups may
-say.</p>
-<p>They are several different types of filter rules:</p>
-<ul>
- <li><strong>File extension</strong> - Rules based on the file extension. For
- example, include all the files with extension *.xml.</li>
- <li><strong>Folder or File name</strong> - Rules based on the folder or file
- name. For example exclude all the resources in the build folder. File names
- can be fully qualified, project relative names, e.g. <strong>WebContent/WEB-INF/web.xml</strong>,
- or simple names, <strong>web.xml</strong>.</li>
- <li><strong>Project nature</strong> - Projects with certain natures can be
- either included or excluded.</li>
- <li><strong>Facet</strong> - Projects with certain facets can be either
- included or excluded.</li>
- <li><strong>Content Type </strong>- Resources of a particular content type
- can be included or excluded.</li>
-</ul>
-<p>The filter rules and groups form the building blocks of what gets validated.
-</p>
-<p>In terms of tuning however, the end user has the final say. The validator
-owners specify the default filter rules and groups for their validator, but the
-end user through the use of preferences can override these settings. </p>
-<h5>Caching</h5>
-<p>Another way that performance is improved is through more effective caching.
-With the previous framework we were noticing that different validators would be
-opening and processing the same file, but that this would happen far enough
-apart, that caches weren't effective. Even if files were being cached, the
-second (or third, or forth, ...) open would happen far enough a means that way
-that the file would have already been evicted from the cache. In the new
-framework, the processing order is more tightly controlled. The framework calls
-the validator and tells it what to validate. This way files are processed in
-order, which means that the chance of them being a cache is much higher. Every
-validator that is interested in file A processes it, and then we move on and
-every validator that is interested in file B processes it, etc.</p>
-<p>Also because state information is kept for the lifetime of the validation
-operation, validators can cache expensive operations, like model creation, that
-might be needed as part of validating several files. </p>
-<h5>Job Control</h5>
-<p>With the earlier framework, there were too many jobs/threads running
-concurrently. This is now more tightly controlled.</p>
-<h4>Dependency Support</h4>
-<p>Another new feature is dependency support. A validator can now assert that a
-resource is dependant on some other resources. For example that a XML file is
-dependant on a XSD file. Now if the XSD file changes the XML can be revalidated.
-As the user comes to trust this dependency support, they wont perform as many
-clean builds.</p>
-<h4>Primary Framework</h4>
-<p>This is the primary validation framework. At some point, the earlier
-framework will be deprecated and then removed. All the new investment will
-happen in this framework. </p>
-<p>The framework collateral will continue to be enhanced (junit testcases,
-documentation, performance improvements, ...)</p>
-<P>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Overview</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="serialized-form.html"><FONT CLASS="NavBarFont1"><B>Serialized</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?overview-summary.html" target="_top"><B>FRAMES</B></A>
- <A HREF="overview-summary.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/package-list b/docs/org.eclipse.wst.validation.doc.isv/reference/api/package-list
deleted file mode 100644
index becb24d..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/package-list
+++ /dev/null
@@ -1,2 +0,0 @@
-org.eclipse.wst.validation
-org.eclipse.wst.validation.internal.provisional.core
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/resources/inherit.gif b/docs/org.eclipse.wst.validation.doc.isv/reference/api/resources/inherit.gif
deleted file mode 100644
index c814867..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/resources/inherit.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/serialized-form.html b/docs/org.eclipse.wst.validation.doc.isv/reference/api/serialized-form.html
deleted file mode 100644
index 68c22c5..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/serialized-form.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0) on Tue May 20 09:50:55 EDT 2008 -->
-<TITLE>
-Serialized Form
-</TITLE>
-
-<META NAME="date" CONTENT="2008-05-20">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Serialized Form";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Serialized</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?serialized-form.html" target="_top"><B>FRAMES</B></A>
- <A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Serialized Form</H1>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="center"><FONT SIZE="+2">
-<B>Package</B> <B>org.eclipse.wst.validation.internal.provisional.core</B></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="org.eclipse.wst.validation.internal.provisional.core.MessageLimitException"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class <A HREF="org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.html" title="class in org.eclipse.wst.validation.internal.provisional.core">org.eclipse.wst.validation.internal.provisional.core.MessageLimitException</A> extends java.lang.RuntimeException implements Serializable</B></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-<B>serialVersionUID: </B>-7034897190745766940L
-
-<P>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Serialized</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?serialized-form.html" target="_top"><B>FRAMES</B></A>
- <A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A>
- <SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/api/stylesheet.css b/docs/org.eclipse.wst.validation.doc.isv/reference/api/stylesheet.css
deleted file mode 100644
index 6ea9e51..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/api/stylesheet.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body { background-color: #FFFFFF; color:#000000 }
-
-/* Headings */
-h1 { font-size: 145% }
-
-/* Table colors */
-.TableHeadingColor { background: #CCCCFF; color:#000000 } /* Dark mauve */
-.TableSubHeadingColor { background: #EEEEFF; color:#000000 } /* Light mauve */
-.TableRowColor { background: #FFFFFF; color:#000000 } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
-.FrameHeadingFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
-.FrameItemFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
-
-/* Navigation bar fonts and colors */
-.NavBarCell1 { background-color:#EEEEFF; color:#000000} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */
-.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;}
-
-.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
-.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
-
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/index.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/index.html
deleted file mode 100644
index 8e7ebc2..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
- <html xmlns:xalan="http://xml.apache.org/xslt">
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <meta name="copyright" content="Copyright (c) Oracle Corporation and others 2000, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Validation Framework Extension Points</title>
- <LINK REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
- </head>
-<body vlink="#800080" link="#0000FF">
-<center>
-<h1>Validation Framework Extension Points </h1>
-</center>The following extension points can be used to add new validators: <h3>
-<a name="vf"></a>Validation Framework</h3>
-<ul>
-<li>
-<a href="vf/org_eclipse_wst_validation_validatorGroup.html">org.eclipse.wst.validation.validatorGroup</a>
-</li>
-<li>
-<a href="vf/org_eclipse_wst_validation_validatorV2.html">org.eclipse.wst.validation.validatorV2</a>
-</li>
-</ul>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_exclude.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_exclude.html
deleted file mode 100644
index 6872ca7..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_exclude.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Validator Exclusion</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">Validator Exclusion</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.validation.exclude<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>WebTools 3.0
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>A way to add additional exclusion filters to a V2 validator.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.extension">extension</a> (<a href="#e.validator">validator</a>+)></p>
-<p class="code SchemaDtd"><!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point CDATA #REQUIRED<p class="code SchemaDtdAttlist">id CDATA #REQUIRED<p class="code SchemaDtdAttlist">name CDATA #IMPLIED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - A short id that is unique within the plug-in, so that this set of extra exclusion filters can be identified.</li>
-<li><b>name</b> - The short user friendly name for the exclusion.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.validator">validator</a> (<a href="#e.exclude">exclude</a>)></p>
-<p class="code SchemaDtd"><!ATTLIST validator</p>
-<p class="code SchemaDtdAttlist">id IDREF #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Identifies the validator that is being extended.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - The fully qualifed validator id that is being extended.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.exclude">exclude</a> (<a href="#e.rules">rules</a>)></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This contains a set of exclusion rules, used in filtering which resources get validated. If any of these rules are matched, then the validator is not called on this resource.</p>
-<br><br>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.fileext">fileext</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST fileext</p>
-<p class="code SchemaDtdAttlist">ext CDATA #REQUIRED<p class="code SchemaDtdAttlist">caseSensitive (true | false) ></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-A file extension, for example html.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>ext</b> - The file extension, for example html.</li>
-<li><b>caseSensitive</b> - If the file extension is case sensitive, then this needs to be set to true.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.projectNature">projectNature</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST projectNature</p>
-<p class="code SchemaDtdAttlist">id CDATA #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Used to filter on project natures.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - The fully qualified project nature id, for example "org.eclipse.jdt.core.javanature".</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.file">file</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST file</p>
-<p class="code SchemaDtdAttlist">name CDATA #REQUIRED<p class="code SchemaDtdAttlist">caseSensitive (true | false) <p class="code SchemaDtdAttlist">type (folder|file|full) ></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>name</b> - The file or folder name. The file name can be fully qualified, that is it starts with a leading slash ("/"), or it can be a relative name. Folder names are separated with the forward slash ("/") character.</li>
-<li><b>caseSensitive</b> - If the file name is not case senstitive, then this needs to be set to false.</li>
-<li><b>type</b> - Type of name, there are three choices. <ul><li>folder - specifies a project relative folder name.</li><li>file - a simple file name (i.e. no path information).</li><li>full - a fully qualified (project relative) file name.</li></ul></li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.rules">rules</a> (<a href="#e.fileext">fileext</a>* , <a href="#e.file">file</a>* , <a href="#e.projectNature">projectNature</a>* , <a href="#e.facet">facet</a>* , <a href="#e.contentType">contentType</a>*)></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-A set of rules for determining if a resource is passed to this validator or not. The rules are OR'ed together.</p>
-<br><br>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.facet">facet</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST facet</p>
-<p class="code SchemaDtdAttlist">id CDATA #REQUIRED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - The facet id.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.contentType">contentType</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST contentType</p>
-<p class="code SchemaDtdAttlist">id CDATA #REQUIRED<p class="code SchemaDtdAttlist">exactMatch (true | false) ></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Used to filter based on content types.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - The content type id.</li>
-<li><b>exactMatch</b> - Set to true if the content type needs to match exactly. Set to false if sub types are considered matches as well.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><!-- A plug-in is turning off the T1A validator for projects that have the ModuleCoreNature -->
- <extension
- id="exclude1"
- point="org.eclipse.wst.validation.exclude">
- <validator
- id="org.eclipse.wst.common.tests.validation.T1A">
- <exclude>
- <rules>
- <projectNature
- id="org.eclipse.jst.j2ee.ModuleCoreNature">
- </projectNature>
- </rules>
- </exclude>
- </validator>
- </extension>
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_referencialFileValidator.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_referencialFileValidator.html
deleted file mode 100644
index e6a3950..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_referencialFileValidator.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Referencial File Validator</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">Referencial File Validator</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.validation.referencialFileValidator<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6><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>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>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.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.extension">extension</a> (<a href="#e.referencialFileValidator">referencialFileValidator</a>)></p>
-<p class="code SchemaDtd"><!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point CDATA #REQUIRED<p class="code SchemaDtdAttlist">id CDATA #IMPLIED<p class="code SchemaDtdAttlist">name CDATA #IMPLIED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>point</b> - a fully qualified identifier of the target extension point</li>
-<li><b>id</b> - an optional identifier of the extension instance</li>
-<li><b>name</b> - an optional name of the extension instance</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.referencialFileValidator">referencialFileValidator</a> (<a href="#e.run">run</a>)></p>
-<p class="code SchemaDtd"><!ATTLIST referencialFileValidator</p>
-<p class="code SchemaDtdAttlist">id CDATA #REQUIRED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - </li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.run">run</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST run</p>
-<p class="code SchemaDtdAttlist">class CDATA #REQUIRED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>class</b> - This class must implement org.eclipse.wst.validation.internal.operations.ReferencialFileValidator.</li>
-</ul>
-<br><br>
-<p class="note SchemaCopyright">
-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>
-
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationHelper.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationHelper.html
deleted file mode 100644
index d8ffd90..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationHelper.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Validation Helper</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">Validation Helper</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.validation.validationHelper<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6><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>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6><p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.extension">extension</a> (<a href="#e.validationHelper">validationHelper</a>)></p>
-<p class="code SchemaDtd"><!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point CDATA #REQUIRED<p class="code SchemaDtdAttlist">id CDATA #IMPLIED<p class="code SchemaDtdAttlist">name CDATA #IMPLIED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>point</b> - a fully qualified identifier of the target extension point</li>
-<li><b>id</b> - an optional identifier of the extension instance</li>
-<li><b>name</b> - an optional name of the extension instance</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.validationHelper">validationHelper</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST validationHelper</p>
-<p class="code SchemaDtdAttlist">helperClass CDATA #REQUIRED<p class="code SchemaDtdAttlist">id CDATA #REQUIRED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>helperClass</b> - The class must implement org.eclipse.wst.validation.internal.IProjectValidationHelper.</li>
-<li><b>id</b> - </li>
-</ul>
-<br><br>
-<p class="note SchemaCopyright">
-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>
-
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationSelectionHandler.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationSelectionHandler.html
deleted file mode 100644
index d8bec99..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationSelectionHandler.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Validation Selection Handler</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">Validation Selection Handler</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.validation.validationSelectionHandler<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6><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>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6><p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.extension">extension</a> (<a href="#e.validationSelectionHandler">validationSelectionHandler</a>+)></p>
-<p class="code SchemaDtd"><!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point CDATA #REQUIRED<p class="code SchemaDtdAttlist">id CDATA #IMPLIED<p class="code SchemaDtdAttlist">name CDATA #IMPLIED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>point</b> - a fully qualified identifier of the target extension point</li>
-<li><b>id</b> - an optional identifier of the extension instance</li>
-<li><b>name</b> - an optional name of the extension instance</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.validationSelectionHandler">validationSelectionHandler</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST validationSelectionHandler</p>
-<p class="code SchemaDtdAttlist">id CDATA #REQUIRED<p class="code SchemaDtdAttlist">handlerClass CDATA #REQUIRED<p class="code SchemaDtdAttlist">selectionType CDATA #REQUIRED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - </li>
-<li><b>handlerClass</b> - The class must implement the IValidationSelectionHandler interface.</li>
-<li><b>selectionType</b> - </li>
-</ul>
-<br><br>
-<p class="note SchemaCopyright">
-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>
-
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validator.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validator.html
deleted file mode 100644
index c013c1b..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validator.html
+++ /dev/null
@@ -1,342 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Validator</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">Validator</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.validation.validator<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6><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>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>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.<p>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.extension">extension</a> (<a href="#e.validator">validator</a>)></p>
-<p class="code SchemaDtd"><!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point CDATA #REQUIRED<p class="code SchemaDtdAttlist">id CDATA #REQUIRED<p class="code SchemaDtdAttlist">name CDATA #REQUIRED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>point</b> - A fully qualified identifier of the target extension point</li>
-<li><b>id</b> - An optional identifier of the extension instance</li>
-<li><b>name</b> - An optional name of the extension instance</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.validator">validator</a> (<a href="#e.projectNature">projectNature</a>* , <a href="#e.filter">filter</a>* , <a href="#e.enablement">enablement</a>* , <a href="#e.helper">helper</a> , <a href="#e.dependentValidator">dependentValidator</a>? , <a href="#e.run">run</a> , <a href="#e.markerId">markerId</a>? , <a href="#e.facet">facet</a>* , <a href="#e.contentTypeBinding">contentTypeBinding</a>*)></p>
-<p class="code SchemaDtd"><!ATTLIST validator</p>
-<p class="code SchemaDtdAttlist">to CDATA #IMPLIED<p class="code SchemaDtdAttlist">from CDATA #IMPLIED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>to</b> - Optional migration tag</li>
-<li><b>from</b> - Optional migration tag</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.projectNature">projectNature</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST projectNature</p>
-<p class="code SchemaDtdAttlist">id CDATA #REQUIRED<p class="code SchemaDtdAttlist">include (true | false) ></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - </li>
-<li><b>include</b> - </li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.contentTypeBinding">contentTypeBinding</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST contentTypeBinding</p>
-<p class="code SchemaDtdAttlist">contentTypeId CDATA #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Associates a particular content type with the current validator, and enables the validator to be run on resources of the specified content type.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>contentTypeId</b> - The content type identifier. This is an ID defined by the 'org.eclipse.core.runtime.contentTypes' extension point.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.filter">filter</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST filter</p>
-<p class="code SchemaDtdAttlist">objectClass CDATA #REQUIRED<p class="code SchemaDtdAttlist">nameFilter CDATA #REQUIRED<p class="code SchemaDtdAttlist">caseSensitive (true | false) <p class="code SchemaDtdAttlist">action CDATA #IMPLIED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>objectClass</b> - </li>
-<li><b>nameFilter</b> - </li>
-<li><b>caseSensitive</b> - </li>
-<li><b>action</b> - </li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.helper">helper</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST helper</p>
-<p class="code SchemaDtdAttlist">class CDATA #REQUIRED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>class</b> - </li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.dependentValidator">dependentValidator</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST dependentValidator</p>
-<p class="code SchemaDtdAttlist">depValValue (true | false) ></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>depValValue</b> - </li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.run">run</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST run</p>
-<p class="code SchemaDtdAttlist">class CDATA #REQUIRED<p class="code SchemaDtdAttlist">incremental (true | false) <p class="code SchemaDtdAttlist">enabled (true | false) <p class="code SchemaDtdAttlist">fullBuild (true | false) <p class="code SchemaDtdAttlist">async (true | false) ></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>class</b> - </li>
-<li><b>incremental</b> - </li>
-<li><b>enabled</b> - </li>
-<li><b>fullBuild</b> - </li>
-<li><b>async</b> - </li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.markerId">markerId</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST markerId</p>
-<p class="code SchemaDtdAttlist">markerIdValue CDATA #IMPLIED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-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.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>markerIdValue</b> - </li>
-</ul>
-<br><div style="color: red; font-style: italic;">The <b>facet</b> element is deprecated</div> <p class="code SchemaDtd"><!ELEMENT <a name="e.facet">facet</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST facet</p>
-<p class="code SchemaDtdAttlist">facetId CDATA #IMPLIED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element is deprecated and enablement is the new recommended approach to filter validators based on facets.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>facetId</b> - </li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.enablement">enablement</a> (<a href="#e.not">not</a> , <a href="#e.and">and</a> , <a href="#e.or">or</a> , <a href="#e.instanceof">instanceof</a> , <a href="#e.test">test</a> , <a href="#e.systemTest">systemTest</a> , <a href="#e.equals">equals</a> , <a href="#e.count">count</a> , <a href="#e.with">with</a> , <a href="#e.resolve">resolve</a> , <a href="#e.adapt">adapt</a> , <a href="#e.iterate">iterate</a> , <a href="#e.reference">reference</a>)*></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-A generic root element. The element can be used inside an extension point to define its enablement expression.
- The children of an enablement expression are combined using the and operator.</p>
-<br><br>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.not">not</a> (<a href="#e.not">not</a> | <a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.instanceof">instanceof</a> | <a href="#e.test">test</a> | <a href="#e.systemTest">systemTest</a> | <a href="#e.equals">equals</a> | <a href="#e.count">count</a> | <a href="#e.with">with</a> | <a href="#e.resolve">resolve</a> | <a href="#e.adapt">adapt</a> | <a href="#e.iterate">iterate</a> | <a href="#e.reference">reference</a>)></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element represent a NOT operation on the result of evaluating it's sub-element expression.</p>
-<br><br>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.and">and</a> (<a href="#e.not">not</a> , <a href="#e.and">and</a> , <a href="#e.or">or</a> , <a href="#e.instanceof">instanceof</a> , <a href="#e.test">test</a> , <a href="#e.systemTest">systemTest</a> , <a href="#e.equals">equals</a> , <a href="#e.count">count</a> , <a href="#e.with">with</a> , <a href="#e.resolve">resolve</a> , <a href="#e.adapt">adapt</a> , <a href="#e.iterate">iterate</a> , <a href="#e.reference">reference</a>)*></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element represent an AND operation on the result of evaluating all it's sub-elements expressions.</p>
-<br><br>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.or">or</a> (<a href="#e.not">not</a> , <a href="#e.and">and</a> , <a href="#e.or">or</a> , <a href="#e.instanceof">instanceof</a> , <a href="#e.test">test</a> , <a href="#e.systemTest">systemTest</a> , <a href="#e.equals">equals</a> , <a href="#e.count">count</a> , <a href="#e.with">with</a> , <a href="#e.resolve">resolve</a> , <a href="#e.adapt">adapt</a> , <a href="#e.iterate">iterate</a> , <a href="#e.reference">reference</a>)*></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element represent an OR operation on the result of evaluating all it's sub-element expressions.</p>
-<br><br>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.instanceof">instanceof</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST instanceof</p>
-<p class="code SchemaDtdAttlist">value CDATA #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element is used to perform an instanceof check of the object in focus. The expression returns
- EvaluationResult.TRUE if the object's type is a sub type of the type specified by the attribute value.
- Otherwise EvaluationResult.FALSE is returned.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>value</b> - a fully qualified name of a class or interface.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.test">test</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST test</p>
-<p class="code SchemaDtdAttlist">property CDATA #REQUIRED<p class="code SchemaDtdAttlist">args CDATA #IMPLIED<p class="code SchemaDtdAttlist">value CDATA #IMPLIED<p class="code SchemaDtdAttlist">forcePluginActivation (true | false) ></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element is used to evaluate the property state of the object in focus. The set of
- testable properties can be extended using the propery tester extension point. The test
- expression returns EvaluationResult.NOT_LOADED if the property tester doing the actual
- testing isn't loaded yet and the attribute forcePluginActivation is set to false.
- If forcePluginActivation is set to true and the evaluation context used to evaluate
- this expression support plug-in activation then evaluating the property will result in
- activating the plug-in defining the tester.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>property</b> - the name of an object's property to test.</li>
-<li><b>args</b> - additional arguments passed to the property tester. Multiple arguments are seperated
- by commas. Each individual argument is converted into a Java base type using the same
- rules as defined for the value attribute of the test expression.</li>
-<li><b>value</b> - the expected value of the property. Can be omitted if the property
- is a boolean property. The test expression is supposed to return
-EvaluationResult.TRUE if the property matches the value and EvaluationResult.FALSE
-otherwise. The value attribute is converted into a Java base type using the following
-rules:
-<ul>
- <li>the string "true" is converted into Boolean.TRUE</li>
- <li>the string "false" is converted into Boolean.FALSE</li>
- <li>if the string contains a dot then the interpreter tries to convert
- the value into a Float object. If this fails the string is treated as a
- java.lang.String</li>
- <li>if the string only consists of numbers then the interpreter
- converts the value in an Integer object.</li>
- <li>in all other cases the string is treated as a java.lang.String</li>
- <li>the conversion of the string into a Boolean, Float, or Integer can
- be suppressed by surrounding the string with single quotes. For
- example, the attribute value="'true'" is converted into the
- string "true"</li>
-</ul></li>
-<li><b>forcePluginActivation</b> - a flag indicating whether the plug-in contributing the property tester
- should be loaded if necessary. As such, this flag should be used judiciously,
- in order to avoid unnecessary plug-in activations. Most clients should avoid
- setting this flag to true. This flag is only honored if the evaluation context
- used to evaluate this expression allows plug-in activation. Otherwise the flag
- is ignored and no plug-in loading takes place.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.systemTest">systemTest</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST systemTest</p>
-<p class="code SchemaDtdAttlist">property CDATA #REQUIRED<p class="code SchemaDtdAttlist">value CDATA #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Tests a system property by calling the System.getProperty method and compares the result
- with the value specified through the value attribute.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>property</b> - the name of an system property to test.</li>
-<li><b>value</b> - the expected value of the property. The value is interpreted as a string value.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.equals">equals</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST equals</p>
-<p class="code SchemaDtdAttlist">value CDATA #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element is used to perform an equals check of the object in focus. The expression returns
- EvaluationResult.TRUE if the object is equal to the value provided by the attribute value. Otherwise
- EvaluationResult.FALSE is returned.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>value</b> - the expected value. The value provided as a string is converted into
- a Java base type using the same rules as for the value attribute of the test expression.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.count">count</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST count</p>
-<p class="code SchemaDtdAttlist">value CDATA #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element is used to test the number of elements in a collection.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>value</b> - an expression to specify the number of elements in a list. Following wildcard
- characters can be used:
- <dl>
- <dt>*</dt> <dd>any number of elements</dd>
- <dt>?</dt> <dd>no elements or one element</dd>
- <dt>+</dt> <dd>one or more elements</dd>
- <dt>!</dt> <dd>no elements</dd>
- <dt>integer value</dt> <dd>the list must contain the exact number of elements</dd>
- </dl></li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.with">with</a> (<a href="#e.not">not</a> , <a href="#e.and">and</a> , <a href="#e.or">or</a> , <a href="#e.instanceof">instanceof</a> , <a href="#e.test">test</a> , <a href="#e.systemTest">systemTest</a> , <a href="#e.equals">equals</a> , <a href="#e.count">count</a> , <a href="#e.with">with</a> , <a href="#e.resolve">resolve</a> , <a href="#e.adapt">adapt</a> , <a href="#e.iterate">iterate</a> , <a href="#e.reference">reference</a>)*></p>
-<p class="code SchemaDtd"><!ATTLIST with</p>
-<p class="code SchemaDtdAttlist">variable CDATA #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element changes the object to be inspected for all its child element to the object
- referenced by the given variable. If the variable can not be resolved then the expression
- will throw a ExpressionException when evaluating it. The children of a with expression
- are combined using the and operator.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>variable</b> - the name of the variable to be used for further inspection. It is up to the evaluator
- of an extension point to provide the variable in the variable pool.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.resolve">resolve</a> (<a href="#e.not">not</a> , <a href="#e.and">and</a> , <a href="#e.or">or</a> , <a href="#e.instanceof">instanceof</a> , <a href="#e.test">test</a> , <a href="#e.systemTest">systemTest</a> , <a href="#e.equals">equals</a> , <a href="#e.count">count</a> , <a href="#e.with">with</a> , <a href="#e.resolve">resolve</a> , <a href="#e.adapt">adapt</a> , <a href="#e.iterate">iterate</a> , <a href="#e.reference">reference</a>)*></p>
-<p class="code SchemaDtd"><!ATTLIST resolve</p>
-<p class="code SchemaDtdAttlist">variable CDATA #REQUIRED<p class="code SchemaDtdAttlist">args CDATA #IMPLIED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element changes the object to be inspected for all its child element to the object
- referenced by the given variable. If the variable can not be resolved then the expression
- will throw a ExpressionException when evaluating it. The children of a with expression
- are combined using the and operator.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>variable</b> - the name of the variable to be resolved. This variable is then used as the object in focus
- for child element evaluation. It is up to the evaluator of an extension point to provide a
- corresponding variable resolver (see IVariableResolver) through the evaluation context passed
- to the root expression element when evaluating the expression.</li>
-<li><b>args</b> - additional arguments passed to the variable resolver. Multiple arguments are seperated
- by commas. Each individual argument is converted into a Java base type using the same
- rules as defined for the value attribute of the test expression.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.adapt">adapt</a> (<a href="#e.not">not</a> , <a href="#e.and">and</a> , <a href="#e.or">or</a> , <a href="#e.instanceof">instanceof</a> , <a href="#e.test">test</a> , <a href="#e.systemTest">systemTest</a> , <a href="#e.equals">equals</a> , <a href="#e.count">count</a> , <a href="#e.with">with</a> , <a href="#e.resolve">resolve</a> , <a href="#e.adapt">adapt</a> , <a href="#e.iterate">iterate</a> , <a href="#e.reference">reference</a>)*></p>
-<p class="code SchemaDtd"><!ATTLIST adapt</p>
-<p class="code SchemaDtdAttlist">type CDATA #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element is used to adapt the object in focus to the type specified by the attribute
- type. The expression returns not loaded if either the adapter or the type referenced isn't
- loaded yet. It throws a ExpressionException during evaluation if the type name doesn't exist
- at all. The children of an adapt expression are combined using the and operator.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>type</b> - the type to which the object in focus is to be adapted.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.iterate">iterate</a> (<a href="#e.not">not</a> , <a href="#e.and">and</a> , <a href="#e.or">or</a> , <a href="#e.instanceof">instanceof</a> , <a href="#e.test">test</a> , <a href="#e.systemTest">systemTest</a> , <a href="#e.equals">equals</a> , <a href="#e.count">count</a> , <a href="#e.with">with</a> , <a href="#e.resolve">resolve</a> , <a href="#e.adapt">adapt</a> , <a href="#e.iterate">iterate</a> , <a href="#e.reference">reference</a>)*></p>
-<p class="code SchemaDtd"><!ATTLIST iterate</p>
-<p class="code SchemaDtdAttlist">operator (or|and) <p class="code SchemaDtdAttlist">ifEmpty (true | false) ></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element is used to iterate over a variable that is of type java.util.Collection. If
- the object in focus is not of type java.util.Collection then an ExpressionException will
- be thrown while evaluating the expression.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>operator</b> - either "and" or "or". The operator defines how the child
- elements will be combined. If not specified, "and" will be used.</li>
-<li><b>ifEmpty</b> - the value return from the iterate expression if the collection is empty. If
- not specified then true is returned when the operator equals "and"
- and false is return if the operator equals "or".</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.reference">reference</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST reference</p>
-<p class="code SchemaDtdAttlist">definitionId IDREF #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This element is used to reference an expression from the <b>org.eclipse.core.expressions.definitions</b> extension point. The expression definition will be evaluated within the current expression element using the current evaluation context.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>definitionId</b> - The unique id of an expression from <b>org.eclipse.core.expressions.definitions</b>.</li>
-</ul>
-<br><br>
-<p class="note SchemaCopyright">
-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>
-
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorDelegates.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorDelegates.html
deleted file mode 100644
index 360f4fd..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorDelegates.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Validator Delegates</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">Validator Delegates</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.validation.validatorDelegates<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6><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>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows validator providers to contribute alternate implementations for a delegating validator.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.extension">extension</a> (<a href="#e.delegate">delegate</a>)></p>
-<p class="code SchemaDtd"><!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point CDATA #REQUIRED<p class="code SchemaDtdAttlist">id CDATA #IMPLIED<p class="code SchemaDtdAttlist">name CDATA #IMPLIED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.delegate">delegate</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST delegate</p>
-<p class="code SchemaDtdAttlist">class CDATA #REQUIRED<p class="code SchemaDtdAttlist">target CDATA #REQUIRED<p class="code SchemaDtdAttlist">name CDATA #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Defines a validator delegate. Delegating validators can have one or more delegates registered, only one of which can be active (selected) at once.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>class</b> - Specifies the class name of the delegate validator. The class must implement IValidatorJob.</li>
-<li><b>target</b> - Specifies the id of the validator extension for which this delegate is being registered.</li>
-<li><b>name</b> - </li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><extension point="org.eclipse.wst.validation.validatorDelegates">
- <delegate
- class="com.acme.fast.SuperFastValidator"
- name="Super fast validator"
- target="org.acme.core.ACMEDelegatingValidator"/>
- </extension>
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-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>
-
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorGroup.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorGroup.html
deleted file mode 100644
index 1c7ac25..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorGroup.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Validator Group</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">Validator Group</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.validation.validatorGroup<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>WebTools 3.4
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>Defines a grouping for validators with listeners notified of group members' activites. Useful for pre-caching common information used by multiple validators and disposing of that information when they're all done.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.extension">extension</a> (<a href="#e.group">group</a>+)></p>
-<p class="code SchemaDtd"><!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point CDATA #REQUIRED<p class="code SchemaDtdAttlist">id CDATA #IMPLIED<p class="code SchemaDtdAttlist">name CDATA #IMPLIED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - A unique identifier for this extension</li>
-<li><b>name</b> - A name for this extension</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.listener">listener</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST listener</p>
-<p class="code SchemaDtdAttlist">class CDATA #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-A listener for activities in this group.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>class</b> - The listener's class.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.group">group</a> (<a href="#e.listener">listener</a>+)></p>
-<p class="code SchemaDtd"><!ATTLIST group</p>
-<p class="code SchemaDtdAttlist">id IDREF #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Declares a validator group. A group may have multiple listeners.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - </li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>Define a listener that simply prints that it has been called.
-<pre class="Example"><span class="code SchemaTag">
-<extension point=</span><span class="code SchemaCstring">"org.eclipse.wst.validation.validatorGroup"</span><span class="code SchemaTag">>
- <group id=</span><span class="code SchemaCstring">"validatorGroup"</span><span class="code SchemaTag">>
- <listener class=</span><span class="code SchemaCstring">"org.eclipse.wst.validation.example.ValidatorGroupListener"</span><span class="code SchemaTag">/>
- </group>
-</extension>
-
-public class org.eclipse.wst.validation.example.ValidatorGroupListener implements IValidatorGroupListener {
-
- public ValidatorGroupListener() {
- }
-
- public void validationFinishing(IResource resource, IProgressMonitor monitor, ValType valType, ValOperation operation) {
- System.out.println("Finishing:" + resource.getFullPath());
- }
-
- public void validationStarting(IResource resource, IProgressMonitor monitor, ValType valType, ValOperation operation) {
- System.out.println("Starting:" + resource.getFullPath());
- }
-}
-
-<extension id=</span><span class="code SchemaCstring">"id"</span><span class="code SchemaTag"> name=</span><span class="code SchemaCstring">"name"</span><span class="code SchemaTag"> point=</span><span class="code SchemaCstring">"org.eclipse.wst.validation.validatorV2"</span><span class="code SchemaTag">>
- <validator class=</span><span class="code SchemaCstring">"org.eclipse.wst.validation.example.Validator"</span><span class="code SchemaTag">>
- <group id=</span><span class="code SchemaCstring">"org.eclipse.wst.validation.example.validatorGroup"</span><span class="code SchemaTag">/>
- </validator>
-</extension>
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>Provisional API.
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2008 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
-
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorV2.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorV2.html
deleted file mode 100644
index 91bf709..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorV2.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Validator V2</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">Validator V2</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.validation.validator-v2<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>WebTools 3.4.
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This is used to register a validator to the validation framework (version 2). In addition to specifying the validator to invoke, it registers a set of default filter rules, to control which resources are passsed to the validator.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.extension">extension</a> (<a href="#e.validator">validator</a>)></p>
-<p class="code SchemaDtd"><!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point CDATA #REQUIRED<p class="code SchemaDtdAttlist">id CDATA #REQUIRED<p class="code SchemaDtdAttlist">name CDATA #REQUIRED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - A short id that is unique within the plug-in, so that this validator can be identified.</li>
-<li><b>name</b> - The short user friendly name of the validator.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.validator">validator</a> (<a href="#e.include">include</a>* , <a href="#e.exclude">exclude</a>? , <a href="#e.messageCategory">messageCategory</a>* , <a href="#e.group">group</a>*)></p>
-<p class="code SchemaDtd"><!ATTLIST validator</p>
-<p class="code SchemaDtdAttlist">class CDATA #REQUIRED<p class="code SchemaDtdAttlist">build (true | false) <p class="code SchemaDtdAttlist">manual (true | false) <p class="code SchemaDtdAttlist">version CDATA #IMPLIED<p class="code SchemaDtdAttlist">sourceid CDATA #IMPLIED<p class="code SchemaDtdAttlist">markerId CDATA #IMPLIED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Defines a validator to the validation framework.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>class</b> - The class that implements the validator.</li>
-<li><b>build</b> - Is this validator enabled by default for build based validations? The default is true.</li>
-<li><b>manual</b> - Is this validator enabled by default for manual based validations? The default is true.</li>
-<li><b>version</b> - The version of the definition. It is a simple integer. If not specified the version is assumed to be 1.</li>
-<li><b>sourceid</b> - If this validator also serves as an as-you-type validator (also know as an ISourceValidator) then it's source id is specified here, so that the two validators can be associated with one another.
-By source id, we mean the id that is used in the org.eclipse.wst.sse.ui.sourceValidation extension point</li>
-<li><b>markerId</b> - If your validator wishes to use it's own marker, it can do so by supplying that marker id here.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.include">include</a> (<a href="#e.rules">rules</a>)></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This contains a set of inclusion rules, which are used in filtering which resources get validated. At least one of these rules must be satisfied in order for the validator to be called on the particular resource.</p>
-<br><br>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.exclude">exclude</a> (<a href="#e.rules">rules</a>)></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-This contains a set of exclusion rules, used in filtering which resources get validated. If any of these rules are matched, then the validator is not called on this resource.</p>
-<br><br>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.fileext">fileext</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST fileext</p>
-<p class="code SchemaDtdAttlist">ext CDATA #REQUIRED<p class="code SchemaDtdAttlist">caseSensitive (true | false) ></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-A file extension, for example html.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>ext</b> - The file extension, for example html.</li>
-<li><b>caseSensitive</b> - If the file extension is case sensitive, then this needs to be set to true.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.projectNature">projectNature</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST projectNature</p>
-<p class="code SchemaDtdAttlist">id CDATA #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Used to filter on project natures.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - The fully qualified project nature id, for example "org.eclipse.jdt.core.javanature".</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.file">file</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST file</p>
-<p class="code SchemaDtdAttlist">name CDATA #REQUIRED<p class="code SchemaDtdAttlist">caseSensitive (true | false) <p class="code SchemaDtdAttlist">type (folder|file|full) ></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>name</b> - The file or folder name. The file name can be fully qualified, that is it starts with a leading slash ("/"), or it can be a relative name. Folder names are separated with the forward slash ("/") character.</li>
-<li><b>caseSensitive</b> - If the file name is not case senstitive, then this needs to be set to false.</li>
-<li><b>type</b> - Type of name, there are three choices. <ul><li>folder - specifies a project relative folder name.</li><li>file - a simple file name (i.e. no path information).</li><li>full - a fully qualified (project relative) file name.</li></ul></li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.rules">rules</a> (<a href="#e.fileext">fileext</a>* , <a href="#e.file">file</a>* , <a href="#e.projectNature">projectNature</a>* , <a href="#e.facet">facet</a>* , <a href="#e.contentType">contentType</a>*)></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-A set of rules for determining if a resource is passed to this validator or not. The rules are OR'ed together.</p>
-<br><br>
-<p class="code SchemaDtd"><!ELEMENT <a name="e.facet">facet</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST facet</p>
-<p class="code SchemaDtdAttlist">id CDATA #REQUIRED></p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - The facet id.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.group">group</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST group</p>
-<p class="code SchemaDtdAttlist">id IDREF #REQUIRED></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Declares that this validator belongs to this validation group.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - The fully qualified ID of the validation group to which this validator belongs.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.contentType">contentType</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST contentType</p>
-<p class="code SchemaDtdAttlist">id CDATA #REQUIRED<p class="code SchemaDtdAttlist">exactMatch (true | false) ></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Used to filter based on content types.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - The content type id.</li>
-<li><b>exactMatch</b> - Set to true if the content type needs to match exactly. Set to false if sub types are considered matches as well.</li>
-</ul>
-<br><p class="code SchemaDtd"><!ELEMENT <a name="e.messageCategory">messageCategory</a> EMPTY></p>
-<p class="code SchemaDtd"><!ATTLIST messageCategory</p>
-<p class="code SchemaDtdAttlist">id CDATA #REQUIRED<p class="code SchemaDtdAttlist">label CDATA #REQUIRED<p class="code SchemaDtdAttlist">severity (error|warning|ignore) ></p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Used to group together a set of messages, where the user can change the message severity of all the messages in the group. This is similar to the support in the JDT, where for example a user can specify whether used methods should be errors, warnings or ignored.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - A simple id that is unique within the scope of this validator.</li>
-<li><b>label</b> - A short, one line label that is displayed to the end user, that describes the message category.</li>
-<li><b>severity</b> - The default severity for this category.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>An example of a validator that will be called on resources that have html or htm file extensions.
-<pre class="Example"><span class="code SchemaTag">
- <extension
- point=</span><span class="code SchemaCstring">"org.eclipse.wst.validation.validator"</span><span class="code SchemaTag">
- id=</span><span class="code SchemaCstring">"Test"</span><span class="code SchemaTag"> name=</span><span class="code SchemaCstring">"%Validator.Name"</span><span class="code SchemaTag">>
- <validator class=</span><span class="code SchemaCstring">"org.eclipse.wst.validation.test.TestValidator"</span><span class="code SchemaTag">>
- <include>
- <rules>
- <fileext ext=</span><span class="code SchemaCstring">"html"</span><span class="code SchemaTag">/>
- <fileext ext=</span><span class="code SchemaCstring">"htm"</span><span class="code SchemaTag">/>
- </rules>
- </include>
- </validator>
- </extension>
-</span></pre>
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2007,2008 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
-
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/toc.xml b/docs/org.eclipse.wst.validation.doc.isv/toc.xml
deleted file mode 100644
index 4cf39eb..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/toc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Validation Framework Javadoc"
- link_to="../org.eclipse.wst.doc.user/reference_toc.xml#javadoc_common">
- <topic label="Validation Framework API Reference" href="reference/api/overview-summary.html">
- <topic label="org.eclipse.wst.validation" href="reference/api/org/eclipse/wst/validation/package-summary.html"/>
- </topic>
- <topic label="Validation Framework Extension Points Reference" href="reference/extension-points/index.html">
- </topic>
-</toc>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/topics_ExtPoint_Reference.xml b/docs/org.eclipse.wst.validation.doc.isv/topics_ExtPoint_Reference.xml
deleted file mode 100644
index d8ec999..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/topics_ExtPoint_Reference.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
- <toc label="Extension Points Reference">
-<topic href="reference/extension-points/vf/org_eclipse_wst_validation_validator.html" label="org.eclipse.wst.validation.validator"/>
-</toc>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/vfextdocs.xml b/docs/org.eclipse.wst.validation.doc.isv/vfextdocs.xml
deleted file mode 100644
index 9246af7..0000000
--- a/docs/org.eclipse.wst.validation.doc.isv/vfextdocs.xml
+++ /dev/null
@@ -1 +0,0 @@
-<files component="vf"><file>org_eclipse_wst_validation_validatorV2.html</file>/n/n<file>org_eclipse_wst_validation_validatorGroup.html</file></files>
\ No newline at end of file
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 64fe525..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.300.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 ddd721a..0000000
--- a/docs/org.eclipse.wst.validation.infopop/ValidationPrefs_HelpContexts.xml
+++ /dev/null
@@ -1,71 +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.
-
-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 or update it's detailed settings by clicking the button in the <b>Settings</b> column. Not all validators have detailed settings.
-
-</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/rtunevalidat.html" label="Tuning validators"/>
-<topic href="../org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html" label="Common validation errors and solutions"/>
-</context>
-
-<context id="jvgp0100">
-<description>The New Filter Rule dialog adds a new rule to either an Include Group or an Exclude Group. There are several types of rules:
-
-<b>File extension</b> - A rule that is only concerned with matching file extensions, for example html for HTML files or xml for XML files.
-
-<b>Folder or file name</b> - A rule for matching folder or file names. These names are relative to a project.
-
-<b>Project nature</b> - The next page shows a drop down list of all the known project natures.
-
-<b>Facet</b> - Typically this would only be used by advanced or internal users, as you would need to know the internal facet ids.
-
-<b>Content Type</b> - The next page will show a drop down list of all the known content types. Content types are more powerful than file extensions, but also slower to match at runtime.
-</description>
-</context>
-
-<context id="jvgp0101">
-<description>A rule for matching file extensions. The file can be located anywhere in the project.
-</description>
-</context>
-
-<context id="jvgp0102">
-<description>Folder or file names. You can either use File or Folder browsers, or type in a name directly. These names are relative to a project.
-
-If you select a file or folder that is outside of the scope of a project, the rule will not be activated.
-
-For files you can match on either simple names, or qualified names. For example matching on the simple name "product.xml", will match the file in any directory. However, matching on the qualified name "WEB-INF/product.xml" will only match the file in the WEB-INF directory.
-</description>
-</context>
-
-<context id="jvgp0103">
-<description>This is a list of the registered Project natures.
-</description>
-</context>
-
-<context id="jvgp0104">
-<description>The internal facet id is specified here. Since you need to know internal ids this setting is typically not used by end users.
-</description>
-</context>
-
-<context id="jvgp0105">
-<description>A list of all the registered Content Types. Content types are more powerful than using file extensions or file names, as they can use the content of the file to more precisely define it's type. However, they require more computer resources to calculate.
-
-Content types form hierarchies, you can specify whether you require an exact match, or whether subtypes in the hierarchy should match as well.
-</description>
-</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 c6ad7d5..0000000
--- a/docs/org.eclipse.wst.validation.infopop/ValidationProjPrefs_HelpContexts.xml
+++ /dev/null
@@ -1,36 +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 or change it's detailed settings by clicking the button in the <b>Settings</b> column. Not all validators have detailed settings.
-
-</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/rtunevalidat.html" label="Tuning validators"/>
-<topic href="../org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html" label="Common validation errors and solutions"/>
-</context>
-
-<context id="jvpp0100">
-<description>The New Filter Rule dialog adds a new rule to either an Include Group or an Exclude Group. There are several types of rules:
-
-<b>File extension</b> - A rule that is only concerned with matching file extensions, for example html for HTML files or xml for XML files.
-
-<b>Folder or file name</b> - A rule for matching folder or file names. These names are relative to a project.
-
-<b>Content Type</b> - The next page will show a drop down list of all the known content types. Content types are more powerful than file extensions, but also slower to match at runtime.
-</description>
-</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 2199df3..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, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.validation.infopop/build.properties b/docs/org.eclipse.wst.validation.infopop/build.properties
deleted file mode 100644
index 79adbe8..0000000
--- a/docs/org.eclipse.wst.validation.infopop/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = META-INF/,\
- plugin.xml,\
- ValidationPrefs_HelpContexts.xml,\
- ValidationProjPrefs_HelpContexts.xml,\
- plugin.properties,\
- about.html
-src.includes = build.properties
-generateSourceBundle=false
\ No newline at end of file
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/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 ec70e89..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="3.0.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.200" match="compatible"/>
- <import plugin="org.eclipse.jem.util" version="2.0.100" match="compatible"/>
- <import plugin="org.eclipse.emf.edit" version="2.4.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore.xmi" version="2.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.emf" version="1.1.200" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.validation" version="1.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.project.facet.core" version="1.3.0" match="compatible"/>
- <import plugin="org.eclipse.core.expressions" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.command.env.core" version="1.0.203" match="compatible"/>
- <import plugin="org.eclipse.core.commands" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.environment" version="1.0.200" match="compatible"/>
- <import plugin="org.apache.ant" version="1.7.0" match="compatible"/>
- <import plugin="org.eclipse.osgi.util" version="3.1.300" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.1.200" match="compatible"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.301" match="compatible"/>
- <import plugin="com.ibm.icu" version="3.8.1.1" match="compatible"/>
- <import plugin="org.eclipse.ant.core" version="3.1.300" 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/sourceTemplateBundle/about.html b/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=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/sourceTemplateBundle/about.mappings b/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 9474fc0..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/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/sourceTemplateBundle/build.properties b/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/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/sourceTemplateBundle/plugin.properties b/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index c325b0a..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/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/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
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/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 fe81d46..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, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/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 a28390a..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 e717fc0..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, feature@org.eclipse.wst.common_core.feature.source
-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 eb186b2..0000000
--- a/features/org.eclipse.wst.common_sdk.feature/feature.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.common_sdk.feature"
- label="%featureName"
- version="3.0.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"/>
-
- <plugin
- id="org.eclipse.wst.common.project.facet.doc.api"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.common.api.doc"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.validation.doc.isv"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</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 1b6f156..0000000
--- a/features/org.eclipse.wst.common_ui.feature/feature.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.common_ui.feature"
- label="%featureName"
- version="3.0.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.203" match="compatible"/>
- <import plugin="org.eclipse.wst.command.env" version="1.0.305" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.frameworks" version="1.1.200" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui.ide" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.jem.util" version="2.0.100" match="compatible"/>
- <import plugin="org.eclipse.wst.common.environment" version="1.0.200" match="compatible"/>
- <import plugin="org.eclipse.ui.forms" version="3.3.100" match="compatible"/>
- <import plugin="org.eclipse.wst.common.project.facet.core" version="1.3.0" match="compatible"/>
- <import plugin="org.eclipse.gef" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.4.0" match="compatible"/>
- <import plugin="com.ibm.icu" version="3.8.1" match="compatible"/>
- <import plugin="org.eclipse.search" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.core" version="1.1.101" match="compatible"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.301" match="compatible"/>
- <import plugin="org.eclipse.swt" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.1.200" match="compatible"/>
- <import plugin="org.eclipse.wst.validation" version="1.2.0" match="compatible"/>
- </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.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/sourceTemplateBundle/about.html b/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=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/sourceTemplateBundle/about.mappings b/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 40314ea..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/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/sourceTemplateBundle/build.properties b/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/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/sourceTemplateBundle/plugin.properties b/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 4c0b73c..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/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/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
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 10e257a..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,17 +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
-###############################################################################
-generate.feature@org.eclipse.wst.common_core.feature.source=org.eclipse.wst.common_core.feature
-bin.includes = epl-v10.html,\
- eclipse_update_120.jpg,\
- feature.properties,\
- license.html,\
- feature.xml
-
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/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 fe81d46..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, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/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 a28390a..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 34db84c..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.201.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.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.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 2199df3..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, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.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 8041e9c..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.search.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 2c7ba42..0000000
--- a/plugins/org.eclipse.wst.common.environment/.options
+++ /dev/null
@@ -1,28 +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
-
-# Turn on web service framework tracing
-org.eclipse.wst.common.environment/trace/ws_framework=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 d7cf139..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.201.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.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.osgi.util;bundle-version="[3.1.300,4.0.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 2199df3..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, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.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.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 f9d7c2a..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.100.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 2199df3..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, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.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 4f53d03..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.301.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.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.search;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.core;bundle-version="[1.1.101,2.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
- com.ibm.icu;bundle-version="[3.8.1,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 2199df3..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, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.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 e3a2f32..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 = Workspace 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 = Workspace 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 5895525..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSearchListDialog.java
+++ /dev/null
@@ -1,641 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.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.osgi.util.TextProcessor;
-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(TextProcessor.process(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 66af992..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.301.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.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.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 2199df3..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, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.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 9156584..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" basedOn=":org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverExtension"/>
- </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, 2008 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.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 1403071..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistry.java
+++ /dev/null
@@ -1,167 +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();
- List lowPriorityList = new ArrayList();
- List mediumPriorityList = new ArrayList();
- List highPriorityList = 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))
- {
- highPriorityList.addAll((List) ((HashMap) map.get(key)).get(PRIORITY_HIGH));
- mediumPriorityList.addAll((List) ((HashMap) map.get(key)).get(PRIORITY_MEDIUM));
- lowPriorityList.addAll((List) ((HashMap) map.get(key)).get(PRIORITY_LOW));
- }
- } catch (CoreException e)
- {
- }
- }
- result.addAll(highPriorityList);
- result.addAll(mediumPriorityList);
- result.addAll(lowPriorityList);
- 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 8467409..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/util/URIHelper.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * IBM Corporation - Initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- * 20071205 211262 ericdp@ca.ibm.com - Eric Peters, CopyWSDLTreeCommand fails to copy ?wsdl
- *******************************************************************************/
-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);
- }
-
- public static boolean isProtocolFile(String uri)
- {
- return uri != null && uri.startsWith(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.validation.ui/.classpath b/plugins/org.eclipse.wst.validation.ui/.classpath
deleted file mode 100644
index 7acdda6..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="validateui"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="src" path="vf2"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.validation.ui/.cvsignore b/plugins/org.eclipse.wst.validation.ui/.cvsignore
deleted file mode 100644
index b39f8f4..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-runtime
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.validation.ui/.project b/plugins/org.eclipse.wst.validation.ui/.project
deleted file mode 100644
index 32471f6..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.project
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.validation.ui</name>
- <comment></comment>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 9306ade..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon May 08 09:24:56 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7f1fe24..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Tue Feb 12 12:30:46 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=_
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=_
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4638d6c..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Feb 12 12:30:46 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
diff --git a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 13b38fd..0000000
--- a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.validation.ui; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.validation.internal.ui;x-internal:=true,
- org.eclipse.wst.validation.internal.ui.plugin;x-internal:=true
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.swt;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.3.100,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.validation.ui/about.html b/plugins/org.eclipse.wst.validation.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.wst.validation.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.validation.ui/build.properties b/plugins/org.eclipse.wst.validation.ui/build.properties
deleted file mode 100644
index 1749ccd..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = .,\
- plugin.xml,\
- META-INF/,\
- about.html,\
- icons/,\
- plugin.properties
-source.. = validateui/,\
- property_files/,\
- vf2/
-output.. = bin/
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif b/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif
deleted file mode 100644
index 9bd9b0c..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif
deleted file mode 100644
index 91333a1..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif b/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif
deleted file mode 100644
index 1d8900b..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/settings.gif b/plugins/org.eclipse.wst.validation.ui/icons/settings.gif
deleted file mode 100644
index 9c99aad..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/settings.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif
deleted file mode 100644
index 09166da..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.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 20502a4..0000000
--- a/plugins/org.eclipse.wst.validation.ui/plugin.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-<!-- ============================================== -->
-<!-- Popup Contributions -->
-<!-- ============================================== -->
-<!-- By saying "adaptable=true", this item will appear on both IProject and IJavaProject -->
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- objectClass="org.eclipse.core.resources.IResource"
- id="ValidationMenuAction">
- <action
- label="%VBF_UI_POPUP_RUNVALIDATION"
- class="org.eclipse.wst.validation.internal.ui.ValidationMenuAction"
- menubarPath="additions"
- enablesFor="+"
- id="ValidationAction">
- </action>
- </objectContribution>
- </extension>
-
-
-<!-- ====================================================== -->
-<!-- Validation preference page -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- name="%VBF_TITLE_PREFERENCE"
- class="org.eclipse.wst.validation.ui.internal.preferences.ValidationPreferencePage"
- id="ValidationPreferencePage">
- </page>
- </extension>
-
-<!-- ====================================================== -->
-<!-- Validation properties page -->
-<!-- ====================================================== -->
-<!-- By saying "adaptable=true", this item will appear on both IProject and IJavaProject -->
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- name="%VBF_TITLE_PROPERTIES"
- class="org.eclipse.wst.validation.ui.internal.preferences.ValidationPropertyPage"
- id="ValidationPropertiesPage">
- <enabledWhen>
- <adapt type="org.eclipse.core.resources.IProject"/>
- </enabledWhen>
- </page>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties
deleted file mode 100644
index 4db102d..0000000
--- a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-SaveFilesDialog_saving=Saving Resources
-SaveFilesDialog_always_save=&Always save all modified resources automatically prior to validating
-SaveFilesDialog_save_all_resources=Save All Modified Resources
-SaveFilesDialog_must_save=All modified resources must be saved before this operation.
-
-PrefPage_always_save=&Save all modified resources automatically prior to validating
-
-RunValidationDialogTitle=Running Validation
-UnableToSave=Unable to set save automatically preference in save files for validation dialog:
-Validate=Validate
-
-ValResults=Validation Results
-
-ValError1Resource1=The validation completed, one error was discovered. One resource was validated in {0}.
-ValErrorsResource1=The validation completed, {0} errors were discovered. One resource was validated in {1}.
-ValWarn1Resource1=The validation completed with one warning. One resource was validated in {0}.
-ValWarnResource1=The validation completed with {0} warnings. One resource was validated in {1}.
-ValInfo1Resource1=The validation completed with one informational message. One resource was validated in {0}.
-ValInfoResource1=The validation completed with {0} informational messages. One resource was validated in {1}.
-
-ValError1Resources=The validation completed, one error was discovered. {0} resources were validated in {1}.
-ValErrorsResources=The validation completed, {0} errors were discovered. {1} resources were validated in {2}.
-ValWarn1Resources=The validation completed with one warning. {0} resources were validated in {1}.
-ValWarnResources=The validation completed with {0} warnings. {1} resources were validated in {2}.
-ValInfo1Resources=The validation completed with one informational message. {0} resources were validated in {1}.
-ValInfoResources=The validation completed with {0} informational messages. {1} resources were validated in {2}.
-
-ValSuccess=The validation completed with no errors or warnings.
diff --git a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
deleted file mode 100644
index af8e823..0000000
--- a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
+++ /dev/null
@@ -1,158 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# *************************************************************************
-# * Code oriented instructions:
-# *
-# * In the string, you may see the following special sequences:
-# * a) {n} where n is a number. These are replaceable parameters.
-# * b) '' In .properties files, in order to see one apostrophe (') in the final
-# * string, sometimes two apostrophes must be entered in the string. In the translated
-# * string, if there is at least one {n} in the string, then to show one apostrophe
-# * to the user, put two apostrophes in the string. If there are no {n} in the string,
-# * then put one apostrophe.
-# * For example, say that you want the user to read "George's file".
-# * GEORGE=George's file was on the desk.
-# * GEORGE2=George''s file and {0} were on the desk.
-# * GEORGE uses one apostrophe because there are no {n} and GEORGE2
-# * uses two apostrophes because there is a {n}.
-# * c) '' text '' where text can be any word(s). The text between the double
-# * apostrophes should not be translated.
-# * d) <text> where text can be any word(s). The text between the angle
-# * brackets should NOT be translated.
-# * e) "text" where text can be any word(s). The text between the quotation
-# * marks should NOT be translated.
-# *
-# *************************************************************************
-# * Other instructions
-# * a) Do not translate any text that is on a line which begins with a comment
-# * symbol (#).
-# * b) Do not translate these words:
-# * schema, EJB, RDB, JAR, RMI, BMP, CMP, OOSQL
-# * c) Please return the .properties files using the same directory structure.
-# * This is necessary because two of the files have the same name.
-# *
-# *************************************************************************
-# Any other comments to the translators are on lines which start like this: # 2TC:
-#
-# Version 1.12
-#
-#
-# ID:
-# VBF - Validation Builder Framework
-#
-
-#
-# Begin Validation Builder Framework UI Strings
-#
-# IDs:
-# VBF_EXC=Exception or error text
-# VBF_UI=UI label
-#
-PREF_BUTTON_OVERRIDE=Allow projects to override these preference settings
-PREF_BUTTON_ENABLEALL=Enable All
-PREF_BUTTON_DISABLEALL=Disable All
-PREF_VALLIST_TITLE=The selected validators will run when validation is performed:
-PREF_MNU_MANUAL=&Manual
-PREF_MNU_BUILD=&Build
-PREF_MNU_SETTINGS=&Settings...
-
-VBF_EXC_INTERNAL_TITLE=Internal error
-VBF_EXC_INTERNAL_PAGE=An unexpected error occurred; click Cancel to close the wizard.
-
-VBF_EXC_INVALID_REGISTER=Validators can run only on open resources.
-ProjectOverridesNotAllowed=The workspace validation preferences do not allow projects to override the workspace settings. In order to allow project settings you need to configure the workspace settings to allow project overrides.
-
-VBF_UI_NO_VALIDATORS_INSTALLED=No validators are installed.
-
-DISABLE_VALIDATION=Suspend all validators
-
-DelegatesDialogTitle=Validator Preferences
-DelegatesComboLabel=Implementation:
-ADD_VALIDATION_BUILDER=Add Validation Builder to project
-ConfigWsSettings=Configure Workspace Settings...
-VALIDATOR=Validator
-MANUAL=Manual
-BUILD=Build
-SETTINGS=Settings
-
-SaveFilesDialog_saving=Saving Resources
-SaveFilesDialog_always_save=&Always save all modified resources automatically prior to validating
-SaveFilesDialog_save_all_resources=Save All Modified Resources
-SaveFilesDialog_must_save=All modified resources must be saved before this operation.
-
-PrefPage_always_save=&Save all modified resources automatically prior to validating
-PrefPageConfirmDialog=Show a confirmation dialog when performing manual validations
-
-RunValidationDialogTitle=Running Validation
-
-fdTitle=Validation Filters for {0}
-fdNoFilters=The validator does not have currently have any filters installed.
-ErrConfig=Extension configuration error. An internal error has happened, the validator {0} has incorrectly configured the validation extension point.
-
-FilterHelp=Filter rules are grouped into groups. Inside of any one group the rules are combined by using the logical OR operator. There are two types of groups Include and Exclude. If any of the rules in the Exclude group match, the resource is not validated. If there are Include groups, at least one rule from each group must match before the resource is validated.
-ButtonAddGroupInclude=Add Include Group...
-ButtonAddGroupExclude=Add Exclude Group...
-ButtonAddRule=Add Rule...
-ButtonRemove=Remove
-
-LabelEnableProjectSpecific=Enable project specific settings
-
-LabelExtension=File extension
-LabelFile=Folder or file name
-LabelProjects=Project nature
-LabelFacets=Facet
-LabelContentType=Content Type
-
-# Note to translators, keep the <A> and </A> tags exactly as they are
-DoNotShowResults=Do not show this dialog in the future.
-
-DescExtension=File extension, for example "html" for HTML files.
-DescFile=Either a folder, a relative file, or a fully qualified file name.
-DescProjects=A project nature.
-DescFacets=A facet.
-DescContentType=A content type, for example the XML content type.
-
-ErrorsWarnings=Errors/Warnings
-
-Validation=Validation
-ValidationStatus=Validation Status
-
-ErrSummary=Validation results. Errors={0}, Warnings={1}, Information={2}
-ValidationSuccessful=Validation was successful
-
-FrWizard=New Filter Rule Wizard
-FrSelectFilterType=Select Filter Type
-FrFileExtension=File Extension
-FrFileExtensionLabel=File extension, for example html:
-FrCaseSensitive=Is the comparison case sensitive?
-FrExactMatch=Check this if the content type needs to match exactly. Do not check it, if sub types need to match as well.
-FrSimpleFileName=For file based comparisons, use only the simple file name.
-FrFolderOrFile=Folder or File Name
-FrFolderOrFileLabel=File or folder:
-FrBrowseFile=Browse File...
-FrFileFilter=Select the file that will serve as the filter
-FrBrowseFolder=Browse Folder...
-FrFolderFilter=Select the folder that will serve as the filter
-FrProjectNature=Project Nature
-FrProjectNatureLabel=Project nature:
-FrFacit=Facet
-FrFacitLabel=Facet id:
-FrContentType=Content Type
-FrContentTypeLabel=Content Type:
-FrMsgSev=Select the severity level for the following problems
-
-RebuildTitle=Validation Settings Changed
-RebuildMsg=The validation settings have changed. A full rebuild is required for the changes to take effect. Do the full build now?
-
-#
-# End Validation Builder Framework UI Strings
-#
-
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java
deleted file mode 100644
index d8ce485..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-
-public interface ContextIds {
- static final String PREFIX = WTPUIPlugin.PLUGIN_ID;
-
- // context ids for the Validation Properties Page
- public static final String VALIDATION_PROPERTIES_PAGE = PREFIX + ".jvpp0000"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_OVERRIDE = PREFIX + ".jvpp0001"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_BUILD_NOVALSELECTED = PREFIX + ".jvpp0003"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_AUTOBUILD = PREFIX + ".jvpp0004"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALSELECTED = PREFIX + ".jvpp0005"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALCONFIG = PREFIX + ".jvpp0006"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_AUTO_ENABLED = PREFIX + ".jvpp0020"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED = PREFIX + ".jvpp0030"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_BOTH = PREFIX + ".jvpp0031"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_AUTO = PREFIX + ".jvpp0032"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_MANUAL = PREFIX + ".jvpp0033"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_REBUILD_ENABLED = PREFIX + ".jvpp0040"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_MAX_MESSAGES = PREFIX + ".jvpp0050"; //$NON-NLS-1$
-
- public static final String VALIDATION_PREFERENCE_PAGE = PREFIX + ".jvgp0000"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_OVERRIDE = PREFIX + ".jvgp0005"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_DISABLE_ALL_ENABLED = PREFIX + ".jvgp0010"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_REBUILD_DISABLED = PREFIX +
- // ".jvgp0011"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_AUTO_ENABLED = PREFIX + ".jvgp0020"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_AUTOBUILD = PREFIX +
- // ".jvgp0021"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_NOINCVALSELECTED = PREFIX
- // + ".jvgp0022"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_NOINCVALCONFIG = PREFIX +
- // ".jvgp0023"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_MAX_MESSAGES = PREFIX + ".jvgp0030"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/DelegatingValidatorPreferencesDialog.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/DelegatingValidatorPreferencesDialog.java
deleted file mode 100644
index e00900a..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/DelegatingValidatorPreferencesDialog.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.ui;
-
-import java.util.Map;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-
-/**
- * Dialog used to allow the user to select a validator delegate from the list of
- * registered delegates for a given delegating validator.
- */
-public class DelegatingValidatorPreferencesDialog extends Dialog
-{
- /**
- * The delegating validator's descriptor.
- */
- private ValidatorMetaData delegatingValidatorDescriptor;
-
- /**
- * The selected validator delegate ID.
- */
- private String delegateID;
-
- /**
- * Constructs the dialog on the given shell.
- *
- * @param parentShell
- * the dialog's parent. Must not be null.
- * @param targetID
- * the delegating validator's id
- *
- * @param delegateID
- * the ID of the currently selected validator delegate.
- */
- public DelegatingValidatorPreferencesDialog(Shell parentShell, ValidatorMetaData vmd, String delegateID)
- {
- super(parentShell);
-
- delegatingValidatorDescriptor = vmd;
- this.delegateID = delegateID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent)
- {
- super.createDialogArea(parent);
-
- getShell().setText(ValUIMessages.DelegatesDialogTitle);
-
- GridLayout layout = new GridLayout();
- parent.setLayout(layout);
-
- Label label = new Label(parent, SWT.NONE);
- GridData labelData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- labelData.widthHint = 250;
- label.setLayoutData(labelData);
- label.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
- String delegatingValidatorName = delegatingValidatorDescriptor.getValidatorDisplayName();
- label.setText(delegatingValidatorName);
-
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData separatorData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- separator.setLayoutData(separatorData);
-
- Composite group = new Composite(parent, SWT.NONE);
- GridData groupGridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- group.setLayoutData(groupGridData);
- GridLayout groupLayout = new GridLayout(2, false);
- group.setLayout(groupLayout);
-
- Label comboLabel = new Label(group, SWT.NONE);
- comboLabel.setLayoutData(new GridData());
- comboLabel.setText(ValUIMessages.DelegatesComboLabel);
-
- Combo combo = new Combo(group, SWT.READ_ONLY);
- GridData comboGridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- combo.setLayoutData(comboGridData);
-
- final ComboViewer comboViewer = new ComboViewer(combo);
- comboViewer.setContentProvider(new DelegatesContentProvider());
- comboViewer.setLabelProvider(new DelegatesLabelProvider());
- String targetID = delegatingValidatorDescriptor.getValidatorUniqueName();
-
- comboViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
-
- public void selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) comboViewer.getSelection();
- setDelegateID(((ValidatorDelegateDescriptor) selection.getFirstElement()).getId());
- }
- });
-
- comboViewer.setInput(targetID);
-
- ValidatorDelegateDescriptor selected = ValidatorDelegatesRegistry.getInstance().getDescriptor(targetID, delegateID);
-
- if (selected != null)
- {
- comboViewer.setSelection(new StructuredSelection(new Object[] { selected }));
- }
-
- Label endSeparator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData endSeparatorData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- endSeparator.setLayoutData(endSeparatorData);
- Dialog.applyDialogFont(parent);
-
- return parent;
- }
-
- /**
- * Provides contents for the delegate validators combo box.
- */
- private final class DelegatesContentProvider implements IStructuredContentProvider
- {
- public void dispose()
- {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- String targetID = (String) inputElement;
- Map delegatesByID = ValidatorDelegatesRegistry.getInstance().getDelegateDescriptors(targetID);
-
- if (delegatesByID == null)
- {
- return new Object[] {};
- }
-
- return delegatesByID.values().toArray();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- }
- }
-
- /**
- * Provides the labels/images for the delegate validator combo box
- *
- * @author vbaciul
- *
- */
- private final class DelegatesLabelProvider implements ILabelProvider
- {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose()
- {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
- public Image getImage(Object element)
- {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
- public String getText(Object element)
- {
- return ((ValidatorDelegateDescriptor) element).getName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- }
- }
-
- /*
- * Provides the ID of the currently selected validator delegate ID.
- */
- public String getDelegateID()
- {
- return delegateID;
- }
-
- /**
- * Sets the currently selected validator delegate ID.
- *
- * @param delegateID
- */
- private void setDelegateID(String delegateID)
- {
- this.delegateID = delegateID;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ListContentProvider.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ListContentProvider.java
deleted file mode 100644
index 90b6d02..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ListContentProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * A specialized content provider to show a list of editor parts.
- * This class has been copied from org.eclipse.jdt.internal.ui.viewsupport.ListContentProvider
- * This class should be removed once a generic solution is made available.
- */
-public class ListContentProvider implements IStructuredContentProvider {
- List fContents;
-
- public ListContentProvider() {
- }
-
- public Object[] getElements(Object input) {
- if (fContents != null && fContents == input)
- return fContents.toArray();
- return new Object[0];
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- if (newInput instanceof List)
- fContents= (List)newInput;
- else
- fContents= null;
- // we use a fixed set.
- }
-
- public void dispose() {
- }
-
- public boolean isDeleted(Object o) {
- return fContents != null && !fContents.contains(o);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesDialog.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesDialog.java
deleted file mode 100644
index 2deb872..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesDialog.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * /
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.dialogs.ListDialog;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-/**
- * A generic save files dialog. The bulk of the code
- * for this dialog was taken from the JDT refactoring
- * support in org.eclipse.jdt.internal.ui.refactoring.RefactoringSaveHelper.
- * This class is a good candidate for reuse amoung components.
- */
-public class SaveFilesDialog extends ListDialog {
-
- public SaveFilesDialog(Shell parent)
- {
- super(parent);
- setTitle(ValidationUIMessages.SaveFilesDialog_save_all_resources);
- setAddCancelButton(true);
- setLabelProvider(createDialogLabelProvider());
- setMessage(ValidationUIMessages.SaveFilesDialog_must_save);
- setContentProvider(new ListContentProvider());
- }
-
- protected Control createDialogArea(Composite container)
- {
- Composite result= (Composite) super.createDialogArea(container);
- boolean fAllowSaveAlways = true;
- if (fAllowSaveAlways) {
- final Button check= new Button(result, SWT.CHECK);
- check.setText(ValidationUIMessages.SaveFilesDialog_always_save);
- //check.setSelection(RefactoringSavePreferences.getSaveAllEditors());
- check.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try
- {
- GlobalConfiguration config = ConfigurationManager.getManager().getGlobalConfiguration();
- config.setSaveAutomatically(check.getSelection());
- config.store();
- }
- catch(InvocationTargetException exc)
- {
- Logger.getLogger(ValidationUIPlugin.getBundleName()).log(Level.WARNING,
- ValidationUIMessages.UnableToSave + exc);
- }
-
- }
- });
- applyDialogFont(result);
- }
- return result;
- }
-
- private ILabelProvider createDialogLabelProvider() {
- return new LabelProvider() {
- public Image getImage(Object element) {
- return ((IEditorPart) element).getTitleImage();
- }
- public String getText(Object element) {
- return ((IEditorPart) element).getTitle();
- }
- };
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesHelper.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesHelper.java
deleted file mode 100644
index f323332..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesHelper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * /
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A helper class for the save dirty files dialog.
- */
-public class SaveFilesHelper {
-
- /**
- * Retreive an array of IEditorParts representing all the dirty
- * editors open for the files provided in the list.
- *
- * @param files
- * A list of IFiles.
- * @return
- * An array of IEditorParts containing all the dirty editors for the files in the list.
- */
- public static IEditorPart[] getDirtyEditors(List files) {
- Set<IEditorInput> inputs = new HashSet<IEditorInput>();
- List<IEditorPart> result = new LinkedList<IEditorPart>();
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- for (int i = 0; i < windows.length; i++) {
- IWorkbenchPage[] pages = windows[i].getPages();
- for (int x = 0; x < pages.length; x++) {
- IEditorPart[] editors = pages[x].getDirtyEditors();
- for (int z = 0; z < editors.length; z++) {
- IEditorPart ep = editors[z];
- IEditorInput input = ep.getEditorInput();
- if (input instanceof IFileEditorInput) {
- IFileEditorInput fileInput = (IFileEditorInput) input;
- if (files.contains(fileInput.getFile())) {
- if (!inputs.contains(input)) {
- inputs.add(input);
- result.add(ep);
- }
- }
- }
- }
- }
- }
- return result.toArray(new IEditorPart[result.size()]);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java
deleted file mode 100644
index a04c829..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.SelectionListenerAction;
-
-
-public class ValidateAction extends SelectionListenerAction {
- protected ValidationMenuAction delegate;
-
- public ValidateAction() {
- super(ValidationUIMessages.Validate);
- delegate = new ValidationMenuAction();
- }
-
- /**
- * Implementation of method defined on <code>IAction</code>.
- */
- public void run() {
- delegate.run(this);
- }
-
- /**
- * Updates this action in response to the given selection.
- * <p>
- * The <code>SelectionListenerAction</code> implementation of this method returns
- * <code>true</code>. Subclasses may extend to react to selection changes; however, if the
- * super method returns <code>false</code>, the overriding method must also return
- * <code>false</code>.
- * </p>
- *
- * @param selection
- * the new selection
- * @return <code>true</code> if the action should be enabled for this selection, and
- * <code>false</code> otherwise
- */
- protected boolean updateSelection(IStructuredSelection selection) {
- if (!super.updateSelection(selection))
- return false;
-
- delegate.selectionChanged(this, selection);
-
- return isEnabled(); // "Enabled" is set by the delegate.
- }
-
- /**
- * If a subclass of ValidateAction enables this menu action on a type that is not an IResource,
- * this method returns the IResource[] that represent that object. If null is returned, the
- * object will be ignored and the user will not be notified that the object was not validated.
- * This method will be called when updateSelection and run are called. (The result of this
- * method is used to determine which resources will be validated)
- */
- protected IResource[] getResource(Object selected) {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java
deleted file mode 100644
index aa37f64..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
-
-public class ValidationJob extends Job {
-
-
- private Map projects;
- public ValidationJob(String name) {
- super(name);
- }
-
-
- public void setProjectsMap(Map projects){
- this.projects = projects;
- }
-
-
- protected IStatus run(IProgressMonitor monitor) {
-
- return null;
- }
-
- protected Map getProjects() {
- return projects;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
deleted file mode 100644
index af083e7..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.DisabledResourceManager;
-import org.eclipse.wst.validation.internal.ValType;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidationSelectionHandlerRegistryReader;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-import org.eclipse.wst.validation.ui.internal.ManualValidationRunner;
-
-/**
- * This class implements the pop-up menu item "Run Validation" When the item is selected, this
- * action triggers a validation of the project, using all configured, enabled validators.
- */
-public class ValidationMenuAction implements IViewActionDelegate {
- private ISelection _currentSelection;
- protected static final String SEP = "/"; //$NON-NLS-1$
- private Display _currentDisplay;
- private IResourceVisitor _folderVisitor;
- private IResourceVisitor _projectVisitor;
- private Map<IProject, Set<IResource>> _selectedResources;
-
- public ValidationMenuAction() {
- // cache the display before this action is forked. After the action is forked,
- // Display.getCurrent() returns null.
- _currentDisplay = Display.getCurrent();
- _selectedResources = new HashMap<IProject, Set<IResource>>();
- }
-
- private Display getDisplay() {
- return (_currentDisplay == null) ? Display.getCurrent() : _currentDisplay;
- }
-
- /**
- * Return the wizard's shell.
- */
- Shell getShell() {
- Display display = getDisplay();
- Shell shell = (display == null) ? null : display.getActiveShell();
- if (shell == null && display != null) {
- Shell[] shells = display.getShells();
- if (shells.length > 0)
- shell = shells[0];
- }
- return shell;
- }
-
- /**
- * Return a map of the selected elements. Each key of the map is an IProject, and the value is a
- * Set of the selected resources in that project. If a project is selected, and nothing else in
- * the project is selected, a full validation (null value) will be done on the project. If a
- * project is selected, and some files/folders in the project are also selected, only the
- * files/folders will be validated. If a folder is selected, all of its contents are also
- * validated.
- *
- * @return null if there is no selection.
- */
- private Map<IProject, Set<IResource>> loadSelected(ValidateAction action) {
- // GRK previously this did not do a clear, but I couldn't understand why that would be so I am forcing a clear
- // GRK In my testing, not doing a clear caused duplicate validations
- _selectedResources.clear();
- if ((_currentSelection == null) || _currentSelection.isEmpty() ||
- !(_currentSelection instanceof IStructuredSelection))return null;
-
- Object[] elements = ((IStructuredSelection) _currentSelection).toArray();
- for (Object element : elements) {
- if (element != null)addSelected(action, element);
- }
- return _selectedResources;
- }
-
- private void addSelected(ValidateAction action, Object selected) {
- if (selected instanceof IProject) {
- addVisitor((IProject) selected);
- } else if (selected instanceof IFile) {
- addSelected((IFile) selected);
- } else if (selected instanceof IFolder) {
- addVisitor((IFolder) selected);
- } else if (isValidType(getExtendedType(selected))) {
- addSelected(action,getExtendedType(selected));
- } else {
- // Not a valid input type. Must be IProject, IJavaProject, or IResource.
- // If this ValidationMenuAction is a delegate of ValidateAction, is
- // the input type recognized by the ValidateAction?
- boolean valid = false;
- if (action != null) {
- IResource[] resources = action.getResource(selected);
- if (resources != null) {
- valid = true;
- for (int i = 0; i < resources.length; i++) {
- addSelected(action, resources[i]);
- }
- }
- }
- if (!valid) {
- // Stop processing. This allows the "Run Validation" menu item
- // to gray out once an element that can not be validated is selected.
- _selectedResources.clear();
- }
- }
- }
-
- private Object getExtendedType(Object selected) {
- Object result = ValidationSelectionHandlerRegistryReader.getInstance().getExtendedType(selected);
- return result == null ? selected : result;
- }
-
- private boolean isValidType(Object object) {
- return object instanceof IProject || object instanceof IFile || object instanceof IFolder;
- }
-
-
- void addSelected(IResource selected) {
- IProject project = selected.getProject();
- boolean added = _selectedResources.containsKey(project);
- Set<IResource> changedRes = null;
- if (added) {
- // If the value is null, the entire project needs to be validated anyway.
- changedRes = _selectedResources.get(project);
- if (changedRes == null)return;
-
- } else {
- changedRes = new HashSet<IResource>();
- }
- if (changedRes.add(selected)) {
- _selectedResources.put(project, changedRes);
- }
- }
-
- private void addVisitor(IFolder selected) {
- // add the folder and its children
- try {
- selected.accept(getFolderVisitor());
- } catch (CoreException exc) {
- ValidationUIPlugin.getPlugin().handleException(exc);
- return;
- }
- }
-
- private IResourceVisitor getFolderVisitor() {
- if (_folderVisitor == null) {
- _folderVisitor = new IResourceVisitor() {
- public boolean visit(IResource res) {
- if (res instanceof IFile) {
- addSelected(res);
- } else if (res instanceof IFolder) {
- addSelected(res);
- }
- return true; // visit the resource's children
- }
- };
- }
- return _folderVisitor;
- }
-
- private void addVisitor(IProject selected) {
- // add the folder and its children
- if(!selected.isAccessible())return;
- try {
- selected.accept(getProjectVisitor());
- } catch (CoreException exc) {
- ValidationUIPlugin.getPlugin().handleException(exc);
- return;
- }
- }
-
- private IResourceVisitor getProjectVisitor() {
- if (_projectVisitor == null) {
- _projectVisitor = new IResourceVisitor() {
- public boolean visit(IResource res) {
- if (DisabledResourceManager.getDefault().isDisabled(res))return false;
- if (res instanceof IFile)addSelected(res);
- else if (res instanceof IFolder)addSelected(res);
-
- return true;
- }
- };
- }
- return _projectVisitor;
- }
-
- /**
- * The delegating action has been invoked. This method does the actual work.
- *
- * @param action
- * Action proxy that handles the presentation portion of the plug-in action.
- */
- public void run(IAction action) {
- ValidateAction vaction = null;
- if (action instanceof ValidateAction) {
- vaction = (ValidateAction) action;
- }
- final Map<IProject, Set<IResource>> projects = loadSelected(vaction);
- if ((projects == null) || (projects.size() == 0)) {
- return;
- }
-
- // If the files aren't saved do not run validation.
- if(!handleFilesToSave(projects))return;
-
- boolean confirm = org.eclipse.wst.validation.internal.ValManager.getDefault().getGlobalPreferences()
- .getConfirmDialog();
- ManualValidationRunner.validate(projects, ValType.Manual, confirm);
- }
-
- /**
- * Selection in the desktop has changed. Plug-in provider can use it to change the availability
- * of the action or to modify other presentation properties.
- *
- * <p>
- * Action delegate cannot be notified about selection changes before it is loaded. For that
- * reason, control of action's enable state should also be performed through simple XML rules
- * defined for the extension point. These rules allow enable state control before the delegate
- * has been loaded.
- * </p>
- *
- * @param action
- * action proxy that handles presentation portion of the plug-in action
- * @param selection
- * current selection in the desktop
- */
- public void selectionChanged(IAction action, ISelection selection) {
- _currentSelection = selection;
- boolean enabled = quickCheck(selection);
-
- // Don't force the plug-in to be activated just to check this setting.
- if (enabled && ValidationPlugin.isActivated() && ValidationRegistryReader.isActivated()){
- enabled = hasManualValidators(selection);
- }
- action.setEnabled(enabled);
- }
-
- /**
- * Do a quick check on the selection, so see if we know that we don't want to validate the selection.
- *
- * @param selection
- * @return false if we are sure that we don't want to validate it. Return true if we are still not sure.
- */
- private boolean quickCheck(ISelection selection){
- if (selection == null || selection.isEmpty())return false;
- if (selection instanceof IStructuredSelection){
- IStructuredSelection ss = (IStructuredSelection)selection;
- Object sel = ss.getFirstElement();
- if (sel != null){
- if (sel instanceof IProject){
- IProject project = (IProject)sel;
- if (!project.isOpen())return false;
- }
- }
- }
-
- return true;
- }
-
- /**
- * Answer true if any of the selected items have manual validators enabled.
- * @param selection
- */
- private boolean hasManualValidators(ISelection selection){
-
- if (selection instanceof IStructuredSelection){
- IStructuredSelection ss = (IStructuredSelection)selection;
- for (Iterator it = ss.iterator(); it.hasNext();){
- Object sel = it.next();
- if (sel instanceof IResource){
- IResource resource = (IResource)sel;
- if (ValidationFramework.getDefault().hasValidators(resource, true, false))return true;
- }
- }
- }
-
- return false;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
- */
- public void init(IViewPart view) {
- }
-
- /**
- * Handle any files that must be saved prior to running
- * validation.
- *
- * @param projects
- * The list of projects that will be validated.
- * @return
- * True if all files have been saved, false otherwise.
- */
- protected boolean handleFilesToSave(Map<IProject, Set<IResource>> projects)
- {
- List fileList = getIFiles(projects);
- final IEditorPart[] dirtyEditors = SaveFilesHelper.getDirtyEditors(fileList);
- if(dirtyEditors == null || dirtyEditors.length == 0)return true;
- boolean saveAutomatically = false;
- try
- {
- saveAutomatically = ConfigurationManager.getManager().getGlobalConfiguration().getSaveAutomatically();
- }
- catch(InvocationTargetException e)
- {
- // In this case simply default to false.
- }
- SaveFilesDialog sfDialog = null;
- if(!saveAutomatically)
- {
- sfDialog = new SaveFilesDialog(ValidationUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell());
- sfDialog.setInput(Arrays.asList(dirtyEditors));
- }
-
- if(saveAutomatically || sfDialog.open() == Window.OK){
- ProgressMonitorDialog ctx = new ProgressMonitorDialog(getShell());
-
- IRunnableWithProgress runnable = new IRunnableWithProgress(){
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException{
- try {
- monitor.beginTask(ValidationUIMessages.SaveFilesDialog_saving, dirtyEditors.length);
- int numDirtyEditors = dirtyEditors.length;
- for(int i = 0; i < numDirtyEditors; i++){
- dirtyEditors[i].doSave(new SubProgressMonitor(monitor, 1));
- }
- } finally {
- monitor.done();
- }
- }
- };
-
- try {
- ctx.run(false, true, runnable);
- return true;
- } catch (InvocationTargetException e) {
- ValidationUIPlugin.getPlugin().handleException(e);
- } catch (InterruptedException e) {
- ValidationUIPlugin.getPlugin().handleException(e);
- }
- }
- return false;
- }
-
- protected List<IFile> getIFiles(Map<IProject, Set<IResource>> projects) {
- List<IFile> fileList = new LinkedList<IFile>();
- for(IProject project : projects.keySet()) {
- for(IResource resource : projects.get(project)) {
- if(resource instanceof IFile)fileList.add((IFile)resource);
- }
- }
- return fileList;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIMessages.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIMessages.java
deleted file mode 100644
index d6963b3..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIMessages.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * /
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by Validation UI.
- */
-public class ValidationUIMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.wst.validation.internal.ui.validationui";//$NON-NLS-1$
-
- public static String SaveFilesDialog_saving;
- public static String SaveFilesDialog_always_save;
- public static String SaveFilesDialog_save_all_resources;
- public static String SaveFilesDialog_must_save;
- public static String PrefPage_always_save;
- public static String RunValidationDialogTitle;
- public static String UnableToSave;
-
- public static String Validate;
-
- public static String ValResults;
-
- // results validating one resource
- public static String ValError1Resource1;
- public static String ValErrorsResource1;
- public static String ValWarn1Resource1;
- public static String ValWarnResource1;
- public static String ValInfo1Resource1;
- public static String ValInfoResource1;
-
- // results validating multiple resources
- public static String ValError1Resources;
- public static String ValErrorsResources;
- public static String ValWarn1Resources;
- public static String ValWarnResources;
- public static String ValInfo1Resources;
- public static String ValInfoResources;
-
- public static String ValSuccess;
-
-
- static {
- // load message values from bundle file
- NLS.initializeMessages(BUNDLE_NAME, ValidationUIMessages.class);
- }
-
- private ValidationUIMessages() {
- // cannot create new instance
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java
deleted file mode 100644
index 4a8acb8..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui.plugin;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-import org.eclipse.wst.validation.internal.operations.ValidationOperation;
-
-
-/**
- * This is a wrapper for an IWorkspaceRunnable to the IRunnableWithProgress. This class needs to be
- * used when running the operation from a IRunnableContext.
- *
- * @see IRunnableContext
- * @see ValidationUIPlugin#getRunnableWithProgress Creation date: (5/8/2001 1:28:45 PM)
- * @author: Administrator
- */
-public class RunnableWithProgressWrapper implements IRunnableWithProgress {
- private IHeadlessRunnableWithProgress headlessRunnable = null;
- private IWorkspaceRunnable workspaceRunnable = null;
- private ValidationOperation validationOperation = null;
-
- /**
- * @deprecated Will be removed in Milestone 3. Use
- * RunnableWithProgressWrapper(IWorkspaceRunnable)
- */
- public RunnableWithProgressWrapper(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
- setHeadlessRunnable(aHeadlessRunnableWithProgress);
- }
-
- public RunnableWithProgressWrapper(IWorkspaceRunnable aHeadlessRunnableWithProgress) {
- setWorkspaceRunnable(aHeadlessRunnableWithProgress);
- }
-
- public RunnableWithProgressWrapper(ValidationOperation op) {
- setValidationOperation(op);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use getWorkspaceRunnable()
- */
- protected IHeadlessRunnableWithProgress getHeadlessRunnable() {
- return headlessRunnable;
- }
-
- protected IWorkspaceRunnable getWorkspaceRunnable() {
- return workspaceRunnable;
- }
-
- /**
- * @see IRunnableWithProgress
- */
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- try {
- if (getHeadlessRunnable() != null) {
- getHeadlessRunnable().run(monitor);
- } else {
- IWorkspaceRunnable runnable = (getWorkspaceRunnable() == null) ? validationOperation : getWorkspaceRunnable();
- if (runnable == null) {
- return;
- }
- ResourcesPlugin.getWorkspace().run(runnable, monitor);
- }
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc);
- }
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use setWorkspaceRunnable(IWorkspaceRunnable)
- */
- protected void setHeadlessRunnable(IHeadlessRunnableWithProgress newHeadlessRunnable) {
- headlessRunnable = newHeadlessRunnable;
- }
-
- protected void setWorkspaceRunnable(IWorkspaceRunnable newWorkspaceRunnable) {
- workspaceRunnable = newWorkspaceRunnable;
- }
-
- protected void setValidationOperation(ValidationOperation op) {
- validationOperation = op;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java
deleted file mode 100644
index 3f0496b..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-import org.eclipse.wst.validation.internal.operations.ValidationOperation;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-
-
-public class ValidationUIPlugin extends WTPUIPlugin {
- private static ValidationUIPlugin _plugin = null;
-
- public final static String VALIDATION_PROP_FILE_NAME = "validate_ui"; //$NON-NLS-1$
- public static final String VALIDATION_PLUGIN_ID = "org.eclipse.wst.validation.ui"; //$NON-NLS-1$
- public static final String[] ICON_DIRS = new String[]{"icons"}; //$NON-NLS-1$
-
- public ValidationUIPlugin() {
- super();
- if (_plugin == null) {
- _plugin = this;
- }
- }
-
- public static String getBundleName() {
- return VALIDATION_PROP_FILE_NAME;
- }
-
- public static ValidationUIPlugin getPlugin() {
- return _plugin;
- }
-
- /**
- * Returns the translated String found with the given key.
- *
- * @param key
- * java.lang.String
- * @return java.lang.String
- */
- public static String getResourceString(String key) {
- try {
- return Platform.getResourceString(Platform.getBundle(VALIDATION_PLUGIN_ID), key);
- } catch (Exception e) {
- ValidationUIPlugin.getPlugin().handleException(e);
- return key;
- }
- }
-
- /**
- * This method should be called whenever you need to run one of our headless operations in the
- * UI.
- */
- public static IRunnableWithProgress getRunnableWithProgress(IWorkspaceRunnable aWorkspaceRunnable) {
- return new RunnableWithProgressWrapper(aWorkspaceRunnable);
- }
-
-// public static IRunnableWithProgress getRunnableWithProgress(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
-// return new RunnableWithProgressWrapper(aHeadlessRunnableWithProgress);
-// }
-
- // Need a third, ValidationOperation version of this method, because ValidationOperation
- // is both an IWorkspaceRunnable and an IHeadlessRunnableWithProgress. This method will
- // exist only while IHeadlessRunnableWithProgress exists.
- public static IRunnableWithProgress getRunnableWithProgress(ValidationOperation op) {
- return new RunnableWithProgressWrapper(op);
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- // org.eclipse.wst.validation.internal.operations.ValidatorManager.setResourceUtilClass(org.eclipse.wst.validation.internal.operations.ui.UIResourceUtil.class);
- }
-
- /**
- * Get a .gif from the image registry.
- */
- public Image getImage(String key) {
- ImageRegistry imageRegistry = getImageRegistry();
- Image image = imageRegistry.get(key);
- if (image == null || image.isDisposed()) {
- ImageDescriptor descriptor = getImageDescriptor(key);
- if (descriptor != null) {
- image = descriptor.createImage();
- imageRegistry.put(key, image);
- }
- }
- return image;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
- URL gifImageURL = getImageURL(key);
- if (gifImageURL != null)
- imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
- return imageDescriptor;
- }
-
- /**
- * @param key
- * @return
- */
- private URL getImageURL(String key) {
- return ValidationUIPlugin.getImageURL(key, getBundle());
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public static URL getImageURL(String key, Bundle bundle) {
- String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
- IPath path = null;
- for (int i = 0; i < ICON_DIRS.length; i++) {
- path = new Path(ICON_DIRS[i]).append(gif);
- if (Platform.find(bundle,path) == null)
- continue;
- try {
- return new URL( bundle.getEntry("/"), path.toString()); //$NON-NLS-1$
- } catch (MalformedURLException exception) {
- exception.printStackTrace();
- continue;
- }
- }
- return null;
- }
-
-
- public void handleException(Throwable e){
- Status status = new Status(IStatus.ERROR, PLUGIN_ID, e.getLocalizedMessage(), e);
- getLog().log(status);
- }
-
- /**
- * Write a message into the log.
- *
- * We are in the transition of moving to a new approach for localized messages. This is the new
- * approach for exceptions.
- *
- * @param severity message severity, see IStaus
- * @param message a localized message
- */
- public void logMessage(int severity, String message){
- Status status = new Status(severity, PLUGIN_ID, message);
- getLog().log(status);
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/AdapterFactory.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/AdapterFactory.java
deleted file mode 100644
index 4337534..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/AdapterFactory.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.model.FilterGroup;
-import org.eclipse.wst.validation.internal.model.FilterRule;
-
-public class AdapterFactory implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adapterType == IWorkbenchAdapter.class&& adaptableObject instanceof Validator.V2)return _valAdaptor;
- if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof FilterGroup)return _fgAdaptor;
- if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof FilterRule)return _ruleAdaptor;
-
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[] { IWorkbenchAdapter.class };
- }
-
- private IWorkbenchAdapter _valAdaptor = new IWorkbenchAdapter() {
-
- public Object[] getChildren(Object o) {
- return ((Validator.V2) o).getGroups();
- }
-
- public ImageDescriptor getImageDescriptor(Object o) {
- return null;
- }
-
- public String getLabel(Object o) {
- return ((Validator.V2) o).getName();
- }
-
- public Object getParent(Object o) {
- return null;
- }
-
- };
-
- private IWorkbenchAdapter _fgAdaptor = new IWorkbenchAdapter() {
-
- public Object[] getChildren(Object o) {
- return ((FilterGroup) o).getRules();
- }
-
- public ImageDescriptor getImageDescriptor(Object o) {
- return null;
- }
-
- public String getLabel(Object o) {
- FilterGroup fg = (FilterGroup) o;
- return fg.getDisplayableType();
- }
-
- public Object getParent(Object o) {
- return null;
- }
- };
-
- private IWorkbenchAdapter _ruleAdaptor = new IWorkbenchAdapter() {
-
- public Object[] getChildren(Object o) {
- return new Object[0];
- }
-
- public ImageDescriptor getImageDescriptor(Object o) {
- return null;
- }
-
- public String getLabel(Object o) {
- FilterRule rule = (FilterRule) o;
- return rule.getName();
- }
-
- public Object getParent(Object o) {
- return null;
- }
-
- };
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/HelpContextIds.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/HelpContextIds.java
deleted file mode 100644
index 1af7aeb..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/HelpContextIds.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.wst.validation.ui.internal;
-
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-public interface HelpContextIds {
- String PreferencePage = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0000"; //$NON-NLS-1$
-
- String FilterRule = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0100"; //$NON-NLS-1$
- String FRFileExt = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0101"; //$NON-NLS-1$
- String FRName = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0102"; //$NON-NLS-1$
- String FRProjectNature = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0103"; //$NON-NLS-1$
- String FRFacet = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0104"; //$NON-NLS-1$
- String FRContentType = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0105"; //$NON-NLS-1$
-
- String ProjectPage = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvpp0000"; //$NON-NLS-1$
- String ProjectFilterRule = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvpp0100"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ImageNames.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ImageNames.java
deleted file mode 100644
index 5873170..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ImageNames.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal;
-
-/**
- * Names of the images.
- * @author karasiuk
- *
- */
-public interface ImageNames {
-
- String okTable = "ok_tbl"; //$NON-NLS-1$
- String failTable = "fail_tbl"; //$NON-NLS-1$
- String settings = "settings"; //$NON-NLS-1$
- String disabled = "_disabled"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ManualValidationRunner.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ManualValidationRunner.java
deleted file mode 100644
index 52b47ea..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ManualValidationRunner.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.internal.ValOperation;
-import org.eclipse.wst.validation.internal.ValType;
-import org.eclipse.wst.validation.internal.ValidationRunner;
-import org.eclipse.wst.validation.ui.internal.dialog.ResultsDialog;
-
-/**
- * Run a manual validation.
- * @author karasiuk
- *
- */
-public class ManualValidationRunner extends WorkspaceJob {
-
- private Map<IProject, Set<IResource>> _projects;
- private ValType _valType;
- private boolean _showResults;
-
- /**
- * Validate the selected projects and/or resources.
- *
- * @param projects
- * The selected projects. The key is an IProject and the value is
- * the Set of IResources that were selected. Often this will be
- * every resource in the project.
- *
- * @param isManual
- * Is this a manual validation?
- *
- * @param isBuild
- * Is this a build based validation?
- *
- * @param showResults
- * When the validation is finished, show the results in a dialog box.
- */
- public static void validate(Map<IProject, Set<IResource>> projects, ValType valType, boolean showResults){
- ManualValidationRunner me = new ManualValidationRunner(projects, valType, showResults);
-
- //TODO optimize this, I don't like the idea of validators having to lock the entire project
- Set<IProject> keys = projects.keySet();
- IProject[] projectArray = new IProject[keys.size()];
- keys.toArray(projectArray);
- if (projectArray.length == 1)me.setRule(projectArray[0]);
- else {
- me.setRule(MultiRule.combine(projectArray));
- }
- me.schedule();
- }
-
- private ManualValidationRunner(Map<IProject, Set<IResource>> projects, ValType valType, boolean showResults){
- super(ValUIMessages.Validation);
- _projects = projects;
- _valType = valType;
- _showResults = showResults;
- }
-
- public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
-
- long start = System.currentTimeMillis();
- final ValOperation vo = ValidationRunner.validate(_projects, _valType, monitor, false);
- final long time = System.currentTimeMillis() - start;
- int resourceCount = 0;
- for (Set s : _projects.values())resourceCount += s.size();
- final int finalResourceCount = resourceCount;
- if (vo.getResult().isCanceled())return Status.CANCEL_STATUS;
-
- if (_showResults){
- Display display = Display.getDefault();
- Runnable run = new Runnable(){
-
- public void run() {
- ValidationResult vr = vo.getResult();
- ResultsDialog rd = new ResultsDialog(null, vr, time, finalResourceCount);
- rd.open();
- }
-
- };
- display.asyncExec(run);
- }
- return Status.OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java
deleted file mode 100644
index 99da9b9..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ValUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.wst.validation.ui.internal.messages"; //$NON-NLS-1$
-
- public static String ADD_VALIDATION_BUILDER;
-
- public static String PREF_BUTTON_OVERRIDE;
- public static String PREF_VALLIST_TITLE;
- public static String PREF_BUTTON_ENABLEALL;
- public static String PREF_BUTTON_DISABLEALL;
- public static String PREF_MNU_MANUAL;
- public static String PREF_MNU_BUILD;
- public static String PREF_MNU_SETTINGS;
-
- public static String ConfigWsSettings;
- public static String DoNotShowResults;
- public static String DelegatesDialogTitle;
- public static String DelegatesComboLabel;
-
- public static String ErrorsWarnings;
-
- public static String VBF_EXC_INTERNAL_TITLE;
- public static String VBF_EXC_INTERNAL_PAGE;
- public static String VBF_EXC_INVALID_REGISTER;
- public static String DISABLE_VALIDATION;
-
- public static String MANUAL;
- public static String BUILD;
- public static String SETTINGS;
- public static String VALIDATOR;
- public static String VBF_UI_NO_VALIDATORS_INSTALLED;
-
- public static String SaveFilesDialog_saving;
- public static String SaveFilesDialog_always_save;
- public static String SaveFilesDialog_save_all_resources;
- public static String SaveFilesDialog_must_save;
- public static String PrefPage_always_save;
- public static String PrefPageConfirmDialog;
- public static String ProjectOverridesNotAllowed;
- public static String RunValidationDialogTitle;
-
- /* Validator Filters */
- public static String fdTitle;
- public static String fdNoFilters;
-
- public static String ErrConfig;
-
- public static String FilterHelp;
-
- public static String ButtonAddGroupInclude;
- public static String ButtonAddGroupExclude;
- public static String ButtonAddRule;
- public static String ButtonRemove;
-
- public static String LabelExtension;
- public static String LabelFile;
- public static String LabelProjects;
- public static String LabelFacets;
- public static String LabelContentType;
- public static String LabelEnableProjectSpecific;
-
- public static String DescExtension;
- public static String DescFile;
- public static String DescProjects;
- public static String DescFacets;
- public static String DescContentType;
-
- public static String Validation;
- public static String ValidationStatus;
-
- public static String ErrSummary;
- public static String ValidationSuccessful;
-
- public static String FrWizard;
- public static String FrSelectFilterType;
- public static String FrFileExtension;
- public static String FrFileExtensionLabel;
- public static String FrCaseSensitive;
- public static String FrExactMatch;
- public static String FrFolderOrFile;
- public static String FrFolderOrFileLabel;
- public static String FrBrowseFile;
- public static String FrFileFilter;
- public static String FrBrowseFolder;
- public static String FrFolderFilter;
- public static String FrProjectNature;
- public static String FrProjectNatureLabel;
- public static String FrSimpleFileName;
- public static String FrFacit;
- public static String FrFacitLabel;
- public static String FrContentType;
- public static String FrContentTypeLabel;
- public static String FrMsgSev;
-
- public static String RebuildTitle;
- public static String RebuildMsg;
-
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ValUIMessages.class);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/FilterDialog.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/FilterDialog.java
deleted file mode 100644
index 672b2d0..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/FilterDialog.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal.dialog;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.model.BaseWorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.wst.validation.MessageSeveritySetting;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValMessages;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.internal.model.FilterGroup;
-import org.eclipse.wst.validation.internal.model.FilterRule;
-import org.eclipse.wst.validation.internal.model.ValidatorHelper;
-import org.eclipse.wst.validation.ui.internal.AdapterFactory;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-
-/**
- * Display a filter dialog for a particular Validator, that is a list of all the filters that are active for
- * the validator.
- *
- * @author karasiuk
- *
- */
-public class FilterDialog extends Dialog {
-
- /**
- * If we are doing project level filters this will point to the project. This is null if we are doing
- * workspace level filters.
- */
- private IProject _project;
-
- /**
- * A deep copy of the validator, so that we can use it as a model object, and not worry about the
- * user not saving their changes.
- */
- private Validator _validator;
-
- // The V2 version of _validator.
- private Validator.V2 _v2;
- private TreeViewer _tree;
- private Combo _delegating;
- private IAdapterFactory _adaptorFactory = new AdapterFactory();
-
- private Button _addGroupInclude;
- private Button _addGroupExclude;
- private Button _addRule;
- private Button _remove;
- private ISelectionChangedListener _nodeChangedListener;
-
- private FilterGroup _selectedGroup;
- private FilterRule _selectedRule;
-
- private Combo[] _messageSev;
-
- private static String[] _messages = new String[]{
- ValMessages.SevError, ValMessages.SevWarning, ValMessages.SevIgnore};
-
- private Shell _shell;
-
- /**
- * Create a dialog that knows how to change a validator's filters.
- *
- * @param shell
- *
- * @param validator the validator that is being updated.
- *
- * @param project the project that the filters are being added to. If these are workspace
- * level filters, then this must be null.
- */
- public FilterDialog(Shell shell, Validator validator, IProject project){
- super(shell);
- _shell = shell;
- setShellStyle(getShellStyle() | SWT.CLOSE|SWT.MIN|SWT.MAX|SWT.RESIZE);
- _validator = validator.copy(true);
- _v2 = _validator.asV2Validator();
- _project = project;
- }
-
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(NLS.bind(ValUIMessages.fdTitle, _validator.getName()));
- }
-
- protected Control createDialogArea(Composite parent) {
- Composite c = (Composite)super.createDialogArea(parent);
- c.setLayout(new GridLayout(2, false));
- if (_v2 == null){
- new Label(c, SWT.NONE).setText(ValUIMessages.fdNoFilters);
- }
- else {
- Label blurb = new Label(c, SWT.LEFT | SWT.WRAP);
- blurb.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
- blurb.setText(ValUIMessages.FilterHelp);
-
- _tree = new TreeViewer(c, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- _tree.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- Platform.getAdapterManager().registerAdapters(_adaptorFactory, Validator.V2.class);
- Platform.getAdapterManager().registerAdapters(_adaptorFactory, FilterGroup.class);
- Platform.getAdapterManager().registerAdapters(_adaptorFactory, FilterRule.class);
- _tree.setContentProvider(new BaseWorkbenchContentProvider());
- _tree.setLabelProvider(new WorkbenchLabelProvider());
- _tree.setInput(_v2);
- _tree.expandAll();
-
- addButtons(c);
-
- String delegatingId = _v2.getDelegatingId();
- if (delegatingId != null){
- addDelegatorSelection(c);
- }
-
- _nodeChangedListener = new ISelectionChangedListener(){
-
- public void selectionChanged(SelectionChangedEvent event) {
- _selectedGroup = null;
- _selectedRule = null;
- if (event.getSelection() instanceof IStructuredSelection){
- IStructuredSelection sel = (IStructuredSelection)event.getSelection();
- if (sel.getFirstElement() instanceof FilterGroup){
- _selectedGroup = (FilterGroup)sel.getFirstElement();
- }
- else if (sel.getFirstElement() instanceof FilterRule){
- _selectedRule = (FilterRule)sel.getFirstElement();
- }
- }
- updateButtons();
- }
-
- };
-
- _tree.addSelectionChangedListener(_nodeChangedListener);
-
- addMessageMappings(c);
- }
- return c;
- }
-
- private void addButtons(Composite c) {
- Composite buttons = new Composite(c, SWT.TOP);
- GridData gd = new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1);
- buttons.setLayoutData(gd);
- buttons.setLayout(new GridLayout(1, true));
- _addGroupInclude = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
- _addGroupInclude.setText(ValUIMessages.ButtonAddGroupInclude);
- _addGroupInclude.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
-
- _addGroupInclude.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- addGroup(false);
- }
-
- public void widgetSelected(SelectionEvent e) {
- addGroup(false);
- }
-
- });
-
- _addGroupExclude = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
- _addGroupExclude.setText(ValUIMessages.ButtonAddGroupExclude);
- _addGroupExclude.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
-
- _addGroupExclude.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- addGroup(true);
- }
-
- public void widgetSelected(SelectionEvent e) {
- addGroup(true);
- }
-
- });
-
- _addRule = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
- _addRule.setText(ValUIMessages.ButtonAddRule);
- _addRule.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
- _addRule.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- doIt();
- }
-
- public void widgetSelected(SelectionEvent e) {
- doIt();
- }
-
- private void doIt(){
- NewFilterRule nfr = new NewFilterRule(_project);
- WizardDialog wd = new WizardDialog(_shell, nfr);
- wd.setBlockOnOpen(true);
- int rc = wd.open();
- if (rc == WizardDialog.CANCEL)return;
-
- FilterRule rule = nfr.getRule();
- if (rule != null){
- _selectedGroup.add(rule);
- _v2.bumpChangeCountGroups();
- refresh();
- }
- }
-
- });
-
- _remove = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
- _remove.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
- _remove.setText(ValUIMessages.ButtonRemove);
- _remove.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- remove();
- }
-
- public void widgetSelected(SelectionEvent e) {
- remove();
- }
- });
-
- Button restore = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
- restore.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
- String defaults = JFaceResources.getString("defaults"); //$NON-NLS-1$
- restore.setText(defaults);
- restore.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- restoreDefaults();
- }
-
- public void widgetSelected(SelectionEvent e) {
- restoreDefaults();
- }
- });
- }
-
- private void restoreDefaults() {
- if (_v2 != null){
- try {
- String id = _v2.getId();
- Validator[] vals = ValManager.getDefaultValidators();
- for (Validator v : vals){
- if (v.getId().equals(id)){
- _validator = v;
- _v2 = v.asV2Validator();
- _tree.setInput(_v2);
- _tree.expandAll();
- refresh();
- return;
- }
- }
- }
- catch (InvocationTargetException e){
-
- }
- }
-
- }
-
-
- private void addMessageMappings(Composite c) {
- if (_v2 == null)return;
- Map<String,MessageSeveritySetting> mappings = _validator.getMessageSettings();
- if (mappings == null || mappings.size() == 0)return;
-
- Group group = new Group(c, SWT.NONE);
- group.setText(ValUIMessages.FrMsgSev);
- group.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
- group.setLayout(new GridLayout(2, false));
-
-// Label heading = new Label(c, SWT.LEFT);
-// heading.setText(ValUIMessages.ErrorsWarnings);
-// heading.setFont(JFaceResources.getHeaderFont());
-// heading.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
-
- _messageSev = new Combo[mappings.size()];
- int i= 0;
- for (MessageSeveritySetting ms : mappings.values()){
- Label label = new Label(group, SWT.LEFT);
- label.setText(" " + ms.getLabel() + ":"); //$NON-NLS-1$ //$NON-NLS-2$
-
- Combo sev = new Combo(group, SWT.RIGHT);
- _messageSev[i++] = sev;
- sev.setItems(_messages);
- sev.select(ms.getCurrent().ordinal());
- sev.setData(ms);
- sev.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- select(e);
- }
-
- public void widgetSelected(SelectionEvent e) {
- select(e);
- }
-
- private void select(SelectionEvent e){
- Combo w = (Combo)e.widget;
- MessageSeveritySetting ms = (MessageSeveritySetting)w.getData();
- int i = w.getSelectionIndex();
- if (ms.setCurrent(MessageSeveritySetting.Severity.values()[i]))
- _validator.bumpChangeCountMessages();
- }
-
- });
- }
- }
-
- /**
- * Add a combo box so that the user can change which delegating validator to call.
- */
- private void addDelegatorSelection(Composite c) {
- Map map = ValidatorDelegatesRegistry.getInstance().getDelegateDescriptors(_v2.getValidatorClassname());
- if (map == null)return;
-
- Composite line = new Composite(c, SWT.NONE);
- line.setLayout(new RowLayout(SWT.HORIZONTAL));
- line.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
-
- Label label = new Label(line, SWT.CENTER);
- label.setText(ValUIMessages.DelegatesComboLabel);
-
-
- _delegating = new Combo(line, SWT.READ_ONLY);
- String[] items = new String[map.size()];
- final String ids[] = new String[map.size()];
- String selected = null;
- Iterator it = map.values().iterator();
- for (int i=0; i<items.length;i++){
- ValidatorDelegateDescriptor vd = (ValidatorDelegateDescriptor)it.next();
- items[i] = vd.getName();
- ids[i] = vd.getId();
- if (vd.getId().equals(_v2.getDelegatingId())){
- selected = vd.getName();
- }
- }
- _delegating.setItems(items);
- _delegating.setText(selected);
- _delegating.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- int sel = _delegating.getSelectionIndex();
- _v2.setDelegatingId(ids[sel]);
- }
-
- });
- }
-
- /**
- * Add a new filter group to the validator.
- * @param exclude
- */
- private void addGroup(boolean exclude){
- if (_v2 == null)return;
- _v2.add(FilterGroup.create(exclude));
- refresh();
-
- }
-
- private void refresh(){
- _tree.refresh();
- updateButtons();
- }
-
- /**
- * Remove the current selection from the validator.
- */
- private void remove(){
- if (_selectedRule != null){
- FilterGroup[] groups = _v2.getGroups();
- for (int i=0; i<groups.length; i++){
- if (groups[i].remove(_selectedRule)){
- _v2.bumpChangeCountGroups();
- refresh();
- return;
- }
- }
- }
-
- if (_selectedGroup != null){
- _v2.remove(_selectedGroup);
- refresh();
- return;
- }
- }
-
- private void updateButtons() {
- if (_v2 != null){
- _addGroupExclude.setEnabled(!ValidatorHelper.hasExcludeGroup(_v2));
- }
- _addRule.setEnabled(_selectedGroup != null);
- _remove.setEnabled(_selectedGroup != null || _selectedRule != null);
- if (_messageSev != null){
- Map<String,MessageSeveritySetting> msgs = _validator.getMessageSettings();
- if (msgs != null && _messageSev.length == msgs.size()){
- int i = 0;
- for (MessageSeveritySetting ms : msgs.values()){
- _messageSev[i++].select(ms.getCurrent().ordinal());
- }
- }
- }
- }
-
-
- public boolean close() {
- Platform.getAdapterManager().unregisterAdapters(_adaptorFactory);
- if (_tree != null)_tree.removeSelectionChangedListener(_nodeChangedListener);
- return super.close();
- }
-
- protected Point getInitialSize() {
- return new Point(600, 475);
- }
-
- public Validator getValidator() {
- return _validator;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/NewFilterRule.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/NewFilterRule.java
deleted file mode 100644
index fad49d7..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/NewFilterRule.java
+++ /dev/null
@@ -1,568 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal.dialog;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNatureDescriptor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.validation.internal.model.FilterRule;
-import org.eclipse.wst.validation.ui.internal.HelpContextIds;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-
-/**
- * A wizard that adds new rules to validators.
- * @author karasiuk
- *
- */
-public class NewFilterRule extends Wizard {
-
- private Page1 _page1;
- private IWizardPage _page2;
-
- private IProject _project;
-
- private FilterRule _rule;
-
- public NewFilterRule(IProject project){
- _project = project;
- setWindowTitle(ValUIMessages.FrWizard);
- _page1 = new Page1(project);
- addPage(_page1);
- setForcePreviousAndNextButtons(true);
- }
-
- public boolean canFinish() {
- if (_page2 != null)return _page2.isPageComplete();
- return false;
- }
-
- public FilterRule getRule(){
- return _rule;
- }
-
- public boolean performFinish() {
- if (_page2 == null)return false;
- FilterWizardPage page = (FilterWizardPage)_page2;
- _rule = page.getFilterRule();
- return _rule != null;
- }
-
- public IWizardPage getNextPage(IWizardPage page) {
- if (page == _page1){
- setForcePreviousAndNextButtons(false);
- _page2 = returnOrBuildPage(_page1.getSelectedFilter());
- return _page2;
- }
- return null;
- }
-
- private IWizardPage returnOrBuildPage(int selectedFilter) {
- IWizardPage page = null;
- if (_project != null && selectedFilter == 2)selectedFilter = 4;
- switch (selectedFilter){
- case 0:
- page = new FileExtPage();
- break;
- case 1:
- page = new FilePage(_project);
- break;
- case 2:
- page = new ProjectPage();
- break;
- case 3:
- page = new FacetPage();
- break;
- case 4:
- page = new ContentTypePage();
- break;
- }
- addPage(page);
- return page;
- }
-
- public static class Page1 extends WizardPage {
-
- private int _selectedFilter;
- private IProject _project;
-
-
- public Page1(IProject project){
- super("page1", ValUIMessages.FrSelectFilterType, null); //$NON-NLS-1$
- setPageComplete(true);
- _project = project;
- }
-
- public void createControl(Composite parent) {
- String helpId = _project == null ? HelpContextIds.FilterRule : HelpContextIds.ProjectFilterRule;
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, helpId);
- String[] labels = null;
- String[] desc = null;
- if (_project != null){
- labels = new String[]{ValUIMessages.LabelExtension, ValUIMessages.LabelFile,
- ValUIMessages.LabelContentType};
-
- desc = new String[]{ValUIMessages.DescExtension, ValUIMessages.DescFile,
- ValUIMessages.DescContentType};
- }
- else {
- labels = new String[]{ValUIMessages.LabelExtension, ValUIMessages.LabelFile,
- ValUIMessages.LabelProjects, ValUIMessages.LabelFacets,
- ValUIMessages.LabelContentType};
-
- desc = new String[]{ValUIMessages.DescExtension, ValUIMessages.DescFile,
- ValUIMessages.DescProjects, ValUIMessages.DescFacets,
- ValUIMessages.DescContentType};
- }
-
- Composite control = new Composite(parent, SWT.NONE);
- control.setLayout(new GridLayout(2, false));
-
- SelectionListener listener = new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- doIt(e);
- }
-
- public void widgetSelected(SelectionEvent e) {
- doIt(e);
- }
-
- private void doIt(SelectionEvent e){
- if (e.getSource() instanceof Button){
- Button b = (Button)e.getSource();
- if (b.getData() instanceof Integer) {
- Integer index = (Integer) b.getData();
- setSelectedFilter(index.intValue());
- }
- }
- }
-
- };
- for (int i=0; i<labels.length; i++){
- Button button = new Button(control, SWT.RADIO);
- button.setText(labels[i]);
- button.setData(new Integer(i));
- button.addSelectionListener(listener);
- (new Label(control, SWT.WRAP)).setText(desc[i]);
- if (i == 0)button.setSelection(true);
- }
- setControl(control);
- }
-
- public int getSelectedFilter() {
- return _selectedFilter;
- }
-
- public void setSelectedFilter(int selectedFilter) {
- _selectedFilter = selectedFilter;
- getContainer().updateButtons();
- }
-
- }
-
- public static class FileExtPage extends WizardPage implements FilterWizardPage {
-
- private Text _pattern;
- private Button _case;
-
- public FileExtPage(){
- super("fileext", ValUIMessages.FrFileExtension, null); //$NON-NLS-1$
- }
-
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRFileExt);
- Composite control = new Composite(parent, SWT.NONE);
- setControl(control);
- control.setLayout(new GridLayout(2, false));
- (new Label(control, SWT.NONE)).setText(ValUIMessages.FrFileExtensionLabel);
- _pattern = new Text(control, SWT.NONE);
- _pattern.setFocus();
- _pattern.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
-
- _case = new Button(control, SWT.CHECK);
- _case.setText(ValUIMessages.FrCaseSensitive);
- _case.setSelection(false);
- _case.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 2, 1));
-
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
- return FilterRule.FileExt.createFileExt(_pattern.getText(), _case.getSelection());
- }
-
- public boolean isPageComplete() {
- return _pattern != null && _pattern.getText().trim().length() > 0;
- }
-
-
- }
-
- public static class FilePage extends WizardPage implements FilterWizardPage {
-
- private Text _pattern;
- private Button _browseFile;
- private Button _browseFolder;
- private Button _case;
- private Button _simpleFileName;
-
- private IProject _project;
- private int _type = FilterRule.File.FileTypeFile;
- private IPath _fullFileName;
- private String _root;
-
- public FilePage(IProject project){
- super("file", ValUIMessages.FrFolderOrFile, null); //$NON-NLS-1$
- _project = project;
- }
-
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRName);
- final Composite control = new Composite(parent, SWT.NONE);
- setControl(control);
- control.setLayout(new GridLayout(4, false));
- (new Label(control, SWT.NONE)).setText(ValUIMessages.FrFolderOrFileLabel);
- _pattern = new Text(control, SWT.NONE);
- _pattern.setFocus();
- _pattern.setLayoutData(new GridData(300, SWT.DEFAULT));
- _pattern.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
-
- _root = null;
- IPath base = _project == null ? ResourcesPlugin.getWorkspace().getRoot().getLocation() :
- _project.getLocation();
- if (base != null)_root = base.toOSString();
-
- _browseFile = new Button(control, SWT.PUSH);
- _browseFile.setText(ValUIMessages.FrBrowseFile);
- _browseFile.setEnabled(_root != null);
- _browseFile.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- browse();
- }
-
- public void widgetSelected(SelectionEvent e) {
- browse();
- }
-
- private void browse(){
- FileDialog fd = new FileDialog(control.getShell(), SWT.OPEN);
- fd.setText(ValUIMessages.FrFileFilter);
- fd.setFilterPath(_root);
-
- String file = fd.open();
- if (file != null){
- if (file.startsWith(_root))file = file.substring(_root.length()+1);
- else file = null;
- }
- if (file != null){
- _fullFileName = new Path(file);
- if (_project == null)_fullFileName = _fullFileName.removeFirstSegments(1);
-
- if (_simpleFileName.getSelection()){
- _type = FilterRule.File.FileTypeFile;
- _pattern.setText(_fullFileName.lastSegment());
- }
- else {
- _type = FilterRule.File.FileTypeFull;
- _pattern.setText(_fullFileName.toPortableString());
- }
- }
- else {
- _fullFileName = null;
- _pattern.setText(""); //$NON-NLS-1$
- }
- }
- });
-
- _browseFolder = new Button(control, SWT.PUSH);
- _browseFolder.setText(ValUIMessages.FrBrowseFolder);
- _browseFolder.setEnabled(_root != null);
- _browseFolder.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- browse();
- }
-
- public void widgetSelected(SelectionEvent e) {
- browse();
- }
-
- private void browse(){
- DirectoryDialog fd = new DirectoryDialog(control.getShell());
- fd.setMessage(ValUIMessages.FrFolderFilter);
- fd.setFilterPath(_root);
- String dir = fd.open();
- if (dir != null){
- _fullFileName = null;
- _type = FilterRule.File.FileTypeFolder;
- if (dir.startsWith(_root) && dir.length() > _root.length()){
- dir = dir.substring(_root.length()+1);
- IPath path = new Path(dir);
- if (_project == null)path = path.removeFirstSegments(1);
- _pattern.setText(path.toPortableString());
- }
- else {
- _pattern.setText(""); //$NON-NLS-1$
- }
- }
- }
-
- });
-
- _case = new Button(control, SWT.CHECK);
- _case.setText(ValUIMessages.FrCaseSensitive);
- _case.setSelection(false);
- _case.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 4, 1));
-
- addSimpleFileNameButton(control);
- }
-
- private void addSimpleFileNameButton(final Composite control) {
- _simpleFileName = new Button(control, SWT.CHECK);
- _simpleFileName.setText(ValUIMessages.FrSimpleFileName);
- _simpleFileName.setSelection(_type == FilterRule.File.FileTypeFile);
- _simpleFileName.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 4, 1));
-
- _simpleFileName.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- if (_type == FilterRule.File.FileTypeFolder)return;
- if (_simpleFileName.getSelection()){
- if (_fullFileName != null)_pattern.setText(_fullFileName.lastSegment());
- _type = FilterRule.File.FileTypeFile;
- }
- else {
- if (_fullFileName != null)_pattern.setText(_fullFileName.toPortableString());
- _type = FilterRule.File.FileTypeFull; }
- }
- });
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
- return FilterRule.createFile(_pattern.getText(), _case.getSelection(), _type);
- }
-
- public boolean isPageComplete() {
- if (_pattern == null)return false;
- if (_pattern.getText() == null)return false;
- return _pattern.getText().trim().length() > 0;
- }
-
- }
-
- public static class ProjectPage extends WizardPage implements FilterWizardPage{
-
- private Combo _natures;
- private String[] _ids;
-
- public ProjectPage(){
- super("project", ValUIMessages.FrProjectNature, null); //$NON-NLS-1$
- }
-
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRProjectNature);
- Composite control = new Composite(parent, SWT.NONE);
- setControl(control);
- control.setLayout(new GridLayout(2, false));
- (new Label(control, SWT.NONE)).setText(ValUIMessages.FrProjectNatureLabel);
-
- IProjectNatureDescriptor[] pn = ResourcesPlugin.getWorkspace().getNatureDescriptors();
- String items[] = new String[pn.length];
- _ids = new String[pn.length];
- for (int i=0; i<pn.length; i++){
- _ids[i] = pn[i].getNatureId();
- items[i] = pn[i].getLabel() + " - " + _ids[i]; //$NON-NLS-1$
- }
- _natures = new Combo(control, SWT.DROP_DOWN);
- _natures.setItems(items);
- _natures.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
-
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
- int i = _natures.getSelectionIndex();
- if (i == -1)return null;
-
- return FilterRule.createProject(_ids[i]);
- }
-
- public boolean isPageComplete() {
- if (_natures == null)return false;
- if (_natures.getText() == null)return false;
- return _natures.getText().trim().length() > 0;
- }
-
- }
-
- public static class FacetPage extends WizardPage implements FilterWizardPage {
-
- private Text _pattern;
-
- public FacetPage(){
- super("facet", ValUIMessages.FrFacit, null); //$NON-NLS-1$
- }
-
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRFacet);
- Composite control = new Composite(parent, SWT.NONE);
- setControl(control);
- control.setLayout(new GridLayout(2, false));
- (new Label(control, SWT.NONE)).setText(ValUIMessages.FrFacitLabel);
- _pattern = new Text(control, SWT.NONE);
- _pattern.setFocus();
- _pattern.setLayoutData(new GridData(300, SWT.DEFAULT));
- _pattern.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
- FilterRule rule = FilterRule.createFacet(_pattern.getText());
- return rule;
- }
-
- public boolean isPageComplete() {
- if (_pattern == null)return false;
- if (_pattern.getText() == null)return false;
- return _pattern.getText().trim().length() > 0;
- }
-
- }
-
- public static class ContentTypePage extends WizardPage implements FilterWizardPage {
- private Combo _pattern;
- private Button _exactMatch;
- private Map<String, IContentType> _map;
-
- public ContentTypePage(){
- super("contentType", ValUIMessages.FrContentType, null); //$NON-NLS-1$
- }
-
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRContentType);
- Composite control = new Composite(parent, SWT.NONE);
- setControl(control);
- control.setLayout(new GridLayout(2, false));
- (new Label(control, SWT.NONE)).setText(ValUIMessages.FrContentTypeLabel);
-
- IContentType[] types = Platform.getContentTypeManager().getAllContentTypes();
- _map = new TreeMap<String, IContentType>();
- for (IContentType type : types){
- String name = type.getName();
- if (name == null)name = type.getId();
- _map.put(name, type);
- }
- String items[] = new String[_map.size()];
- int i = 0;
- for (String label : _map.keySet()){
- items[i++] = label;
- }
- _pattern = new Combo(control, SWT.DROP_DOWN | SWT.READ_ONLY);
- _pattern.setFocus();
- _pattern.setLayoutData(new GridData(300, SWT.DEFAULT));
- _pattern.setVisibleItemCount(20);
- _pattern.setItems(items);
- _pattern.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
-
- _exactMatch = new Button(control, SWT.CHECK);
- _exactMatch.setText(ValUIMessages.FrExactMatch);
- _exactMatch.setSelection(false);
- _exactMatch.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 2, 1));
-
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
- IContentType type = _map.get(_pattern.getText());
- if (type == null)return null;
- FilterRule rule = FilterRule.createContentType(type.getId(), _exactMatch.getSelection());
- return rule;
- }
-
- public boolean isPageComplete() {
- if (_pattern == null)return false;
- if (_pattern.getText() == null)return false;
- return _pattern.getText().trim().length() > 0;
- }
-
- }
-
- interface FilterWizardPage {
- /**
- * Answer the rule that was created.
- *
- * @return null if the user didn't create a new rule.
- */
- FilterRule getFilterRule();
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/ResultsDialog.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/ResultsDialog.java
deleted file mode 100644
index 4522eea..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/ResultsDialog.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.ui.internal.dialog;
-
-
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IconAndMessageDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.internal.Misc;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValPrefManagerGlobal;
-import org.eclipse.wst.validation.internal.model.GlobalPreferences;
-import org.eclipse.wst.validation.internal.ui.ValidationUIMessages;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-
-/**
- * A dialog for displaying the results of a manual validation.
- * @author karasiuk
- *
- */
-public class ResultsDialog extends IconAndMessageDialog {
-
- private ValidationResult _result;
- private long _time;
- private int _resourceCount;
- private Button _hideButton;
-
- /**
- * Create a dialog for displaying validation results.
- *
- * @param parentShell this can be null
- * @param results the results of the validation
- * @param time the time that the validation took in milliseconds
- * @param resourceCount the number of resources that were validated
- */
- public ResultsDialog(Shell parentShell, ValidationResult results, long time, int resourceCount) {
- super(parentShell);
- _result = results;
- _time = time;
- _resourceCount = resourceCount;
- }
-
- @Override
- protected void okPressed() {
- if(_hideButton!=null) {
- GlobalPreferences gp = ValManager.getDefault().getGlobalPreferences();
- gp.setConfirmDialog(!_hideButton.getSelection());
- ValPrefManagerGlobal.getDefault().savePreferences(gp);
- }
- super.okPressed();
- }
-
- @Override
- public int open() {
- if (!ErrorDialog.AUTOMATED_MODE) {
- return super.open();
- }
- setReturnCode(OK);
- return OK;
- }
-
- @Override
- protected Image getImage() {
- if (_result.getSeverityError() > 0)return getErrorImage();
- if (_result.getSeverityWarning() > 0)return getWarningImage();
- return getInfoImage();
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- message = getMessage();
- createMessageArea(parent);
-
- new Label(parent, SWT.NONE).setLayoutData(GridDataFactory.swtDefaults().span(2, 1).create());
- addHideCheckbox(parent);
-
- Control c = super.createDialogArea(parent);
- return c;
- }
-
- private void addHideCheckbox(Composite parent) {
- _hideButton = new Button(parent, SWT.CHECK);
- GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.BEGINNING).span(2, 1).applyTo(_hideButton);
- _hideButton.setText(ValUIMessages.DoNotShowResults);
- if (ValManager.getDefault().getGlobalPreferences().getConfirmDialog() && _hideButton.getSelection()) {
- // tell the user where to re-enable it?
- }
- _hideButton.setSelection(!ValManager.getDefault().getGlobalPreferences().getConfirmDialog());
- }
-
-
- @Override
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(ValidationUIMessages.ValResults);
- }
-
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- Button ok = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, false);
- ok.setFocus();
- }
-
- private String getMessage(){
- if (_resourceCount > 1) {
- if (_result.getSeverityError() > 1)
- return NLS.bind(ValidationUIMessages.ValErrorsResources, new Object[]{_result.getSeverityError(), _resourceCount, Misc.getTimeMS(_time)});
- if (_result.getSeverityError() == 1)
- return NLS.bind(ValidationUIMessages.ValError1Resources, _resourceCount, Misc.getTimeMS(_time));
-
- if (_result.getSeverityWarning() > 1)
- return NLS.bind(ValidationUIMessages.ValWarnResources, new Object[]{_result.getSeverityWarning(), _resourceCount, Misc.getTimeMS(_time)});
- if (_result.getSeverityWarning() == 1)
- return NLS.bind(ValidationUIMessages.ValWarn1Resources, _resourceCount, Misc.getTimeMS(_time));
-
- if (_result.getSeverityInfo() > 1)
- return NLS.bind(ValidationUIMessages.ValInfoResources, new Object[]{_result.getSeverityInfo(), _resourceCount, Misc.getTimeMS(_time)});
- if (_result.getSeverityInfo() == 1)
- return NLS.bind(ValidationUIMessages.ValInfo1Resources, _resourceCount, Misc.getTimeMS(_time));
- }
- else if (_resourceCount == 1) {
- if (_result.getSeverityError() > 1)
- return NLS.bind(ValidationUIMessages.ValErrorsResource1, _result.getSeverityError(), Misc.getTimeMS(_time));
- if (_result.getSeverityError() == 1)
- return NLS.bind(ValidationUIMessages.ValError1Resource1, Misc.getTimeMS(_time));
-
- if (_result.getSeverityWarning() > 1)
- return NLS.bind(ValidationUIMessages.ValWarnResource1, _result.getSeverityWarning(), Misc.getTimeMS(_time));
- if (_result.getSeverityWarning() == 1)
- return NLS.bind(ValidationUIMessages.ValWarn1Resource1, Misc.getTimeMS(_time));
-
- if (_result.getSeverityInfo() > 1)
- return NLS.bind(ValidationUIMessages.ValInfoResource1, _result.getSeverityInfo(), Misc.getTimeMS(_time));
- if (_result.getSeverityInfo() == 1)
- return NLS.bind(ValidationUIMessages.ValInfo1Resource1, Misc.getTimeMS(_time));
- }
- return ValidationUIMessages.ValSuccess;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java
deleted file mode 100644
index 0068b47..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java
+++ /dev/null
@@ -1,861 +0,0 @@
-package org.eclipse.wst.validation.ui.internal.preferences;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.FullBuildJob;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValPrefManagerGlobal;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.model.GlobalPreferences;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.ui.DelegatingValidatorPreferencesDialog;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-import org.eclipse.wst.validation.ui.internal.HelpContextIds;
-import org.eclipse.wst.validation.ui.internal.ImageNames;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-import org.eclipse.wst.validation.ui.internal.dialog.FilterDialog;
-
-/**
- * From this page the user can configure individual validators.
- * <p>
- * This class and its inner classes are not intended to be subclassed outside of
- * the validation framework.
- * </p>
- */
-public class ValidationPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
- private IValidationPage _pageImpl = null;
- private Shell _shell;
-
- public interface IValidationPage {
- Composite createPage(Composite parent) throws InvocationTargetException;
-
- boolean performOk() throws InvocationTargetException;
-
- boolean performDefaults() throws InvocationTargetException;
-
- Composite getControl();
-
- void dispose();
-
- void loseFocus();
-
- void gainFocus();
- }
-
- public class InvalidPage implements IValidationPage {
- private Composite page = null;
-
- private Composite composite = null;
- private GridLayout layout = null;
- private Label messageLabel = null;
-
- public InvalidPage(Composite parent) {
- page = createPage(parent);
- }
-
- /**
- * This page is added to the Properties guide if some internal problem
- * occurred; for example, the highlighted item in the workbench is not
- * an IProject (according to this page's plugin.xml, this page is only
- * valid when an IProject is selected).
- */
- public Composite createPage(Composite parent) {
- // Don't create the default and apply buttons.
- noDefaultAndApplyButton();
-
- final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite = new Composite(sc1, SWT.NONE);
- sc1.setContent(composite);
- layout = new GridLayout();
- composite.setLayout(layout);
-
- messageLabel = new Label(composite, SWT.NONE);
- messageLabel.setText(ValUIMessages.VBF_EXC_INVALID_REGISTER);
-
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return composite;
- }
-
- public boolean performDefaults() {
- return true;
- }
-
- /**
- * Since this page occurs under invalid circumstances, there is nothing
- * to save.
- */
- public boolean performOk() {
- return true;
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- messageLabel.dispose();
- // layout.dispose();
- composite.dispose();
- }
-
- public void loseFocus() {
- // This page does not depend on the contents of any other page in
- // the wizard, so do nothing.
- }
-
- public void gainFocus() {
- // This page does not depend on the contents of any other page in
- // the wizard, so do nothing.
- }
- }
-
- private class ValidatorListPage implements IValidationPage {
- private Composite _page;
- private TableViewer _validatorList;
- private Button _enableAllButton;
- private Button _disableAllButton;
- private Button _override;
- private Button _suspend;
- private Button _autoSave;
- private Button _confirmButton;
- private Label _listLabel;
- private Table _validatorsTable;
- private GlobalPreferences _globalPreferences = ValManager.getDefault().getGlobalPreferences();
- private GlobalConfiguration _globalConfig;
- private Validator[] _validators;
-
- private int _changeCount;
-
- /**
- * This class is provided for the CheckboxTableViewer in the
- * ValidationPropertiesPage$ValidatorListPage class.
- */
- public class ValidationContentProvider implements IStructuredContentProvider {
- public void dispose() {
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof Validator[]) {
- return (Validator[]) inputElement;
- }
- return new Object[0];
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }
-
- /**
- * This class is provided for
- * ValidationPropertiesPage$ValidatorListPage's checkboxTableViewer element.
- */
- public class ValidationLabelProvider extends LabelProvider implements ITableLabelProvider {
- public String getText(Object element) {
- if (element == null)return ""; //$NON-NLS-1$
- else if (element instanceof Validator)
- return ((Validator) element).getName();
- else
- return super.getText(element);
- }
-
- private Image getImage(String imageName) {
- boolean isDisabled = !_validatorsTable.isEnabled();
- if (isDisabled)imageName = imageName + ImageNames.disabled;
-
- return ValidationUIPlugin.getPlugin().getImage(imageName);
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- Validator v = (Validator) element;
- if (columnIndex == 1) {
- return getImage(v.isManualValidation() ? ImageNames.okTable : ImageNames.failTable);
- } else if (columnIndex == 2) {
- return getImage(v.isBuildValidation() ? ImageNames.okTable : ImageNames.failTable);
- } else if (columnIndex == 3) {
- if (hasSettings(v))return getImage(ImageNames.settings);
- return null;
-
- }
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- if (columnIndex == 0)return ((Validator) element).getName();
- return null;
- }
- }
-
- /**
- * This class is used to sort the CheckboxTableViewer elements.
- */
- public class ValidationViewerSorter extends ViewerSorter {
- public int compare(Viewer viewer, Object e1, Object e2) {
- // Can't instantiate ViewerSorter because it's abstract, so use this
- // inner class to represent it.
- return super.compare(viewer, e1, e2);
- }
- }
-
- public ValidatorListPage(Composite parent) throws InvocationTargetException {
- _page = createPage(parent);
- }
-
- private void setupTableColumns(Table table) {
- TableColumn validatorColumn = new TableColumn(table, SWT.NONE);
- validatorColumn.setText(ValUIMessages.VALIDATOR);
- validatorColumn.setWidth(245);
- TableColumn manualColumn = new TableColumn(table, SWT.CENTER);
- manualColumn.setText(ValUIMessages.MANUAL);
- manualColumn.pack();
- TableColumn buildColumn = new TableColumn(table, SWT.CENTER);
- buildColumn.setText(ValUIMessages.BUILD);
- buildColumn.pack();
- TableColumn settingsColumn = new TableColumn(table, SWT.CENTER);
- settingsColumn.setText(ValUIMessages.SETTINGS);
- settingsColumn.pack();
- }
-
- public Composite createPage(Composite parent) throws InvocationTargetException {
- _globalConfig = new GlobalConfiguration(ConfigurationManager.getManager().getGlobalConfiguration());
- _validators = copyValidators(ValManager.getDefault().getValidators());
-
- Composite validatorGroup = new Composite(parent, SWT.NONE);
-
- GridLayout validatorGroupLayout = new GridLayout();
- validatorGroupLayout.numColumns = 2;
- validatorGroup.setLayout(validatorGroupLayout);
- GridDataFactory.fillDefaults().grab(true, true).applyTo(validatorGroup);
-
- new Label(validatorGroup, SWT.NONE).setLayoutData(new GridData());
-
- addOverride(validatorGroup);
- addSuspend(validatorGroup);
- addAutoSave(validatorGroup);
- addConfirm(validatorGroup);
-
- _listLabel = new Label(validatorGroup, SWT.NONE);
- GridData listLabelData = new GridData(GridData.FILL_HORIZONTAL);
- listLabelData.horizontalSpan = 2;
- _listLabel.setLayoutData(listLabelData);
- _listLabel.setText(ValUIMessages.PREF_VALLIST_TITLE);
-
- _validatorsTable = new Table(validatorGroup, SWT.SINGLE | SWT.BORDER | SWT.FULL_SELECTION);
- Point preferredSize = _validatorsTable.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- GridDataFactory.fillDefaults().grab(true, true).hint(preferredSize)
- .span(2,1).applyTo(_validatorsTable);
-
-
- _validatorsTable.setHeaderVisible(true);
- _validatorsTable.setLinesVisible(true);
-
- _validatorList = new TableViewer(_validatorsTable);
-// _validatorsTable.setLayoutData(validatorListData);
-// _validatorList.getTable().setLayoutData(validatorListData);
- _validatorList.setLabelProvider(new ValidationLabelProvider());
- _validatorList.setContentProvider(new ValidationContentProvider());
- _validatorList.setSorter(new ValidationViewerSorter());
- setupTableColumns(_validatorsTable);
-
- _validatorList.setInput(_validators);
- _validatorsTable.addMouseListener(new MouseAdapter() {
-
- public void mouseDown(MouseEvent e) {
- if (e.button != 1)return;
-
- TableItem tableItem = _validatorsTable.getItem(new Point(e.x, e.y));
- if (tableItem == null || tableItem.isDisposed())return;
- int columnNumber;
- int columnsCount = _validatorsTable.getColumnCount();
- if (columnsCount == 0) {
- // If no TableColumn, Table acts as if it has a single
- // column which takes the whole width.
- columnNumber = 0;
- } else {
- columnNumber = -1;
- for (int i = 0; i < columnsCount; i++) {
- Rectangle bounds = tableItem.getBounds(i);
- if (bounds.contains(e.x, e.y)) {
- columnNumber = i;
- break;
- }
- }
- if (columnNumber == -1)return;
- }
-
- columnClicked(columnNumber);
- }
- });
-
- _validatorsTable.setMenu(createContextMenu());
- _validatorsTable.addFocusListener(new FocusAdapter() {
-
- public void focusGained(FocusEvent e) {
- super.focusGained(e);
- if (_validatorsTable.getSelectionCount() == 0) {
- _validatorsTable.select(0);
- }
- }
- });
-
- addEnableDisable(validatorGroup);
-
- // Have to set the tab order or only the first checkbox in a
- // Composite can be tabbed to. (Seems to apply only to checkboxes. Have to use the
- // arrow key to navigate the checkboxes.)
- validatorGroup.setTabList(new Control[] { _suspend, _autoSave,
- _validatorsTable, _enableAllButton, _disableAllButton });
-
- updateWidgets();
-
- applyDialogFont(validatorGroup);
- validatorGroup.setSize(validatorGroup.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- return validatorGroup;
- }
-
- private void addEnableDisable(Composite validatorGroup) {
- _enableAllButton = new Button(validatorGroup, SWT.PUSH);
- _enableAllButton.setLayoutData(new GridData());
- _enableAllButton.setText(ValUIMessages.PREF_BUTTON_ENABLEALL);
- _enableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performEnableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE,
- ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
- });
-
- _disableAllButton = new Button(validatorGroup, SWT.PUSH);
- _disableAllButton.setLayoutData(new GridData());
- _disableAllButton.setText(ValUIMessages.PREF_BUTTON_DISABLEALL);
- _disableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performDisableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE,
- ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
- });
- }
-
- /**
- * Make a copy of the current validators and store the results.
- */
- private Validator[] copyValidators(Validator[] vals){
- Validator[] copy = new Validator[vals.length];
- for (int i=0; i<vals.length; i++)copy[i] = vals[i].copy();
- return copy;
- }
-
- private void addConfirm(Composite validatorGroup) {
- GridData gd;
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- _confirmButton = new Button(validatorGroup, SWT.CHECK);
- _confirmButton.setLayoutData(gd);
- _confirmButton.setText(ValUIMessages.PrefPageConfirmDialog);
- _confirmButton.setSelection(_globalPreferences.getConfirmDialog());
- _confirmButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- // do not increment the _changeCount as this by itself should not trigger a build prompt
- _globalPreferences.setConfirmDialog(_confirmButton.getSelection());
- _confirmButton.setFocus();
- }
- });
- }
-
- private void addAutoSave(Composite validatorGroup) {
- GridData gd;
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- _autoSave = new Button(validatorGroup, SWT.CHECK);
- _autoSave.setLayoutData(gd);
- _autoSave.setText(ValUIMessages.PrefPage_always_save);
- _autoSave.setSelection(_globalPreferences.getSaveAutomatically());
- _autoSave.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- // do not increment the _changeCount as this by itself should not trigger a build prompt
- _globalPreferences.setSaveAutomatically(_autoSave.getSelection());
- _autoSave.setFocus();
- }
- });
- }
-
- private void addSuspend(Composite validatorGroup) {
- GridData gd;
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
-
- _suspend = new Button(validatorGroup, SWT.CHECK);
- _suspend.setLayoutData(gd);
- _suspend.setText(ValUIMessages.DISABLE_VALIDATION);
- _suspend.setSelection(_globalPreferences.getDisableAllValidation());
- _suspend.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- _changeCount++;
- _suspend.setFocus();
- _validatorsTable.setEnabled(!_suspend.getSelection());
- _enableAllButton.setEnabled(!_suspend.getSelection());
- _disableAllButton.setEnabled(!_suspend.getSelection());
- _validatorList.refresh();
- }
- });
- }
-
- private void addOverride(Composite validatorGroup) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
-
- _override = new Button(validatorGroup, SWT.CHECK);
- _override.setLayoutData(gd);
- _override.setText(ValUIMessages.PREF_BUTTON_OVERRIDE);
- _override.setEnabled(true);
- _override.setSelection(_globalPreferences.getOverride());
- _override.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- _changeCount++;
- _globalPreferences.setOverride(_override.getSelection());
- _override.setFocus();
-
- }
- });
- }
-
- protected Menu createContextMenu() {
- final Menu menu = new Menu(_validatorsTable.getShell(), SWT.POP_UP);
- final MenuItem manualItem = new MenuItem(menu, SWT.CHECK);
- manualItem.setText(ValUIMessages.PREF_MNU_MANUAL);
- final MenuItem buildItem = new MenuItem(menu, SWT.CHECK);
- buildItem.setText(ValUIMessages.PREF_MNU_BUILD);
- final MenuItem settingsItem = new MenuItem(menu, SWT.PUSH);
- settingsItem.setText(ValUIMessages.PREF_MNU_SETTINGS);
-
- class MenuItemListener extends SelectionAdapter {
- public void widgetSelected(SelectionEvent e) {
- MenuItem menuItem = (MenuItem) e.getSource();
- int index = menu.indexOf(menuItem) + 1;
- columnClicked(index);
- }
- }
- MenuItemListener listener = new MenuItemListener();
- manualItem.addSelectionListener(listener);
- buildItem.addSelectionListener(listener);
- settingsItem.addSelectionListener(listener);
-
- menu.addMenuListener(new MenuAdapter() {
- public void menuShown(MenuEvent e) {
- IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
- Validator vw = (Validator) selection.getFirstElement();
- manualItem.setSelection(vw.isManualValidation());
- buildItem.setSelection(vw.isBuildValidation());
- settingsItem.setEnabled(hasSettings(vw));
- }
- });
-
- return menu;
- }
-
- protected void columnClicked(int columnToEdit) {
- IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
- Validator val = (Validator) selection.getFirstElement();
-
- switch (columnToEdit) {
- case 1:
- _changeCount++;
- val.setManualValidation(!val.isManualValidation());
- break;
- case 2:
- _changeCount++;
- val.setBuildValidation(!val.isBuildValidation());
- break;
- case 3:
- Validator.V2 v2 = val.asV2Validator();
- if (v2 != null){
- FilterDialog fd = new FilterDialog(_shell, val, null);
- if (Window.OK == fd.open()){
- _changeCount++;
- val.become(fd.getValidator());
- }
- }
- else {
- handleOldDelegate(val);
- }
-
- break;
- default:
- break;
- }
- _validatorList.refresh();
- }
-
- private void handleOldDelegate(Validator val) {
- Validator.V1 v1 = val.asV1Validator();
- if (v1 == null)return;
-
- ValidatorMetaData vmd = v1.getVmd();
- if (!vmd.isDelegating())return;
-
- String delegateID = _globalConfig.getDelegateUniqueName(vmd);
- Shell shell = Display.getCurrent().getActiveShell();
- DelegatingValidatorPreferencesDialog dialog =
- new DelegatingValidatorPreferencesDialog(shell, vmd, delegateID);
-
- dialog.setBlockOnOpen(true);
- dialog.create();
-
- int result = dialog.open();
- if (result == Window.OK){
- _changeCount++;
- _globalConfig.setDelegateUniqueName(vmd, dialog.getDelegateID());
- }
- }
-
- /**
- * Does this validator have extra settings that can be configured?
- * @param v
- * @return true if it does
- */
- boolean hasSettings(Validator v){
- if (v.asV2Validator() != null)return true;
- if (v.getDelegatingId() != null)return true;
- return false;
- }
-
- protected void updateWidgets() throws InvocationTargetException {
- // Need to update even the widgets that do not change based on another
- // widgets because of performDefaults(). If performDefaults() is
- // selected, then the pagePreferences values are reset, and these widgets
- // might also need to be updated.
- updateAllWidgets();
- updateHelp();
- }
-
- private void updateAllWidgets() throws InvocationTargetException {
- _suspend.setSelection(_globalPreferences.getDisableAllValidation());
- _autoSave.setSelection(_globalPreferences.getSaveAutomatically());
- _confirmButton.setSelection(_globalPreferences.getConfirmDialog());
- _override.setSelection(_globalPreferences.getOverride());
- _validatorsTable.setEnabled(!_suspend.getSelection());
- _enableAllButton.setEnabled(!_suspend.getSelection());
- _disableAllButton.setEnabled(!_suspend.getSelection());
- _validatorList.setInput(_validators);
- _validatorList.refresh();
- }
-
- public boolean performOk() throws InvocationTargetException {
- _globalPreferences.setDisableAllValidation(_suspend.getSelection());
- _globalPreferences.setSaveAutomatically(_autoSave.getSelection());
- ValPrefManagerGlobal vpm = ValPrefManagerGlobal.getDefault();
- vpm.savePreferences(_globalPreferences, _validators);
- saveV1Preferences();
-
- if (_changeCount > 0 &&
- MessageDialog.openQuestion(_shell, ValUIMessages.RebuildTitle, ValUIMessages.RebuildMsg)){
-
- FullBuildJob fbj = new FullBuildJob();
- try {
- fbj.runInWorkspace(new NullProgressMonitor());
- }
- catch (CoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- return true;
- }
-
- /**
- * Save the V1 preferences, so that the old validators continue to work.
- */
- private void saveV1Preferences(){
- try {
- GlobalConfiguration gc = ConfigurationManager.getManager().getGlobalConfiguration();
- // gc.setCanProjectsOverride(overrideButton.getSelection());
-
- if (_globalPreferences.getDisableAllValidation())gc.setDisableAllValidation(true);
- //pagePreferences.setEnabledValidators(getEnabledValidators());
-
- gc.setEnabledManualValidators(getEnabledManualValidators());
- gc.setEnabledBuildValidators(getEnabledBuildValidators());
-
- gc.passivate();
- gc.store();
- }
- catch (InvocationTargetException e){
- ValidationUIPlugin.getPlugin().handleException(e);
- }
-
- }
-
- /**
- * Answer all the V1 validators that are manually enabled.
- * @return
- */
- private ValidatorMetaData[] getEnabledManualValidators() {
- List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
- for (Validator v : _validators){
- if (v.isManualValidation()){
- Validator.V1 v1 = v.asV1Validator();
- if (v1 != null){
- list.add(v1.getVmd());
- }
- }
- }
- ValidatorMetaData[] result = new ValidatorMetaData[list.size()];
- list.toArray(result);
- return result;
- }
-
- /**
- * Answer all the V1 validators that are enabled for build.
- * @return
- */
- private ValidatorMetaData[] getEnabledBuildValidators() {
- List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
- for (Validator v : _validators){
- if (v.isBuildValidation()){
- Validator.V1 v1 = v.asV1Validator();
- if (v1 != null)list.add(v1.getVmd());
- }
- }
- ValidatorMetaData[] result = new ValidatorMetaData[list.size()];
- list.toArray(result);
- return result;
- }
-
- public boolean performDefaults() throws InvocationTargetException {
- _changeCount++;
- _validators = copyValidators(ValManager.getDefaultValidators());
- updateWidgets();
- getDefaultsButton().setFocus();
- return true;
- }
-
- public boolean performEnableAll() throws InvocationTargetException {
- setAllValidators(true);
- _enableAllButton.setFocus();
- _validatorList.refresh();
- return true;
- }
-
- public boolean performDisableAll() throws InvocationTargetException {
- setAllValidators(false);
- _disableAllButton.setFocus();
- _validatorList.refresh();
- return true;
- }
-
- private void setAllValidators(boolean bool){
- _changeCount++;
- for (Validator v : _validators){
- v.setBuildValidation(bool);
- v.setManualValidation(bool);
- }
- }
-
- protected void updateHelp() {
-// PlatformUI.getWorkbench().getHelpSystem().setHelp(_suspend, ContextIds.VALIDATION_PREFERENCE_PAGE_DISABLE_ALL_ENABLED);
- }
-
- /*
- * Store the current values of the controls into the preference store.
- */
-
- public Composite getControl() {
- return _page;
- }
-
- public void dispose() {
- _autoSave.dispose();
- _suspend.dispose();
- _disableAllButton.dispose();
- _enableAllButton.dispose();
- _listLabel.dispose();
- _suspend.dispose();
- _validatorList.getTable().dispose();
- }
-
- public void loseFocus() {
- }
-
- public void gainFocus() {
- }
- }
-
- /*
- * @see PreferencePage#createContents(Composite)
- */
- protected Control createContents(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.PreferencePage);
- try {
- _shell = parent.getShell();
- _pageImpl = new ValidatorListPage(parent);
- } catch (Exception exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
-
- return _pageImpl.getControl();
- }
-
- public void init(IWorkbench workbench) {
- }
-
- /**
- * Performs special processing when this page's Defaults button has been
- * pressed.
- * <p>
- * This is a framework hook method for subclasses to do special things when
- * the Defaults button has been pressed. Subclasses may override, but should
- * call <code>super.performDefaults</code>.
- * </p>
- */
- protected void performDefaults() {
- super.performDefaults();
-
- try {
- _pageImpl.performDefaults();
- } catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
-
- /**
- * When the user presses the "OK" or "Apply" button on the Properties
- * Guide/Properties Page, respectively, some processing is performed by this
- * PropertyPage. If the page is found, and completes successfully, true is
- * returned. Otherwise, false is returned, and the guide doesn't finish.
- */
- public boolean performOk() {
- try {
- return _pageImpl.performOk();
- }
- catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- return false;
- }
- }
-
- /**
- * Since the pages are inner classes of a child PreferencePage, not a
- * PreferencePage itself, DialogPage's automatic disposal of its children's
- * widgets cannot be used. Instead, dispose of each inner class' widgets
- * explicitly.
- */
- public void dispose() {
- super.dispose();
- try {
- if (_pageImpl != null) {
- _pageImpl.dispose();
- _pageImpl = null;
- }
-
- // TODO figure out what this thing did
- // ExtensionManger.instance().getDelegate().disposePreferencePage();
- } catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
-
- private void logError(Throwable exc) {
- ValidationUIPlugin.getPlugin().handleException(exc);
- }
-
- /*
- * package visibility because if this method is private, then the compiler
- * needs to create a synthetic accessor method for the internal classes, and
- * that can have performance implications.
- */
- void displayAndLogError(String title, String message, Throwable exc) {
- logError(exc);
- displayMessage(title, message, org.eclipse.swt.SWT.ICON_ERROR);
- }
-
- private void displayMessage(String title, String message, int iIconType) {
- MessageBox messageBox = new MessageBox(getShell(),
- org.eclipse.swt.SWT.OK | iIconType | org.eclipse.swt.SWT.APPLICATION_MODAL);
- messageBox.setMessage(message);
- messageBox.setText(title);
- messageBox.open();
- }
-
- /**
- * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
- */
- public void setVisible(boolean visible) {
- super.setVisible(visible);
-
- if (_pageImpl == null)return;
- if (visible)_pageImpl.gainFocus();
- else _pageImpl.loseFocus();
- }
-
- protected Button getDefaultsButton() {
- return super.getDefaultsButton();
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java
deleted file mode 100644
index ef8dabd..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java
+++ /dev/null
@@ -1,854 +0,0 @@
-package org.eclipse.wst.validation.ui.internal.preferences;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValPrefManagerProject;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.model.ProjectPreferences;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.ui.DelegatingValidatorPreferencesDialog;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-import org.eclipse.wst.validation.ui.internal.HelpContextIds;
-import org.eclipse.wst.validation.ui.internal.ImageNames;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-import org.eclipse.wst.validation.ui.internal.dialog.FilterDialog;
-
-/**
- * From this page the user can configure individual validators on individual projects.
- *
- * @author karasiuk
- */
-public class ValidationPropertyPage extends PropertyPage {
-
- private IValidationPage _pageImpl;
- private Shell _shell;
-
- public interface IValidationPage {
- Composite createPage(Composite parent) throws InvocationTargetException;
-
- boolean performOk() throws InvocationTargetException;
-
- boolean performDefaults() throws InvocationTargetException;
-
- Composite getControl();
-
- void dispose();
-
- void loseFocus();
-
- void gainFocus();
- }
-
- public class InvalidPage implements IValidationPage {
- private Composite page = null;
-
- private Composite composite = null;
- private GridLayout layout = null;
- private Label messageLabel = null;
-
- public InvalidPage(Composite parent) {
- page = createPage(parent);
- }
-
- /**
- * This page is added to the Properties guide if some internal problem
- * occurred; for example, the highlighted item in the workbench is not
- * an IProject (according to this page's plugin.xml, this page is only
- * valid when an IProject is selected).
- */
- public Composite createPage(Composite parent) {
- noDefaultAndApplyButton();
-
- final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite = new Composite(sc1, SWT.NONE);
- sc1.setContent(composite);
- layout = new GridLayout();
- composite.setLayout(layout);
-
- messageLabel = new Label(composite, SWT.NONE);
- messageLabel.setText(ValUIMessages.VBF_EXC_INVALID_REGISTER);
-
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return composite;
- }
-
- public boolean performDefaults() {
- return true;
- }
-
- /**
- * Since this page occurs under invalid circumstances, there is nothing
- * to save.
- */
- public boolean performOk() {
- return true;
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- messageLabel.dispose();
- // layout.dispose();
- composite.dispose();
- }
-
- public void loseFocus() {
- }
-
- public void gainFocus() {
- }
- }
-
- private class ValidatorListPage implements IValidationPage {
- private Composite _page;
-
- private TableViewer _validatorList;
- private Button _enableAllButton;
- private Button _disableAllButton;
- private Button _override;
- private Button _suspend;
- private Link _configLink;
- private Button _addValidationBuilder;
- private Table _validatorsTable;
- private Validator[] _validators;
-
- /**
- * This class is provided for the CheckboxTableViewer in the
- * ValidationPropertiesPage$ValidatorListPage class.
- */
- public class ValidationContentProvider implements IStructuredContentProvider {
- public void dispose() {
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof Validator[]) {
- return (Validator[]) inputElement;
- }
- return new Object[0];
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }
-
- /**
- * This class is provided for
- * ValidationPropertiesPage$ValidatorListPage's checkboxTableViewer
- * element.
- */
- public class ValidationLabelProvider extends LabelProvider implements ITableLabelProvider {
- public String getText(Object element) {
- if (element == null)return ""; //$NON-NLS-1$
- else if (element instanceof Validator)
- return ((Validator) element).getName();
- else
- return super.getText(element);
- }
-
- private Image getImage(String imageName) {
- boolean isDisabled = !_validatorsTable.isEnabled();
- if (isDisabled)
- imageName = imageName + ImageNames.disabled;
-
- return ValidationUIPlugin.getPlugin().getImage(imageName);
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- Validator v = (Validator) element;
- if (columnIndex == 1) {
- return getImage(v.isManualValidation() ? ImageNames.okTable
- : ImageNames.failTable);
- } else if (columnIndex == 2) {
- return getImage(v.isBuildValidation() ? ImageNames.okTable
- : ImageNames.failTable);
- } else if (columnIndex == 3) {
- if (hasSettings(v))return getImage(ImageNames.settings);
- return null;
- }
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- if (columnIndex == 0)return ((Validator) element).getName();
- return null;
- }
- }
-
- public ValidatorListPage(Composite parent) throws InvocationTargetException {
- _page = createPage(parent);
- }
-
- private void setupTableColumns(Table table) {
- TableColumn validatorColumn = new TableColumn(table, SWT.NONE);
- validatorColumn.setText(ValUIMessages.VALIDATOR);
- validatorColumn.setWidth(245);
- TableColumn manualColumn = new TableColumn(table, SWT.CENTER);
- manualColumn.setText(ValUIMessages.MANUAL);
- manualColumn.pack();
- TableColumn buildColumn = new TableColumn(table, SWT.CENTER);
- buildColumn.setText(ValUIMessages.BUILD);
- buildColumn.pack();
- TableColumn settingsColumn = new TableColumn(table, SWT.CENTER);
- settingsColumn.setText(ValUIMessages.SETTINGS);
- settingsColumn.pack();
- }
-
- public Composite createPage(Composite parent) throws InvocationTargetException {
- _validators = copyValidators(ValManager.getDefault().getValidators(getProject(), false));
-
- Composite validatorGroup = new Composite(parent, SWT.NONE);
-
- GridLayout validatorGroupLayout = new GridLayout();
- validatorGroupLayout.numColumns = 2;
- validatorGroup.setLayout(validatorGroupLayout);
- GridDataFactory.fillDefaults().grab(true, true).applyTo(validatorGroup);
-
- addOverride(validatorGroup);
- addConfigLink(validatorGroup);
- addSuspend(validatorGroup);
- addValidationBuilder(validatorGroup);
- new Label(validatorGroup, SWT.NONE).setLayoutData(new GridData());
-
- Label listLabel = new Label(validatorGroup, SWT.NONE);
- GridData listLabelData = new GridData(GridData.FILL_HORIZONTAL);
- listLabelData.horizontalSpan = 2;
- listLabel.setLayoutData(listLabelData);
- listLabel.setText(ValUIMessages.PREF_VALLIST_TITLE);
-
- _validatorsTable = new Table(validatorGroup, SWT.BORDER | SWT.FULL_SELECTION);
- Point preferredSize = _validatorsTable.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- GridDataFactory.fillDefaults().grab(true, true).hint(preferredSize)
- .span(2,1).applyTo(_validatorsTable);
-
- _validatorsTable.setHeaderVisible(true);
- _validatorsTable.setLinesVisible(true);
-
- _validatorList = new TableViewer(_validatorsTable);
- _validatorList.setLabelProvider(new ValidationLabelProvider());
- _validatorList.setContentProvider(new ValidationContentProvider());
- _validatorList.setSorter(new ViewerSorter());
- setupTableColumns(_validatorsTable);
-
- _validatorList.setInput(_validators);
- _validatorsTable.addMouseListener(new MouseAdapter() {
-
- public void mouseDown(MouseEvent e) {
- if (e.button != 1)return;
-
- TableItem tableItem = _validatorsTable.getItem(new Point(e.x, e.y));
- if (tableItem == null || tableItem.isDisposed()) {
- // item no longer exists
- return;
- }
- int columnNumber;
- int columnsCount = _validatorsTable.getColumnCount();
- if (columnsCount == 0) {
- // If no TableColumn, Table acts as if it has a single column
- // which takes the whole width.
- columnNumber = 0;
- } else {
- columnNumber = -1;
- for (int i = 0; i < columnsCount; i++) {
- Rectangle bounds = tableItem.getBounds(i);
- if (bounds.contains(e.x, e.y)) {
- columnNumber = i;
- break;
- }
- }
- if (columnNumber == -1)return;
- }
-
- columnClicked(columnNumber);
- }
- });
-
- _validatorsTable.setMenu(createContextMenu());
- _validatorsTable.addFocusListener(new FocusAdapter() {
-
- public void focusGained(FocusEvent e) {
- super.focusGained(e);
- if (_validatorsTable.getSelectionCount() == 0) {
- _validatorsTable.select(0);
- }
- }
- });
-
- addButtons(validatorGroup);
-
- // Have to set the tab order or only the first checkbox in a
- // Composite can be tabbed to. (Seems to apply only to checkboxes. Have to use the
- // arrow key to navigate the checkboxes.)
- validatorGroup.setTabList(new Control[] { _override, _suspend});
-
- updateWidgets();
-
- applyDialogFont(validatorGroup);
- validatorGroup.setSize(validatorGroup.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return validatorGroup;
- }
-
- private void addButtons(Composite validatorGroup) {
-
- Composite buttons = new Composite(validatorGroup, SWT.NONE);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- buttons.setLayout(new RowLayout());
-
- _enableAllButton = new Button(buttons, SWT.PUSH);
- _enableAllButton.setText(ValUIMessages.PREF_BUTTON_ENABLEALL);
- _enableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performEnableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE,ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
- });
-
- _disableAllButton = new Button(buttons, SWT.PUSH);
- _disableAllButton.setText(ValUIMessages.PREF_BUTTON_DISABLEALL);
- _disableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performDisableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
- });
- }
-
- private void addSuspend(Composite validatorGroup) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- _suspend = new Button(validatorGroup, SWT.CHECK);
- _suspend.setLayoutData(gd);
- _suspend.setText(ValUIMessages.DISABLE_VALIDATION);
- _suspend.setSelection(getProjectPreferences().getSuspend());
- _suspend.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- _suspend.setFocus();
- enableDisableWidgets();
- _validatorList.refresh();
- }
- });
- }
-
- private void addConfigLink(Composite validatorGroup){
- _configLink = new Link(validatorGroup,SWT.None);
- GridData layout = new GridData(GridData.HORIZONTAL_ALIGN_END);
- _configLink.setLayoutData(layout);
- _configLink.setText("<A>"+ //$NON-NLS-1$
- ValUIMessages.ConfigWsSettings+"</A>"); //$NON-NLS-1$
- _configLink.addSelectionListener(new SelectionListener() {
- public static final String DATA_NO_LINK = "PropertyAndPreferencePage.nolink"; //$NON-NLS-1$
-
- public void doLinkActivated(Link e) {
- String id = getPreferencePageID();
- PreferencesUtil.createPreferenceDialogOn(getShell(), id, new String[]{id}, DATA_NO_LINK).open();
- try {
- updateWidgets();
- } catch (InvocationTargetException ie) {
-
- }
- }
-
- private String getPreferencePageID() {
- return "ValidationPreferencePage"; //$NON-NLS-1$
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- doLinkActivated((Link) e.widget);
- }
-
- public void widgetSelected(SelectionEvent e) {
- doLinkActivated((Link) e.widget);
- }
- });
-
- }
-
- /**
- * If the current project doesn't have the validation builder configured on it,
- * and the user has asked us to add a builder, add the builder.
- * Otherwise return without doing anything.
- */
- private void addBuilder() {
- if (_addValidationBuilder != null && _addValidationBuilder.getSelection())
- ValidatorManager.addProjectBuildValidationSupport(getProject());
- }
-
-
- private void addValidationBuilder(Composite validatorGroup) {
- if (hasValidationBuilder())return;
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- _addValidationBuilder = new Button(validatorGroup, SWT.CHECK);
- _addValidationBuilder.setLayoutData(gd);
- _addValidationBuilder.setText(ValUIMessages.ADD_VALIDATION_BUILDER);
- _addValidationBuilder.setSelection(false);
- }
-
- /**
- * Make a copy of the current validators and store the results.
- */
- private Validator[] copyValidators(Validator[] vals){
- Validator[] validators = new Validator[vals.length];
- for (int i=0; i<vals.length; i++)validators[i] = vals[i].copy();
- return validators;
- }
-
- /**
- * Does this validator have extra settings that can be configured?
- * @param v
- * @return true if it does
- */
- boolean hasSettings(Validator v){
- if (v.asV2Validator() != null)return true;
- if (v.getDelegatingId() != null)return true;
- return false;
- }
-
- /**
- * Answer if this project has a validator builder assigned to it.
- */
- private boolean hasValidationBuilder(){
- try {
- IProjectDescription description = getProject().getDescription();
- ICommand[] commands = description.getBuildSpec();
- for (int i = 0; i < commands.length; i++) {
- if (commands[i].getBuilderName().equals(ValidationPlugin.VALIDATION_BUILDER_ID))
- return true;
- }
- return false;
- }
- catch (CoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- return false;
- }
-
-
- private void addOverride(Composite validatorGroup) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-// gd.horizontalSpan = 2;
- _override = new Button(validatorGroup, SWT.CHECK);
- _override.setLayoutData(gd);
- _override.setText(ValUIMessages.LabelEnableProjectSpecific);
- _override.setSelection(getProjectPreferences().getOverride());
- _override.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- _override.setFocus();
- if (ValManager.getDefault().getGlobalPreferences().getOverride()){
- enableDisableWidgets();
- _validatorList.refresh();
- }
- else {
- MessageDialog.openWarning(_shell, ValUIMessages.Validation,
- ValUIMessages.ProjectOverridesNotAllowed);
- }
- }
-
- });
- }
-
- protected Menu createContextMenu() {
- final Menu menu = new Menu(_validatorsTable.getShell(), SWT.POP_UP);
- final MenuItem manualItem = new MenuItem(menu, SWT.CHECK);
- manualItem.setText(ValUIMessages.PREF_MNU_MANUAL);
- final MenuItem buildItem = new MenuItem(menu, SWT.CHECK);
- buildItem.setText(ValUIMessages.PREF_MNU_BUILD);
- final MenuItem settingsItem = new MenuItem(menu, SWT.PUSH);
- settingsItem.setText(ValUIMessages.PREF_MNU_SETTINGS);
-
- class MenuItemListener extends SelectionAdapter {
- public void widgetSelected(SelectionEvent e) {
- MenuItem menuItem = (MenuItem) e.getSource();
- int index = menu.indexOf(menuItem) + 1;
- columnClicked(index);
- }
- }
- MenuItemListener listener = new MenuItemListener();
- manualItem.addSelectionListener(listener);
- buildItem.addSelectionListener(listener);
- settingsItem.addSelectionListener(listener);
-
- menu.addMenuListener(new MenuAdapter() {
- public void menuShown(MenuEvent e) {
- IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
- Validator val = (Validator) selection.getFirstElement();
- manualItem.setSelection(val.isManualValidation());
- buildItem.setSelection(val.isBuildValidation());
- settingsItem.setEnabled(hasSettings(val));
- }
- });
-
- return menu;
- }
-
- protected void columnClicked(int columnToEdit) {
- IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
- Validator val = (Validator) selection.getFirstElement();
-
- switch (columnToEdit) {
- case 1:
- val.setManualValidation(!val.isManualValidation());
- break;
- case 2:
- val.setBuildValidation(!val.isBuildValidation());
- break;
- case 3:
- Validator.V2 v2 = val.asV2Validator();
- if (v2 != null){
- FilterDialog fd = new FilterDialog(_shell, val, getProject());
- if (Window.OK == fd.open()){
- val.become(fd.getValidator());
- }
- }
- else {
- handleOldDelegate(val);
- }
-
- break;
- default:
- break;
- }
- _validatorList.refresh();
- }
-
- private void handleOldDelegate(Validator val) {
- try {
- Validator.V1 v1 = val.asV1Validator();
- if (v1 == null)return;
-
- ValidatorMetaData vmd = v1.getVmd();
- if (!vmd.isDelegating())return;
-
- GlobalConfiguration gc = ConfigurationManager.getManager().getGlobalConfiguration();
- String delegateID = gc.getDelegateUniqueName(vmd);
- Shell shell = Display.getCurrent().getActiveShell();
- DelegatingValidatorPreferencesDialog dialog =
- new DelegatingValidatorPreferencesDialog(shell, vmd, delegateID);
-
- dialog.setBlockOnOpen(true);
- dialog.create();
-
- int result = dialog.open();
- if (result == Window.OK)gc.setDelegateUniqueName(vmd, dialog.getDelegateID());
- }
- catch (InvocationTargetException e){
-
- }
- }
-
- protected void updateWidgets() throws InvocationTargetException {
- // Need to update even the widgets that do not change based on another
- // widgets because of performDefaults(). If performDefaults() is selected,
- // then the pagePreferences values are reset, and these widgets
- // might also need to be updated.
- updateAllWidgets();
- updateHelp();
- }
-
- protected void updateWidgetsForDefaults() throws InvocationTargetException {
- updateAllWidgets();
- updateHelp();
- }
-
- private void updateAllWidgets() throws InvocationTargetException {
- _suspend.setSelection(getProjectPreferences().getSuspend());
- _override.setSelection(getProjectPreferences().getOverride());
- enableDisableWidgets();
- _validatorList.setInput(_validators);
- _validatorList.refresh();
- }
-
- public boolean performOk() throws InvocationTargetException {
-
- addBuilder();
- // [213631] this warning should only be shown if the user actually tried to override
- // the validators
- if (!ValManager.getDefault().getGlobalPreferences().getOverride() && _override.getSelection()){
- MessageDialog.openWarning(_shell, ValUIMessages.Validation,
- ValUIMessages.ProjectOverridesNotAllowed);
- return false;
- }
- updateV1ProjectSettings();
- getProjectPreferences().setSuspend(_suspend.getSelection());
- getProjectPreferences().setOverride(_override.getSelection());
- IProject project = getProject();
- ValPrefManagerProject vpm = new ValPrefManagerProject(project);
- vpm.savePreferences(getProjectPreferences(), _validators);
- return true;
- }
-
- /**
- * Update the version 1 project settings.
- */
- private void updateV1ProjectSettings() {
- try {
- ProjectConfiguration pc = ConfigurationManager.getManager().getProjectConfiguration(getProject());
- pc.setDoesProjectOverride(_override.getSelection());
- pc.setDisableAllValidation(_suspend.getSelection());
- }
- catch (InvocationTargetException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Answer the specific project preferences. If the project didn't have any specific project
- * preferences, then create a default set.
- * @return
- */
- private ProjectPreferences getProjectPreferences(){
- return ValManager.getDefault().getProjectPreferences(getProject());
- }
-
- public boolean performDefaults() throws InvocationTargetException {
- _validators = copyValidators(ValManager.getDefaultValidators(getProject()));
- updateWidgetsForDefaults();
- getDefaultsButton().setFocus();
- return true;
- }
-
- public boolean performEnableAll() throws InvocationTargetException {
- setAllValidators(true);
- _enableAllButton.setFocus();
- _validatorList.refresh();
- return true;
- }
-
- private void setAllValidators(boolean bool) {
- for (TableItem item : _validatorsTable.getItems()) {
- Validator val = (Validator) item.getData();
- val.setManualValidation(bool);
- val.setBuildValidation(bool);
- }
- }
-
- public boolean performDisableAll() throws InvocationTargetException {
- setAllValidators(false);
- _disableAllButton.setFocus();
- _validatorList.refresh();
- return true;
- }
-
- protected void updateHelp() {
-// PlatformUI.getWorkbench().getHelpSystem().setHelp(_suspend, ContextIds.VALIDATION_PREFERENCE_PAGE_DISABLE_ALL_ENABLED);
- }
-
- /*
- * Store the current values of the controls into the preference store.
- */
-
- public Composite getControl() {
- return _page;
- }
-
- public void dispose() {
- _override.dispose();
- _suspend.dispose();
- _configLink.dispose();
- _disableAllButton.dispose();
- _enableAllButton.dispose();
- _validatorList.getTable().dispose();
- }
-
- /**
- * Enable or disable the widgets based on some top level preferences.
- */
- private void enableDisableWidgets() {
- boolean globalOverride = ValManager.getDefault().getGlobalPreferences().getOverride();
- boolean enable = !_suspend.getSelection() & _override.getSelection() & globalOverride;
- _suspend.setEnabled(_override.getSelection() & globalOverride);
- _validatorsTable.setEnabled(enable);
- _enableAllButton.setEnabled(enable);
- _disableAllButton.setEnabled(enable);
- _configLink.setEnabled(!globalOverride || !_override.getSelection());
- }
-
- public void loseFocus() {
- // This page does not need to cache anything before it loses focus.
- }
-
- public void gainFocus() {
- }
- }
-
- protected Control createContents(Composite parent) {
- try {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.ProjectPage);
- _shell = parent.getShell();
- _pageImpl = new ValidatorListPage(parent);
- } catch (Exception exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
-
- return _pageImpl.getControl();
- }
-
- protected void performDefaults() {
- super.performDefaults();
-
- try {
- _pageImpl.performDefaults();
- } catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
-
- public boolean performOk() {
- try {
- return _pageImpl.performOk();
- } catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- return false;
- }
- }
-
- /**
- * Since the pages are inner classes of a child PreferencePage, not a
- * PreferencePage itself, DialogPage's automatic disposal of its children's
- * widgets cannot be used. Instead, dispose of each inner class' widgets
- * explicitly.
- */
- public void dispose() {
- super.dispose();
- try {
- if (_pageImpl != null) {
- _pageImpl.dispose();
- _pageImpl = null;
- }
- } catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
-
- private void logError(Throwable exc) {
- ValidationUIPlugin.getPlugin().handleException(exc);
- }
-
- /*
- * package visibility because if this method is private, then the compiler
- * needs to create a synthetic accessor method for the internal classes, and
- * that can have performance implications.
- */
- void displayAndLogError(String title, String message, Throwable exc) {
- logError(exc);
- displayMessage(title, message, org.eclipse.swt.SWT.ICON_ERROR);
- }
-
- private void displayMessage(String title, String message, int iIconType) {
- MessageBox messageBox = new MessageBox(getShell(),
- org.eclipse.swt.SWT.OK | iIconType | org.eclipse.swt.SWT.APPLICATION_MODAL);
- messageBox.setMessage(message);
- messageBox.setText(title);
- messageBox.open();
- }
-
- /**
- * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
- */
- public void setVisible(boolean visible) {
- super.setVisible(visible);
-
- if (_pageImpl == null)return;
- if (visible)_pageImpl.gainFocus();
- else _pageImpl.loseFocus();
- }
-
- /**
- * @see org.eclipse.jface.preference.PreferencePage#getDefaultsButton()
- */
- protected Button getDefaultsButton() {
- return super.getDefaultsButton();
- }
-
- /**
- * Returns the selected project.
- */
- public IProject getProject() {
- IAdaptable selectedElement = getElement();
- if (selectedElement == null)return null;
- if (selectedElement instanceof IProject)return (IProject) selectedElement;
-
- Object adaptedObject = selectedElement.getAdapter(IProject.class);
- if (adaptedObject instanceof IProject)return (IProject) adaptedObject;
- return null;
-
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/.classpath b/plugins/org.eclipse.wst.validation/.classpath
deleted file mode 100644
index 64ae09a..0000000
--- a/plugins/org.eclipse.wst.validation/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="validate"/>
- <classpathentry kind="src" path="validate_core"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="src" path="vf2"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/common/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.validation/.cvsignore b/plugins/org.eclipse.wst.validation/.cvsignore
deleted file mode 100644
index e936909..0000000
--- a/plugins/org.eclipse.wst.validation/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-bin
-temp.folder
-validate.jar
-build.xml
-common.jar
-validatesrc.zip
-commonsrc.zip
-src.zip
-org.eclipse.wst.validation_1.0.0.zip
-@dot
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.validation/.options b/plugins/org.eclipse.wst.validation/.options
deleted file mode 100644
index 36a7471..0000000
--- a/plugins/org.eclipse.wst.validation/.options
+++ /dev/null
@@ -1,25 +0,0 @@
-org.eclipse.wst.validation/debug=true
-
-# Set this to true if you wish performance information to be logged
-org.eclipse.wst.validation/timings=false
-
-# set this to true if you want version 1 validator tracing
-org.eclipse.wst.validation/v1=false
-
-# Set this to a file name, if you wish the results to be logged to a file, otherwise
-# they will be written to stderr. When logged to a file the results are in a
-# CSV (comma separated values) form. When logged to stderr they are in a more
-# human readable form.
-org.eclipse.wst.validation/timings/tracefile=
-
-# By default times that are written to the trace file are in milliseconds for elapsed
-# time and nanoseconds for cpu time. If you find these times easier to read as seconds
-# as expressed by a double, the following flag can be turned on.
-org.eclipse.wst.validation/timings/useDoubles=false
-
-# If extra detail is needed for a particular validator it's id can be specified here.
-# For example, if you wanted more detail on the XML validator you would use
-# org.eclipse.wst.xml.core.xml
-org.eclipse.wst.validation/extraValDetail=
-
-
diff --git a/plugins/org.eclipse.wst.validation/.project b/plugins/org.eclipse.wst.validation/.project
deleted file mode 100644
index 846dae7..0000000
--- a/plugins/org.eclipse.wst.validation/.project
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.validation</name>
- <comment></comment>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 58507dd..0000000
--- a/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,78 +0,0 @@
-#Fri Apr 11 07:15:44 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=_
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=_
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 76ddc11..0000000
--- a/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Jun 11 14:58:22 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
diff --git a/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
deleted file mode 100644
index b849201..0000000
--- a/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.validation; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.wst.validation.internal.plugin.ValidationPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.validation,
- org.eclipse.wst.validation.internal;x-friends:="org.eclipse.wst.common.tests.validation",
- org.eclipse.wst.validation.internal.core;x-friends:="org.eclipse.wst.common.tests.validation",
- org.eclipse.wst.validation.internal.delegates;x-internal:=true,
- org.eclipse.wst.validation.internal.model;x-internal:=true,
- org.eclipse.wst.validation.internal.operations;x-friends:="org.eclipse.wst.common.tests.validation",
- org.eclipse.wst.validation.internal.plugin;x-friends:="org.eclipse.wst.common.tests.validation",
- org.eclipse.wst.validation.internal.provisional;x-internal:=true,
- org.eclipse.wst.validation.internal.provisional.core
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.validation/about.html b/plugins/org.eclipse.wst.validation/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.wst.validation/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.validation/build.properties b/plugins/org.eclipse.wst.validation/build.properties
deleted file mode 100644
index 167d165..0000000
--- a/plugins/org.eclipse.wst.validation/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- META-INF/,\
- about.html,\
- .,\
- .options,\
- xsds/
-jars.compile.order = .
-src.includes = component.xml,\
- xsds/
-output.. = bin/
-source.. = validate_core/,\
- property_files/,\
- validate/,\
- vf2/
diff --git a/plugins/org.eclipse.wst.validation/component.xml b/plugins/org.eclipse.wst.validation/component.xml
deleted file mode 100644
index 21011d7..0000000
--- a/plugins/org.eclipse.wst.validation/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.validation"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.validation" fragment="false"/><plugin id="org.eclipse.wst.validation.ui" fragment="false"/><package name="org.eclipse.wst.validation.core"></package><package name="org.eclipse.wst.validation.plugin"></package></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/plugin.properties b/plugins/org.eclipse.wst.validation/plugin.properties
deleted file mode 100644
index d7722e4..0000000
--- a/plugins/org.eclipse.wst.validation/plugin.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-VALIDATION_BUILDER_NAME=Validation
-VALIDATION_PROBLEMMARKER_NAME=Validation Message
-ProblemMarkerV2=Validation Message
-
-VALIDATION_PROJECTMARKER_NAME=Enabled Validators
-VALIDATION_PREFERENCEMARKER_NAME=Validation Preferences
-Validator=Validator
-ReferencialFileValidator=ReferencialFileValidator
-validationSelectionHandler=validationSelectionHandler
-ValidatorDelegates=Validator Delegates
-
-Bundle-Name.0 = Validation Framework
-Bundle-Vendor.0 = Eclipse.org
-
-Extension.validator=Validator (Version 2)
diff --git a/plugins/org.eclipse.wst.validation/plugin.xml b/plugins/org.eclipse.wst.validation/plugin.xml
deleted file mode 100644
index 1b17568..0000000
--- a/plugins/org.eclipse.wst.validation/plugin.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-<!-- Validation extension points -->
- <extension-point id="validator" name="%Validator" schema="xsds/validatorExtSchema.exsd"/>
- <extension-point id="validatorV2" name="%Extension.validator" schema="xsds/validator.exsd"/>
- <extension-point id="referencialFileValidator" name="%ReferencialFileValidator" schema="xsds/referencialFileExtSchema.exsd"/>
- <extension-point id="validationSelectionHandler" name="%validationSelectionHandler" schema="xsds/validationSelectionHandler.exsd"/>
- <extension-point id="validationHelper" name="validationHelper" schema="xsds/validationHelper.exsd"/>
- <extension-point id="validatorDelegates" name="%ValidatorDelegates" schema="xsds/validatorDelegates.exsd"/>
- <extension-point id="validatorGroup" name="Validator Group" schema="xsds/validatorgroup.exsd"/>
- <extension-point id="exclude" name="Validator Exclusions" schema="xsds/exclude.exsd"/>
-
-<!--============================-->
-<!-- Validation Contributions -->
-<!--============================-->
- <extension
- id="validationbuilder"
- name="%VALIDATION_BUILDER_NAME"
- point="org.eclipse.core.resources.builders">
- <builder>
- <run
- class="org.eclipse.wst.validation.internal.operations.ValidationBuilder">
- </run>
- </builder>
- </extension>
-<!-- Problem markers must be a subtype of problemmarker to be displayed in the task view -->
- <extension
- id="problemmarker"
- name="%VALIDATION_PROBLEMMARKER_NAME"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.core.resources.problemmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="owner">
- </attribute>
- <attribute
- name="validationSeverity">
- </attribute>
- <attribute
- name="targetObject">
- </attribute>
- <attribute
- name="groupName">
- </attribute>
- <attribute
- name="messageId">
- </attribute>
- </extension>
-<!-- Don't want to display this marker in the task view -->
- <extension
- id="projectmarker"
- name="%VALIDATION_PROJECTMARKER_NAME"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.core.resources.textmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="enabledValidatorList">
- </attribute>
- <attribute
- name="autoValidate">
- </attribute>
- <attribute
- name="runWhenBuild">
- </attribute>
- <attribute
- name="maxNumMessages">
- </attribute>
- <attribute
- name="overrideGlobalPreferences">
- </attribute>
- <attribute
- name="version">
- </attribute>
- </extension>
-<!-- Don't want to display this marker in the task view -->
- <extension
- id="preferencemarker"
- name="%VALIDATION_PREFERENCEMARKER_NAME"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.core.resources.textmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="enabledValidatorList">
- </attribute>
- <attribute
- name="autoValidate">
- </attribute>
- <attribute
- name="runWhenBuild">
- </attribute>
- <attribute
- name="maxNumMessages">
- </attribute>
- <attribute
- name="projectsCanOverride">
- </attribute>
- <attribute
- name="version">
- </attribute>
- </extension>
- <!-- GRK - I added a new problem marker so that we can keep the v2 changes separate from the v1 framework. -->
- <extension
- id="problemmarker2"
- name="%ProblemMarkerV2"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.core.resources.problemmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="owner">
- </attribute>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties b/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties
deleted file mode 100644
index a5062b8..0000000
--- a/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties
+++ /dev/null
@@ -1,73 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-ErrConfig=IWAE0100E Extension configuration error. An internal error has happened, the validator {0} has incorrectly configured the validation extension point.
-ErrGroupName=IWAE0101E Invalid element, expect either the element "include" or "exclude".
-ErrFilterRule=IWAE0102E An invalid filter rule has been encountered.
-
-ErrGroupNoType=IWAE0103E Groups must have a valid type, no type was returned
-ErrGroupInvalidType=IWAE0104E Groups must have a valid type, the following invalid type was returned: {0}
-ErrDependencyVersion=IWAE0105E Only version {0} is supported
-
-ErrPatternAttrib=IWAE0106E The pattern attribute must be supplied
-ErrTypeReq=IWAE0107E Type is a required attribute for file filters
-
-VbfExcSyntaxNoValClass=IWAE0016E Validator cannot be created because no "class" attribute is specified in the <run> element of the plugin.xml file for the validator named {0}. Cannot create a validator unless a <run> element exists that specifies the "class" attribute. The value of the "class" attribute should be the name of the class that implements the IWorkbenchHelper interface.
-VbfExcSyntaxNoValRun=IWAE0015E Validator cannot be created because no <run> element is specified in the plugin.xml file for the validator named {0}. Cannot create a validator unless a <run> element exists that specifies the "class" attribute. The value of the "class" attribute should be the name of the class that implements the IWorkbenchHelper interface.
-VbfExcSyntaxNoValNull=IWAE0018E Validator class {0} could not be created. IConfigurationElement.createExecutableExtension(String) returned null.
-
-ErrType=The value of the type attribute is incorrect. It was specified as {0} but the only valid values are: {1}, {2}, {3}
-ConfigError=It appears that validator {0} (with id {1}) has been configured incorrectly, it produced {2} messages while validating {3}. It has been disabled. Try restoring the defaults for this validator.
-
-DecodeError1=IWAE0019E There was a problem deserializing a string. A boolean was expected but not found.
-Error20=IWAE0020E Internal error, the incoming validator must be a v2 validator
-GroupInclude=Include Group
-GroupExclude=Exclude Group
-
-TypeInclude=include
-TypeExclude=exclude
-
-JobName=Validation
-JobNameMonitor=Validation Monitor
-JobIndexSave=Index Save
-
-MigrationJobName=Validation Setup
-
-RuleProjectNature=Project nature
-RuleFileExt=File extension
-RuleFile=File
-RuleContentType=Content Type
-RuleFacet=Facet
-RuleFolder=Folder
-RuleFull=Qualified File
-
-FileExtWithCase={0}: {1} (case sensitive)
-FileExtWithoutCase={0}: {1}
-
-ContentTypeExact={0}: {1} (excludes subtypes)
-ContentTypeNotExact={0}: {1} (includes subtypes)
-
-LogValStart=Validator {0} starting to validate: {1}
-LogValEnd=Validator {0} finished validating: {1}
-LogValEndTime=Validator {0} with id {1} finished validating: {2} in {3}
-LogValSummary=Validator {0} with id {1} validated {2} resources in {3}
-LogValSummary2=Validator {0} with id {1} validated {2} resources in {3} using {4} of CPU time
-LogSession=Session started on: {0}
-
-SevError=Error
-SevWarning=Warning
-SevIgnore=Ignore
-
-TimeUnder=under a second
-TimeNano={0} nanoseconds
-TimeMicro={0} microseconds
-TimeSec={0} seconds
-TimeMin={0} minutes
-
diff --git a/plugins/org.eclipse.wst.validation/property_files/validate_base.properties b/plugins/org.eclipse.wst.validation/property_files/validate_base.properties
deleted file mode 100644
index 9e2583d..0000000
--- a/plugins/org.eclipse.wst.validation/property_files/validate_base.properties
+++ /dev/null
@@ -1,140 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# To avoid name collisions, each extension point should preface their property names with an identifier.
-#
-# *************************************************************************
-# * Code oriented instructions:
-# *
-# * In the string, you may see the following special sequences:
-# * a) {n} where n is a number. These are replaceable parameters.
-# * b) '' In .properties files, in order to see one apostrophe (') in the final
-# * string, sometimes two apostrophes must be entered in the string. In the translated
-# * string, if there is at least one {n} in the string, then to show one apostrophe
-# * to the user, put two apostrophes in the string. If there are no {n} in the string,
-# * then put one apostrophe.
-# * For example, say that you want the user to read "George's file".
-# * GEORGE=George's file was on the desk.
-# * GEORGE2=George''s file and {0} were on the desk.
-# * GEORGE uses one apostrophe because there are no {n} and GEORGE2
-# * uses two apostrophes because there is a {n}.
-# * c) '' text '' where text can be any word(s). The text between the double
-# * apostrophes should not be translated.
-# * d) <text> where text can be any word(s). The text between the angle
-# * brackets should NOT be translated.
-# * e) "text" where text can be any word(s). The text between the quotation
-# * marks should NOT be translated.
-# *
-# *************************************************************************
-# * Other instructions
-# * a) Do not translate any text that is on a line which begins with a comment
-# * symbol (#).
-# * b) Do not translate these words:
-# * schema, EJB, RDB, JAR, RMI, BMP, CMP, OOSQL
-# * c) Please return the .properties files using the same directory structure.
-# * This is necessary because two of the files have the same name.
-# *
-# *************************************************************************
-# Any other comments to the translators are on lines which start like this: # 2TC:
-#
-# Version 1.14
-#
-#
-# ID:
-# VBF - Validation Builder Framework
-# VBF_EXC=Exception or error text
-# VBF_STATUS=Status message
-# VBF_TASK=Task list message
-#
-
-#
-# Begin Validation Builder Framework Strings
-#
-# IDs:
-# VBF_EXC=Exception or error text
-# VBF_STATUS=Status message
-# VBF_TASK=Task list message
-#
-VBF_EXC_CANNOT_ADD_MARKER=IWAE0001E The marker cannot be added to resource {0} in the task list.
-VBF_EXC_CANNOT_REMOVE_MARKER=IWAE0002E The marker cannot be removed from resource {0} in the task list.
-
-VBF_EXC_HELPER_MISSING=IWAE0003E Unable to load {0} because it did not specify a <helper>. Each validator must identify the helper class that loads its MOF model.
-VBF_EXC_HELPER_CANNOTLOAD=IWAE0004E Unable to load {0} because its <helper>, {1}, could not be loaded. Ensure that the case-sensitive file name is spelled correctly.
-
-VBF_EXC_INTERNAL=IWAE0005E An internal error occurred during validation. Validation was being run on project {0} with validator {1}. The message thrown was {2}.
-
-# 2TC: In the following string, "type" is a noun
-VBF_EXC_INVALID_TYPE_FILTER=IWAE0006E Invalid type filter; {0} must be an instance of {1}.
-VBF_EXC_INVALID_RESOURCE=IWAE0007E Cannot add message "{0}" with target object "{1}" because no file, folder, or project can be found with which to associate the message.
-
-VBF_EXC_MISSING_VALIDATOR_EP=IWAE0008E The validator framework could not be started. The extension point named \"{0}\" could not be found. Save all log files and contact your IBM representative.
-VBF_EXC_MISSING_PROJECTNATURE_ID=IWAE0009E A projectNature must have an associated ID. Validation is ignoring this tag and continuing.
-
-VBF_EXC_RUNTIME=IWAE0010E Run-time exception {0} occurred during validation. The validator being run was {1} and the message thrown was {2}.
-
-VBF_EXC_SYNTAX_NO_HELPER=IWAE0012E No <helper> element is specified in the plugin.xml file for validator {0}. Since the helper cannot be created, the validator will not be loaded.
-VBF_EXC_SYNTAX_NO_HELPER_CLASS=IWAE0013E No "class" attribute in the <helper> element is specified in the plugin.xml file for validator {0}. The helper cannot be created without the name of the class that implements it. Since the helper cannot be created, the validator will not be loaded.
-VBF_EXC_SYNTAX_NO_HELPER_THROWABLE=IWAE0014E The helper {0} cannot be created because a Throwable was caught.
-VBF_EXC_SYNTAX_NO_VAL_THROWABLE=IWAE0017E Cannot create validator {0} because a Throwable was caught.
-
-VBF_EXC_DISABLEV=IWAE0019E Cannot instantiate validator {0}. Disabling the validator; read the log for details.
-VBF_EXC_DISABLEH=IWAE0020E Cannot instantiate helper {0}. Disabling validator {1}; read the log for details.
-VBF_EXC_ORPHAN_IVALIDATOR=IWAE0021E Cannot locate meta-data for validator {0}.
-
-VBF_EXC_VALIDATORNAME_IS_NULL=IWAE0022E The plugin with ID {0} has been disabled because its getName() method returns null. The method must return a value.
-
-VBF_EXC_NULLCREATE=IWAE0023E Cannot create a validation configuration on a null resource.
-VBF_EXC_NULLSAVE=IWAE0024E Cannot save a validation configuration on a null resource.
-VBF_EXC_SAVE=IWAE0025E Could not save the validation configuration on resource {0}.
-VBF_EXC_NULLRETRIEVE=IWAE0026E Cannot retrieve the validation configuration because resource is null.
-VBF_EXC_RETRIEVE=IWAE0027E Could not retrieve the validation configuration for resource {0}.
-
-VBF_EXC_BADVMD=IWAE0028E ValidatorMetaData[] must not be null or empty.
-VBF_EXC_OPENPRJ=IWAE0029E Project {0} must be open.
-VBF_EXC_EXISTPRJ=IWAE0030E Project {0} must exist.
-VBF_EXC_BADPRJ=IWAE0031E Project {0} must be the project that contains the resources in the IResource[].
-VBF_EXC_MULTIPRJ=IWAE0032E All IResource instances in the IResource[] must be part of the same IProject instance. The resources come from the following projects: {0}.
-VBF_EXC_BADVAL=IWAE0033E Validator {0} must be configured on {1};
-
-VBF_STATUS_INITIALIZING=Initializing {0}.
-
-VBF_STATUS_VALIDATOR_CLEANUP=Performing cleanup on {0} before termination.
-
-VBF_STATUS_PROGRESSMONITOR_TITLE=Validating
-VBF_STATUS_NULL_DELTA=Last build state of {0} could not be retrieved. Performing a full validation.
-
-VBF_STATUS_VALIDATOR_TERMINATED=Validation of {0} using {1} was cancelled.
-
-VBF_STATUS_START_REMOVING_OLD_MESSAGES=Removing {0} messages on {1} has started...
-VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES=Messages removed.
-
-VBF_STATUS_STARTING_VALIDATION=Validation of {0} by {1} has started...
-VBF_STATUS_ENDING_VALIDATION=Validation of {0} by {1} is complete. All known problems have been reported.
-VBF_STATUS_ENDING_VALIDATION_ABNORMALLY=Validation of {0} by {1} ended abnormally. The list of problems may be incomplete. Please check the information messages for the cause of the abnormal termination.
-
-VBF_STATUS_LOOKING=Looking for validation messages owned by uninstalled validators...
-VBF_STATUS_LOOKINGDONE=Looking for validation messages owned by uninstalled validators...done.
-VBF_STATUS_REMOVING=Removing validation messages owned by uninstalled validators...
-VBF_STATUS_REMOVINGDONE=Removing validation messages owned by uninstalled validators...done.
-
-VBF_WRONG_CONTEXT_FOR_DELEGATE=The validator {0} is a being invoked with a wrong context. Please use an IProjectValidationContext.
-VBF_NO_DELEGATE=The validator {0} is a delegating validator but no delegate can found for it.
-VBF_CANNOT_INSTANTIATE_DELEGATE=The validator delegate {0} registered for {1} cannot be instantiated.
-
-# The following message will be deleted soon.
-VBF_TASK_WARN_MESSAGE_LIMIT_ABORT=IWAE0034W IWAD3000I: {1} terminated validation of {0} because the maximum number of messages were reported. Some messages may be missing.
-
-VBF_TASK_WARN_MESSAGE_LIMIT_VAL=IWAE0035W IWAD3000I: Some messages may be missing because the maximum number of messages has been reported. Increase the maximum number of messages and try again.
-VBF_VALIDATION_JOB_MSG=Waiting for build
-
-#
-# End Validation Builder Framework Strings
-#
-
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationConstants.java
deleted file mode 100644
index 18e6d44..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationConstants.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Validation constants needed to implement the marker extension point and the user's preferences.
- *
- * Only the validation framework should use this interface.
- */
-public interface ConfigurationConstants {
- String DISABLE_ALL_VALIDATION_SETTING = "disableAllValidation"; //$NON-NLS-1$ // boolean
- String SAVE_AUTOMATICALLY_SETTING = "saveAutomatically"; //$NON-NLS-1$ // boolean
-
- // Defaults for the preference and project values
-
- String CURRENT_VERSION = (String) ValidationPlugin.getPlugin().getBundle().getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION); // this is a constant, so it should be intern
- boolean DEFAULT_ASYNC = true;
- boolean DEFAULT_DISABLE_VALIDATION_SETTING = false;
- ValidatorMetaData[] DEFAULT_ENABLED_VALIDATORS = ValidationRegistryReader.getReader().getValidatorMetaDataArrayEnabledByDefault(); // store a copy here so that we don't modify the original and don't create a copy every time we need this value
- int DEFAULT_MAXNUMMESSAGES = 50;
- int DEPTH_INFINITE = IResource.DEPTH_INFINITE;
- int DEPTH_ZERO = IResource.DEPTH_ZERO;
- String ELEMENT_SEPARATOR = ";"; //$NON-NLS-1$ // separates the name of one IValidator from the next in the list of enabled validators for a project or preference
- String DELEGATES_SEPARATOR = "="; //$NON-NLS-1$ // Separates the delegating validator id from the delegate validator id in the list of delegates
-
- // The following values must match the attributes in the preference marker as shown in
- // plugin.xml
- // Even though the plugin.xml values are not used to create new Preference or Project markers,
- // maintaining one local name ensures that there's no confusion writing the migration code.
- // These are the QualifiedNames used to persist the user's settings.
- String ENABLED_MANUAL_VALIDATORS = "enabledManualValidatorList"; //$NON-NLS-1$ // String
- String ENABLED_BUILD_VALIDATORS = "enabledBuildValidatorList"; //$NON-NLS-1$ // String
- String DELEGATE_VALIDATORS = "delegateValidatorList"; //$NON-NLS-1$ // String
- String J2EE_PLUGIN_ID = "org.eclipse.jst.j2ee"; //$NON-NLS-1$ // For 4.03, this is the plugin id that the validation constants were declared in.
- String MAXNUMMESSAGES = "maxNumMessages"; //$NON-NLS-1$ // integer
- String PLUGIN_ID = ValidationPlugin.PLUGIN_ID;
- String PREF_PROJECTS_CAN_OVERRIDE = "projectsCanOverride"; //$NON-NLS-1$ // boolean
- // end validation message marker constants
-
- // Preference and Project constants
- String PREFERENCE_MARKER = PLUGIN_ID + ".preferencemarker"; //$NON-NLS-1$
- String PRJ_MARKER = PLUGIN_ID + ".projectmarker"; //$NON-NLS-1$ // The extension which saves user validation preferences for a particular project (e.g. which validators run on the project)
- String PRJ_MARKER_403 = J2EE_PLUGIN_ID + ".projectmarker"; //$NON-NLS-1$ // The extension which saves user validation preferences for a particular project (e.g. which validators run on the project)
- String PRJ_OVERRIDEGLOBAL = "overrideGlobalPreferences"; //$NON-NLS-1$ // boolean (Use the global preferences or override)
-
- QualifiedName USER_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
- QualifiedName USER_MANUAL_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationManualConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
- QualifiedName USER_BUILD_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationBuildConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
- QualifiedName DELEGATES_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationDelegatesConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
-
- // Validation message marker constants
-
- /**
- * org.eclipse.wst.validation.problemmarker - The marker id which is used to add v1 validation markers
- * to the task list */
- String VALIDATION_MARKER = PLUGIN_ID + ".problemmarker"; //$NON-NLS-1$
-
- /** For incremental validation, this field associates a message with a group, so that a subset of messages may be removed from a file. */
- String VALIDATION_MARKER_GROUP = "groupName"; //$NON-NLS-1$
-
- /** Persist the message id of the message, not just the translated text. */
- String VALIDATION_MARKER_MESSAGEID = "messageId"; //$NON-NLS-1$
-
- // The following values must match the attributes in the validation message marker as shown in plugin.xml
- String VALIDATION_MARKER_OWNER = "owner"; //$NON-NLS-1$ // The IValidator who owns the IMarker on the task list
- String VALIDATION_MARKER_SEVERITY = "validationSeverity"; //$NON-NLS-1$ // one of the SeverityEnum values
- String VALIDATION_MARKER_TARGETOBJECT = "targetObject"; //$NON-NLS-1$ // When more than one target object resolves to the same IResource, this field identifies which targetObject owns a particular message.
- String VERSION = "version"; //$NON-NLS-1$
-
- // WSAD versions which created markers of these types
- String VERSION4_03 = "4.03"; //$NON-NLS-1$
- String VERSION5_0 = "5.0"; //$NON-NLS-1$
- String VERSION5_01 = "5.0.1"; //$NON-NLS-1$
- // end preference and project defaults
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationManager.java
deleted file mode 100644
index 0c0c0be..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationManager.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * Only the validation framework can use this class.
- */
-public final class ConfigurationManager implements ConfigurationConstants {
- private static ConfigurationManager _instance = null;
-
- private ConfigurationManager() {}
-
- public static ConfigurationManager getManager() {
- if (_instance == null) {
- _instance = new ConfigurationManager();
- }
- return _instance;
- }
-
- /**
- * Given a validation marker, return the fully-qualified class name of the validator who owns
- * the message. If the validator cannot be found or if the marker is not a validation marker,
- * return null.
- */
- public String getValidator(IMarker marker) {
- if (marker == null)return null;
-
- try {
- if (!marker.getType().equals(VALIDATION_MARKER))return null;
-
- Object attrib = marker.getAttribute(VALIDATION_MARKER_OWNER);
- if (attrib == null) {
- // owner not set
- return null;
- }
- return attrib.toString();
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- }
-
- /**
- * Return true if the given marker is a validation marker. Otherwise return false.
- */
- public boolean isValidationMarker(IMarker marker) {
- if (marker == null)return false;
-
- try {
- return marker.getType().equals(VALIDATION_MARKER);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return false;
- }
- }
-
- /**
- * This method is for use by the TVT Validation plug-in ONLY!!! No code should access the
- * validation markers in the list directly except for the validation framework and the TVT
- * Validation plug-in.
- */
- public void removeAllValidationMarkers(IProject project) {
- if ((project == null) || (!project.isOpen()))return;
-
- try {
- project.deleteMarkers(VALIDATION_MARKER, false, DEPTH_INFINITE); // false means only
- // consider VALIDATION_MARKER, not variants of VALIDATION_MARKER.
- //Since addTask only adds VALIDATION_MARKER, we don't need to consider its subtypes.
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * This method returns the global preferences for the workspace.
- */
- public GlobalConfiguration getGlobalConfiguration() throws InvocationTargetException {
- IWorkspaceRoot root = ValidationConfiguration.getRoot();
- GlobalConfiguration gp = null;
- try {
- gp = (GlobalConfiguration) root.getSessionProperty(USER_PREFERENCE);
- if (gp == null)gp = getGlobalConfiguration(root);
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{root.getName()}));
- }
- return gp;
- }
-
- private synchronized GlobalConfiguration getGlobalConfiguration(IWorkspaceRoot root) throws InvocationTargetException {
- GlobalConfiguration gp = null;
- try {
- gp = (GlobalConfiguration) root.getSessionProperty(USER_PREFERENCE);
- if (gp == null) {
- gp = new GlobalConfiguration(root);
- 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.
- *
- * @deprecated this method doesn't do anything.
- */
- public void resetProjectNature(IProject project) throws InvocationTargetException {
- }
-
- public void closing(IProject project) {
- try {
- if (isMigrated(project)) {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- if(!prjp.useGlobalPreference())
- prjp.store();
- }
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
-
- 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;
- }
-
- /**
- * Answer the appropriate configuration based on whether the project has overridden the configuration
- * or not. If the project exists and is allowed to override the global configuration answer the
- * project configuration, otherwise answer the global configuration.
- * @param project it can be null
- */
- public ValidationConfiguration getConfiguration(IProject project) throws InvocationTargetException {
- if (project == null)return getGlobalConfiguration();
- ProjectConfiguration pc = getProjectConfiguration(project);
- if (pc != null && !pc.useGlobalPreference())return pc;
- return getGlobalConfiguration();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/EventManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/EventManager.java
deleted file mode 100644
index de77ba9..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/EventManager.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * This class manages resource change events for the validation framework.
- */
-public class EventManager implements IResourceChangeListener {
- private static EventManager _inst;
-
- // false means that eclipse is not shutting down, and true means that it is shutting down.
- private boolean _shutdown;
-
- private IResourceDeltaVisitor _postAutoBuildVisitor;
- private boolean _isActive; // has the registry been read?
-
- private Set<IProjectChangeListener> _listeners = new HashSet<IProjectChangeListener>(4);
-
- private EventManager() {
- }
-
- public static EventManager getManager() {
- if (_inst == null)_inst = new EventManager();
- return _inst;
- }
-
- public void addProjectChangeListener(IProjectChangeListener listener){
- Tracing.log("EventManager-03: add listener: ", listener); //$NON-NLS-1$
- _listeners.add(listener);
- }
-
- public void removeProjectChangeListener(IProjectChangeListener listener){
- _listeners.remove(listener);
- }
-
- private void signal(IProject project, int type){
- if (Tracing.isLogging()){
- String name = "Null"; //$NON-NLS-1$
- if (project != null)name = project.getName();
- Tracing.log("EventManager-02: signal project: " + name + ", IProjectChangeListener type: " + type); //$NON-NLS-1$ //$NON-NLS-2$
- }
- for (IProjectChangeListener pcl : _listeners){
- try {
- pcl.projectChanged(project, type);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- public void opening(IProject project) {
- if (project == null || !ValidationPlugin.isActivated())return;
-
- signal(project, IProjectChangeListener.ProjectOpened);
-
- // When the project is opened, check for any orphaned tasks or tasks whose owners need to be updated.
- ConfigurationManager.getManager().opening(project);
- }
-
- public void closing(IProject project) {
- if (project == null || !ValidationPlugin.isActivated())return;
-
- signal(project, IProjectChangeListener.ProjectClosed);
-
- try {
- boolean isMigrated = ConfigurationManager.getManager().isMigrated(project);
- // If it's not migrated, then it hasn't been loaded, and we don't want to load the
- // validator and its prerequisite plug-ins until they're needed.
- if (isMigrated) {
- ValidatorMetaData[] vmds = ConfigurationManager.getManager().getProjectConfiguration(project).getValidators();
- for (ValidatorMetaData vmd : vmds) {
-
- if (!vmd.isActive()) {
- // If this validator has not been activated, or if it has been shut down,
- // don't activate it again.
- continue;
- }
-
- IWorkbenchContext helper = null;
- try {
- helper = vmd.getHelper(project);
- helper.closing();
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
-
- ValidationPlugin.getPlugin().handleException(e);
- } catch (Exception e) {
- // If there is a problem with this particular helper, log the error and
- // continue with the next validator.
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- ConfigurationManager.getManager().closing(project);
- }
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
-
- public void deleting(IProject project) {
- if (project == null)return;
-
- signal(project, IProjectChangeListener.ProjectDeleted);
-
- try {
- boolean isMigrated = ConfigurationManager.getManager().isMigrated(project);
- // If it's not migrated, then it hasn't been loaded, and we don't want to load the
- // validator and its prerequisite plug-ins until they're needed.
- if (isMigrated) {
- ValidatorMetaData[] vmds = ConfigurationManager.getManager().getProjectConfiguration(project).getValidators();
- for (ValidatorMetaData vmd : vmds) {
-
- if (!vmd.isActive()) {
- // If this validator has not been activated, or if it has been shut down,
- // don't activate it again.
- continue;
- }
-
- IWorkbenchContext helper = null;
- try {
- helper = vmd.getHelper(project);
- helper.deleting();
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- } catch (Exception e) {
- // If there is a problem with this particular helper, log the error and
- // continue with the next validator.
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
- }
-
- ConfigurationManager.getManager().deleting(project);
- }
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- }
-
- /**
- * If a project's description changes, The project may have changed its nature. Update the cache
- * to reflect the new natures. The project could be opening. Migrate.
- */
- private void postAutoChange(IResourceDelta delta) {
- if (_postAutoBuildVisitor == null) {
- _postAutoBuildVisitor = new IResourceDeltaVisitor() {
- public boolean visit(IResourceDelta subdelta) throws CoreException {
- if (subdelta == null)return false;
-
- IResource resource = subdelta.getResource();
- if (resource instanceof IWorkspaceRoot)return true;
- if (resource instanceof IProject) {
- IProject project = (IProject) resource;
- if ((subdelta.getFlags() & IResourceDelta.DESCRIPTION) == IResourceDelta.DESCRIPTION) {
- signal(project, IProjectChangeListener.ProjectChanged);
- return false;
- }
-
- if ((subdelta.getFlags() & IResourceDelta.OPEN) == IResourceDelta.OPEN) {
- if (project.isOpen()) {
- // Project was just opened. If project.isOpen() had returned false,
- // project would just have been closed.
- opening(project);
- }
- return false;
- }
-
- if ((subdelta.getFlags() & IResourceDelta.ADDED) == IResourceDelta.ADDED) {
- signal(project, IProjectChangeListener.ProjectAdded);
- return false;
- }
- }
-
- return false;
- }
- };
- }
-
- try {
- delta.accept(_postAutoBuildVisitor, true);
- } catch (CoreException exc) {
- ValidationPlugin.getPlugin().handleException(exc);
- }
- }
-
- /**
- * Notifies this manager that some resource changes have happened on the platform. If the change
- * is a project deletion, that project should be removed from the cache.
- *
- * @see IResourceDelta
- * @see IResource
- */
- public void resourceChanged(IResourceChangeEvent event) {
- if (_shutdown && !isActive()) {
- // If we're shutting down, and nothing has been activated, don't need to do anything.
- return;
- }
-
- if (Tracing.isLogging()){
- Tracing.log("Eventmanager-01: IResourceChangeEvent type=" + //$NON-NLS-1$
- Misc.resourceChangeEventType(event.getType()) +
- ", resource=" + //$NON-NLS-1$
- event.getResource() + ", source=" + event.getSource() + ", delta=" + //$NON-NLS-1$//$NON-NLS-2$
- event.getDelta());
- }
-
- if (event.getSource() instanceof IWorkspace) {
- boolean isProject = event.getResource() instanceof IProject;
- if ((event.getType() == IResourceChangeEvent.PRE_DELETE) && isProject) {
- deleting((IProject) event.getResource());
- } else if ((event.getType() == IResourceChangeEvent.PRE_CLOSE) && isProject) {
- closing((IProject) event.getResource());
- } else if (event.getType() == IResourceChangeEvent.POST_BUILD) {
- postAutoChange(event.getDelta());
- }
- }
- }
-
- /**
- * Notifies this manager that the ValidationPlugin is shutting down. (Usually implies that
- * either the plug-in could not load, or that the workbench is shutting down.)
- * <p>
- * The manager will then notify all active helpers of the shutdown, so that they may perform any
- * last-minute writes to disk, cleanup, etc.
- */
- public void shutdown() {
- try {
- // resourceChanged(IResourceChangeEvent) needs to know when a shutdown has started.
- _shutdown = true;
-
- // If the validators are loaded, then for every project in the workbench,
- // we must see if it has been loaded. If it has, every enabled IWorkbenchContext
- // must be called to clean up. If the project hasn't been loaded, then no
- // IWorkbenchContext built anything, and there's nothing to clean up.
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceRoot workspaceRoot = workspace.getRoot();
- IProject[] projects = workspaceRoot.getProjects();
- ProjectConfiguration prjp = null;
- for (IProject project : projects) {
- if (!project.isOpen()) {
- // If the project isn't opened, there's nothing to clean up.
- // If the project was opened, it would have been migrated, and there's something
- // to clean up.
- continue;
- }
-
- try {
- boolean isMigrated = ConfigurationManager.getManager().isMigrated(project);
- // If it's not migrated, then it hasn't been loaded, and we don't want to load
- // the validator and its prerequisite plug-ins until they're needed.
- if (isMigrated) {
- prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
-
- ValidatorMetaData[] vmdList = prjp.getEnabledValidators();
- // if vmdList is null, IProject has never been loaded, so nothing to clean up
- if (vmdList != null) {
- for (int j = 0; j < vmdList.length; j++) {
- ValidatorMetaData vmd = vmdList[j];
-
- if (!vmd.isActive()) {
- // If this validator has not been activated, or if it has been
- // shut down, don't activate it again.
- continue;
- }
-
- IWorkbenchContext helper = vmd.getHelper(project);
- if (helper != null) {
- try {
- helper.shutdown();
- } catch (Exception exc) {
- // Since we're shutting down, ignore the exception.
- }
- }
- }
- }
- }
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- }
- } catch (Exception exc) {
- // Since we're shutting down, ignore the exception.
- }
- }
-
- public boolean isActive() {
- // Have to use this convoluted technique for the shutdown problem.
- // i.e., when eclipse is shut down, if validation plug-in hasn't been loaded,
- // the EventManager is activated for the first time, and it
- // sends many exceptions to the .log. At first, I wrote a
- // static method on ValidationRegistryReader, which returned true
- // if the registry had been read, and false otherwise. However,
- // that didn't solve the exception problem, because eclipse's
- // class loader failed to load the ValidationRegistryReader class.
- //
- // The fix is to keep all shutdown mechanisms in this class.
- // Track everything in here.
- return _isActive;
- }
-
- /**
- * This method should only be called by the ValidationRegistryReader once the registry has been
- * read.
- */
- public void setActive(boolean b) {
- _isActive = b;
- }
-
- /**
- * This method should be used to determine if the workbench is running in UI or Headless.
- *
- * @deprecated This plug-in no longer depends on jem. If you need this function use the jem
- * code directly.
- */
- public static boolean isHeadless() {
- //return UIContextDetermination.getCurrentContext() == UIContextDetermination.HEADLESS_CONTEXT;
- return false;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/FilterUtil.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/FilterUtil.java
deleted file mode 100644
index fb2a80d..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/FilterUtil.java
+++ /dev/null
@@ -1,658 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.wst.validation.internal.core.IFileDelta;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.operations.WorkbenchFileDelta;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Utility class for the ValidationOperation hierarchy.
- */
-public final class FilterUtil {
- private static VMDDeltaVisitor _deltaVisitor = null;
- private static VMDResourceVisitor _resourceVisitor = null;
-
- private interface VMDRecorder {
- public Map<ValidatorMetaData, Set<IFileDelta>> getResult();
-
- public void setEnabledValidators(Set<ValidatorMetaData> enabledValidators);
-
- public void setProgressMonitor(IProgressMonitor monitor);
-
- public IProgressMonitor getProgressMonitor();
- }
-
- private interface VMDDeltaVisitor extends VMDRecorder, IResourceDeltaVisitor {
- }
-
- private interface VMDResourceVisitor extends VMDRecorder, IResourceVisitor {
- }
-
- private FilterUtil() {
- }
-
- /**
- * Given a Set of enabled ValidatorMetaData, create a Map with each ValidatorMetaData as a key
- * with an associated null value.
- */
- static Map<ValidatorMetaData, Set<IFileDelta>> wrapInMap(Set<ValidatorMetaData> enabledValidators) {
- Map<ValidatorMetaData, Set<IFileDelta>> result = new HashMap<ValidatorMetaData, Set<IFileDelta>>();
- if ((enabledValidators == null) || (enabledValidators.size() == 0))return result;
-
- for (ValidatorMetaData vmd : enabledValidators)result.put(vmd, null);
- return result;
- }
-
- static void checkCanceled(IProgressMonitor monitor) throws OperationCanceledException {
- if (monitor == null)return;
- else if (monitor.isCanceled())throw new OperationCanceledException(""); //$NON-NLS-1$
- }
-
- /**
- * Given a Map of VMD <=>Set(IFileDelta), either return the existing Set or create a Set and
- * return it.
- */
- private static Set<IFileDelta> getResourceDeltas(Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators,
- ValidatorMetaData vmd) {
- Set<IFileDelta> fileDeltas = enabledValidators.get(vmd);
- if (fileDeltas == null) {
- fileDeltas = new HashSet<IFileDelta>();
- enabledValidators.put(vmd, fileDeltas);
- }
- return fileDeltas;
- }
-
- /**
- * Given the IFileDelta type, return the corresponding IResourceDelta type.
- */
- private static int getResourceDeltaType(int ifileDeltaType) {
- switch (ifileDeltaType) {
- case (IFileDelta.ADDED) : {
- return IResourceDelta.ADDED;
- }
-
- case (IFileDelta.DELETED) : {
- return IResourceDelta.REMOVED;
- }
-
- case (IFileDelta.CHANGED) :
- default : {
- return IResourceDelta.CHANGED;
- }
- }
- }
-
- /**
- * Given the IResourceDelta type, return the corresponding IFileDelta type.
- */
- static int getFileDeltaType(int iresourceDeltaType) {
- switch (iresourceDeltaType) {
- case IResourceDelta.ADDED : // resource has been added to the workbench
- {
- return IFileDelta.ADDED;
- }
-
- case IResourceDelta.CHANGED : // resources has been changed in the workbench
- {
- return IFileDelta.CHANGED;
- }
-
- case IResourceDelta.REMOVED : // resource has been deleted from the workbench
- {
- return IFileDelta.DELETED;
- }
-
- case IResourceDelta.ADDED_PHANTOM : // incoming workbench resource
- {
- return IFileDelta.ADDED;
- }
-
- case IResourceDelta.REMOVED_PHANTOM : // outgoing workbench resource
- {
- return IFileDelta.DELETED;
- }
-
- default : {
- return IFileDelta.CHANGED;
- }
- }
- }
-
-
- /**
- * Return the validators which are both configured on this type of project, (as stored in
- * getProject()), and enabled by the user on this project.
- */
- static void addFileDelta(Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators,
- ValidatorMetaData vmd, WorkbenchFileDelta fileDelta) {
- Set<IFileDelta> fileDeltas = getResourceDeltas(enabledValidators, vmd);
- fileDeltas.add(fileDelta);
- enabledValidators.put(vmd, fileDeltas);
- }
-
- /**
- * Return a Map wrapper, with each VMD from enabledValidators as the key, and the value a Set of
- * IFileDelta wrapper around the changed Object[].
- *
- * If filterIn is true, do not check if the resources are filtered in by the validator. If
- * filterIn is false, check if the resources are filtered in by the validator (recommended).
- */
- public static Map<ValidatorMetaData, Set<IFileDelta>>
- getFileDeltas(Set<ValidatorMetaData> enabledValidators, Object[] changedResources, boolean filterIn) {
- // by default assume that the resources have changed, i.e. not added or deleted
- return getFileDeltas(enabledValidators, changedResources, IFileDelta.CHANGED, filterIn);
- }
-
- /**
- * Return a Map wrapper, with each VMD from enabledValidators as the key, and the value a Set of
- * IFileDelta wrapper around the changed Object[], with each delta of type deltaType.
- */
- public static Map<ValidatorMetaData, Set<IFileDelta>>
- getFileDeltas(Set<ValidatorMetaData> enabledValidators, Object[] changedResources, int ifileDeltaType) {
- // by default check if the Objects are filtered in by the validator
- return getFileDeltas(enabledValidators, changedResources, ifileDeltaType, false);
- }
-
- /**
- * Return a Map wrapper, with each VMD from enabledValidators as the key, and the value a Set of
- * IFileDelta wrapper around the changed Object[].
- * <p>
- * If "force" is true, then don't check if the object is filtered in by the validator or not.
- * ValidatorSubsetOperation can use validators that don't filter in these particular resources,
- * but can use a defaultExtension's validators instead.
- */
- public static Map<ValidatorMetaData, Set<IFileDelta>> getFileDeltas(Set<ValidatorMetaData> enabledValidators,
- Object[] changedResources, int ifileDeltaType, boolean force) {
-
- Map<ValidatorMetaData, Set<IFileDelta>> result = new HashMap<ValidatorMetaData, Set<IFileDelta>>();
- if ((enabledValidators == null) || (enabledValidators.size() == 0)) {
- return result;
- }
-
- boolean cannotLoad = false;
- IWorkbenchContext helper = null;
- for (ValidatorMetaData vmd : enabledValidators) {
- try {
- Set<IFileDelta> deltas = new HashSet<IFileDelta>();
- IProgressMonitor monitor = new NullProgressMonitor();
- for (int i = 0; i < changedResources.length; i++) {
- Object obj = changedResources[i];
- WorkbenchFileDelta wfd = null;
- if (obj instanceof IResource) {
- IResource res = (IResource) obj;
- if (force || !filterOut(monitor, vmd, res, getResourceDeltaType(ifileDeltaType))) {
- helper = vmd.getHelper(res.getProject());
-
- wfd = getFileDelta(helper, vmd, res, getResourceDeltaType(ifileDeltaType));
- }
- } else {
- wfd = new WorkbenchFileDelta(obj);
- }
-
- if (wfd != null) {
- deltas.add(wfd);
- }
- }
- result.put(vmd, deltas);
- } catch (InstantiationException e) {
- cannotLoad = true;
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
-
- }
-
- if (cannotLoad) {
- // Some of the validators should not be in the result set because either their
- // validator class or helper class could not be instantiated.
- Object[] vmds = enabledValidators.toArray();
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = (ValidatorMetaData) vmds[i];
- if (vmd.cannotLoad()) {
- result.remove(vmd);
- }
- }
- }
-
- return result;
- }
-
- public static WorkbenchFileDelta getFileDelta(IWorkbenchContext helper, ValidatorMetaData vmd, IResource resource, int iresourceDeltaType) {
- // strip off the eclipse-specific information
- String fileName = helper.getPortableName(resource);
- if (fileName == null) {
- // The resource is not contained in the current project.
- // Can't see how this would happen, but check for it anyway.
-
- // [122960] null should be allowed
-// String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NULL_NAME),
-// new Object[]{resource.getName(), vmd.getValidatorDisplayName()});
-// ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, result);
-
- IPath resourcePath = resource.getFullPath();
- if (resourcePath != null) {
- // Since null file names are not allowed, default to the fully-qualified name of the
- // resource.
- fileName = resourcePath.toString();
- } else {
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR,
- "portableName is null and path is null for resource " + resource); //$NON-NLS-1$
- return null;
- }
- }
-
- int ifileDeltaType = getFileDeltaType(iresourceDeltaType);
- return new WorkbenchFileDelta(fileName, ifileDeltaType, resource);
- }
-
-
- /**
- * Add the IResource to the vmd's list of resources to validate. Return true if the add was
- * successful or false if the add was not successful.
- */
- static boolean addToFileList(Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators, IWorkbenchContext helper, ValidatorMetaData vmd, IResource resource, int resourceDelta, boolean isFullBuild) {
- if ((vmd == null) || (resource == null)) {
- return false;
- }
-
- try {
- helper.registerResource(resource);
- } catch (Exception exc) {
- ValidationPlugin.getPlugin().handleException(exc);
- InternalValidatorManager.getManager().addInternalErrorTask(resource.getProject(), vmd, exc);
-
- // Don't return ... even though the register threw an exception, that's not to say
- // that the validator can't validate.
- }
-
- if (isFullBuild) {
- // To indicate a full build to the validator, don't build up a list of files;
- // pass in null instead. Given that the list of files should not be used,
- // don't calculate it.
- return true;
- }
-
-
- WorkbenchFileDelta newFileDelta = getFileDelta(helper, vmd, resource, resourceDelta);
- if (newFileDelta != null) {
- // if delta is null, getFileDelta will have logged the problem already
- addFileDelta(enabledValidators, vmd, newFileDelta);
- }
-
- return true;
- }
-
- /**
- * Whether a full verification or a delta verification is in progress, both will call this
- * method to process the resource. This method calls the current Validator to filter the
- * resource (i.e., this method returns if the resource fails the filter test).
- * <code>process</code> also sends output to the <code>IProgressMonitor</code>, and calls
- * the current Validator to validate the resource.
- *
- * To process a resource, there are several steps: 1. check if the resource is registered for
- * this validator (i.e., the validator has either specified it in a filter, or has not filtered
- * it out explicitly) 2. call <code>isValidationSource</code> on the current validator with
- * the current resource. This method performs further filtering by the Validator itself, in
- * addition to the static filtering done by the framework, based on the information in
- * plugin.xml. 3. If the resource passes both filters, call <code>validate</code> on the
- * validator, with the resource. 4. When complete (either by failing to pass a filter, or by the
- * completion of the <code>validate</code>), increment the IProgressMonitor's status by one
- * (i.e., one resource has been processed.)
- */
- static boolean filterOut(IProgressMonitor monitor, ValidatorMetaData vmd, IResource resource, int resourceDelta) {
- if (monitor == null) {
- return false;
- }
-
- checkCanceled(monitor);
- return !(vmd.isApplicableTo(resource, resourceDelta));
- }
-
- /**
- * Whether a full verification or a delta verification is in progress, both
- * will call this method to process the resource. This method calls the
- * current Validator to filter the resource (i.e., this method returns if
- * the resource fails the filter test). It also sends output to the
- * <code>IProgressMonitor</code>, and calls the current Validator to
- * validate the resource.
- * <p>
- * To process a resource, there are several steps:
- * <ol>
- * <li>Check if the resource is registered for this validator (i.e., the
- * validator has either specified it in a filter, or has not filtered it out
- * explicitly)
- * <li>Call <code>isValidationSource</code> on the current validator with
- * the current resource. This method performs further filtering by the
- * Validator itself, in addition to the static filtering done by the
- * framework, based on the information in the extension point.
- * <li>If the resource passes both filters, call <code>validate</code> on
- * the validator, with the resource.
- * <li>When complete (either by failing to pass a filter, or by the
- * completion of the <code>validate</code>), increment the
- * IProgressMonitor's status by one (i.e., one resource has been processed.)
- * </ol>
- */
- static void filterOut(IProgressMonitor monitor, Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators,
- IResource resource, int resourceDelta, boolean isFullBuild) {
- if (monitor == null)return;
-
- checkCanceled(monitor);
-
- boolean cannotLoad = false;
- for (ValidatorMetaData vmd : enabledValidators.keySet()) {
- checkCanceled(monitor);
-
- if (!filterOut(monitor, vmd, resource, resourceDelta)) {
- try {
- // Notify the helper that a resource is about to be filtered in
- IWorkbenchContext helper = vmd.getHelper(resource.getProject());
- addToFileList(enabledValidators, helper, vmd, resource, resourceDelta, isFullBuild);
- } catch (InstantiationException e) {
- cannotLoad = true;
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- if (cannotLoad) {
- // Some of the validators need to be removed from the set because the validator
- // or helper cannot be instantiated.
- Object[] vmds = enabledValidators.keySet().toArray();
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = (ValidatorMetaData) vmds[i];
- if (vmd.cannotLoad()) {
- enabledValidators.remove(vmd);
- }
- }
- }
- }
-
- /**
- * Whether a full verification or a delta verification is in progress, both will call this
- * method to process the resource. This method calls the current Validator to filter the
- * resource (i.e., this method returns if the resource fails the filter test).
- * <code>process</code> also sends output to the <code>IProgressMonitor</code>, and calls
- * the current Validator to validate the resource.
- *
- * This method is called during an incremental, not a full, validation. The full validation
- * fakes an IResourceDelta, and the incremental needs to check that the delta is one of the
- * deltas which is filtered in by the validation framework.
- *
- * @see filterOut(IResourceDelta)
- *
- * To process a resource, there are several steps: 1. check if the resource is registered for
- * this validator (i.e., the validator has either specified it in a filter, or has not filtered
- * it out explicitly) 2. call <code>isValidationSource</code> on the current validator with
- * the current resource. This method performs further filtering by the Validator itself, in
- * addition to the static filtering done by the framework, based on the information in
- * plugin.xml. 3. If the resource passes both filters, call <code>validate</code> on the
- * validator, with the resource. 4. When complete (either by failing to pass a filter, or by the
- * completion of the <code>validate</code>), increment the IProgressMonitor's status by one
- * (i.e., one resource has been processed.)
- */
- static void filterOut(IProgressMonitor monitor, Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators,
- IResource resource, IResourceDelta delta) {
- // filter in only resources which have been added, deleted, or its content changed.
- // moves will be registered as an add & delete combination
- if (filterOut(delta))return;
-
- filterOut(monitor, enabledValidators, resource, delta.getKind(), false); // false =
- // incremental
- // build
- }
-
- /**
- * Filter out resource deltas which don't correspond to changes that validators can validate.
- *
- * This method will filter in deltas only if the delta is an add, a delete, or if the content of
- * the file has changed.
- *
- * Return true if the delta should be filtered out, and false if we should validate it.
- *
- * @see IResourceDelta
- */
- static boolean filterOut(IResourceDelta delta) {
- if (delta == null) {
- return true;
- }
-
- switch (delta.getKind()) {
- case IResourceDelta.ADDED : // resource has been added to the workbench
- {
- return false;
- }
-
- case IResourceDelta.REMOVED : // resource has been deleted from the workbench
- {
- // If the delta is an IProject, and the IProject is getting deleted or closed, don't
- // validate it or its children.
- if (delta.getResource() instanceof IProject) {
- return true;
- }
- return false;
- }
-
- case IResourceDelta.CHANGED : // resources has been changed in the workbench
- {
- // We want to add the enterprise bean only if its source file's
- // contents have changed. (for example, if a folder has been
- // added to the project, the IFile will be changed because
- // its position has been changed, but the enterprise bean
- // doesn't need to be redeployed. See IResourceDelta.getFlags()
- // for more information.)
- //
- // Or, if ejb-jar.xml has changed, the EJBJar is destroyed & created
- // from scratch, so the list of EnterpriseBean is new. Purge the old
- // EJBJar from the EJBCache (since it will never be referenced again),
- // and load the new EJBJar into the cache.
- if ((delta.getResource() instanceof IFile) && ((delta.getFlags() & IResourceDelta.CONTENT) != 0)) {
- return false;
- }
- }
- }
- return true;
- }
-
- /**
- * This method returns true if the given resource and its children should be processed by the
- * validators. That is, there are several types of changes which can occur to an IProject which
- * should not trigger a revalidation of the project or its children. (e.g. project is deleted or
- * closed.) For those cases, or if the IResourceDelta is invalid, this method will return false
- * (do not validate the IProject or its children). Otherwise, return true (validate the resource &
- * its children). If an IProject itself has not changed, but one of its children has
- * (delta.getKind() of NO_CHANGE), then return true so that the children are validated.
- */
- static boolean shouldProcess(IResource resource, IResourceDelta delta) {
- if ((resource != null) && !(resource instanceof IProject)) {
- return true;
- }
-
- if (delta == null) {
- return false;
- }
-
- switch (delta.getKind()) {
- case IResourceDelta.ADDED : // resource has been deleted from the workbench; may be part
- // of a move
- {
- if (0 != (delta.getFlags() & IResourceDelta.MOVED_FROM)) {
- // If it's being moved, don't revalidate its children. If it's being added, fall
- // through to the "return true;" at the end of this method.
- return false;
- }
- break;
- }
-
- case IResourceDelta.REMOVED : // resource has been deleted from the workbench; may be
- // part of a move
- {
- // Whether it's being deleted or moved, don't revalidate its children.
- return false;
- }
-
- case IResourceDelta.CHANGED : // resource has been changed in the workbench; may be part
- // of a move
- {
- if ((delta.getFlags() & IResourceDelta.OPEN) != 0) {
- // Change is related to the OPEN bit. Whether the project was closed and is now
- // open,
- // or the project was open and is now closed, don't need to revalidate the
- // children.
- return false;
- } else if ((delta.getFlags() & IResourceDelta.REPLACED) != 0) {
- // project was moved
- return false;
- }
-
- break;
- }
- }
-
- return true;
- }
-
- private static VMDResourceVisitor getResourceVisitor(IProgressMonitor monitor, Set<ValidatorMetaData> enabledValidators) {
- if (_resourceVisitor == null) {
- _resourceVisitor = new VMDResourceVisitor() {
- private Map<ValidatorMetaData, Set<IFileDelta>> _vmdDeltas = null;
- private IProgressMonitor _progressMonitor = null;
-
- public Map<ValidatorMetaData, Set<IFileDelta>> getResult() {
- return _vmdDeltas;
- }
-
- public void setEnabledValidators(Set<ValidatorMetaData> validators) {
- _vmdDeltas = wrapInMap(validators);
- }
-
- public IProgressMonitor getProgressMonitor() {
- return _progressMonitor;
- }
-
- public void setProgressMonitor(IProgressMonitor m) {
- _progressMonitor = m;
- }
-
- public boolean visit(IResource res) throws CoreException {
- FilterUtil.checkCanceled(getProgressMonitor());
-
- // We don't need to filter out anything, because a full validation
- // is about to be performed.
- filterOut(getProgressMonitor(), _vmdDeltas, res, IResourceDelta.CHANGED, true);
-
- return true; // visit the resource's children as well
- }
- };
- }
- _resourceVisitor.setProgressMonitor(monitor);
- _resourceVisitor.setEnabledValidators(enabledValidators);
-
- return _resourceVisitor;
- }
-
- private static VMDDeltaVisitor getDeltaVisitor(IProgressMonitor monitor, Set<ValidatorMetaData> enabledValidators) {
- if (_deltaVisitor == null) {
- _deltaVisitor = new VMDDeltaVisitor() {
- private Map<ValidatorMetaData, Set<IFileDelta>> _vmdDeltas = null;
- private IProgressMonitor _progressMonitor = null;
-
- public Map<ValidatorMetaData, Set<IFileDelta>> getResult() {
- return _vmdDeltas;
- }
-
- public void setEnabledValidators(Set<ValidatorMetaData> validators) {
- _vmdDeltas = wrapInMap(validators);
- }
-
- public IProgressMonitor getProgressMonitor() {
- return _progressMonitor;
- }
-
- public void setProgressMonitor(IProgressMonitor m) {
- _progressMonitor = m;
- }
-
- public boolean visit(IResourceDelta subdelta) throws CoreException {
- checkCanceled(getProgressMonitor());
- if (subdelta == null)
- return true;
-
- IResource resource = subdelta.getResource();
-
- if (Tracing.isLogging()) {
- StringBuffer buffer = new StringBuffer("FilterUtil-01: subdelta of "); //$NON-NLS-1$
- buffer.append(resource.getName());
- buffer.append(" has resource delta kind: "); //$NON-NLS-1$
- buffer.append(subdelta.getKind());
- buffer.append(" Does the resource exist? "); //$NON-NLS-1$
- buffer.append(resource.exists());
- buffer.append(" Is it a phantom? "); //$NON-NLS-1$
- buffer.append(resource.isPhantom());
- Tracing.log(buffer);
- }
-
- // If the delta is an IProject, and the IProject is getting deleted or closed,
- // don't validate it or its children.
- if (shouldProcess(resource, subdelta)) {
- filterOut(getProgressMonitor(), _vmdDeltas, resource, subdelta);
- return true; // visit the delta's children as well
- }
- return false; // do not visit the delta's children
- }
- };
- }
- _deltaVisitor.setProgressMonitor(monitor);
- _deltaVisitor.setEnabledValidators(enabledValidators);
-
- return _deltaVisitor;
- }
-
- public static Map<ValidatorMetaData, Set<IFileDelta>> loadDeltas(final IProgressMonitor monitor,
- final Set<ValidatorMetaData> enabledValidators, IResourceDelta delta) throws CoreException {
- VMDDeltaVisitor visitor = getDeltaVisitor(monitor, enabledValidators);
- delta.accept(visitor, true); // true means include phantom resources
- return visitor.getResult();
- }
-
- public static Map<ValidatorMetaData, Set<IFileDelta>> loadDeltas(final IProgressMonitor monitor,
- final Set<ValidatorMetaData> enabledValidators, IProject project) throws CoreException {
- VMDResourceVisitor visitor = getResourceVisitor(monitor, enabledValidators);
- project.accept(visitor, IResource.DEPTH_INFINITE, true); // true means include phantom
- // resources
- return visitor.getResult();
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java
deleted file mode 100644
index 318de6d..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * This class represents the global Preferences as set on the Validation Preferences page.
- */
-public class GlobalConfiguration extends ValidationConfiguration {
- static final boolean PREF_PROJECTS_CAN_OVERRIDE_DEFAULT = true;
- static final boolean PREF_SAVE_AUTOMATICALLY_DEFAULT = false;
-
- private boolean _canProjectsOverride = getCanProjectsOverrideDefault();
- private boolean _saveAutomatically = getSaveAutomaticallyDefault();
-
- /**
- * This constructor should be used in all cases except for the Preference page's values.
- */
- public GlobalConfiguration(IWorkspaceRoot root) throws InvocationTargetException {
- super(root, convertToArray(ValidationRegistryReader.getReader().getAllValidators()));
-
- // Can't put the call to load() and passivate() in the ValidationConfiguration constructor due
- // to the order of initialization.
- // 1. First the ValidationConfiguration constructor is called, and that loads the stored values.
- // 2. Then this class's <init> method is called, and that initializes the "override" field
- // to the default, which may be different than the stored value.
- }
-
- /**
- * This constructor is provided only for the Preference page, so that the page can store values
- * without persisting them (i.e., if the user presses Cancel then nothing needs to be done.)
- */
- public GlobalConfiguration(GlobalConfiguration original) throws InvocationTargetException {
- super();
- original.copyTo(this);
- }
-
- public boolean canProjectsOverride() {
- return _canProjectsOverride;
- }
-
- public void setCanProjectsOverride(boolean can) {
- _canProjectsOverride = can;
- }
-
- public boolean getSaveAutomatically() {
- return _saveAutomatically;
- }
-
- public void setSaveAutomatically(boolean save) {
- _saveAutomatically = save;
- }
-
- public void resetToDefault() throws InvocationTargetException {
- setDisableAllValidation(getDisableValidationDefault());
- setEnabledValidators(getEnabledValidatorsDefault());
- setEnabledManualValidators(getManualEnabledValidators());
- setEnabledBuildValidators(getBuildEnabledValidators());
- setCanProjectsOverride(getCanProjectsOverrideDefault());
- setSaveAutomatically(getSaveAutomaticallyDefault());
- setDefaultDelegates(getValidators());
- }
-
- /**
- * This method exists only for migration purposes. The root marker must be deleted after
- * migration is complete.
- */
- protected IMarker[] getMarker() {
- try {
- IWorkspaceRoot root = getRoot();
- IMarker[] markers = root.findMarkers(ConfigurationConstants.PREFERENCE_MARKER, false, IResource.DEPTH_ONE);
-
- if (markers.length == 1) {
- return markers;
- }
- // job is done. Nothing to migrate.
- return null;
-
- } catch (CoreException e) {
- // Can't find the IMarker? Assume it's deleted.
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- }
-
- protected void load(IMarker[] marker) throws InvocationTargetException {
- // The 5.0 preferences were stored in an IMarker, and the current.preferences are stored in
- // PersistentProperties on the IResource.
- // A 5.0 root can have no marker values if the preference page, properties page, and
- // validation were never viewed or run.
- try {
- IWorkspaceRoot root = getRoot();
- if (marker == null) {
- // There were no global preferences in 4.03, so the migration is to create some.
- resetToDefault(); // assign the default values to the new Global Preference
- return;
- }
-
- IMarker rootMarker = marker[0]; // getMarker() has already checked that there's a marker
- // in the array
-// ValidatorMetaData[] enabledValidators = null;
-// String enabledValidatorsString = (String) getValue(rootMarker, ConfigurationConstants.ENABLED_VALIDATORS);
-// if (enabledValidatorsString == null) {
-// enabledValidators = ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
-// } else {
-// enabledValidators = getStringAsEnabledElementsArray(enabledValidatorsString);
-// }
-//
-// setEnabledValidators(enabledValidators);
- String enabledManualValidators = (String) getValue(rootMarker, ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
- setEnabledManualValidators(getStringAsEnabledElementsArray(enabledManualValidators));
- String enabledBuildValidators = (String) getValue(rootMarker, ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
- setEnabledManualValidators(getStringAsEnabledElementsArray(enabledBuildValidators));
-// if (enabledManualValidators.equals(null) || enabledBuildValidators.equals(null))
-// enabledValidators = ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
- setCanProjectsOverride(getValue(rootMarker, ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE, PREF_PROJECTS_CAN_OVERRIDE_DEFAULT));
- root.getWorkspace().deleteMarkers(marker);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- protected void copyTo(GlobalConfiguration gp) throws InvocationTargetException {
- super.copyTo(gp);
-
- // Need to have a distinct method for this child class (i.e., the parameter
- // is not a ValidationConfiguration) because if this initialization is
- // called as part of ValidationConfiguration's constructor, then the value of
- // this field is overwritten. Fields of this class are initialized to the
- // default after the ValidationConfiguration parent is created.
- gp.setCanProjectsOverride(canProjectsOverride());
- gp.setSaveAutomatically(getSaveAutomatically());
- }
-
- public static boolean getCanProjectsOverrideDefault() {
- return PREF_PROJECTS_CAN_OVERRIDE_DEFAULT;
- }
-
- public static boolean getSaveAutomaticallyDefault() {
- return PREF_SAVE_AUTOMATICALLY_DEFAULT;
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#deserialize(String)
- */
- public void deserialize(String storedConfiguration) throws InvocationTargetException {
- super.deserialize(storedConfiguration);
-
- if (storedConfiguration != null && storedConfiguration.length() > 0) {
- // If it's null, then super.deserialize has already called resetToDefault to initialize
- // this instance.
- int canOverrideIndex = storedConfiguration.indexOf(ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE);
- int disableAllValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
- int saveAutomaticallyIndex = storedConfiguration.indexOf(ConfigurationConstants.SAVE_AUTOMATICALLY_SETTING);
- if (disableAllValidationIndex != -1) {
- String canOverride = storedConfiguration.substring(canOverrideIndex + ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE.length(), disableAllValidationIndex);
- setCanProjectsOverride(Boolean.valueOf(canOverride).booleanValue());
- }
- if(saveAutomaticallyIndex != -1)
- {
- String saveAutomatically = storedConfiguration.substring(saveAutomaticallyIndex + ConfigurationConstants.SAVE_AUTOMATICALLY_SETTING.length(), canOverrideIndex);
- setSaveAutomatically(Boolean.valueOf(saveAutomatically).booleanValue());
- }
- }
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#serialize()
- */
- public String serialize() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.SAVE_AUTOMATICALLY_SETTING);
- buffer.append(String.valueOf(getSaveAutomatically()));
- buffer.append(ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE);
- buffer.append(String.valueOf(canProjectsOverride()));
- buffer.append(super.serialize());
- return buffer.toString();
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IProjectValidationHelper.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IProjectValidationHelper.java
deleted file mode 100644
index 959988e..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IProjectValidationHelper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-
-/**
- * ValidatorHelper extensions must implement this interface.
- */
-public interface IProjectValidationHelper {
-
- public IContainer[] getOutputContainers(IProject project);
-
- public IContainer[] getSourceContainers(IProject project);
-
- public void disposeInstance();
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IValidationSelectionHandler.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IValidationSelectionHandler.java
deleted file mode 100644
index 38292b6..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IValidationSelectionHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * This is used by extensions to add valid validation types to the validate
- * menu action.
- */
-public interface IValidationSelectionHandler {
-
- /**
- * Return a valid IResource type for the extensible object selection,
- * should be instance of IFolder, IFile, or IProject if this extension knows
- * how to handle the selection, otherwise it should return null
- */
- public IResource getBaseValidationType(Object selection);
-
- /**
- * @return the classname of the validation type to register for validation
- */
- public String getValidationTypeString();
-
- public void setValidationTypeString(String validationType);
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/InternalValidatorManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/InternalValidatorManager.java
deleted file mode 100644
index 5f9dba8..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/InternalValidatorManager.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public final class InternalValidatorManager {
- private static InternalValidatorManager _inst = null;
- private static final String OP_GROUP = "ValidationOperation"; //$NON-NLS-1$ // when the ValidationOperation
-
- // adds a message to the task
- // list; e.g. cancel, or internal
- // error, this group name is used
- // to distinguish between the
- // messages that the validator
- // itself put, and the ones which
- // the validator owns, but the
- // operation put. //$NON-NLS-1$
-
- private InternalValidatorManager() {
- //default
- }
-
- public static InternalValidatorManager getManager() {
- if (_inst == null) {
- _inst = new InternalValidatorManager();
- }
- return _inst;
- }
-
- /**
- * Return a new Set that contains all of the elements from the array.
- */
- public static Set<ValidatorMetaData> wrapInSet(ValidatorMetaData[] vmds) {
- Set<ValidatorMetaData> result = new HashSet<ValidatorMetaData>();
- if ((vmds == null) || (vmds.length == 0))return result;
-
- for (ValidatorMetaData vmd : vmds)result.add(vmd);
-
- return result;
- }
-
- /**
- * If the current validator throws a Throwable, log the internal error to the task list.
- *
- * This method is for use by the validation framework only.
- */
- public void addInternalErrorTask(IProject project, ValidatorMetaData vmd, Throwable exc) {
- addOperationTask(project, vmd, ResourceConstants.VBF_EXC_INTERNAL, new String[]{project.getName(), vmd.getValidatorDisplayName(), ((exc.getMessage() == null) ? "" : exc.getMessage())}); //$NON-NLS-1$
- }
-
- /**
- * If the user is cancelling validation on the current project/resource, Add an information task
- * to the task list informing the user that validation has not been run on the current project.
- *
- * If the current validator throws a Throwable, log the internal error to the task list.
- */
- public void addOperationTask(IProject project, ValidatorMetaData vmd, String messageId, String[] parms) {
- Message message = ValidationPlugin.getMessage();
- message.setSeverity(IMessage.LOW_SEVERITY);
- message.setId(messageId);
- message.setParams(parms);
- message.setGroupName(OP_GROUP);
-
- // Although the message is owned by the validator, the string of the message has to be
- // loaded by this class' ClassLoader
- WorkbenchReporter.addMessage(project, vmd.getValidatorUniqueName(), getClass().getClassLoader(), message);
- }
-
-
- /**
- * If the user cancelled the previous validation with this validator, or if there was a
- * Throwable caught during the last execution of this validator, and the validator is in the
- * process of validating now, remove the former information task messages.
- */
- public void removeOperationTasks(IProject project, ValidatorMetaData vmd) {
- WorkbenchReporter.removeMessageSubset(project, vmd.getValidatorUniqueName(), OP_GROUP);
- }
-
- /**
- * Return an array of the fully-qualified names of the validator classes.
- */
- public String[] getValidatorNames(ValidatorMetaData[] vmds) {
- Set<String> temp = new HashSet<String>();
- for (ValidatorMetaData vmd : vmds) {
- for (String name : vmd.getValidatorNames()) {
- temp.add(name);
- }
- }
-
- String[] vmdNames = new String[temp.size()];
- temp.toArray(vmdNames);
- return vmdNames;
- }
-
- /**
- * Return an array of the fully-qualified names of the validator classes.
- */
- public String[] getValidatorNames(Collection<ValidatorMetaData> vmds) {
- Set<String> temp = new HashSet<String>();
- for (ValidatorMetaData vmd : vmds) {
- for (String name : vmd.getValidatorNames()) {
- temp.add(name);
- }
- }
-
- String[] vmdNames = new String[temp.size()];
- temp.toArray(vmdNames);
- return vmdNames;
- }
-
- /**
- * Return a list of validators that validate files with the given extension.
- */
- public ValidatorMetaData[] getValidatorsForExtension(IProject project, String fileExtension) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
-
- // Get all of the validators configured on the project for the given file extension
- ValidatorMetaData[] vmds = prjp.getValidators();
-
- // Construct a fake IFile type to represent a file with this extension.
- StringBuffer buffer = new StringBuffer(project.getName());
- buffer.append(IPath.SEPARATOR);
- buffer.append(fileExtension);
- IPath path = new Path(buffer.toString());
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-
- ValidatorMetaData[] temp = new ValidatorMetaData[vmds.length];
- int count = 0;
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- if (vmd.isApplicableTo(file)) {
- temp[count++] = vmd;
- }
- }
-
- ValidatorMetaData[] result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- return result;
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return new ValidatorMetaData[0];
- }
- }
-
- /**
- * Return a list of validator names that validate files with the given extension.
- */
- public String[] getValidatorNamesForExtension(IProject project, String fileExtension) {
- ValidatorMetaData[] vmds = getValidatorsForExtension(project, fileExtension);
-
- String[] names = new String[vmds.length];
- for (int i = 0; i < names.length; i++) {
- names[i] = vmds[i].getValidatorUniqueName();
- }
- return names;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java
deleted file mode 100644
index b91a777..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
-
-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.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * This class represents the Project Preferences as set on the Project's Validation Properties page.
- */
-public class ProjectConfiguration extends ValidationConfiguration {
-
- /** false - If the user has never set a preference before, this is the override default */
- static final boolean PRJ_OVERRIDEGLOBAL_DEFAULT = false;
-
- /** default_value - the configuration is using the defaults. */
- private static final String DefaultValue = "default_value"; //$NON-NLS-1$
-
- private boolean _doesProjectOverride = getDoesProjectOverrideDefault();
-
- /**
- * This constructor should be used in all cases except for the Properties page's values.
- */
- protected ProjectConfiguration(IProject project) throws InvocationTargetException {
- // The extractProjectValidators method extracts just this project's validators from the
- // global list.
- super(project, extractProjectValidators(convertToArray(ValidationRegistryReader.getReader().getAllValidators()), project));
-
- // Can't put the call to load() and passivate() in the ValidationConfiguration constructor
- // due
- // to the order of initialization.
- // 1. First the ValidationConfiguration constructor is called, and that loads the stored
- // values.
- // 2. Then this class's <init> method is called, and that initializes the "override" field
- // to the default,
- // which may be different than the stored value.
- }
-
- /**
- * This constructor is provided only for the Properties page, so that the page can store values
- * without persisting them (i.e., if the user presses Cancel then nothing needs to be done.)
- */
- 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 e) {
- ValidationPlugin.getPlugin().handleException(e);
- 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();
- }
-
- public Map<String,String> getDelegatingValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().getDelegatingValidators();
- }
- return super.getDelegatingValidators();
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#getEnabledIncrementalValidators(boolean)
- */
- public ValidatorMetaData[] getEnabledIncrementalValidators(boolean incremental) throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getEnabledIncrementalValidators(incremental), getResource());
- }
- return super.getEnabledIncrementalValidators(incremental);
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#isEnabled(ValidatorMetaData)
- */
- public boolean isEnabled(ValidatorMetaData vmd) throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().isEnabled(vmd);
- }
- return super.isEnabled(vmd);
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfDisabledValidators()
- */
- public int numberOfDisabledValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfDisabledValidators();
- }
- return super.numberOfDisabledValidators();
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfEnabledIncrementalValidators()
- */
- public int numberOfEnabledIncrementalValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfEnabledIncrementalValidators();
- }
- return super.numberOfEnabledIncrementalValidators();
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfEnabledValidators()
- */
- public int numberOfEnabledValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfEnabledValidators();
- }
- return super.numberOfEnabledValidators();
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfIncrementalValidators()
- */
- public int numberOfIncrementalValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfIncrementalValidators();
- }
- return super.numberOfIncrementalValidators();
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfValidators()
- */
- public int numberOfValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfValidators();
- }
- return super.numberOfValidators();
- }
-
- /**
- * This method could be called with the project's values, or with the global preference values.
- * Validators that are not configured on this project will be ignored.
- */
- public void setEnabledValidators(ValidatorMetaData[] vmds) {
- super.setEnabledValidators(extractProjectValidators(vmds, getResource()));
- }
-
- /**
- * This method could be called with the project's values, or with the global preference values.
- * Validators that are not configured on this project will be ignored.
- */
- public void setValidators(ValidatorMetaData[] vmds) {
- super.setValidators(extractProjectValidators(vmds, getResource()));
- }
-
- /**
- * Given a set of validators, usually the global preference set, change the set so that it
- * contains only the validators configured on this project.
- */
- private static ValidatorMetaData[] extractProjectValidators(ValidatorMetaData[] vmds, IResource resource) {
- ValidationRegistryReader reader = ValidationRegistryReader.getReader();
- int length = (vmds == null) ? 0 : vmds.length;
- ValidatorMetaData[] temp = new ValidatorMetaData[length];
- if (length == 0) {
- return temp;
- }
-
- int count = 0;
- IProject project = (IProject) resource;
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- if (reader.isConfiguredOnProject(vmd, project)) {
- temp[count++] = vmd;
- }
- }
-
- ValidatorMetaData[] result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- temp = null;
-
- return result;
- }
-
- public void resetToDefault() throws InvocationTargetException {
- // The default values of the project is whatever the preference values are
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
-
- setEnabledManualValidators(gp.getManualEnabledValidators());
- setEnabledBuildValidators(gp.getBuildEnabledValidators());
- setDelegatingValidators(gp.getDelegatingValidators());
-
- // except for this field, which is unique to the project preferences
- setDoesProjectOverride(getDoesProjectOverrideDefault());
- }
-
- public void resetToDefaultForProjectDescriptionChange() throws InvocationTargetException {
- // The default values of the project is whatever the preference values are
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- setEnabledManualValidators(gp.getManualEnabledValidators());
- setEnabledBuildValidators(gp.getBuildEnabledValidators());
- setDelegatingValidators(gp.getDelegatingValidators());
- }
-
- /**
- * The project's nature has changed, so recalculate the validators that are configured on the
- * project, and reset the values of the project to the default.
- *
- * @deprecated this method doesn't do anything
- */
- public void resetProjectNature() {
- /*
- * We do not want to perform the resetting the of the validators as the nature never gets
- * reset due to change in the project references - VKB GlobalConfiguration gp =
- * ConfigurationManager.getManager().getGlobalConfiguration();
- * setValidators(gp.getValidators()); // Reset the validators that are configured on the
- * project (the ProjectConfiguration automatically saves only the validators that are
- * configured on the project). resetToDefault(); // Given that the project is "new", reset
- * its values to the Preferences.
- */
- }
-
- /**
- * This method exists only for migration purposes. The project marker must be deleted after
- * migration is complete.
- */
- protected IMarker[] getMarker() {
- try {
- // First try to find the 4.03 project marker.
- IMarker[] allMarkers = getResource().findMarkers(ConfigurationConstants.PRJ_MARKER_403, false, IResource.DEPTH_ZERO);
-
- // If it doesn't exist, then this might be a 5.0 project marker.
- if ((allMarkers == null) || (allMarkers.length == 0)) {
- allMarkers = getResource().findMarkers(ConfigurationConstants.PRJ_MARKER, false, IResource.DEPTH_ZERO);
- }
-
- // There should be only one projectmarker.
- if (allMarkers.length == 1) {
- return allMarkers;
- }
- // Job is done. Nothing to migrate.
- return null;
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- }
-
- protected void load(IMarker[] marker) {
- // 4.03 project preferences are different from the current in the following ways:
- // 1. Only preferences that could be set were the enabled validators and the auto-validate
- // option.
- // 2. The preferences were stored in an IMarker instead of a PersistentProperty.
- // The 5.0 project settings were stored in an IMarker, and the current settings are stored
- // in a PersistentProperty.
- // A 5.0 project could have a null validation marker if the validation page was never
- // opened on it, and if validation was never run.
- try {
- if (marker == null) {
- // Assume default values
- resetToDefault();
- return;
- }
-
- IMarker prjMarker = marker[0]; // getProjectMarker() has already checked that there's a
- // marker in the array
-// GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
-
-// String enabledValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_VALIDATORS);
-// ValidatorMetaData[] enabledVal = null;
-// if (enabledValStr == null) {
-// enabledVal = gp.getEnabledValidators();
-// } else {
-// enabledVal = getStringAsEnabledElementsArray(enabledValStr);
-// }
-// setEnabledValidators(enabledVal);
-
- ValidatorMetaData[] enabledManaualVal = null;
- ValidatorMetaData[] enabledBuildVal = null;
- String enabledManualValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
- String enabledBuildValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
-// ValidatorMetaData[] enabledVal = null;
-// if (enabledManualValStr.equals(null) || enabledBuildValStr.equals(null)) {
-// enabledVal = gp.getEnabledValidators();
-// } else {
- if (!enabledManualValStr.equals(null) && !enabledBuildValStr.equals(null)) {
- enabledManaualVal = getStringAsEnabledElementsArray(enabledManualValStr);
- setEnabledManualValidators(enabledManaualVal);
- enabledBuildVal = getStringAsEnabledElementsArray(enabledManualValStr);
- setEnabledBuildValidators(enabledBuildVal);
- }
-
- String version = loadVersion(marker); // In 4.03, every project had its own validators &
- // auto-validate settings.
- Boolean boolVal = (Boolean) getValue(prjMarker, ConfigurationConstants.PRJ_OVERRIDEGLOBAL);
- if ((boolVal == null) && (version.equals(ConfigurationConstants.VERSION4_03))) {
- // Different default for 4.03. In 4.03, all projects overrode the global, because
- // the
- // global preferences didn't exist.
- setDoesProjectOverride(true);
- } else if (boolVal == null) {
- setDoesProjectOverride(getDoesProjectOverrideDefault());
- } else {
- setDoesProjectOverride(boolVal.booleanValue());
- }
-
- getResource().getWorkspace().deleteMarkers(marker);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- protected void copyTo(ProjectConfiguration prjp) throws InvocationTargetException {
- super.copyTo(prjp);
-
- // Need to have a distinct method for this child class (i.e., the parameter
- // is not a ValidationConfiguration) because if this initialization is
- // called as part of ValidationConfiguration's constructor, then the value of
- // this field is overwritten. Fields of this class are initialized to the
- // default after the ValidationConfiguration parent is created.
- prjp.setDoesProjectOverride(doesProjectOverride());
- }
-
- public static boolean getDoesProjectOverrideDefault() {
- return PRJ_OVERRIDEGLOBAL_DEFAULT;
- }
-
- /**
- * Return true if the enabled validators have not changed since this ValidationConfiguration was
- * constructed, false otherwise. (This method is needed for the Properties and Preference pages;
- * if the list of validators hasn't changed, then there is no need to update the task list;
- * updating the task list is a costly operation.)
- *
- * The "allow" parameter represents whether or not the global "allow projects to override" has
- * been changed: - TRUE means that the preference "allow" parameter has been changed - FALSE
- * means that the preference "allow" paramter has not been changed
- */
- public boolean hasEnabledValidatorsChanged(ValidatorMetaData[] oldEnabledVmd, boolean allow) throws InvocationTargetException {
- // First check the obvious: is every enabled validator still enabled, and is
- // the number of enabled validators the same as it was before? If not, return true.
- if (super.hasEnabledValidatorsChanged(oldEnabledVmd)) {
- return true;
- }
-
-
- // If the global preference validators have changed, does the task list need to be updated?
- // PREF | PROJ | UPDATE
- // ALLOW | OVERRIDE | TASK LIST
- //------------------------------
- // 0 | 0 | 1
- // 0 | 1 | 1
- // 1 | 0 | 1
- // 1 | 1 | 0
- //
- // If the global "allow" preference changes from "allow" to "don't allow", or vice versa,
- // and the project overrides the preferences, and the validators differ between the project
- // and the preferences, then the task list must be updated.
- if (allow) {
- // "allow" has changed, so see if the preference and the project validators match.
- ValidatorMetaData[] projEnabledVmd = super.getEnabledValidators(); // bypass the check
- // for whether the global preferences are to be used or not
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- return gp.hasEnabledValidatorsChanged(projEnabledVmd);
- }
-
- return false;
- }
-
- public boolean haveDelegatesChanged(Map<String, String> oldDelegates, boolean allow) throws InvocationTargetException {
-
- if (super.haveDelegatesChanged(oldDelegates)) {
- return true;
- }
-
- if (allow) {
- Map<String, String> projDelegates = super.getDelegatingValidators();
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- return gp.haveDelegatesChanged(projDelegates);
- }
-
- return false;
- }
-
-
- public void deserialize(String storedConfiguration) throws InvocationTargetException {
- if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
- resetToDefault();
- } else if (storedConfiguration != null) {
- int prjOverrideIndex = storedConfiguration.indexOf(ConfigurationConstants.PRJ_OVERRIDEGLOBAL);
- int disableAllValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
- int versionIndex = storedConfiguration.indexOf(ConfigurationConstants.VERSION);
- if (disableAllValidationIndex != -1) {
- String disableAllValidation = storedConfiguration.substring(disableAllValidationIndex + ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING.length(), versionIndex);
- setDisableAllValidation(Boolean.valueOf(disableAllValidation).booleanValue());
- } else {
- setDisableAllValidation(false);;
- }
- // project doesn't override the global
- if (disableAllValidationIndex != -1) {
- String prjOverride = storedConfiguration.substring(prjOverrideIndex + ConfigurationConstants.PRJ_OVERRIDEGLOBAL.length(), disableAllValidationIndex);
- setDoesProjectOverride(Boolean.valueOf(prjOverride).booleanValue());
- }
- }
- }
-
- public String serialize() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.PRJ_OVERRIDEGLOBAL);
- buffer.append(String.valueOf(doesProjectOverride()));
- if (doesProjectOverride()) {
- // Store common values for the Project configuration only if they differ from the global
- buffer.append(super.serialize());
- }
- return buffer.toString();
- }
-
- public ValidatorMetaData[] getEnabledFullBuildValidators(boolean fullBuild) throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getEnabledFullBuildValidators(fullBuild), getResource());
- }
- return super.getEnabledFullBuildValidators(fullBuild);
- }
-
- /**
- * Given a set of validators, usually the global preference set, change the set so that it
- * contains only the validators configured on this project.
- */
- private static ValidatorMetaData[] extractProjectValidators(ValidatorMetaData[] vmds, IResource resource, boolean onlyReferenced) {
- ValidationRegistryReader reader = ValidationRegistryReader.getReader();
- int length = (vmds == null) ? 0 : vmds.length;
- ValidatorMetaData[] temp = new ValidatorMetaData[length];
- if (length == 0) {
- return temp;
- }
-
- int count = 0;
- IProject project = (IProject) resource;
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- if (reader.isConfiguredOnProject(vmd, project)) {
- if (!onlyReferenced || vmd.isDependentValidator())
- temp[count++] = vmd;
- }
- }
-
- ValidatorMetaData[] result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- temp = null;
-
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#getEnabledFullBuildValidators(boolean)
- */
- public ValidatorMetaData[] getEnabledFullBuildValidators(boolean fullBuild, boolean onlyReferenced) throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getEnabledFullBuildValidators(fullBuild), getResource(), onlyReferenced);
- }
- return super.getEnabledFullBuildValidators(fullBuild, onlyReferenced);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#getIncrementalValidators()
- */
- public ValidatorMetaData[] getIncrementalValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getIncrementalValidators(), getResource());
- }
- return super.getIncrementalValidators();
- }
-
- public int numberOfManualValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfManualEnabledValidators();
- }
- return super.numberOfManualEnabledValidators();
- }
- public boolean isDisableAllValidation() throws InvocationTargetException{
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().isDisableAllValidation();
- }
- return super.isDisableAllValidation();
- }
-
- public ValidatorDelegateDescriptor getDelegateDescriptor(ValidatorMetaData vmd) throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().getDelegateDescriptor(vmd);
- }
-
- return super.getDelegateDescriptor(vmd);
- }
-
- public void store() throws InvocationTargetException {
- IProject project = (IProject) getResource();
- 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 e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- 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, DefaultValue);
- deserialize(storedConfig);
- String storedManualConfig = prefs.get(USER_MANUAL_PREFERENCE, DefaultValue);
- deserializeManual(storedManualConfig);
- String storedBuildConfig = prefs.get(USER_BUILD_PREFERENCE, DefaultValue);
- deserializeBuild(storedBuildConfig);
- String storedDelegatesConfiguration = prefs.get(DELEGATES_PREFERENCE, DefaultValue);
- 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 d638d0a..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorExtension.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 3, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.validation.internal.operations.ReferencialFileValidator;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * @author vijayb
- */
-public class ReferencialFileValidatorExtension {
- private String id = null;
- private ReferencialFileValidator instance;
- private boolean errorCondition = false;
- private IConfigurationElement element;
-
- /** referencialFileValidator */
- public static final String REF_FILE_VALIDATOR_EXTENSION = "referencialFileValidator"; //$NON-NLS-1$
-
- /** run */
- public static final String RUN = "run"; //$NON-NLS-1$
-
- /** id */
- public static final String ATT_ID = "id"; //$NON-NLS-1$
-
- /** class */
- public static final String ATT_CLASS = "class"; //$NON-NLS-1$
-
- public ReferencialFileValidatorExtension() {
- super();
- }
-
- public ReferencialFileValidator getInstance() {
- try {
- if (instance == null && !errorCondition)
- instance = (ReferencialFileValidator) element.createExecutableExtension(RUN);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- errorCondition = true;
- }
- return instance;
- }
-
- public ReferencialFileValidatorExtension(IConfigurationElement element) {
- if(!REF_FILE_VALIDATOR_EXTENSION.equals(element.getName()))
- throw new IllegalArgumentException("Extensions must be of the type \"" + REF_FILE_VALIDATOR_EXTENSION + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
- this.element = element;
- init();
- }
-
- private void init() {
- this.id = this.element.getAttribute(ATT_ID);
- }
-
- /**
- * @return Returns the id.
- */
- public String getId() {
- return id;
- }
-
- public IConfigurationElement getElement() {
- return element;
- }
-
- /**
- * @param id
- * The id to set.
- */
- public void setId(String id) {
- this.id = id;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorRegistryReader.java
deleted file mode 100644
index c9233ef..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorRegistryReader.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 3, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.validation.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.internal.operations.ReferencialFileValidator;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * @author vijayb
- */
-public class ReferencialFileValidatorRegistryReader {
- static ReferencialFileValidatorRegistryReader instance;
-
- private static final String Id = "id"; //$NON-NLS-1$
- private static final String ExtensionPoint = "referencialFileValidator"; //$NON-NLS-1$
-
- protected List<ReferencialFileValidatorExtension> referencialFileValidationExtensions;
-
- public ReferencialFileValidatorRegistryReader() {
- }
-
- /**
- * Read the extension point and parse it.
- */
- public void readRegistry() {
- IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(Id, ExtensionPoint);
- if (point == null)return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- internalReadElement(elements[i]);
- }
- }
-
- private void internalReadElement(IConfigurationElement element) {
- boolean recognized = this.readElement(element);
- if (!recognized) {
- logError(element, "Error processing extension: " + element); //$NON-NLS-1$
- }
- }
-
- /*
- * Logs the error in the desktop log using the provided text and the information in the configuration element.
- */
- protected void logError(IConfigurationElement element, String text) {
- IExtension extension = element.getDeclaringExtension();
- StringBuffer buf = new StringBuffer();
- buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
- buf.append("\n" + text); //$NON-NLS-1$
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, buf.toString());
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (ReferencialFileValidatorExtension.REF_FILE_VALIDATOR_EXTENSION.equals(element.getName())) {
- addExtension(element);
- return true;
- }
- return false;
- }
-
- /**
- * Sets the extension point.
- *
- * @param newExtension
- * The extensions to set
- */
- protected void addExtension(IConfigurationElement newExtension) {
-
- //add to the list of post validator extensions only if the extension is not added yet
- boolean containsExt = true;
- for(ReferencialFileValidatorExtension ext : getReferencialFileValidationExtensions()) {
- if(!ext.getElement().getAttribute(Id).equals(newExtension.getAttribute(Id)))containsExt = false;
- }
- if(!containsExt ||getReferencialFileValidationExtensions().isEmpty())
- getReferencialFileValidationExtensions().add(new ReferencialFileValidatorExtension(newExtension));
-
- getReferencialFileValidationExtensions().add(new ReferencialFileValidatorExtension(newExtension));
- }
-
- /**
- * Sets the extension point.
- *
- * @param newExtension
- * The extensions to set
- */
- protected void addExtensionPoint(ReferencialFileValidatorExtension newExtension) {
- if (referencialFileValidationExtensions == null)
- referencialFileValidationExtensions = new ArrayList<ReferencialFileValidatorExtension>();
- referencialFileValidationExtensions.add(newExtension);
- }
-
- /**
- * @return the appropriate handler for the project based on priorities of those which are
- * available and enabled
- */
- public ReferencialFileValidator getReferencialFileValidator() {
- for (ReferencialFileValidatorExtension refFileValExt: getReferencialFileValidationExtensions()) {
- return refFileValExt.getInstance();
- }
- return null;
- }
-
- /**
- * Gets the singleton instance.
- */
- public static ReferencialFileValidatorRegistryReader getInstance() {
- if (instance == null) {
- instance = new ReferencialFileValidatorRegistryReader();
- instance.readRegistry();
- }
- return instance;
- }
-
- /**
- * @return Returns the handlerExtensions.
- */
- protected List<ReferencialFileValidatorExtension> getReferencialFileValidationExtensions() {
- if (referencialFileValidationExtensions == null)
- referencialFileValidationExtensions = new ArrayList<ReferencialFileValidatorExtension>();
- return referencialFileValidationExtensions;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/RegistryConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/RegistryConstants.java
deleted file mode 100644
index 81a78b4..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/RegistryConstants.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-
-import org.eclipse.wst.validation.internal.operations.IRuleGroup;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * Validation constants needed to declare an extension point, and to implement an extension.
- */
-public interface RegistryConstants {
- String PLUGIN_ID = ValidationPlugin.PLUGIN_ID;
-
- /** validator - extension point declaration of the validator */
- String VALIDATOR_EXT_PT_ID = "validator"; //$NON-NLS-1$
-
- /** run - identifies the Validator class */
- String TAG_RUN_CLASS = "run"; //$NON-NLS-1$
-
- /**
- * filter - identifies a filter -- type and/or name -- used to filter out resources which are
- * not to be validated. (i.e., if the resource doesn't pass this filter test, don't validate it.)
- */
- String TAG_FILTER = "filter"; //$NON-NLS-1$
-
- /**
- * identifies a filter -- type and/or name -- used to filter out resources which are not to be validated. (i.e., if the resource doesn't pass this filter test, don't validate it.)
- */
- String TAG_CONTENTTYPE = "contentTypeBinding"; //$NON-NLS-1$
-
- /**
- * identifies a type
- */
- String ATT_CONTENTTYPEID = "contentTypeId"; //$NON-NLS-1$
- /** helper - IValidationContext which loads the MOF model for the IValidator */
- String TAG_HELPER_CLASS = "helper"; //$NON-NLS-1$
-
- /** projectNature - identifies the projects which the validator should run on */
- String TAG_PROJECT_NATURE = "projectNature"; //$NON-NLS-1$
-
- /**
- * aggregateValidator - identifies a validator(s) which this validator aggregates. This value is used
- * to remove all messages owned by a particular validator. Aggregate validators cannot be shared.
- * only one validator may use an aggregate of that type. */
- String TAG_AGGREGATE_VALIDATORS = "aggregateValidator"; //$NON-NLS-1$
-
- /** objectClass - identifies a type */
- String ATT_OBJECT_CLASS = "objectClass"; //$NON-NLS-1$
-
- /** nameFilter - identifies a name (may include the '*' wildcard anywhere in the name) */
- String ATT_NAME_FILTER = "nameFilter"; //$NON-NLS-1$
-
- /** id - identifies a unique id to filter on */
- String ATT_ID = "id"; //$NON-NLS-1$
-
- /** class - identifies a class name of a tag, e.g. "helper class", or "run class" */
- String ATT_CLASS = "class"; //$NON-NLS-1$
-
- /** action - identifies the incremental validation actions for which a resource should be filtered in */
- String ATT_ACTION_FILTER = "action"; //$NON-NLS-1$
-
- /**
- * incremental - identifies whether or not the validator supports incremental build validation.
- * Default is true (i.e., incremental builds are supported).
- */
- String ATT_INCREMENTAL = "incremental"; //$NON-NLS-1$
-
- /** true - The incremental default. */
- boolean ATT_INCREMENTAL_DEFAULT = true;
-
- /**
- * fullBuild - identifies whether or not the validator supports full build validation.
- * Default is true (i.e., full build validation is supported).
- */
- String ATT_FULLBUILD = "fullBuild"; //$NON-NLS-1$
-
- /** true - The build default. */
- boolean ATT_FULLBUILD_DEFAULT = true;
-
- /** enabled - identifies whether or not the validator is enabled by default. Default is "true" (enabled). */
- String ATT_ENABLED = "enabled"; //$NON-NLS-1$
-
- /** true - The "enabled" default. */
- boolean ATT_ENABLED_DEFAULT = true;
-
- /** include - Include projects with this nature */
- String ATT_INCLUDE = "include"; //$NON-NLS-1$
-
- /**
- * true - By default, if "include" is not specified in the projectNature element,
- * then assume that the nature is included. */
- boolean ATT_INCLUDE_DEFAULT = true;
-
- /**
- * ruleGroup - identifies the different validation passes which this validator recognizes.
- * The values are identified in IRuleGroup.
- */
- String ATT_RULE_GROUP = "ruleGroup"; //$NON-NLS-1$
-
- /** the default pass includes only the FAST PASS. FULL can be invoked only explicitly by an operation. */
- int ATT_RULE_GROUP_DEFAULT = IRuleGroup.PASS_FAST;
-
- /** caseSensitive */
- String ATT_CASE_SENSITIVE = "caseSensitive"; //$NON-NLS-1$
-
- /** async - Is the validator thread-safe? */
- String ATT_ASYNC = "async"; //$NON-NLS-1$
-
- /** false - The "can validator run asynchronously" default. In the future this may be changed to true. */
- boolean ATT_ASYNC_DEFAULT = false;
-
- /** migrate - the "migrate" section of the validator */
- String TAG_MIGRATE = "migrate"; //$NON-NLS-1$
-
- /** validator - the "validator" element of the "migrate" section */
- String TAG_VALIDATOR = "validator"; //$NON-NLS-1$
-
- /** from - the fully-qualified class name of the former validator class */
- String ATT_FROM = "from"; //$NON-NLS-1$
-
- /** to - the fully-qualified class name of the current validator class */
- String ATT_TO = "to"; //$NON-NLS-1$
- String DEP_VALIDATOR = "dependentValidator"; //$NON-NLS-1$
- String DEP_VAL_VALUE = "depValValue"; //$NON-NLS-1$
- String MARKER_ID = "markerId"; //$NON-NLS-1$
- String MARKER_ID_VALUE = "markerIdValue"; //$NON-NLS-1$
- boolean DEP_VAL_VALUE_DEFAULT = false;
- String FACET = "facet"; //$NON-NLS-1$
- String FACET_ID ="facetId"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceConstants.java
deleted file mode 100644
index 62f8a08..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceConstants.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-
-
-/**
- * Constants used to access the string resources associated with the plug-in.
- *
- * See the plugin.properties file, in the plugin's directory, for the contents of the strings.
- */
-public interface ResourceConstants {
- // A marker cannot be added to the task list.
- String VBF_EXC_CANNOT_ADD_MARKER = "VBF_EXC_CANNOT_ADD_MARKER"; //$NON-NLS-1$
-
- // A marker cannot be removed from the task list.
- String VBF_EXC_CANNOT_REMOVE_MARKER = "VBF_EXC_CANNOT_REMOVE_MARKER"; //$NON-NLS-1$
-
- // Internal error has occurred.
- String VBF_EXC_INTERNAL = "VBF_EXC_INTERNAL"; //$NON-NLS-1$
-
- // If the validator cannot be loaded because it didn't specify a helper
- String VBF_EXC_HELPER_MISSING = "VBF_EXC_HELPER_MISSING"; //$NON-NLS-1$
-
- // If the validator cannot be loaded because its helper cannot be loaded
- String VBF_EXC_HELPER_CANNOTLOAD = "VBF_EXC_HELPER_CANNOTLOAD"; //$NON-NLS-1$
-
- // A java.lang.Runtime error has occurred during the build.
- String VBF_EXC_RUNTIME = "VBF_EXC_RUNTIME"; //$NON-NLS-1$
-
- // If the "Validator" extension point has been removed from the plugin.xml file.
- String VBF_EXC_MISSING_VALIDATOR_EP = "VBF_EXC_MISSING_VALIDATOR_EP"; //$NON-NLS-1$
-
- // If the user has specified an invalid type filter in their plugin.xml file.
- // i.e., it isn't an instance of IResource.
- String VBF_EXC_INVALID_TYPE_FILTER = "VBF_EXC_INVALID_TYPE_FILTER"; //$NON-NLS-1$
-
- // The validator extension has made a mistake in its plugin.xml's projectNature tag
- String VBF_EXC_MISSING_PROJECTNATURE_ID = "VBF_EXC_MISSING_PROJECTNATURE_ID"; //$NON-NLS-1$
-
- // The validator extension has made a mistake in its plugin.xml's syntax.
- String VBF_EXC_VALIDATORNAME_IS_NULL = "VBF_EXC_VALIDATORNAME_IS_NULL"; //$NON-NLS-1$
-
- // Title for the IProgressMonitor.
- String VBF_STATUS_PROGRESSMONITOR_TITLE = "VBF_STATUS_PROGRESSMONITOR_TITLE"; //$NON-NLS-1$
-
- // Status line for the IProgressMonitor
- String VBF_STATUS_INITIALIZING = "VBF_STATUS_INITIALIZING"; //$NON-NLS-1$
-
- // If the user has cancelled validation, each validator might have cleanup to do. This message
- // is shown to tell the user which validator is being cleaned up at the moment.
- String VBF_STATUS_VALIDATOR_CLEANUP = "VBF_STATUS_VALIDATOR_CLEANUP"; //$NON-NLS-1$
-
- // If the user cancelled validation, remove all of the validator's tasks from the task list, and
- // put an entry saying that validation on {project} using {validator} was cancelled.
- String VBF_STATUS_VALIDATOR_TERMINATED = "VBF_STATUS_VALIDATOR_TERMINATED"; //$NON-NLS-1$
-
- // Before a validator is begun, this message informs the user that validation, using a
- // particular validator, has begun
- String VBF_STATUS_STARTING_VALIDATION = "VBF_STATUS_STARTING_VALIDATION"; //$NON-NLS-1$
-
- // After a validator is finished, this message informs the user that validation, using a
- // particular validator, has completed.
- String VBF_STATUS_ENDING_VALIDATION = "VBF_STATUS_ENDING_VALIDATION"; //$NON-NLS-1$
-
- // If a validator throws an unchecked exception, this message is displayed to the user.
- String VBF_STATUS_ENDING_VALIDATION_ABNORMALLY = "VBF_STATUS_ENDING_VALIDATION_ABNORMALLY"; //$NON-NLS-1$
-
- // If the build's getDelta(getProject()) method returns null, let the user know that a full
- // validation will be performed because there's no delta information.
- String VBF_STATUS_NULL_DELTA = "VBF_STATUS_NULL_DELTA"; //$NON-NLS-1$
-
- String VBF_EXC_SYNTAX_NO_HELPER = "VBF_EXC_SYNTAX_NO_HELPER"; //$NON-NLS-1$
- String VBF_EXC_SYNTAX_NO_HELPER_CLASS = "VBF_EXC_SYNTAX_NO_HELPER_CLASS"; //$NON-NLS-1$
- String VBF_EXC_SYNTAX_NO_HELPER_THROWABLE = "VBF_EXC_SYNTAX_NO_HELPER_THROWABLE"; //$NON-NLS-1$
- String VBF_EXC_SYNTAX_NO_VAL_THROWABLE = "VBF_EXC_SYNTAX_NO_VAL_THROWABLE"; //$NON-NLS-1$
- String VBF_EXC_INVALID_RESOURCE = "VBF_EXC_INVALID_RESOURCE"; //$NON-NLS-1$
-
- String VBF_EXC_NULLCREATE = "VBF_EXC_NULLCREATE"; //$NON-NLS-1$
- String VBF_EXC_NULLSAVE = "VBF_EXC_NULLSAVE"; //$NON-NLS-1$
- String VBF_EXC_SAVE = "VBF_EXC_SAVE"; //$NON-NLS-1$
- String VBF_EXC_NULLRETRIEVE = "VBF_EXC_NULLRETRIEVE"; //$NON-NLS-1$
- String VBF_EXC_RETRIEVE = "VBF_EXC_RETRIEVE"; //$NON-NLS-1$
-
- String VBF_EXC_BADVMD = "VBF_EXC_BADVMD"; //$NON-NLS-1$
- String VBF_EXC_OPENPRJ = "VBF_EXC_OPENPRJ"; //$NON-NLS-1$
- String VBF_EXC_EXISTPRJ = "VBF_EXC_EXISTPRJ"; //$NON-NLS-1$
- String VBF_EXC_BADPRJ = "VBF_EXC_BADPRJ"; //$NON-NLS-1$
- String VBF_EXC_MULTIPRJ = "VBF_EXC_MULTIPRJ"; //$NON-NLS-1$
- String VBF_EXC_BADVAL = "VBF_EXC_BADVAL"; //$NON-NLS-1$
-
- String VBF_STATUS_START_REMOVING_OLD_MESSAGES = "VBF_STATUS_START_REMOVING_OLD_MESSAGES"; //$NON-NLS-1$
- String VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES = "VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES"; //$NON-NLS-1$
-
- String VBF_TASK_WARN_MESSAGE_LIMIT_VAL = "VBF_TASK_WARN_MESSAGE_LIMIT_VAL"; //$NON-NLS-1$
-
- String VBF_VALIDATION_JOB_MSG = "VBF_VALIDATION_JOB_MSG"; //$NON-NLS-1$
-
- String VBF_EXC_DISABLEV = "VBF_EXC_DISABLEV"; //$NON-NLS-1$
- String VBF_EXC_DISABLEH = "VBF_EXC_DISABLEH"; //$NON-NLS-1$
- String VBF_EXC_ORPHAN_IVALIDATOR = "VBF_EXC_ORPHAN_IVALIDATOR"; //$NON-NLS-1$
-
- String VBF_STATUS_LOOKING = "VBF_STATUS_LOOKING"; //$NON-NLS-1$
- String VBF_STATUS_LOOKINGDONE = "VBF_STATUS_LOOKINGDONE"; //$NON-NLS-1$
- String VBF_STATUS_REMOVING = "VBF_STATUS_REMOVING"; //$NON-NLS-1$
- String VBF_STATUS_REMOVINGDONE = "VBF_STATUS_REMOVINGDONE"; //$NON-NLS-1$
-
- String VBF_WRONG_CONTEXT_FOR_DELEGATE = "VBF_WRONG_CONTEXT_FOR_DELEGATE"; //$NON-NLS-1$
- String VBF_NO_DELEGATE = "VBF_NO_DELEGATE"; //$NON-NLS-1$
- String VBF_CANNOT_INSTANTIATE_DELEGATE = "VBF_CANNOT_INSTANTIATE_DELEGATE"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceHandler.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceHandler.java
deleted file mode 100644
index c3d2f7e..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceHandler.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * This class retrieves the Strings from the .properties file appropriate for the machine's Locale.
- */
-public class ResourceHandler {
- //TODO Make this class final once the public ResourceHandler has been deleted.
- private static ResourceBundle _bundle = null;
-
- protected ResourceHandler() {
- //TODO Make this method private once the public ResourceHandler has been deleted.
- super();
- }
-
- /**
- * Return the resource bundle which contains the messages, as identified by
- */
- public static ResourceBundle getBundle() {
- if (_bundle == null) {
- try {
- _bundle = ResourceBundle.getBundle(ValidationPlugin.getBundlePropertyFileName());
- } catch (MissingResourceException exc) {
- _bundle = null;
- if (Tracing.isLogging()) {
- Tracing.log("ResourceHandler-01", "Cannot find bundle " + ValidationPlugin.getBundlePropertyFileName()); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- }
- return _bundle;
- }
-
- public static String getExternalizedMessage(String key) {
- try {
- ResourceBundle bundle = getBundle();
- if (bundle == null) {
- Tracing.log("ResourceHandler-02: ", "Resource bundle is null"); //$NON-NLS-1$ //$NON-NLS-2$
- return key;
- }
-
- return bundle.getString(key);
- } catch (NullPointerException exc) {
- Tracing.log("ResourceHandler-03: ", "Cannot find message id ", key); //$NON-NLS-1$ //$NON-NLS-2$
- }
- return key;
- }
-
- public static String getExternalizedMessage(String key, String[] parms) {
- String res = ""; //$NON-NLS-1$
- try {
- res = java.text.MessageFormat.format(getExternalizedMessage(key), (Object[])parms);
- } catch (MissingResourceException exc) {
- Tracing.log("ResourceHandler-04: ", "Cannot find message id ", key); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (NullPointerException exc) {
- if (Tracing.isLogging()) {
- Tracing.log("ResourceHandler-05: Cannot format message id " + key + " with " + parms.length + " parameters."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
- return res;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TaskListUtility.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TaskListUtility.java
deleted file mode 100644
index 7da60d7..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TaskListUtility.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * This class must be called only by the validation framework.
- *
- * This singleton interacts with the eclipse workbench's Task list. TaskListUtility adds and removes
- * tasks from the list.
- *
- * This class must not be called outside of an IWorkspaceRunnable or IRunnableWithProgress. Many
- * resource deltas can be generated by the methods in this class.
- */
-public class TaskListUtility implements ConfigurationConstants {
- protected static final int DEPTH_INFINITE = IResource.DEPTH_INFINITE;
- protected static final int DEPTH_ZERO = IResource.DEPTH_ZERO;
- protected static final String VALIDATION_MARKER_TARGETOBJECT = "targetObject"; //$NON-NLS-1$
- private final static IMarker[] NO_MARKERS = new IMarker[0];
-
- public static IWorkspaceRoot getRoot() {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- return root;
- }
-
- /**
- * This method is here for use by the SABER validator's reporter instance ONLY. Do not use. See
- * defect 260144 for details.
- */
- @SuppressWarnings("unchecked")
- public static IMarker setPriority(IMarker item, int priority) throws CoreException {
- Map attrib = item.getAttributes();
- attrib.put(IMarker.PRIORITY, new Integer(priority));
- item.setAttributes(attrib);
- return item;
- }
-
- /**
- * This method adds a message to a resource in the task list.
- */
- public static IMarker addTask(String pluginId, IResource resource, String location,
- String messageId, String message, int markerType, String markerName, String targetObjectName,
- String groupName, int offset, int length) throws CoreException {
-
- if ((message == null) || (resource == null) || (!resource.exists())) {
- return null;
- }
-
- int severity = getSeverity(markerType);
-
- // Allow duplicate entries in the task list.
- // Prior to a full validation, the validation framework will remove all messages owned
- // by a validator before it is executed.
- // Prior to an incremental validation, the validation framework will remove all messages,
- // on each of the changed resources, owned by a validator before it is invoked.
- //
- // It is up to the validator to make sure that it is not adding the same message
- // in more than one place, and also to clear out any old messages which are not cleared
- // by the validation framework.
- IMarker item = null;
- MarkerManager.getDefault().hook(resource);
- if(markerName != null && markerName.length() >0 )
- item = resource.createMarker(markerName); // add a validation marker
- else
- item = resource.createMarker(VALIDATION_MARKER); // add a validation marker
-
- // For performance reasons, replace the multiple setAttribute
- // calls above with a single setAttributes call.
- boolean offsetSet = ((offset != IMessage.OFFSET_UNSET) && (length != IMessage.OFFSET_UNSET));
- int size = (offsetSet) ? 10 : 8; // add CHAR_START, CHAR_END only if the offset is set. If
- // the offset is set, it takes precendence over the line
- // number. (eclipse's rule, not mine.)
- String[] attribNames = new String[size];
- Object[] attribValues = new Object[size];
-
- // Very first thing, add the owner. That way, if the code dies
- // before things are persisted, hopefully this marker will be persisted.
- // Hopefully, eclipse WILL persist this field, as requested.
- attribNames[0] = VALIDATION_MARKER_OWNER;
- attribValues[0] = pluginId;
- attribNames[1] = VALIDATION_MARKER_SEVERITY; // this validation severity is stored, in
- // addition to the marker severity, to enable
- // more than one severity of message to be
- // displayed. e.g. ERROR | WARNING (using
- // binary OR). The IMarker constants are
- // regular decimal constants.
- attribValues[1] = new Integer(markerType);
- attribNames[2] = VALIDATION_MARKER_TARGETOBJECT; // to distinguish between messages which
- // are registered on an IResource, but
- // against different target objects
- attribValues[2] = ((targetObjectName == null) ? "" : targetObjectName); //$NON-NLS-1$
- attribNames[3] = VALIDATION_MARKER_GROUP;
- attribValues[3] = ((groupName == null) ? "" : groupName); //$NON-NLS-1$
- attribNames[4] = IMarker.MESSAGE;
- attribValues[4] = message;
- attribNames[5] = VALIDATION_MARKER_MESSAGEID;
- attribValues[5] = messageId;
-
- attribNames[6] = IMarker.SEVERITY; // IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING,
- // IMarker.SEVERITY_INFO
- attribValues[6] = new Integer(severity);
- try {
- // If the location is a line number, store it as a line number
- Integer lineNumber = Integer.valueOf(location);
- attribNames[7] = IMarker.LINE_NUMBER;
- attribValues[7] = lineNumber;
- } catch (NumberFormatException exc) {
- // Otherwise, store it as a text location
- attribNames[7] = IMarker.LOCATION;
- attribValues[7] = location;
- }
-
- if (offsetSet) {
- attribNames[8] = IMarker.CHAR_START;
- attribValues[8] = new Integer(offset);
- attribNames[9] = IMarker.CHAR_END;
- attribValues[9] = new Integer(offset + length);
- }
-
- item.setAttributes(attribNames, attribValues);
-
- return item;
- }
-
- /**
- * This method adds a message to a resource in the task list.
- */
- public static IMarker addTask(String pluginId, IResource resource, String location,
- String messageId, String message, int markerType, String targetObjectName,
- String groupName, int offset, int length) throws CoreException {
-
- return addTask(pluginId, resource, location, messageId,
- message, markerType, null, targetObjectName, groupName, offset, length);
- }
-
- /**
- * Given one of the SeverityEnum severities, return the IMarker severity int that is its
- * equivalent.
- *
- * This method was made public for the SaberReporter. No one other than TaskListUtility, or the
- * SaberReporter, should use this method!
- *
- */
- private static int getSeverity(int severityEnumValue) {
- switch (severityEnumValue) {
- case (IMessage.HIGH_SEVERITY) : {
- return IMarker.SEVERITY_ERROR;
- }
-
- case (IMessage.LOW_SEVERITY) : {
- return IMarker.SEVERITY_INFO;
- }
-
- case (IMessage.NORMAL_SEVERITY) : {
- return IMarker.SEVERITY_WARNING;
- }
-
- case (IMessage.ALL_MESSAGES) :
- case (IMessage.ERROR_AND_WARNING) :
- default : {
- // assume it's a warning.
- return IMarker.SEVERITY_WARNING;
- }
- }
- }
-
- private static int getDepth(IResource resource) {
- if (resource instanceof IProject) {
- return DEPTH_INFINITE; // DEPTH_INFINITE means get this project's markers, and the
- // markers belonging to the project's children.
- } else if (resource instanceof IWorkspaceRoot) {
- // Needed for the ValidationMigrator when it checks for orphan tasks.
- return DEPTH_INFINITE; // DEPTH_INFINITE means get all of the markers in the workspace
- }
-
- return DEPTH_ZERO; // DEPTH_ZERO means just this resource, not its children
- }
-
- public static IMarker[] getValidationTasks(int severity, IProject project) {
- // DEPTH_INFINITE means get this project's markers, and the markers
- // belonging to the project's children.
- return getValidationTasks(project, severity);
- }
-
- public static IMarker[] getValidationTasks(IResource resource, int severity) {
- return getValidationTasks(resource, severity, getDepth(resource));
- }
-
- /**
- * Return true if the marker is owned by the ownerId.
- */
- public static boolean isOwner(IMarker marker, String ownerId) {
- try {
- Object owner = marker.getAttribute(VALIDATION_MARKER_OWNER);
- if ((owner == null) || !(owner instanceof String)) {
- // The ValidationMigrator will remove any "unowned" validation markers.
- return false;
- }
-
- return ((String) owner).equals(ownerId);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return false;
- }
- }
-
- private static IMarker[] getValidationTasks(IResource resource, int severity, int depth) {
- IMarker[] tempMarkers = null;
- int validCount = 0;
- 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 e) {
- if (Tracing.isLogging())ValidationPlugin.getPlugin().handleException(e);
- return NO_MARKERS;
- }
-
- // Now filter in the markers, based on severity type.
- if (allMarkers.length != 0) {
- tempMarkers = new IMarker[allMarkers.length];
- for (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 {
- // 226541 - I was seeing markers with valid severities being reset, so I added this
- // additional test.
- if (marker.getAttribute(IMarker.SEVERITY, -1) == -1)
- marker.setAttribute(IMarker.SEVERITY, getSeverity(severity));
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
- } else if ((severity & filterSeverity.intValue()) == 0) {
- continue;
- }
- tempMarkers[validCount++] = marker;
- }
- }
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- 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 e) {
- ValidationPlugin.getPlugin().handleException(e);
- return NO_MARKERS;
- }
- }
-
- IMarker[] result = new IMarker[validCount];
- System.arraycopy(temp, 0, result, 0, validCount);
- return result;
- }
-
- /**
- * This method retrieves all validation tasks from the resource. If depth is INFINITE, child
- * tasks are returned as well. Only the tasks which are owned by the specified messageOwner, and
- * apply to the named IMessage's target object (objectName) will be returned.
- */
- private static IMarker[] getValidationTasks(IResource resource, String[] messageOwner, String objectName, String groupName, int depth) throws CoreException {
- if ((messageOwner == null) || (resource == null)) {
- return NO_MARKERS;
- }
-
- int validCount = 0;
- IMarker[] validList = null;
- IMarker[] markers = getValidationTasks(resource, messageOwner, depth);
- if (markers != null) {
- validList = new IMarker[markers.length];
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
-
- // If more than one target object resolves to the same resource, removing one
- // target's
- // messages should not remove the other target object's messages.
- if (objectName != null) {
- Object targetObject = marker.getAttribute(VALIDATION_MARKER_TARGETOBJECT);
- if ((targetObject == null) || !(targetObject instanceof String) || !(((String) targetObject).equals(objectName))) {
- continue;
- }
- }
-
- if (groupName != null) {
- Object group = marker.getAttribute(VALIDATION_MARKER_GROUP);
- if ((group == null) || !(group instanceof String) || !(((String) group).equals(groupName))) {
- continue;
- }
- }
-
- validList[validCount++] = marker;
- }
- }
-
- if (validCount == 0) {
- return NO_MARKERS;
- }
-
- IMarker[] result = new IMarker[validCount];
- System.arraycopy(validList, 0, result, 0, validCount);
- return result;
- }
-
- /**
- * Remove all validation messages from the resource and its children.
- */
- public static void removeAllTasks(IResource resource) {
- if (resource == null) {
- return;
- }
-
- try {
- IMarker[] markers = getValidationTasks(resource, IMessage.ALL_MESSAGES);
- ResourcesPlugin.getWorkspace().deleteMarkers(markers);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * This method removes all tasks from the resource. If the resource is an IProject, all tasks
- * are also removed from the project's children.
- */
- public static void removeAllTasks(IResource resource, String[] owners) throws CoreException {
- removeAllTasks(resource, owners, null); // null means remove messages from all target
- // objects
- }
-
- /**
- * This method removes all messages from a resource in the task list.
- */
- public static void removeAllTasks(IResource resource, String owner, String objectName) throws CoreException {
- removeAllTasks(resource, new String[]{owner}, objectName);
- }
-
- public static void removeAllTasks(IResource resource, String[] owners, String objectName) throws CoreException {
- removeAllTasks(resource, owners, objectName, getDepth(resource));
- }
-
- protected static void removeAllTasks(IResource resource, String[] owners, String objectName, int depth) throws CoreException {
- removeTaskSubset(resource, owners, objectName, null, depth); // null means no group name
- }
-
- /**
- * This method removes a subset of tasks from the project, including child tasks. Every task
- * which belongs to the group, identified by groupName, will be removed.
- */
- public static void removeTaskSubset(IResource resource, String[] owners, String objectName, String groupName) throws CoreException {
- removeTaskSubset(resource, owners, objectName, groupName, getDepth(resource));
- }
-
- /**
- * This method removes a subset of tasks from the project, including child tasks. Every task
- * which belongs to the group, identified by groupName, will be removed.
- */
- protected static void removeTaskSubset(IResource resource, String[] owners, String objectName, String groupName, int depth) throws CoreException {
- if ((owners == null) || (resource == null)) {
- return;
- }
-
- IMarker[] allTasks = getValidationTasks(resource, owners, objectName, groupName, depth);
- if (allTasks.length > 0) {
- ResourcesPlugin.getWorkspace().deleteMarkers(allTasks);
- }
- }
-
- /**
- * This method changes all validator markers which are owned by "from" to make their owner "to".
- */
- public static void updateOwner(String from, String to) throws CoreException {
- updateOwner(from, to, getRoot());
- }
-
- /**
- * This method changes all validator markers on the IResource and its children. All markers
- * owned by "from" have their owner reassigned to "to".
- */
- public static void updateOwner(String from, String to, IResource resource) throws CoreException {
- IMarker[] ownedMarkers = getValidationTasks(resource, from);
- if (ownedMarkers == null) {
- return;
- }
-
- for (int i = 0; i < ownedMarkers.length; i++) {
- IMarker marker = ownedMarkers[i];
- marker.setAttribute(VALIDATION_MARKER_OWNER, to);
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/VThreadManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/VThreadManager.java
deleted file mode 100644
index e9d9b7e..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/VThreadManager.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * This class manages (queue, invoke, etc.) the Runnables that perform the validation for a
- * particular validator.
- */
-public class VThreadManager {
- private static VThreadManager _manager = null;
- private static final int MAX_NUM_OF_RESTART = 5; // the maximum number of times that the thread
- // should attempt to ignore a Throwable and
- // carry on
-
- private Thread _validationThread = null; // This thread checks if the current Runnable is
- // finished, and if so, loads the first Runnable off of
- // the queue and starts it.
- volatile int restart = 0; // how many times has the thread been restarted?
- volatile Jobs _jobs = null;
-
- private VThreadManager() {
- _jobs = new Jobs();
-
- // Start the validation thread to check for queued ValidationOperation
- Runnable validationRunnable = new Runnable() {
- public void run() {
- while (true) {
- try {
- if (restart > MAX_NUM_OF_RESTART) {
- // something has gone seriously, seriously wrong
- String message = "restart = " + restart; //$NON-NLS-1$
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
- break;
- }
-
- Runnable job = getJobs().dequeue(); // If currentRunnable is null, there's
- // nothing on the queue. Shouldn't
- // happen with a semaphore.
- if (job != null) {
- getJobs().setActive(true);
- job.run();
- getJobs().setActive(false);
- }
- } catch (Exception e) {
- restart++;
- getJobs().setActive(false);
- ValidationPlugin.getPlugin().handleException(e);
- } finally {
- //do nothing
- }
- }
- }
- };
-
- _validationThread = new Thread(validationRunnable, "ValidationThread"); //$NON-NLS-1$
- _validationThread.start();
- }
-
- public static VThreadManager getManager() {
- if (_manager == null) {
- _manager = new VThreadManager();
- }
- return _manager;
- }
-
- Jobs getJobs() {
- return _jobs;
- }
-
- public void queue(Runnable runnable) {
- getJobs().queue(runnable);
- }
-
- /**
- * Return true if all of the Runnables have been run.
- */
- public boolean isDone() {
- return getJobs().isDone();
- }
-
- private class Jobs {
- private Vector<Runnable> _queuedJobs; // The queued Runnables that need to be run.
- private boolean _isActive; // Is a job being run in the validation thread?
-
- public Jobs() {
- _queuedJobs = new Vector<Runnable>();
- }
-
- public synchronized void queue(Runnable runnable) {
- // If there is a thread running already, then it must finish before another validation
- // thread is launched, or the validation messages could reflect the last thread
- // finished,
- // instead of the last state of changes.
-
- // Have to wait for the current Runnable to finish, so add this to the end of the queue
- _queuedJobs.add(runnable);
- notifyAll();
- }
-
- /**
- * Pop the Runnable off of the head of the queue.
- */
- synchronized Runnable dequeue() {
- while (_queuedJobs.size() == 0) {
- try {
- wait();
- } catch (InterruptedException exc) {
- //Ignore
- }
- } // Block on the semaphore; break when a job has been added to the queue.
-
- Runnable job = null;
- if (_queuedJobs.size() > 0) {
- job = _queuedJobs.get(0);
- if (job != null) {
- _queuedJobs.remove(0);
- }
- }
- return job;
- }
-
- public synchronized boolean isActive() {
- return _isActive;
- }
-
- public synchronized void setActive(boolean active) {
- _isActive = active;
- }
-
- /**
- * Return true if all of the Runnables have been run.
- */
- public synchronized boolean isDone() {
- return ((_queuedJobs.size() == 0) && !isActive());
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationConfiguration.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationConfiguration.java
deleted file mode 100644
index 3c5e616..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationConfiguration.java
+++ /dev/null
@@ -1,1056 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * 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;
-
- /**
- * Map of all validators configured on the project or installed globally. The value of true
- * means that the VMD is enabled, and a value of false means that the VMD is disabled.
- */
- private Map<ValidatorMetaData, Boolean> _validators;
- protected Map<ValidatorMetaData, Boolean> manualValidators;
- protected Map<ValidatorMetaData, Boolean> buildValidators;
-
- protected String USER_PREFERENCE = "USER_PREFERENCE"; //$NON-NLS-1$
- protected String USER_MANUAL_PREFERENCE = "USER_MANUAL_PREFERENCE"; //$NON-NLS-1$
- protected String USER_BUILD_PREFERENCE = "USER_BUILD_PREFERENCE"; //$NON-NLS-1$
- protected String DELEGATES_PREFERENCE = "DELEGATES_PREFERENCE"; //$NON-NLS-1$
-
- /**
- * The key is the target id, that is the id of the place holder validator. The value is the id
- * of the real validator.
- */
- private Map<String, String> _delegatesByTarget;
-
- private static final String DefaultValue = "default_value"; //$NON-NLS-1$
-
- public static String getEnabledElementsAsString(Set<ValidatorMetaData> elements) {
- if (elements == null)return null;
-
- StringBuffer buffer = new StringBuffer();
- for (ValidatorMetaData vmd : elements) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append(ConfigurationConstants.ELEMENT_SEPARATOR);
- }
- return buffer.toString();
- }
-
- private boolean getDisableAllValidation() {
- return false;
- }
-
- public static String getEnabledElementsAsString(ValidatorMetaData[] elements) {
- StringBuffer buffer = new StringBuffer();
- for (ValidatorMetaData vmd : elements) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append(ConfigurationConstants.ELEMENT_SEPARATOR);
- }
- return buffer.toString();
- }
-
- public static Set<ValidatorMetaData> getStringAsEnabledElements(String elements) {
- if (elements == null)return null;
-
- Set<ValidatorMetaData> result = new HashSet<ValidatorMetaData>();
- StringTokenizer tokenizer = new StringTokenizer(elements, ConfigurationConstants.ELEMENT_SEPARATOR);
- while (tokenizer.hasMoreTokens()) {
- String elem = tokenizer.nextToken();
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(elem);
- if (vmd != null)result.add(vmd);
- }
- return result;
- }
-
- public static ValidatorMetaData[] getStringAsEnabledElementsArray(String elements) {
- if (elements == null)return null;
-
- StringTokenizer tokenizer = new StringTokenizer(elements, ConfigurationConstants.ELEMENT_SEPARATOR);
- ValidatorMetaData[] result = new ValidatorMetaData[tokenizer.countTokens()];
- int count = 0;
- while (tokenizer.hasMoreTokens()) {
- String elem = tokenizer.nextToken();
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(elem);
- if (vmd != null)result[count++] = vmd;
- }
-
- if (count != result.length) {
- ValidatorMetaData[] trimResult = new ValidatorMetaData[count];
- System.arraycopy(result, 0, trimResult, 0, count);
- return trimResult;
- }
-
- return result;
- }
-
- public static IWorkspaceRoot getRoot() {
- return ResourcesPlugin.getWorkspace().getRoot();
- }
-
- protected ValidationConfiguration() throws InvocationTargetException {
- _validators = new HashMap<ValidatorMetaData, Boolean>();
- _delegatesByTarget = new HashMap<String, String>();
- }
-
- 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()];
- for (ValidatorMetaData vmd : getBuildEnabledValidatorsMap().keySet()) {
- Boolean bvalue = getBuildEnabledValidatorsMap().get(vmd);
- if (bvalue) {
- // If the validator is enabled
- if (vmd == null)continue;
- if ( vmd.isBuildValidation() ) {
- if (!onlyReferenced || vmd.isDependentValidator())
- temp[count++] = vmd;
- }
- }
- }
- result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- }
- else {
- result = new ValidatorMetaData[0];
- }
- return result;
- }
-
- public void setEnabledValidators(ValidatorMetaData[] vmds) {
- // First, "disable" all validators
- Map<ValidatorMetaData, Boolean> all = getValidatorMetaData();
- for (ValidatorMetaData vmd : all.keySet()) {
- all.put(vmd, Boolean.FALSE);
- }
-
- // Then enable only the validators in the array
- if ((vmds == null) || (vmds.length == 0))return;
-
- for (ValidatorMetaData vmd : vmds) {
- all.put(vmd, Boolean.TRUE);
- }
- }
-
- public void setEnabledManualValidators(ValidatorMetaData[] vmds) throws InvocationTargetException {
- Set<ValidatorMetaData> manualEnabledVMDs = new HashSet<ValidatorMetaData>(vmds.length);
- for (ValidatorMetaData vmd : vmds)manualEnabledVMDs.add(vmd);
-
- for(ValidatorMetaData data : getValidators()) {
- if(manualEnabledVMDs.contains(data))
- getManualEnabledValidatorsMap().put(data, Boolean.TRUE);
- else
- getManualEnabledValidatorsMap().put(data, Boolean.FALSE);
- }
- }
-
- /**
- * Update the list of validators that have been enabled for manual validation.
- *
- * @param vmds the validators that are enabled for manual validation.
- * @throws InvocationTargetException
- */
- public void setEnabledManualValidators(Set<ValidatorMetaData> vmds) throws InvocationTargetException {
- for(ValidatorMetaData data : getValidators()) {
- if(vmds.contains(data))getManualEnabledValidatorsMap().put(data, Boolean.TRUE);
- else getManualEnabledValidatorsMap().put(data, Boolean.FALSE);
- }
- }
-
- public void setEnabledBuildValidators(ValidatorMetaData[] vmds) throws InvocationTargetException {
- Set<ValidatorMetaData> buildEnabledVMDs = new HashSet<ValidatorMetaData>(vmds.length);
- for (ValidatorMetaData vmd : vmds)buildEnabledVMDs.add(vmd);
- for(ValidatorMetaData data : getValidators()) {
- if(buildEnabledVMDs.contains(data))
- getBuildEnabledValidatorsMap().put(data, Boolean.TRUE);
- else
- getBuildEnabledValidatorsMap().put(data, Boolean.FALSE);
- }
- }
-
- /**
- * Update the list of validators that have been enabled for build validation.
- *
- * @param vmds the validators that are enabled for build validation.
- * @throws InvocationTargetException
- */
- public void setEnabledBuildValidators(Set<ValidatorMetaData> vmds) throws InvocationTargetException {
- for(ValidatorMetaData data : getValidators()) {
- if(vmds.contains(data))getBuildEnabledValidatorsMap().put(data, Boolean.TRUE);
- else getBuildEnabledValidatorsMap().put(data, Boolean.FALSE);
- }
- }
-
- private Map<ValidatorMetaData, Boolean> getValidatorMetaData() {
- return _validators;
- }
-
-
- public ValidatorMetaData[] getDisabledValidators() throws InvocationTargetException {
- return getValidators(false);
- }
-
- /**
- * Return an array of ValidatorMetaData - if value is false, return the disabled validators; if
- * value is true, return the enabled validators.
- */
- private ValidatorMetaData[] getValidators(boolean value) throws InvocationTargetException {
- ValidatorMetaData[] temp = new ValidatorMetaData[numberOfValidators()];
- int count = 0;
- for (ValidatorMetaData vmd : getValidatorMetaData().keySet()) {
- Boolean bvalue = getValidatorMetaData().get(vmd);
- if (bvalue.booleanValue() == value) {
- temp[count++] = vmd;
- }
- }
-
- ValidatorMetaData[] result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- return result;
- }
-
- public ValidatorMetaData[] getManualEnabledValidators() throws InvocationTargetException {
- Map<ValidatorMetaData, Boolean> map = getManualEnabledValidatorsMap();
- if (!map.isEmpty()) {
- List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
- for (Map.Entry<ValidatorMetaData, Boolean> me : map.entrySet()) {
- Boolean obj = me.getValue();
- if (obj != null && obj)list.add(me.getKey());
- }
- return (ValidatorMetaData[]) list.toArray(new ValidatorMetaData[list.size()]);
- }
- return getEnabledValidators();
- }
-
- public ValidatorMetaData[] getBuildEnabledValidators() throws InvocationTargetException {
- Map<ValidatorMetaData, Boolean> map = getBuildEnabledValidatorsMap();
- List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
- if (!map.isEmpty()) {
- for (Map.Entry<ValidatorMetaData, Boolean> me : map.entrySet()) {
- Boolean obj = me.getValue();
- if (obj != null && obj)list.add(me.getKey());
- }
- return (ValidatorMetaData[]) list.toArray(new ValidatorMetaData[list.size()]);
- }
- return getEnabledValidators();
- }
-
- /**
- * Answer the map of the validators that have been enabled for build validation,
- * creating it if necessary.
- */
- protected Map<ValidatorMetaData, Boolean> getBuildEnabledValidatorsMap() {
- if(buildValidators == null)buildValidators = new HashMap<ValidatorMetaData, Boolean>();
- return buildValidators;
- }
-
- /**
- * Answer the map of the validators that have been enabled for manual validation,
- * creating it if necessary.
- */
- protected Map<ValidatorMetaData, Boolean> getManualEnabledValidatorsMap() {
- if(manualValidators == null)manualValidators = new HashMap<ValidatorMetaData, Boolean>();
- return manualValidators;
- }
-
- /**
- * Return all incremental validators for this preference; either every installed validator
- * (global) or every validator configured on the project (project).
- */
- public ValidatorMetaData[] getIncrementalValidators() throws InvocationTargetException {
- ValidatorMetaData[] temp = new ValidatorMetaData[numberOfValidators()];
- int count = 0;
- for (ValidatorMetaData vmd : getValidatorMetaData().keySet()) {
- Boolean bvalue = getValidatorMetaData().get(vmd);
- if (bvalue && vmd.isIncremental())temp[count++] = vmd;
- }
-
- ValidatorMetaData[] result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- return result;
- }
-
- /**
- * Return all validators for this preference; either every installed validator (global) or every
- * validator configured on the project (project).
- */
- public ValidatorMetaData[] getValidators() throws InvocationTargetException {
- return convertToArray(_validators.keySet());
- }
-
- public void setValidators(ValidatorMetaData[] vmds) {
- _validators.clear();
- for (ValidatorMetaData vmd : vmds) {
- if (vmd == null)continue;
- _validators.put(vmd, (vmd.isEnabledByDefault() ? Boolean.TRUE : Boolean.FALSE));
- }
- }
-
- public void setDefaultDelegates(ValidatorMetaData[] vmds) throws InvocationTargetException {
- _delegatesByTarget.clear();
- for (ValidatorMetaData vmd : vmds) {
- if (vmd == null)continue;
-
- String targetID = vmd.getValidatorUniqueName();
- String delegateID = ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(targetID);
- if (delegateID == null)continue;
- _delegatesByTarget.put(targetID, ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(targetID));
- }
- }
-
- /**
- * Returns the number of configured validators on the given project or installed validators in
- * the workspace.
- */
- public int numberOfValidators() throws InvocationTargetException {
- return _validators.size();
- }
-
- public int numberOfEnabledIncrementalValidators() throws InvocationTargetException {
- return numberOfIncrementalValidators(getEnabledValidators());
- }
-
- public int numberOfIncrementalValidators() throws InvocationTargetException {
- return numberOfIncrementalValidators(getValidators());
- }
-
- private static int numberOfIncrementalValidators(ValidatorMetaData[] vmds) {
- int count = 0;
- for (ValidatorMetaData vmd : vmds) {
- if (vmd.isIncremental())count++;
- }
- return count;
- }
-
- /**
- * Returns the number of enabled validators on the project or workspace.
- */
- public int numberOfEnabledValidators() throws InvocationTargetException {
- return getEnabledValidators().length;
- }
-
- /**
- * Returns the number of disabled validators on the project or workspace.
- */
- public int numberOfDisabledValidators() throws InvocationTargetException {
- return getDisabledValidators().length;
- }
-
- /**
- * The value returned from this method is guaranteed to be non-null.
- */
- public final String getVersion() throws InvocationTargetException {
- if (_version == null)loadVersion();
- return _version;
- }
-
- private void setVersion(String version) {
- _version = version;
- }
-
- /**
- * This preference has been migrated; change the version to the current version.
- */
- public void markVersionCurrent() {
- // The version should not be marked current until the migration is complete
- // (i.e., ValidationMigrator has been invoked.) Migrating the user's configuration
- // is only the first step of the migration.
- setVersion(ConfigurationConstants.CURRENT_VERSION);
- }
-
- public boolean isVersionCurrent() throws InvocationTargetException {
- return getVersion().equals(ConfigurationConstants.CURRENT_VERSION);
- }
-
- // IResource could be an IProject or an IWorkspaceRoot
- public IResource getResource() {
- return _resource;
- }
-
- /**
- * Return true if the validator is enabled on this preference.
- */
- public boolean isEnabled(String validatorClassName) throws InvocationTargetException {
- if (validatorClassName == null) {
- return false;
- }
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorClassName);
- return isEnabled(vmd);
- }
-
- /**
- * Return true if the validator is enabled on this preference.
- */
- public boolean isEnabled(ValidatorMetaData vmd) throws InvocationTargetException {
- if (vmd == null)return false;
-
- Boolean value = getValidatorMetaData().get(vmd);
- if (value == null)return false;
-
- return value.booleanValue();
- }
-
- /**
- * Once all of the fields have been updated on this ValidationConfiguration instance, this
- * preference should be stored back on the IResource for later use. This method must be called
- * manually by the validation framework once the fields of this type have been updated.
- */
- public final void passivate() throws InvocationTargetException {
- try {
- if (getResource() == null) {
- throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLSAVE));
- }
- getResource().setSessionProperty(ConfigurationConstants.USER_PREFERENCE, this);
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SAVE, new String[]{getResource().getName()}));
- }
- }
-
- /**
- * Reset the values to the default values.
- */
- public abstract void resetToDefault() throws InvocationTargetException;
-
- protected Boolean convertToBoolean(boolean value) {
- return (value == true ? Boolean.TRUE : Boolean.FALSE);
- }
-
- protected Integer convertToInteger(int value) {
- return new Integer(value);
- }
-
- protected boolean convertToBoolean(String value) {
- Boolean b = Boolean.valueOf(value);
- return b.booleanValue();
- }
-
- protected int convertToInt(String value) {
- Integer t = Integer.valueOf(value);
- return t.intValue();
- }
-
- public static ValidatorMetaData[] convertToArray(Collection<ValidatorMetaData> c) {
- int length = (c == null) ? 0 : c.size();
- ValidatorMetaData[] result = new ValidatorMetaData[length];
- if (length == 0)return result;
-
- int count = 0;
- for (ValidatorMetaData vmd : c)result[count++] = vmd;
-
- return result;
- }
-
- public static ValidatorMetaData[] convertToArray(Object[] c) {
- int length = (c == null) ? 0 : c.length;
- ValidatorMetaData[] result = new ValidatorMetaData[length];
- if (length == 0)return result;
-
- System.arraycopy(c, 0, result, 0, length);
- return result;
- }
-
- /**
- * Save the values of these fields before the project or workspace is closed.
- */
- public void store() throws InvocationTargetException {
- 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 e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- }
- }
-
- /**
- * Load and store the version number, but nothing else. The version isn't a preference, but it's
- * stored and loaded as if it is. Because the load mechanism is different between an IProject
- * and the IWorkspaceRoot, keep the load mechanism inside the ValidationConfiguration
- * implementation, but initialize only the minimum at first. After the project has been
- * migrated, load the other fields (loading the other fields before the migration may overwrite
- * the values of those fields).
- */
- protected final void loadVersion() throws InvocationTargetException {
- if (getResource() == null) {
- throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLRETRIEVE));
- }
-
- IMarker[] marker = getMarker();
- String version = null;
- if (marker == null) {
- // either a new workspace or already migrated; proceed as normal
- version = loadVersion(getResource());
- } else {
- // migrate
- version = loadVersion(marker);
- }
- setVersion(version);
- }
-
- protected final String loadVersion(IMarker[] marker) throws InvocationTargetException {
- String version = (String) getValue(marker[0], ConfigurationConstants.VERSION);
- if (version == null) return ConfigurationConstants.VERSION4_03;
-
- return version;
- }
-
- protected final String loadVersion(IResource resource) throws InvocationTargetException {
- try {
- // This method will be called in one of two situations:
- // 1. This is a new workspace and no preferences exist.
- // 2. This is a migrated workspace and the old preferences have already been created as
- // persistent properties.
- String storedConfiguration = resource.getPersistentProperty(ConfigurationConstants.USER_PREFERENCE);
- String version = null;
- if (storedConfiguration == null) {
- version = getVersionDefault();
- } else {
- int versionIndex = storedConfiguration.indexOf(ConfigurationConstants.VERSION);
- if (versionIndex != -1)
- version = storedConfiguration.substring(versionIndex + ConfigurationConstants.VERSION.length());
- }
-
- if (version == null) {
- return getVersionDefault();
- }
-
- return version;
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{getResource().getName()}));
- }
- }
-
- /**
- * Load the values of these fields when the project or workspace is opened.
- */
- protected final void load() throws InvocationTargetException {
- try {
- if (getResource() == null) {
- throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLRETRIEVE));
- }
-
- IMarker[] marker = getMarker();
- if (marker == null) {
- // either a new workspace or already migrated; proceed as normal
- loadPreference();
- } else {
- // migrate
- load(marker);
- }
- } catch (InvocationTargetException exc) {
- throw exc;
- } catch (Exception exc) {
- String resourceName = (getResource() == null) ? "null" : getResource().getName(); //$NON-NLS-1$
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{resourceName}));
- }
- }
-
- /**
- * Return the IMarker that used to store the preference information, if the marker exists. (If
- * it doesn't exist, then it's already been migrated.)
- */
- protected abstract IMarker[] getMarker();
-
- protected abstract void load(IMarker[] marker) throws InvocationTargetException;
-
- protected Object getValue(IMarker marker, String attribName) {
- if (marker == null)return null;
-
- try {
- return marker.getAttribute(attribName);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- }
-
- protected boolean getValue(IMarker marker, String attribName, boolean defaultValue) {
- Boolean bool = (Boolean) getValue(marker, attribName);
- if (bool == null)return defaultValue;
-
- return bool.booleanValue();
- }
-
- protected int getValue(IMarker marker, String attribName, int defaultValue) {
- Integer integer = (Integer) getValue(marker, attribName);
- if (integer == null)return defaultValue;
-
- return integer.intValue();
- }
-
- protected String getValue(IMarker marker, String attribName, String defaultValue) {
- String string = (String) getValue(marker, attribName);
- if (string == null)return defaultValue;
-
- return string;
- }
-
- protected void loadPreference() throws InvocationTargetException {
- // This method will be called in one of two situations:
- // 1. This is a new workspace and no preferences exist.
- // 2. This is a migrated workspace and the old preferences have already been created as
- // persistent properties.
- 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 e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- 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(DefaultValue)) {
- // Assume that the configuration has never been set (new workspace).
- resetToDefault();
- return;
- }
- int buildValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
-
- String manualValidation = storedConfiguration.substring(buildValidationIndex + ConfigurationConstants.ENABLED_BUILD_VALIDATORS.length(),storedConfiguration.length());
- setEnabledBuildValidators(getStringAsEnabledElementsArray(manualValidation));
- }
-
- protected void deserializeManual(String storedConfiguration) throws InvocationTargetException {
- if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
- // Assume that the configuration has never been set (new workspace).
- resetToDefault();
- return;
- }
- int manualValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
-
- String manualValidation = storedConfiguration.substring(manualValidationIndex + ConfigurationConstants.ENABLED_MANUAL_VALIDATORS.length(),storedConfiguration.length());
- setEnabledManualValidators(getStringAsEnabledElementsArray(manualValidation));
- }
-
- protected void deserializeDelegates(String storedConfiguration) throws InvocationTargetException {
-
- if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
- // Assume that the configuration has never been set (new workspace).
- resetToDefault();
- return;
- }
-
- int delegatesIndex = storedConfiguration.indexOf(ConfigurationConstants.DELEGATE_VALIDATORS);
-
- String delegates = storedConfiguration.substring(delegatesIndex + ConfigurationConstants.DELEGATE_VALIDATORS.length(),storedConfiguration.length());
-
- if (delegates == null) {
- return;
- }
-
- StringTokenizer tokenizer = new StringTokenizer(delegates, ConfigurationConstants.ELEMENT_SEPARATOR);
- while (tokenizer.hasMoreTokens()) {
- String delegateConfiguration = tokenizer.nextToken();
- int separatorIndex = delegateConfiguration.indexOf(ConfigurationConstants.DELEGATES_SEPARATOR);
- String targetID = delegateConfiguration.substring(0, separatorIndex);
- String delegateID = delegateConfiguration.substring(separatorIndex + 1);
- _delegatesByTarget.put(targetID, delegateID);
- }
- }
-
- protected void copyTo(ValidationConfiguration up) throws InvocationTargetException {
- up.setVersion(getVersion());
- up.setResource(getResource());
- up.setValidators(getValidators());
- up.setDisableAllValidation(isDisableAllValidation());
- up.setEnabledValidators(getEnabledValidators());
- up.setEnabledManualValidators(getManualEnabledValidators());
- up.setEnabledBuildValidators(getBuildEnabledValidators());
- up.setDelegatingValidators(getDelegatingValidators());
- }
-
- /**
- * The key is the id of the place holder validator, and the value is the id of validator
- * that will perform the validation.
- */
- public Map<String, String> getDelegatingValidators() throws InvocationTargetException {
- return _delegatesByTarget;
- }
-
- public void setDelegatingValidators(Map<String, String> source)
- {
- // It is safe to copy this map as it contains only immutable strings.
- _delegatesByTarget.putAll(source);
- }
-
- /**
- * Return true if the enabled validators have not changed since this ValidationConfiguration was
- * constructed, false otherwise. (This method is needed for the Properties and Preference pages;
- * if the list of validators hasn't changed, then there is no need to update the task list;
- * updating the task list is a costly operation.)
- */
- protected boolean hasEnabledValidatorsChanged(ValidatorMetaData[] oldEnabledVmd) throws InvocationTargetException {
- // First check the obvious: is every enabled validator still enabled, and is
- // the number of enabled validators the same as it was before? If not, return true.
- if (oldEnabledVmd == null) {
- // Something's gone wrong...
- return true;
- }
-
- for (int i = 0; i < oldEnabledVmd.length; i++) {
- ValidatorMetaData vmd = oldEnabledVmd[i];
- if (!isEnabled(vmd)) {
- return true;
- }
- }
-
- // Everything that was enabled is still enabled; have any additional
- // validators been enabled?
- if (numberOfEnabledValidators() != oldEnabledVmd.length) {
- return true;
- }
-
- return false;
- }
-
- /**
- * Determines if there has been a change in the list of delegate validators.
- * @param oldDelegates a Map with the old delegates ID by target ID.
- * @return true if there has been a change, false otherwise.
- * @throws InvocationTargetException
- */
- protected boolean haveDelegatesChanged(Map<String, String> oldDelegates) throws InvocationTargetException {
-
- if (oldDelegates == null)return true;
-
- for (String targetID : oldDelegates.keySet()) {
- String oldDelegateID = oldDelegates.get(targetID);
- String newDelegateID = _delegatesByTarget.get(targetID);
-
- if (oldDelegateID == null || newDelegateID == null)return true;
-
- if (!newDelegateID.equals(oldDelegateID))return true;
- }
-
- if (oldDelegates.size() != _delegatesByTarget.size())return true;
-
- return false;
- }
-
- protected String serialize() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
- buffer.append(String.valueOf(isDisableAllValidation()));
- buffer.append(ConfigurationConstants.VERSION);
- buffer.append(getVersion());
- return buffer.toString();
- }
-
- protected String serializeManualSetting() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
- buffer.append(getEnabledElementsAsString(getManualEnabledValidators()));
- return buffer.toString();
- }
-
- protected String serializeBuildSetting() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
- buffer.append(getEnabledElementsAsString(getBuildEnabledValidators()));
- return buffer.toString();
- }
-
- protected String serializeDelegatesSetting() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.DELEGATE_VALIDATORS);
- buffer.append(getDelegatesAsString(getValidatorMetaData()));
- return buffer.toString();
- }
-
- /**
- * Provides a String which contains pairs of targetID=delegateID separated by a semicolon.
- * @param validatorMetaData a Map with the currently configured validators.
- * @return a String.
- */
- private String getDelegatesAsString(Map<ValidatorMetaData, Boolean> validatorMetaData) {
-
- StringBuffer buffer = new StringBuffer();
- for (ValidatorMetaData vmd : validatorMetaData.keySet()) {
- String targetID = vmd.getValidatorUniqueName();
- String delegateID = getDelegateUniqueName(vmd);
-
- if (delegateID == null)continue;
-
- // Write out pairs targetID=delegateID
-
- buffer.append(targetID);
- buffer.append(ConfigurationConstants.DELEGATES_SEPARATOR);
- buffer.append(delegateID);
- buffer.append(ConfigurationConstants.ELEMENT_SEPARATOR);
- }
-
- return buffer.toString();
- }
-
- /**
- * Provides the delegate's ID of the validator delegate configured in this configuration for
- * a given delegating validator. That is answer the id of validator that is going to do the real work.
- *
- * @param vmd the delegating validator's meta data. Must not be null.
- * @return a String with the id of the validator delegate, null if there isn't one.
- */
- public String getDelegateUniqueName(ValidatorMetaData vmd) {
- String targetID = vmd.getValidatorUniqueName();
- return _delegatesByTarget.get(targetID);
- }
-
- /**
- * Provides the delegate's ID of the validator delegate configured in this configuration for
- * a given delegating validator. That is answer the id of validator that is going to do the real work.
- *
- * @param targetId the id of the target (or place holder) validator. Must not be null.
- * @return a String with the id of the validator delegate, null if there isn't one.
- */
- public String getDelegateForTarget(String targetId){
- return _delegatesByTarget.get(targetId);
- }
-
- /**
- * Sets the delegate's ID of the validator delegate to be used in this configuration for the
- * given delegating validator.
- *
- * @param vmd the delegating validator's metadata. Must not be null.
- * @param delegateID a String with the unique name (ID) of the validator delegate. Must not be null.
- */
- public void setDelegateUniqueName(ValidatorMetaData vmd, String delegateID) {
- String targetID = vmd.getValidatorUniqueName();
- _delegatesByTarget.put(targetID, delegateID);
- }
-
- /**
- * Deserialize everything except the version number; the version is deserialized first, in the
- * loadVersion() method.
- */
- protected void deserialize(String storedConfiguration) throws InvocationTargetException {
- if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
- // Assume that the configuration has never been set (new workspace).
- resetToDefault();
- return;
- }
- int disableAllValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
- int versionIndex = storedConfiguration.indexOf(ConfigurationConstants.VERSION);
- if(disableAllValidationIndex != -1) {
- String disableAllValidation = storedConfiguration.substring(disableAllValidationIndex + ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING.length(),versionIndex);
- setDisableAllValidation(Boolean.valueOf(disableAllValidation).booleanValue());
- } else {
- setDisableAllValidation(false);;
- }
-
- }
-
- public static boolean getDisableValidationDefault() {
- return ConfigurationConstants.DEFAULT_DISABLE_VALIDATION_SETTING;
- }
-
- public static ValidatorMetaData[] getEnabledValidatorsDefault() {
- return ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
- }
-
- public static int getMaximumNumberOfMessagesDefault() {
- return ConfigurationConstants.DEFAULT_MAXNUMMESSAGES;
- }
-
- public static String getVersionDefault() {
- // If the version can't be retrieved, assume that it's a new workspace. (A null version
- // could also mean a 4.03 workspace, but that's taken care of in the load(IMarker[])
- // method.)
- return ConfigurationConstants.CURRENT_VERSION;
- }
-
- public boolean isManualEnabled(ValidatorMetaData vmd) {
- if (vmd == null)return false;
- Boolean value = getManualEnabledValidatorsMap().get(vmd);
- if (value == null)return false;
- return value;
- }
-
- public boolean isBuildEnabled(ValidatorMetaData vmd) {
- if (vmd == null)return false;
- Boolean value = getBuildEnabledValidatorsMap().get(vmd);
- if (value == null)return false;
- return value;
- }
-
- public int numberOfManualEnabledValidators() throws InvocationTargetException {
- return getManualEnabledValidators().length;
- }
-
- public void enableSingleValidator(ValidatorMetaData vmd){
- getValidatorMetaData().put(vmd, Boolean.TRUE);
- }
-
-
- public void disableSingleValidator(ValidatorMetaData vmd){
- getValidatorMetaData().put(vmd, Boolean.FALSE);
- }
-
- public void enableSingleManualValidator(ValidatorMetaData vmd){
- getManualEnabledValidatorsMap().put(vmd, Boolean.TRUE);
- }
-
-
- public void disableSingleManualValidator(ValidatorMetaData vmd){
- getManualEnabledValidatorsMap().put(vmd, Boolean.FALSE);
- }
-
-
- public void enableSingleBuildValidator(ValidatorMetaData vmd){
- getBuildEnabledValidatorsMap().put(vmd, Boolean.TRUE);
- }
-
-
- public void disableSingleBuildValidator(ValidatorMetaData vmd){
- getBuildEnabledValidatorsMap().put(vmd, Boolean.FALSE);
- }
-
- /**
- * Provides the delegate validator descriptor of the validator delegate configured
- * for the given delegating validator in the context of this configuration.
- * @param vmd the delegating validator's meta data. Must not be null.
- * @return a ValidatorDelegateDescriptor for the given delegating validator.
- */
- public ValidatorDelegateDescriptor getDelegateDescriptor(ValidatorMetaData vmd) throws InvocationTargetException {
- String targetID = vmd.getValidatorUniqueName();
- String delegateID = getDelegateUniqueName(vmd);
-
- ValidatorDelegateDescriptor descriptor = ValidatorDelegatesRegistry.getInstance().getDescriptor(targetID, delegateID);
- return descriptor;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationFactoryImpl.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationFactoryImpl.java
deleted file mode 100644
index 1ba2ed1..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationFactoryImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.wst.validation.internal.provisional.ValidationFactory;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-public class ValidationFactoryImpl implements ValidationFactory {
- static ValidationFactory inst = null;
-
- public ValidationFactoryImpl() {
- super();
- }
-
- public static ValidationFactory getInstance() {
- if(inst == null)
- inst = new ValidationFactoryImpl();
- return inst;
- }
-
-
-
- public IValidator getValidator(String validatorUniqueId) throws InstantiationException {
- ValidationRegistryReader reader = ValidationRegistryReader.getReader();
- return reader.getValidator(validatorUniqueId);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
deleted file mode 100644
index d9ed1a8..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
+++ /dev/null
@@ -1,1356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.expressions.EvaluationContext;
-import org.eclipse.core.expressions.EvaluationResult;
-import org.eclipse.core.expressions.Expression;
-import org.eclipse.core.expressions.ExpressionConverter;
-import org.eclipse.core.expressions.ExpressionTagNames;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.internal.operations.IRuleGroup;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.osgi.framework.Bundle;
-
-/**
- * ValidationRegistryReader is a singleton who reads the plugin registry for Validator extensions.
- * The read is done once (in the constructor), and the list of validators can be accessed by calling
- * "getValidatorMetaData(String)" on this class. The read is triggered by a call from
- * ValidatorManager's loadValidatorMetaData(IProject) method. ValidatorManager delegates the load
- * call to this class, and if this class is null, the singleton is new'ed up, and the registry is
- * read.
- *
- * 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;
-
- /** list of all validators registered, with their associated ValidatorMetaData, indexed by project nature id */
- private Map<String,Set<ValidatorMetaData>> _validators;
-
- // list of all validators, indexed by validator class name,
- // with the validator's ValidatorMetaData as the value.
- // Needed by the WorkbenchReporter, because sometimes the
- // IValidator is not enough to remove all messages from the
- // task list.
- private Map<String, ValidatorMetaData> _indexedValidators;
-
- private Set<ValidatorMetaData> _defaultEnabledValidators;
-
- // Since IProject's contents are all instances of IResource, every type filter for a validator
- // must be an instance of IResource. This applies to both the rebuildCache pass and to the
- // validation pass.
- private static final String IRESOURCE = "org.eclipse.core.resources.IResource"; //$NON-NLS-1$
-
- private static final String UNKNOWN_PROJECT = "UNKNOWN"; //$NON-NLS-1$ // This 'project nature id' is used as a key to get the validators which can run on a project type which hasn't been explicitly filtered in or out by any validator.
- private static final String EXCLUDED_PROJECT = "EXCLUDED"; //$NON-NLS-1$ // This 'project nature id' is used as a key to get the validators which are excluded on certain projects.
-
- public HashMap<IProject, Set<ValidatorMetaData>> projectValidationMetaData;
-
- /**
- * The registry is read once - when this class is instantiated.
- */
- private ValidationRegistryReader() {
- super();
-
- try {
- _validators = new HashMap<String,Set<ValidatorMetaData>>();
- _indexedValidators = new HashMap<String, ValidatorMetaData>();
- _defaultEnabledValidators = new HashSet<ValidatorMetaData>();
-
- // Read the registry and build a map of validators. The key into
- // the map is the IValidator instance and the value is the ValidatorMetaData
- // which describes the IValidator.
- readRegistry();
-
- // Once all of the validators have been read, the caches of the
- // validators need to be updated.
- buildCache();
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Traverse over the list of VMDs which have been added and create copies of it. The copies are
- * created to increase runtime performance.
- */
- private void buildCache() {
- for (ValidatorMetaData vmd : _indexedValidators.values()) {
- buildProjectNatureCache(vmd);
- buildDefaultEnabledCache(vmd);
- }
-
- // Now add the validators which are configured on all projects,
- // and all projects but X.
- addRemainder();
-
- // this temporary list isn't needed any more. All of the excluded
- // projects have been added to the project natures which they don't exclude.
- _validators.remove(EXCLUDED_PROJECT);
-
- if (Tracing.isTraceV1()) {
- Tracing.log("ValidationRegistryReader-01: ", debug()); //$NON-NLS-1$
- }
- }
-
- /**
- * Build the cache of VMDs which is indexed by project nature ids. If the validator is
- * registered on all project types, the vmd's project nature filters will be null.
- */
- private void buildProjectNatureCache(ValidatorMetaData vmd) {
- // Build the cache with the identified project natures in validators'
- // extensions.
- ValidatorNameFilter[] projNatureIds = vmd.getProjectNatureFilters();
- String[] facetFilters = vmd.getFacetFilters();
- if (projNatureIds == null) {
- if (facetFilters == null && vmd.getEnablementExpresion() == null) {
- add(UNKNOWN_PROJECT, vmd);
- }
- } else {
- boolean noneIncluded = true; // assume that the validator does not include any project
- // natures
- for (int i = 0; i < projNatureIds.length; i++) {
- ValidatorNameFilter pn = projNatureIds[i];
- if (pn.isInclude()) {
- noneIncluded = false;
- add(pn.getNameFilter(), vmd);
- }
- }
-
- if (noneIncluded) {
- // add it to the list of EXCLUDED projects
- // (that is, a validator which excludes project natures but doesn't
- // explicitly include any. This type of validator runs on any unrecognized (UNKNOWN)
- // projects, but the rest of the cache needs to be built before this is added
- // to the UNKNOWN list. See addExcludedRemainder().
- add(EXCLUDED_PROJECT, vmd);
- }
- }
- }
- /**
- * Build the list of validators which are enabled by default.
- */
- private void buildDefaultEnabledCache(ValidatorMetaData vmd) {
- if (vmd == null)return;
-
- if (vmd.isEnabledByDefault())_defaultEnabledValidators.add(vmd);
- }
-
- /**
- * Add vmd to the list of validators, indexed by validator class name
- */
- private void add(ValidatorMetaData vmd) {
- if (vmd == null) {
- return;
- }
-
- _indexedValidators.put(vmd.getValidatorUniqueName(), vmd);
- }
-
- /*
- * Some validators can run on any type of project. In order to have a static list, add the "any
- * project" validators to each "project nature" validators' list. This avoids adding the "any
- * project" validators to the "project nature" validators at runtime, which results in
- * performance savings.
- *
- * Some validators run on any type of project but X, where X is an excluded project nature.
- * Those validators should also be added via this method.
- */
- private void addRemainder() {
- // First, add all "can-run-on-any-project-type" to every registered project nature type in
- // the cache.
- addAnyRemainder();
-
- // Then add the "can-run-on-any-project-type-but-X" to every non-X registered project nature
- // type in the cache.
- addExcludedRemainder();
- }
-
- private void addExcludedRemainder() {
- Set<ValidatorMetaData> excludedProjVmds = _validators.get(EXCLUDED_PROJECT);
- if (excludedProjVmds == null) {
- // no excluded project natures
- return;
- }
-
- for (ValidatorMetaData vmd : excludedProjVmds) {
-
- // assume that, by default, if someone explicitly excludes
- // a project nature then they don't include any project natures
- boolean noneIncluded = true;
-
- // a project nature then they don't include any project natures
- for (String projId : _validators.keySet()) {
- if (projId.equals(UNKNOWN_PROJECT) || projId.equals(EXCLUDED_PROJECT)) {
- // Don't add list to a project nature which is excluded or applicable to all.
- continue;
- }
-
- ValidatorNameFilter filter = vmd.findProjectNature(projId);
- if (filter != null) {
- // Don't add list to itself (filter.isIncluded() == true) or
- // to a list from which it's excluded (filter.isIncluded() == false)
- if (filter.isInclude()) {
- noneIncluded = false;
- }
- continue;
- }
-
- add(projId, vmd);
- }
-
- if (noneIncluded) {
- // At this point, the "can-run-on-any-project" becomes
- // "not-excluded-on-these-projects". That is, if the project
- // nature id isn't in the list of _validators, then it isn't
- // included or excluded by any validators, so all validators
- // which can run on any project AND all validators which can
- // run on any but certain excluded projects can run on the
- // given IProject.
- add(UNKNOWN_PROJECT, vmd);
- }
- }
- }
-
- private void addAnyRemainder() {
- Set<ValidatorMetaData> anyProjVmds = _validators.get(UNKNOWN_PROJECT);
- if (anyProjVmds == null) {
- // no validators run on all projects
- return;
- }
-
- for (String projId : _validators.keySet()) {
- if (projId.equals(UNKNOWN_PROJECT) || projId.equals(EXCLUDED_PROJECT)) {
- // Don't add list to itself or to a project nature which is excluded.
- continue;
- }
-
- add(projId, anyProjVmds);
- }
- }
-
- private void add(String projectNatureId, Set<ValidatorMetaData> vmdList) {
- if ((vmdList == null) || (vmdList.size() == 0))return;
-
- // whether the validator includes or excludes this
- // project nature id, make sure that an entry is created for it in the table
- Set<ValidatorMetaData> pnVal = createSet(projectNatureId);
- pnVal.addAll(vmdList);
- _validators.put(projectNatureId, pnVal);
- }
-
- private void add(String projectNatureId, ValidatorMetaData vmd) {
- if (vmd == null)return;
-
- // whether the validator includes or excludes this
- // project nature id, make sure that an entry is created for it in the table
- Set<ValidatorMetaData> pnVal = createSet(projectNatureId);
- pnVal.add(vmd);
- _validators.put(projectNatureId, pnVal);
- }
-
- /**
- * When a validator's class or helper class cannot be loaded, the vmd calls this method to
- * disable the validator. The validator will be removed from the preference page, properties
- * page, and enabled list of any project thereafter validated.
- */
- public void disableValidator(ValidatorMetaData vmd) {
- _indexedValidators.remove(vmd.getValidatorUniqueName());
- _defaultEnabledValidators.remove(vmd);
-
- // The whole "on-any-project" and "exclude-this-project-nature" would take
- // a lot of processing time... Instead, traverse the list of proj nature ids,
- // and search the Set of that proj nature id, and remove the vmd if it's in the
- // Set.
- for (String projId : _validators.keySet()) {
- Set<ValidatorMetaData> value = _validators.get(projId);
- if (value == null)continue;
-
- if (value.contains(vmd)) {
- value.remove(vmd);
- _validators.put(projId, value);
- }
- }
- }
-
- private Set<ValidatorMetaData> createSet(String projNature) {
- Set<ValidatorMetaData> v = _validators.get(projNature);
- if (v == null) {
- v = new HashSet<ValidatorMetaData>();
- }
- return v;
- }
-
- /**
- * Given an IConfigurationElement, if it has a project nature(s) specified, return the
- * ValidatorNameFilters which represent those natures. Otherwise return null.
- *
- * A project nature can be specified in plugin.xml to indicate what types of IProjects a
- * validator can run on.
- */
- private String[] getAggregateValidatorsNames(IConfigurationElement element) {
- IConfigurationElement[] filters = element.getChildren(TAG_AGGREGATE_VALIDATORS);
- if (filters.length == 0)
- return null;
-
- String[] names = new String[filters.length];
- for (int i = 0; i < names.length; i++) {
- // In order to speed up our String comparisons, load these
- // names into Java's constants space. This way, we'll be able to
- // use pointer comparison instead of the traditional
- // character-by-character comparison. Since these names should
- // never be set by anyone other than this class, and this class
- // sets them only once, it is safe to declare these Strings
- // constants.
- //
- // To load a String into the constants space, call intern() on the String.
- //
- String nameFilter = filters[i].getAttribute(ATT_CLASS);
- if (nameFilter != null) {
- nameFilter = nameFilter.intern();
- }
- names[i] = nameFilter;
- }
- return names;
- }
-
- private String[] getContentTypeBindings(IConfigurationElement element){
- IConfigurationElement[] bindings = element.getChildren(TAG_CONTENTTYPE);
- if(bindings.length == 0)
- return null;
- String[] cTypeIDs = new String[bindings.length];
- for (int i = 0; i < bindings.length; i ++){
-
- cTypeIDs[i] = bindings[i].getAttribute(ATT_CONTENTTYPEID);
- }
-
- return cTypeIDs;
-
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, if it has any filter tags, construct the
- * appropriate ValidatorFilters to represent those tags; else return null.
- *
- * A filter can be specified in plugin.xml to filter out certain resources.
- */
- private ValidatorFilter[] getFilters(IConfigurationElement element) {
- IConfigurationElement[] filters = element.getChildren(TAG_FILTER);
- if (filters.length == 0)
- return null;
-
- ValidatorFilter[] vf = new ValidatorFilter[filters.length];
- for (int i = 0; i < filters.length; i++) {
- vf[i] = new ValidatorFilter(IRESOURCE);
-
- // In order to speed up our String comparisons, load these
- // names into Java's constants space. This way, we'll be able to
- // use pointer comparison instead of the traditional
- // character-by-character comparison. Since these names should
- // never be set by anyone other than this class, and this class
- // sets them only once, it is safe to declare these Strings
- // constants.
- //
- // To load a String into the constants space, call intern() on the String.
- //
- String nameFilter = filters[i].getAttribute(ATT_NAME_FILTER);
- if (nameFilter != null) {
- nameFilter = nameFilter.intern();
- }
- String isCaseSensitive = filters[i].getAttribute(ATT_CASE_SENSITIVE);
- vf[i].setNameFilter(nameFilter, isCaseSensitive);
-
- String objectClass = filters[i].getAttribute(ATT_OBJECT_CLASS);
- if (objectClass != null) {
- objectClass = objectClass.intern();
- }
- vf[i].setTypeFilter(objectClass);
-
- String actionFilter = filters[i].getAttribute(ATT_ACTION_FILTER);
- if (actionFilter != null) {
- actionFilter = actionFilter.intern();
- }
- vf[i].setActionFilter(actionFilter);
- }
- return vf;
- }
-
- public boolean getDependentValidatorValue(IConfigurationElement element) {
- IConfigurationElement[] depValidatorElement = element.getChildren(DEP_VALIDATOR);
- if (depValidatorElement.length == 0)
- return false;
- String depValue = depValidatorElement[0].getAttribute(DEP_VAL_VALUE);
- boolean depBoolValue = (new Boolean(depValue)).booleanValue();
- return depBoolValue;
- }
-
- /**
- * Return the name of the marker ID associated with the IValidator.
- */
- public String[] getMarkerIdsValue(IConfigurationElement element) {
- IConfigurationElement[] markerId = element.getChildren(MARKER_ID);
- if (markerId.length == 0)
- return null;
- String markerIds[] = new String[markerId.length];
- for(int i = 0; i < markerIds.length; i++) {
- markerIds[i] = markerId[i].getAttribute(MARKER_ID_VALUE);
- }
- return markerIds;
- }
-
- public String[] getFacetIds(IConfigurationElement element) {
- IConfigurationElement[] facets = element.getChildren(FACET);
- if (facets.length == 0)
- return null;
- String[] facetIds = new String[facets.length];
- for (int i = 0; i < facets.length; i++) {
- facetIds[i] = facets[i].getAttribute(FACET_ID);
- }
- return facetIds;
- }
-
- /**
- * Return the name of the helper class associated with the IValidator.
- */
- private String getHelperName(IConfigurationElement element) {
- IConfigurationElement[] helpers = element.getChildren(TAG_HELPER_CLASS);
- if (helpers.length == 0)
- return null;
-
- return helpers[0].getAttribute(ATT_CLASS);
- }
-
- static IWorkbenchContext createHelper(IConfigurationElement element, String helperClassName) {
- IWorkbenchContext wh = null;
- try {
- wh = (IWorkbenchContext) element.createExecutableExtension(TAG_HELPER_CLASS);
- } catch (Exception exc) {
- ValidationPlugin.getPlugin().handleException(exc);
- String result = MessageFormat.format(
- ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NO_HELPER_THROWABLE),
- new Object[]{helperClassName});
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, result);
- return null;
- }
- return wh;
- }
-
- static IValidator createValidator(IConfigurationElement element, String validatorClassName) {
- IValidator validator = null;
- try {
- validator = (IValidator) element.createExecutableExtension(ATT_CLASS);
- } catch (Exception e) {
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NO_VAL_THROWABLE),
- new Object[]{validatorClassName});
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, result);
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- if (validator == null) {
- if (Tracing.isTraceV1()) {
- Tracing.log("ValidationRegistryReader-02: ", //$NON-NLS-1$
- NLS.bind(ValMessages.VbfExcSyntaxNoValNull, validatorClassName));
- }
- return null;
- }
-
- return validator;
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, return whether or not the validator is
- * enabled by default.
- *
- * If no enabled attribute is specified, the default, true (i.e., enabled) is returned.
- */
- private boolean getEnabledByDefault(IConfigurationElement element) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- // Don't need to check if runChildren is null or empty, because that was checked in the
- // initializeValidator method.
-
- String inc = runChildren[0].getAttribute(ATT_ENABLED);
- if (inc == null) {
- return RegistryConstants.ATT_ENABLED_DEFAULT;
- }
-
- return Boolean.valueOf(inc.trim().toLowerCase()).booleanValue(); // this will return true
- // if, and only if, the
- // attribute value is
- // "true". For example,
- // "yes" will be considered
- // "false".
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, return whether or not the validator supports
- * incremental validation.
- *
- * If no incremental attribute is specified, the default, true (i.e., incremental is supported)
- * is returned.
- */
- private boolean getIncremental(IConfigurationElement element) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- // Don't need to check if runChildren is null or empty, because that was checked in the
- // initializeValidator method.
-
- String inc = runChildren[0].getAttribute(ATT_INCREMENTAL);
- if (inc == null) {
- return RegistryConstants.ATT_INCREMENTAL_DEFAULT;
- }
-
- return Boolean.valueOf(inc.trim().toLowerCase()).booleanValue(); // this will return true
- // if, and only if, the
- // attribute value is
- // "true". For example,
- // "yes" will be considered
- // "false".
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, return whether or not the validator supports
- * full build validation.
- *
- * If no incremental attribute is specified, the default, true (i.e., incremental is supported)
- * is returned.
- */
- private boolean getFullBuild(IConfigurationElement element) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- // Don't need to check if runChildren is null or empty, because that was checked in the
- // initializeValidator method.
-
- String fb = runChildren[0].getAttribute(ATT_FULLBUILD);
- if (fb == null) {
- return RegistryConstants.ATT_FULLBUILD_DEFAULT;
- }
-
- return Boolean.valueOf(fb.trim().toLowerCase()).booleanValue(); // this will return true if,
- // and only if, the
- // attribute value is
- // "true". For example,
- // "yes" will be considered
- // "false".
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, return whether or not the validator supports
- * asynchronous validation.
- *
- * If no async attribute is specified, the default, true (i.e., the validator is thread-safe) is
- * returned.
- */
- private boolean getAsync(IConfigurationElement element) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- // Don't need to check if runChildren is null or empty, because that was checked in the
- // initializeValidator method.
-
- String async = runChildren[0].getAttribute(ATT_ASYNC);
- if (async == null) {
- return RegistryConstants.ATT_ASYNC_DEFAULT;
- }
-
- return Boolean.valueOf(async.trim().toLowerCase()).booleanValue(); // this will return true
- // if, and only if, the
- // attribute value is
- // "true". For example,
- // "yes" will be
- // considered "false".
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, return the types of validation passes, as
- * defined in IRuleGroup, that the validator performs.
- *
- * If no pass attribute is specified, the default, IRuleGroup.PASS_FULL, is returned.
- */
- private int getRuleGroup(IConfigurationElement element) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- // Don't need to check if runChildren is null or empty, because that was checked in the
- // initializeValidator method.
-
- String pass = runChildren[0].getAttribute(ATT_RULE_GROUP);
- if (pass == null) {
- return RegistryConstants.ATT_RULE_GROUP_DEFAULT;
- }
-
- final String COMMA = ","; //$NON-NLS-1$
- StringTokenizer tokenizer = new StringTokenizer(pass, COMMA, false); // false means don't
- // return the comma as
- // part of the string
- int result = 0; // no passes identified
- while (tokenizer.hasMoreTokens()) {
- String nextAction = tokenizer.nextToken().trim();
- if (nextAction.equals(IRuleGroup.PASS_FAST_NAME)) {
- result = result | IRuleGroup.PASS_FAST;
- } else if (nextAction.equals(IRuleGroup.PASS_FULL_NAME)) {
- result = result | IRuleGroup.PASS_FULL;
- }
- }
-
- if (result == 0) {
- // No recognized passes. Return the default.
- return RegistryConstants.ATT_RULE_GROUP_DEFAULT;
- }
-
- return result;
- }
-
- private ValidatorMetaData.MigrationMetaData getMigrationMetaData(IConfigurationElement element, 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.
- if (Tracing.isTraceV1()) {
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_MISSING_VALIDATOR_EP),
- new Object[]{ValidationPlugin.PLUGIN_ID + "." + VALIDATOR_EXT_PT_ID}); //$NON-NLS-1$
- Tracing.log("ValidationRegistryReader-03: ", result); //$NON-NLS-1$
- }
- }
- return extensionPoint;
- }
-
- /**
- * It's okay to return a handle to the ValidatorMetaData because the vmd can't be modified by
- * any code not in this package.
- */
- public ValidatorMetaData getValidatorMetaData(IValidator validator) {
- // retrieval will be in log(n) time
- if (validator == null) {
- String message = ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_EXC_ORPHAN_IVALIDATOR, new String[]{"null"}); //$NON-NLS-1$
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
- return null;
- }
-
- String validatorClassName = validator.getClass().getName();
- ValidatorMetaData vmd = getValidatorMetaData(validatorClassName);
- if (vmd != null) {
- return vmd;
- }
-
- // If we got here, then vmd is neither a root nor an aggregate validator,
- // yet the IValidator exists. Internal error.
- String message = ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_EXC_ORPHAN_IVALIDATOR, new String[]{validatorClassName});
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
- return null;
- }
-
- public Set<ValidatorMetaData> getValidatorMetaData(IWorkspaceRoot root) {
- // Every validator on the Preferences page must be returned
- Set<ValidatorMetaData> copy = new HashSet<ValidatorMetaData>();
- clone(_indexedValidators.values(), copy);
- return copy;
- }
-
- /**
- * Return a collection of Validators configured on a certain type of IProject (e.g. EJB Project
- * vs. Web Project).
- *
- * This is a long-running process. If you can, cache the result.
- */
- public Set<ValidatorMetaData> getValidatorMetaData(IProject project) {
- Set<ValidatorMetaData> copy = new HashSet<ValidatorMetaData>();
- getValidatorMetaData(project, copy);
- return copy;
- }
-
- /**
- * Copy the set of configured validator metadata into the Set.
- */
- public void getValidatorMetaData(IProject project, Set<ValidatorMetaData> vmds) {
- if (vmds == null)return;
- vmds.clear();
- int executionMap = 0x0;
- try {
- if (Tracing.isTraceV1()) {
- Tracing.log("ValidationRegistryReader-04: IProject is " + String.valueOf(project)); //$NON-NLS-1$
- }
- if (project == null) {
- executionMap |= 0x1;
- // vmds is already clear
- return;
- }
- String[] projectNatures = null;
- try {
- projectNatures = project.getDescription().getNatureIds();
- } catch (CoreException e) {
- executionMap |= 0x2;
- // vmds is already clear
- ValidationPlugin.getPlugin().handleException(e);
- return;
- }
- // If there are no project natures on a particular project,
- // or if this project nature has no validators configured
- // on it, return the validators which are configured on all
- // projects.
- if ((projectNatures == null) || (projectNatures.length == 0)) {
- executionMap |= 0x4;
-
- // Also include the validators which are enabled through enablement
- // expression for this project.
- // Note that the API isFacetEnabled(vmd, project) works properly
- // only when the plugin containing the property tester is activated.
- // forcePluginActivation="true" may be needed in the declaration of
- // the enablement in the validator extension point.
- // <enablement>
- // <test forcePluginActivation="true" property="foo.testProperty"/>
- // </enablement>
-
- Set<ValidatorMetaData> validatorsWithEnablementExpression = new HashSet<ValidatorMetaData>();
- for (ValidatorMetaData vmd : getAllValidators()) {
- if (isFacetEnabled(vmd, project)) {
- validatorsWithEnablementExpression.add(vmd);
- }
- }
- if(validatorsWithEnablementExpression.size() > 0 ){
- validatorsWithEnablementExpression.addAll( getValidatorMetaDataUnknownProject());
- clone(validatorsWithEnablementExpression, vmds);
- }
- else
- clone(getValidatorMetaDataUnknownProject(), vmds);
-
-
- } else {
- executionMap |= 0x8;
- if (Tracing.isTraceV1()) {
- Tracing.log("ValidationRegistryReader-05: ", projectNatures.toString()); //$NON-NLS-1$
- }
- calculateVmdsForNatureAndFacets(vmds, projectNatures,project);
- // Now filter out the validators which must not run on this project
- removeExcludedProjects(project, vmds);
- if (vmds.size() == 0) {
- executionMap |= 0x20;
- clone(getValidatorMetaDataUnknownProject(), vmds);
- }
- }
- } finally {
- if (Tracing.isTraceV1()) {
- StringBuffer buffer = new StringBuffer();
- for (ValidatorMetaData vmd : vmds) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append("\n"); //$NON-NLS-1$
- }
- Tracing.log("ValidationRegistryReader-06: ", buffer.toString()); //$NON-NLS-1$
- }
- }
- }
-
- /**
- * @param project
- * @param vmds
- * @param projectNatures
- */
- private void calculateVmdsForNatureAndFacets(Set<ValidatorMetaData> vmds, String[] projectNatures, IProject project) {
- Set<ValidatorMetaData> projVmds;
- String[] projectFacetIds = getProjectFacetIds(project);
- for (ValidatorMetaData vmd : getAllValidators()) {
- if (containsProjectFacet(vmd, projectFacetIds) || isFacetEnabled(vmd, project)) {
- vmds.add(vmd);
- }
- }
- for (String projectNatureId : projectNatures) {
- projVmds = _validators.get(projectNatureId);
- if (projVmds == null)continue;
-
- for (ValidatorMetaData vmd : projVmds) {
- if (!vmds.contains(vmd) && (vmd.getFacetFilters() == null || vmd.getFacetFilters().length == 0)) {
- if (vmd.getEnablementExpresion() == null)vmds.add(vmd);
- else if (isFacetEnabled(vmd, project))vmds.add(vmd);
- }
- }
- }
- }
-
- private boolean containsProjectFacet(ValidatorMetaData vmd, String[] projectFacetIds) {
- String[] validatorFacets = vmd.getFacetFilters();
- if (validatorFacets != null && validatorFacets.length > 0) {
- if (projectFacetIds != null && projectFacetIds.length > 0) {
- if (Arrays.asList(projectFacetIds).containsAll(Arrays.asList(validatorFacets)))
- return true;
- }
- }
- return false;
- }
-
- private boolean isFacetEnabled(ValidatorMetaData vmd, IProject project) {
- try {
- Expression expression = vmd.getEnablementExpresion();
- if (expression != null) {
- EvaluationContext context = new EvaluationContext(null, project);
- context.setAllowPluginActivation(true);
- EvaluationResult result = expression.evaluate(context);
- return result == EvaluationResult.TRUE;
- }
- } catch (CoreException ce) {
- }
- return false;
- }
-
- private String[] getProjectFacetIds(IProject project) {
- try {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- if (fProject != null) {
- Object[] projectFacets = fProject.getProjectFacets().toArray();
- String[] projectFacetIds = new String[projectFacets.length];
- for (int i = 0; i < projectFacets.length; i++) {
- IProjectFacet projectFacet = ((IProjectFacetVersion) projectFacets[i]).getProjectFacet();
- projectFacetIds[i] = projectFacet.getId();
- }
- return projectFacetIds;
- }
- } catch (CoreException ce) {
- }
-
- return null;
- }
-
- /*
- * If one project nature on the project includes a particular validator, but another project
- * nature excludes that validator, then the validator needs to be removed from the vmd set.
- *
- * For example, if AValidator can run on any java project but not on a J2EE project, which is an
- * instance of a java project, then the AValidator is included by the java nature and excluded
- * by the J2EE nature. The AValidator would have to be removed from the set.
- */
- private void removeExcludedProjects(IProject project, Set<ValidatorMetaData> vmds) {
- if (Tracing.isTraceV1()) {
- StringBuffer buffer = new StringBuffer("\nValidationRegistryReader-12: before:\n"); //$NON-NLS-1$
- for (ValidatorMetaData vmd : vmds) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append("\n"); //$NON-NLS-1$
- }
- Tracing.log(buffer);
- }
-
- String[] projectNatures = null;
- try {
- projectNatures = project.getDescription().getNatureIds();
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return;
- }
- if ((projectNatures == null) || (projectNatures.length == 0)) {
- // nothing needs to be removed from the list
- return;
- }
- for (int i = 0; i < projectNatures.length; i++) {
- String nature = projectNatures[i];
- Iterator<ValidatorMetaData> iterator = vmds.iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = iterator.next();
- ValidatorNameFilter[] natureFilters = vmd.getProjectNatureFilters();
- if (natureFilters == null) {
- // Can run on any project
- continue;
- }
-
- for (ValidatorNameFilter pn : natureFilters) {
- if (nature.equals(pn.getNameFilter()) && !pn.isInclude()) {
- iterator.remove();
- break;
- }
- }
- }
- }
-
- if (Tracing.isTraceV1()) {
- StringBuffer buffer = new StringBuffer("\nValidationRegistryReader-13: after:\n"); //$NON-NLS-1$
- for (ValidatorMetaData vmd : vmds) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append("\n"); //$NON-NLS-1$
- }
- Tracing.log(buffer);
- }
- }
-
- @SuppressWarnings("unchecked")
- private Collection clone(Collection input, Collection copy) {
- if (input == null || copy == null)return null;
- copy.clear();
- copy.addAll(input);
- return copy;
- }
-
- public String debug() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("Project nature => validators configured"); //$NON-NLS-1$
- buffer.append("\n"); //$NON-NLS-1$
- for (String projId : _validators.keySet()) {
- buffer.append("projId: "); //$NON-NLS-1$
- buffer.append(projId);
- buffer.append("\n"); //$NON-NLS-1$
- Set<ValidatorMetaData> validators = _validators.get(projId);
- for (ValidatorMetaData vmd : validators) {
- buffer.append("\t"); //$NON-NLS-1$
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append("\n"); //$NON-NLS-1$
- }
- }
- buffer.append("\n"); //$NON-NLS-1$
-
- buffer.append("Enable/disable validator by default"); //$NON-NLS-1$
- buffer.append("\n"); //$NON-NLS-1$
- for (ValidatorMetaData vmd : _indexedValidators.values()) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append(" enabled? "); //$NON-NLS-1$
- buffer.append(vmd.isEnabledByDefault());
- buffer.append("\n"); //$NON-NLS-1$
- }
-
- return buffer.toString();
- }
-
- public boolean isConfiguredOnProject(ValidatorMetaData vmd, IProject project) {
- if (projectValidationMetaData == null)
- projectValidationMetaData = new HashMap<IProject, Set<ValidatorMetaData>>();
-
- Set<ValidatorMetaData> vmds = projectValidationMetaData.get(project);
- if (vmds != null) {
- return vmds.contains(vmd);
- } else {
- Set<ValidatorMetaData> prjVmds = getValidatorMetaData(project);
- if (prjVmds == null || prjVmds.size() == 0)return false;
- 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<ValidatorMetaData> getValidatorMetaDataUnknownProject() {
- Set<ValidatorMetaData> projVmds = _validators.get(UNKNOWN_PROJECT);
- if (projVmds == null) {
- projVmds = new HashSet<ValidatorMetaData>();
- }
- return projVmds;
- }
-
- /**
- * Return a set of ValidatorMetaData which are enabled by default.
- */
- public Set<ValidatorMetaData> getValidatorMetaDataEnabledByDefault() {
- Set<ValidatorMetaData> copy = new HashSet<ValidatorMetaData>();
- clone(_defaultEnabledValidators, copy);
- return copy;
- }
-
- public ValidatorMetaData[] getValidatorMetaDataArrayEnabledByDefault() {
- ValidatorMetaData[] result = new ValidatorMetaData[_defaultEnabledValidators.size()];
- _defaultEnabledValidators.toArray(result);
- return result;
- }
-
- /**
- * This method should be called ONLY by the validation framework, UI, or TVT plugin. In general,
- * only the validation framework and the validation TVT should handle ValidatorMetaData objects.
- *
- * Given a string which identifies a fully-qualified class name of a validator, return the
- * ValidatorMetaData that uses a validator of that name, if it exists.
- *
- * It's okay to return a handle to the ValidatorMetaData because the vmd can't be modified by
- * any code not in this package.
- */
- public ValidatorMetaData getValidatorMetaData(String validatorClassName) {
- if (validatorClassName == null)return null;
-
- ValidatorMetaData vmd2 = _indexedValidators.get(validatorClassName);
- if (vmd2 != null)return vmd2;
-
- // Check for an aggregate validator
- for (ValidatorMetaData vmd : _indexedValidators.values()) {
- if (vmd == null)continue;
-
- if (vmd.getValidatorUniqueName().equals(validatorClassName))return vmd;
-
- String[] aggregateNames = vmd.getAggregatedValidatorNames();
- if (aggregateNames != null) {
- for (String aggregateName : aggregateNames) {
- if (validatorClassName.equals(aggregateName))return vmd;
- }
- }
-
- // Current name of validator doesn't match; has this validator been
- // migrated from another package?
- ValidatorMetaData.MigrationMetaData mmd = vmd.getMigrationMetaData();
- if (mmd == null) {
- // Validator class name hasn't been migrated
- continue;
- }
-
- Set<String[]> idList = mmd.getIds();
- if (idList == null) {
- // Invalid <migrate> element.
- continue;
- }
-
- for (String[] ids : idList) {
- if (ids.length != 2) {
- // log
- continue;
- }
-
- String from = ids[0];
- if (from == null) {
- // log
- continue;
- }
-
- if (from.equals(validatorClassName)) {
- return vmd;
- }
- }
- }
-
- // If we got to this point, no validator using that class name is loaded.
- return null;
- }
-
- /**
- * Return true if the named validator is installed, otherwise false.
- */
- public boolean isExistingValidator(String validatorClassName) {
- return (getValidatorMetaData(validatorClassName) != null);
- }
-
- /**
- * Initialize the validator with the static metadata (runtime metadata is initialized in the
- * ValidationOperation class).
- */
- private ValidatorMetaData initializeValidator(IConfigurationElement element, String validatorName, String pluginId) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- if ((runChildren == null) || (runChildren.length < 1)) {
- // How can an IValidatorImpl be created when there no class name to instantiate?
- if (Tracing.isLogging()) {
- Tracing.log("ValidationRegistryReader-07: ", NLS.bind(ValMessages.VbfExcSyntaxNoValRun, validatorName)); //$NON-NLS-1$
- }
- return null;
- }
-
- //WTP Bugzilla defect: 82338
- //Using the Unique Identifier give the flexibility of the same validator class used by other validator extensions without writing a new validation class
- //Reverting the fix back as the class name defined in the ext is unique to this validator and has to be used for the unique id in the validation metadata
- String validatorImplName = runChildren[0].getAttribute(ATT_CLASS);
-
- if (validatorImplName == null) {
- // Same as before; how can we instantiate when...
- if (Tracing.isLogging()) {
- Tracing.log("ValidationRegistryReader-08: ", NLS.bind(ValMessages.VbfExcSyntaxNoValClass, validatorName)); //$NON-NLS-1$
- }
- return null;
- }
-
- String helperImplName = getHelperName(element);
- if (helperImplName == null) {
- // Same as before; how can we instantiate when...
- if (Tracing.isLogging()) {
- Tracing.log("ValidationRegistryReader-09: ", NLS.bind(ValMessages.VbfExcSyntaxNoValRun, validatorImplName)); //$NON-NLS-1$
- }
- return null;
- }
-
- // In order to speed up our String comparisons, load these
- // names into Java's constants space. This way, we'll be able to
- // use pointer comparison instead of the traditional
- // character-by-character comparison. Since these names should
- // never be set by anyone other than this class, and this class
- // sets them only once, it is safe to declare these Strings
- // constants.
- //
- // To load a String into the constants space, call intern() on the String.
- //
- 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);
-
- if (Tracing.isTraceV1()) {
- Tracing.log("ValidationRegistryReader-10: validator loaded: " + validatorImplName); //$NON-NLS-1$
- }
-
- 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) { //$NON-NLS-1$
- String pluginID = markerid.substring(0, markerid.lastIndexOf(".")); //$NON-NLS-1$
- Bundle bundle = Platform.getBundle(pluginID);
- if (bundle == null)
- qualifiedMarkerIds[i] = pluginId + "." + customMarkerIds[i]; //$NON-NLS-1$
- else
- qualifiedMarkerIds[i] = customMarkerIds[i];
- } else
- qualifiedMarkerIds[i] = pluginId + "." + customMarkerIds[i]; //$NON-NLS-1$
- }
- vmd.setMarkerIds(qualifiedMarkerIds);
- }
- }
-
- private Expression getEnablementElement(IConfigurationElement element) {
- IConfigurationElement[] enablements = element.getChildren(ExpressionTagNames.ENABLEMENT);
- if (enablements.length == 0)
- return null;
- try {
- return ExpressionConverter.getDefault().perform(enablements[0]);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- return null;
- }
-
- /**
- * This method should be called ONLY BY THE VALIDATION FRAMEWORK! The value from this method is
- * used to populate the validation preference page.
- */
- public Collection<ValidatorMetaData> getAllValidators() {
- Set<ValidatorMetaData> validators = new HashSet<ValidatorMetaData>(50);
- clone(_indexedValidators.values(), validators);
- return validators;
- }
-
- public int numberOfValidators() {
- return _indexedValidators.size();
- }
-
- /**
- * Reads one extension by looping through its configuration elements.
- */
- private void readExtension(IExtension extension) {
- IConfigurationElement[] elements = extension.getConfigurationElements();
-
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
-
- String label = extension.getLabel();
- if (label == null || label.equals("")) { //$NON-NLS-1$
- if (Tracing.isTraceV1()) {
- String[] msgParm = {extension.getUniqueIdentifier()};
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_VALIDATORNAME_IS_NULL),
- (Object[])msgParm);
- Tracing.log("ValidationRegistryReader-11: ", result); //$NON-NLS-1$
- }
- } else {
- // If getLabel() returns an empty string, this is an illegal validator.
- // The PropertyPage, and other status messages, need to have a displayable name for
- // the validator.
- String pluginId = extension.getContributor().getName();
- ValidatorMetaData vmd = initializeValidator(element, label, pluginId);
-
- if (vmd != null) {
- // Add this validator to the list of validators; if vmd is null, the validator
- // couldn't be created.
- add(vmd);
- }
- }
- }
- }
-
- /**
- * Reads the registry to find the Validators which have been implemented.
- */
- private void readRegistry() {
- _validators.clear();
-
- // Get the extensions that have been registered.
- IExtensionPoint validatorEP = getValidatorExtensionPoint();
- if (validatorEP == null) {
- return;
- }
- IExtension[] extensions = validatorEP.getExtensions();
-
- // find all runtime implementations
- for (int i = 0; i < extensions.length; i++) {
- readExtension(extensions[i]);
- }
-
- // Force the delegate validators registry to be read early to avoid
- // the non-synchronized singleton issue which occurs when two delegating
- // validators race to load the registry.
-
- ValidatorDelegatesRegistry.getInstance();
- }
-
- public IValidator getValidator(String validatorClassName) throws InstantiationException {
- ValidatorMetaData vmd = _indexedValidators.get(validatorClassName);
- if(vmd != null)
- return vmd.getValidator();
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationSelectionHandlerRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationSelectionHandlerRegistryReader.java
deleted file mode 100644
index cf3ce9a..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationSelectionHandlerRegistryReader.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-public class ValidationSelectionHandlerRegistryReader {
-
- public static final String VALIDATION_SELECTION_HANDLER = "validationSelectionHandler"; //$NON-NLS-1$
- static final String ATT_ID = "id"; //$NON-NLS-1$
-
- /** handlerClass - */
- static final String ATT_HANDLER_CLASS = "handlerClass"; //$NON-NLS-1$
-
- static final String ATT_SELECTION_TYPE = "selectionType"; //$NON-NLS-1$
- private static ValidationSelectionHandlerRegistryReader INSTANCE;
- private List<IValidationSelectionHandler> _validationSelectionHandlers;
-
- public ValidationSelectionHandlerRegistryReader() {
- }
-
- public static ValidationSelectionHandlerRegistryReader getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new ValidationSelectionHandlerRegistryReader();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- /**
- * Read the extension point and parse it.
- */
- public void readRegistry() {
- IExtensionPoint point = Platform.getExtensionRegistry()
- .getExtensionPoint(ValidationPlugin.PLUGIN_ID, VALIDATION_SELECTION_HANDLER);
- if (point == null)return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- internalReadElement(elements[i]);
- }
- }
-
- private void internalReadElement(IConfigurationElement element) {
- boolean recognized = this.readElement(element);
- if (!recognized) {
- logError(element, "Error processing extension: " + element); //$NON-NLS-1$
- }
- }
-
- /*
- * Logs the error in the desktop log using the provided text and the information in the configuration element.
- */
- protected void logError(IConfigurationElement element, String text) {
- IExtension extension = element.getDeclaringExtension();
- StringBuffer buf = new StringBuffer();
- buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
- buf.append("\n" + text); //$NON-NLS-1$
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, buf.toString());
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(VALIDATION_SELECTION_HANDLER))
- return false;
-
-// String handlerClass = element.getAttribute(ATT_HANDLER_CLASS);
- String selectionType = element.getAttribute(ATT_SELECTION_TYPE);
-
- IValidationSelectionHandler handler = null;
- try {
- handler = (IValidationSelectionHandler) element.createExecutableExtension(ATT_HANDLER_CLASS);
- handler.setValidationTypeString(selectionType);
- getValidationSelectionHandlers().add(handler);
- return true;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
-
- private List<IValidationSelectionHandler> getValidationSelectionHandlers() {
- if (_validationSelectionHandlers == null)
- _validationSelectionHandlers = new ArrayList<IValidationSelectionHandler>();
- return _validationSelectionHandlers;
- }
-
- public Object getExtendedType(Object selection) {
- Object result = null;
- for (IValidationSelectionHandler handler : getValidationSelectionHandlers()) {
- result = handler.getBaseValidationType(selection);
- if (result != null)break;
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorActionFilter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorActionFilter.java
deleted file mode 100644
index ee241be..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorActionFilter.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IResourceDelta;
-
-/**
- * This class stores the value of the "action" attribute in the validator's plugin.xml contribution.
- */
-public class ValidatorActionFilter {
- public static final String ADD = "add"; //$NON-NLS-1$ // if the resource delta is an addition; this value is used in plugin.xml
- public static final String CHANGE = "change"; //$NON-NLS-1$ // if the resource delta is a change; this value is used in plugin.xml
- public static final String DELETE = "delete"; //$NON-NLS-1$ // if the resource delta is a removal; this value is used in plugin.xml
- public static final int ALL_ACTIONS = (IResourceDelta.ADDED | IResourceDelta.CHANGED | IResourceDelta.REMOVED);
-
- private int _actionType = 0; // Default to 0, so that if an invalid filter is specified, then no
-
- // matter what the IResourceDelta is, the delta & _actionType will
- // always == 0. (i.e., the resource will never be filtered in)
-
- public ValidatorActionFilter() {
- super();
- }
-
- /**
- * Return the hexadecimal number which represents the type(s) of actions which this filter
- * allows in.
- */
- public int getActionType() {
- // Since IResourceDelta's constants are hexadecimal numbers,
- // it's nicer to return a corresponding hexadecimal, for bitwise OR,
- // than it is to have three boolean methods on this class, i.e.,
- // isAdd, isChange, isDelete.
- return _actionType;
- }
-
- /**
- * <p>
- * Parse the incoming string, which is extracted from the plugin.xml file, to determine the
- * value of the actionType.
- * <p>
- * The string can contain one, two, or three constants. If there is more than one constant, the
- * constants should be separated by a comma.
- * <p>
- * These are the three constants: add, change, delete. The order that the constants are
- * specified in does not matter. The constants are case-sensitive; i.e., ADD is not considered
- * the same as add.
- * <p>
- * If the action attribute is not defined, the default behaviour is to filter in all types of
- * actions: add, change, delete. (i.e., the same behaviour can be achieved by specifying "add,
- * change, delete" as the action attribute's value.
- * <p>
- * If the action attribute is defined, and none of the constants are defined, then the filter is
- * invalid, and will be ignored by the Validation Framework. (If none of the actions should be
- * filtered in, then the filter itself should not exist.)
- * <p>
- * If the action attribute is defined, and one of the constants is defined, then the form of the
- * action should be like this: <br>
- * <filter ... action="add"/>
- * <p>
- * If the action attribute is defined, and more than one constant is defined, then the form of
- * the action should be like this: <br>
- * <filter ... action="add, delete"/>
- * <p>
- * If the action attribute is defined, and an unknown constant is defined, then the unknown
- * constant will be ignored. For example, <br>
- * <filter ... action="ADD, delete"/> <br>
- * is the same as specifying <br>
- * <filter ... action="delete"/> <br>
- * and if all of the constants are unknown, the filter is invalid, and will be ignored by the
- * Validation Framework. e.g., <br>
- * <filter ... action="ADD, DELETE"/> <br>
- * is the same as not specifying a filter.
- * <p>
- * If the action attribute is defined, and a constant is defined more than once, the extra
- * constant is ignored. For example, <br>
- * <filter ... action="add, change, add"/> <br>
- * is the same as specifying <br>
- * <filter ... action="add, change"/>
- */
- public void setActionTypes(String actions) {
- if (actions == null) {
- // user has not defined the "action" element, so default to everything
- _actionType = ALL_ACTIONS;
- return;
- }
-
- final String COMMA = ","; //$NON-NLS-1$
- StringTokenizer tokenizer = new StringTokenizer(actions, COMMA, false); // false means don't
- // return the comma
- // as part of the
- // string
- int isAdd = 0;
- int isChange = 0;
- int isDelete = 0;
- while (tokenizer.hasMoreTokens()) {
- String nextAction = tokenizer.nextToken().trim();
- if (nextAction.equals(ADD)) {
- isAdd = IResourceDelta.ADDED;
- } else if (nextAction.equals(CHANGE)) {
- isChange = IResourceDelta.CHANGED;
- } else if (nextAction.equals(DELETE)) {
- isDelete = IResourceDelta.REMOVED;
- }
- }
- _actionType = isAdd | isChange | isDelete;
- }
-
- public String toString() {
- final String ON = "on"; //$NON-NLS-1$
- final String OFF = "off"; //$NON-NLS-1$
- StringBuffer buffer = new StringBuffer();
- buffer.append(" ActionFilter:"); //$NON-NLS-1$
- buffer.append(" add: " + (((getActionType() & IResourceDelta.ADDED) != 0) ? ON : OFF)); //$NON-NLS-1$
- buffer.append(" change: " + (((getActionType() & IResourceDelta.CHANGED) != 0) ? ON : OFF)); //$NON-NLS-1$
- buffer.append(" delete: " + (((getActionType() & IResourceDelta.REMOVED) != 0) ? ON : OFF)); //$NON-NLS-1$
- return buffer.toString();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorFilter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorFilter.java
deleted file mode 100644
index d51a217..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorFilter.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * This class represents the plugin.xml tags, for a validator, for both name filters and type
- * filters. i.e., if an object has name filter and type filter specified, the filter filters out
- * objects which are not both of that type and named like the filter.
- */
-public class ValidatorFilter {
- private ValidatorNameFilter _nameFilter;
- private ValidatorTypeFilter _typeFilter;
- private ValidatorActionFilter _actionFilter;
-
- ValidatorFilter() {
- super();
- _nameFilter = new ValidatorNameFilter();
- _typeFilter = new ValidatorTypeFilter();
- _actionFilter = new ValidatorActionFilter();
- }
-
- ValidatorFilter(String mustImplementClass) {
- this();
- _nameFilter = new ValidatorNameFilter();
- _typeFilter.setMustImplementClass(mustImplementClass);
- _actionFilter = new ValidatorActionFilter();
- }
-
- public boolean isApplicableAction(int resourceDelta) {
- return ((resourceDelta & _actionFilter.getActionType()) != 0);
- }
-
- /**
- * Returns true if the given resource's name matches the name filter.
- *
- * e.g. if the name filter is "*.java", and this resource is "readme.txt", this method will
- * return false. If the resource is named "readme.java", this method will return true.
- */
- boolean isApplicableName(IResource resource) {
- return _nameFilter.isApplicableName(resource);
- }
-
- /**
- * Returns true if the given resource's type matches the type filter.
- *
- * e.g. if the type filter is "IFile", and this resource is "IProject", this method will return
- * false. If the resource is an IFile, this method will return true.
- */
- boolean isApplicableType(IResource resource) {
- return _typeFilter.isApplicableType(resource);
- }
-
- public void setActionFilter(String actions) {
- _actionFilter.setActionTypes(actions);
- }
-
- /**
- * Sets the name filter.
- */
- void setNameFilter(String filter, String isCaseSensitiveString) {
- _nameFilter.setNameFilter(filter);
- if(filter != null)
- _nameFilter.setNameFilterExtension(getFilterExt(filter));
- _nameFilter.setCaseSensitive(isCaseSensitiveString);
- }
-
- private String getFilterExt(String filter) {
- return filter.substring(filter.indexOf(".") + 1); //$NON-NLS-1$
- }
-
-
- /**
- * Sets the type filter.
- */
- void setTypeFilter(String filter) {
- _typeFilter.setTypeFilter(filter);
- }
-
- public String toString() {
- final String lineSep = System.getProperty("line.separator"); //$NON-NLS-1$
- StringBuffer buffer = new StringBuffer();
- buffer.append("ValidatorFilter:"); //$NON-NLS-1$
- buffer.append(lineSep);
- buffer.append(" nameFilter = " + _nameFilter); //$NON-NLS-1$
- buffer.append(lineSep);
- buffer.append(" typeFilter = " + _typeFilter); //$NON-NLS-1$
- buffer.append(lineSep);
- buffer.append(" actionFilter = " + _actionFilter); //$NON-NLS-1$
- buffer.append(lineSep);
- return buffer.toString();
- }
-
- /**
- * @return Returns the _nameFilter.
- */
- public ValidatorNameFilter get_nameFilter() {
- return _nameFilter;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java
deleted file mode 100644
index ceb7425..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java
+++ /dev/null
@@ -1,618 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.expressions.Expression;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-import org.eclipse.wst.validation.internal.plugin.ValidationHelperRegistryReader;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-import org.osgi.framework.Bundle;
-
-/**
- * This class stores information, as specified by a validator's plugin.xml tags. There is one
- * ValidatorMetaData for each Validator. No Validator should attempt to access its
- * ValidatorMetaData; it is for use by the base framework only.
- */
-public class ValidatorMetaData {
- private 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 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;
- private boolean _manualValidation = true;
- private boolean _buildValidation = true;
- private Map<IValidatorJob, IWorkbenchContext> _helpers =
- Collections.synchronizedMap( new HashMap<IValidatorJob, IWorkbenchContext>() );
- private Expression _enablementExpression;
-
- ValidatorMetaData() {
- }
-
- /**
- * 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<String> getNameFilters() {
- List<String> nameFilters = new ArrayList<String>();
- if (_filters != null && _filters.length > 0) {
- for (ValidatorFilter filter : _filters) {
- ValidatorNameFilter nameFilter = filter.get_nameFilter();
- if (nameFilter != null) {
- nameFilters.add(nameFilter.getNameFilter());
- }
- }
- }
- return nameFilters;
- }
-
- /**
- * Return the list of class names of the primary validator and its aggregates.
- */
- public String[] getValidatorNames() {
- 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;
- }
-
- 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<String[]> _ids;
-
- public MigrationMetaData() {
- }
-
- public void addId(String oldId, String newId) {
- if (oldId == null)return;
- if (newId == null)return;
-
- String[] ids = new String[]{oldId, newId};
- getIds().add(ids);
- }
-
- public Set<String[]> getIds() {
- if (_ids == null)_ids = new HashSet<String[]>();
- return _ids;
- }
- }
-
- public void addDependentValidator(boolean b) {
- _dependentValidator = 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 _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 946cfba..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorNameFilter.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * Represents a name filter tag in a validator's plugin.xml file. e.g. <filter name="*.*"> Then
- * this class would store the "*.*", and provide the wildcard matching functionality.
- */
-public class ValidatorNameFilter {
- private String _nameFilter;
- private String nameFilterExtension;
- private boolean _include = true; // by default, filter in the IFile specified
- private final static String WILDCARD = "*"; //$NON-NLS-1$
- private boolean _isCaseSensitive = true; // by default, the filter name is case-sensitive
-
- /**
- * Insert the method's description here. Creation date: (12/4/00 11:08:41 AM)
- */
- ValidatorNameFilter() {
- //default
- }
-
- /**
- * Get the filter, as specified in plugin.xml
- */
- String getNameFilter() {
- return _nameFilter;
- }
-
- boolean isCaseSensitive() {
- return _isCaseSensitive;
- }
-
- boolean isInclude() {
- return _include;
- }
-
- /**
- * Return true if the given resource is both applicable and include="true".
- */
- boolean isApplicableTo(IResource resource) {
- return (isApplicableName(resource) && isInclude());
- }
-
- protected void setNameFilterExtension(String filterExt) {
- nameFilterExtension = filterExt;
- }
-
- /**
- * Returns true if the name of the resource matches the filter, or if there is no filter
- * specified.
- */
- public boolean isApplicableName(IResource resource) {
- // If name filter is null, means filter out no names.
- // Otherwise, return true only if the given name matches
- // the name filter.
- if (_nameFilter == null)
- return true;
-
- String name = resource.getName();
-// return true if the file name is exact match of the _nameFilter
- if (name.equalsIgnoreCase(_nameFilter))
- return true;
-
- int indexOfStarDot = _nameFilter.indexOf("*."); //$NON-NLS-1$
-
- //return value if the filter name extension matches the extension
- //of the resource
- if (indexOfStarDot != -1) {
- String nameExtension = name.substring(name.lastIndexOf(".") + 1); //$NON-NLS-1$
- return nameFilterExtension.equalsIgnoreCase(nameExtension);
- }
-
- if (!isCaseSensitive()) {
- name = name.toLowerCase();
- }
-
- return verifyNameMatch(_nameFilter, name);
- }
-
- void setInclude(String includeValue) {
- if (includeValue != null) {
- setInclude(Boolean.valueOf(includeValue).booleanValue());
- }
- }
-
- void setInclude(boolean includeBool) {
- _include = includeBool;
- }
-
- /**
- * Set the filter, as specified in plugin.xml
- */
- void setNameFilter(String filter) {
- _nameFilter = filter;
- }
-
- void setCaseSensitive(String isCaseSensitiveString) {
- if (isCaseSensitiveString != null) {
- // only change the value from the default if the case-sensitive attribute is defined
- _isCaseSensitive = Boolean.valueOf(isCaseSensitiveString).booleanValue();
- }
- }
-
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("NameFilter:\n\tnameFilter = "); //$NON-NLS-1$
- buffer.append(_nameFilter);
- return buffer.toString();
- }
-
- /**
- * Return true if the given name matches the given filter.
- *
- * The only filter wildcard allowed is '*'.
- */
- static boolean verifyNameMatch(final String filter, String name) {
- /*
- * There are eight possible wildcard combinations, given that a wildcard may, if present, be
- * at the beginning, middle, or end of a name; or any combination of those positions. i.e.,
- *
- * beginning middle end 0 0 0 0 0 1 0 1 0 0 1 1 1 0 0 1 0 1 1 1 0 1 1 1
- *
- */
- StringTokenizer tokenizer = new StringTokenizer(filter, WILDCARD, true);
- boolean wildcardFlag = false;
- while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- if (token.equals(WILDCARD)) {
- wildcardFlag = true;
- } else {
- if (wildcardFlag) {
- int tokenIndex = name.indexOf(token);
- if (tokenIndex >= 0) {
- name = name.substring(tokenIndex + token.length());
- } else {
- return false;
- }
- } else {
- if (name.startsWith(token)) {
- int tokenIndex = token.length();
- name = name.substring(tokenIndex);
- } else {
- return false;
- }
- }
- wildcardFlag = false;
- }
- }
- if (!name.equals("")) { //$NON-NLS-1$
- if (!wildcardFlag) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java
deleted file mode 100644
index f495aa6..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * Represents a type filter tag in a validator's plugin.xml file. e.g. <filter
- * objectClass="com.ibm.foo.MyClass"> Then this class would store the "com.ibm.foo.MyClass", and
- * provide the "instanceof" matching functionality.
- */
-public class ValidatorTypeFilter {
- private Class _typeFilterClass;
- private String _mustImplementClass; // the type set in setTypeFilter must implement the
-
- // class/interface identified by this fully-qualified
- // Java string.
-
- ValidatorTypeFilter() {
- //default
- }
-
- ValidatorTypeFilter(String mustImplementClass) {
- setMustImplementClass(mustImplementClass);
- }
-
- /**
- * Type filters are allowed only for certain types of classes. This method returns the name of
- * the class which this type must implement before it can be a filter.
- */
- String getMustImplementClass() {
- return _mustImplementClass;
- }
-
- /**
- * Return the type filter as a java.lang.Class object.
- */
- Class getTypeFilterClass() {
- return _typeFilterClass;
- }
-
- /**
- * Returns true if the resource passed in either an instance of the type filter class, or if
- * there is no type filter class defined in plugin.xml.
- */
- public boolean isApplicableType(IResource resource) {
- // If type filter is null, means filter out no types.
- // Otherwise, return true only if the given type is an instance of
- // the type filter.
- if (_typeFilterClass == null)
- return true;
-
- // If the resource is an instance of the type filter class.
- return isInstance(resource.getClass(), _typeFilterClass);
- }
-
- /**
- * Checks if filterClass is a parent (interface or superclass) of objectClass.
- */
- boolean isInstance(Class objectClass, Class filterClass) {
- // The java.lang.Class.isInstance call doesn't check interfaces fully.
- // i.e., if I have two interfaces, A and B, and B extends A but
- // doesn't implement A, then the isInstance call will return false.
- //
- // So, instead of using Class.isInstance, do the checking myself.
- for (Class cl = objectClass; cl != null; cl = cl.getSuperclass()) {
- if (cl.getName().equals(filterClass.getName())) {
- return true;
- }
- Class[] clInterfaces = cl.getInterfaces();
- for (int i = 0; i < clInterfaces.length; i++) {
- if (clInterfaces[i].getName().equals(filterClass.getName())) {
- return true;
- }
- return isInstance(clInterfaces[i], filterClass);
- }
- }
- return false;
- }
-
- /**
- * Type filters are allowed only for certain types of classes. This method sets the name of the
- * class which this type must implement before it can be a filter.
- */
- void setMustImplementClass(String className) {
- _mustImplementClass = className;
- }
-
- /**
- * If the filter implements the mustImplementClass (in ValidatorFilter's case, IResource), then
- * this is a valid filter, and store the filter value.
- */
- void setTypeFilter(String filter) {
- Class filterClass = null;
- Class mustImplementClass = null;
-
- if (filter == null) {
- _typeFilterClass = null;
- return;
- }
-
- try {
- filterClass = Class.forName(filter);
- if (getMustImplementClass() != null) {
- mustImplementClass = Class.forName(getMustImplementClass());
-
- // If the filter class is not an instance of mustImplementClass
- if (!isInstance(filterClass, mustImplementClass)) {
- _typeFilterClass = null;
- if (Tracing.isLogging()) {
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INVALID_TYPE_FILTER),
- new Object[]{filter, getMustImplementClass()});
- Tracing.log("ValidatorTypeFilter-01: ", result); //$NON-NLS-1$
- }
- }
- }
- } catch (ClassNotFoundException exc) {
- _typeFilterClass = null;
- if (Tracing.isLogging()) {
- Tracing.log("ValidatorTypeFilter-02: The class named " + filter + //$NON-NLS-1$
- " cannot be instantiated because it does not exist. Check the spelling of the name, " + //$NON-NLS-1$
- "in the validator's plugin.xml contribution, and try restarting eclipse again."); //$NON-NLS-1$
- }
- return;
- }
- _typeFilterClass = filterClass;
- }
-
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("TypeFilter:"); //$NON-NLS-1$
- buffer.append(" _typeFilterClass = " + _typeFilterClass.getName()); //$NON-NLS-1$
- buffer.append(" _mustImplementClass = " + _mustImplementClass); //$NON-NLS-1$
- return buffer.toString();
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/DelegatingValidator.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/DelegatingValidator.java
deleted file mode 100644
index d143f9b..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/DelegatingValidator.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.delegates;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.LocalizedMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * This class is to be used as a base class by clients who want to provide
- * alternate validator implementations for a given validator type.
- *
- * It locates the currently configured delegate for this validator and calls its
- * validate method.
- *
- * @see IValidator
- * @see IDelegatingValidator
- *
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this
- * API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public class DelegatingValidator extends AbstractValidator implements IDelegatingValidator
-{
- public DelegatingValidator()
- {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidator#cleanup(org.eclipse.wst.validation.internal.provisional.core.IReporter)
- */
- public void cleanup(IReporter reporter)
- {
- // [Issue] This method does not get passed the validation context. How are
- // going to know the delegate in order to invoke its cleanup method?
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidator#validate(org.eclipse.wst.validation.internal.provisional.core.IValidationContext,
- * org.eclipse.wst.validation.internal.provisional.core.IReporter)
- */
- public void validate(IValidationContext helper, IReporter reporter) throws ValidationException
- {
- validateInJob(helper, reporter);
- }
-
- /**
- * Wraps the original reporter instance to make it look like this validator is
- * the one generating messages. This is needed because the framework ignores
- * messages coming from the delegate validator because it is not registered
- * with the validation framework.
- */
- private class DelegatingReporter implements IReporter
- {
- /**
- * The reporter passed originally to the delegating validator by the
- * framework.
- */
- IReporter delegatingReporter;
-
- /**
- * The delegating validator.
- */
- IValidator delegatingValidator;
-
- /**
- * Constructor.
- *
- * @param validator
- * the original validator.
- * @param reporter
- * the reporter originally passed to the delegating validator.
- */
- DelegatingReporter(IValidator validator, IReporter reporter)
- {
- delegatingReporter = reporter;
- delegatingValidator = validator;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator,
- * org.eclipse.wst.validation.internal.provisional.core.IMessage)
- */
- public void addMessage(IValidator origin, IMessage message)
- {
- delegatingReporter.addMessage(delegatingValidator, message);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator,
- * org.eclipse.wst.validation.internal.provisional.core.IMessage)
- */
- public void displaySubtask(IValidator validator, IMessage message)
- {
- delegatingReporter.displaySubtask(delegatingValidator, message);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#getMessages()
- */
- public List getMessages()
- {
- return delegatingReporter.getMessages();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#isCancelled()
- */
- public boolean isCancelled()
- {
- return delegatingReporter.isCancelled();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator)
- */
- public void removeAllMessages(IValidator origin)
- {
- delegatingReporter.removeAllMessages(delegatingValidator);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator,
- * java.lang.Object)
- */
- public void removeAllMessages(IValidator origin, Object object)
- {
- delegatingReporter.removeAllMessages(delegatingValidator, object);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#removeMessageSubset(org.eclipse.wst.validation.internal.provisional.core.IValidator,
- * java.lang.Object, java.lang.String)
- */
- public void removeMessageSubset(IValidator validator, Object obj, String groupName)
- {
- delegatingReporter.removeMessageSubset(delegatingValidator, obj, groupName);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidatorJob#validateInJob(org.eclipse.wst.validation.internal.provisional.core.IValidationContext,
- * org.eclipse.wst.validation.internal.provisional.core.IReporter)
- */
- public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException
- {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(this);
- String validatorName = vmd.getValidatorDisplayName();
-
- // We need to ensure that the context is an IProjectValidationContext. The
- // limitation of using an IValidationContext is that it does not readily
- // provide the project the validator is being invoked upon.
-
- if (!(helper instanceof IProjectValidationContext))
- {
- throw new ValidationException(new LocalizedMessage(IMessage.HIGH_SEVERITY, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_WRONG_CONTEXT_FOR_DELEGATE, new String[] { validatorName })));
- }
-
- IProjectValidationContext projectContext = (IProjectValidationContext) helper;
- IProject project = projectContext.getProject();
-
- ValidatorDelegateDescriptor delegateDescriptor = null;
-
- try
- {
- ProjectConfiguration projectConfig = ConfigurationManager.getManager().getProjectConfiguration(project);
-
- delegateDescriptor = projectConfig.getDelegateDescriptor(vmd);
- }
- catch (InvocationTargetException e)
- {
- // Already dealt with by the framework.
- }
- finally
- {
- if (delegateDescriptor == null)
- {
- throw new ValidationException(new LocalizedMessage(IMessage.HIGH_SEVERITY, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_NO_DELEGATE, new String[] { vmd.getValidatorDisplayName() })));
- }
- }
-
- IValidatorJob delegate = (IValidatorJob)delegateDescriptor.getValidator();
-
- // We need to make it look like this validator is the one generating
- // messages so we wrap the reporter and use this validator as the source.
- // The validation framework does not recognize our validators because they
- // are not registered directly with the framework.
- // We could make them work like the aggregated validators but that would
- // create problems with markers not being cleaned up if someone switches
- // validators.
- // TODO : Maybe we could clear all the markers generated by a delegate when
- // the user chooses a different delegate implementation?
-
- DelegatingReporter delegatingReporter = new DelegatingReporter(this, reporter);
-
- IStatus status = delegate.validateInJob(helper, delegatingReporter);
-
- return status;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidatorJob#getSchedulingRule(org.eclipse.wst.validation.internal.provisional.core.IValidationContext)
- */
- public ISchedulingRule getSchedulingRule(IValidationContext helper)
- {
- return null;
- }
-
-@Override
-public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- return null;
-}
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/IDelegatingValidator.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/IDelegatingValidator.java
deleted file mode 100644
index e779ed9..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/IDelegatingValidator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.delegates;
-
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * A delegating validator delegates the actual validation work to a delegate
- * validator. This is a marker interface used internally by the framework to
- * determine if a delegate is a delegating validator.
- *
- * [Issue] Could/should this interface be replaced with an attribute on the
- * validators extension definition?
- *
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this
- * API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public interface IDelegatingValidator extends IValidatorJob
-{
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegateDescriptor.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegateDescriptor.java
deleted file mode 100644
index 51910e0..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegateDescriptor.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.delegates;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.LocalizedMessage;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * ValidatorDelegateDescriptor stores information about a delegate validator.
- * <p>
- * It is also used to store the instance of the validator it describes. To
- * obtain the instance call getValidator().
- * </p>
- */
-public class ValidatorDelegateDescriptor {
- /**
- * The platform configuration element describing this delegate.
- */
- private IConfigurationElement _delegateConfiguration;
-
- /**
- * The delegating validator's ID.
- */
- private String _delegatingValidatorID;
-
- /**
- * The delegate's ID.
- */
- private String _id;
-
- /**
- * The delegate's display name.
- */
- private String _name;
-
- /**
- * Constructs a descriptor.
- *
- * @param id
- * The delegate's unique id. Must be unique in the context of a
- * delegating validator.
- * @param delegateConfiguration
- * The delegates configuration element
- * @param delegateName
- * The delegate's display name.
- * @param targetValidatorID
- * The target validator's unique id.
- */
- public ValidatorDelegateDescriptor(String id,
- IConfigurationElement delegateConfiguration, String delegateName,
- String targetValidatorID) {
-
- assert id != null;
- assert delegateConfiguration != null;
- assert targetValidatorID != null;
-
- _id = id;
- _delegateConfiguration = delegateConfiguration;
- _name = delegateName;
- _delegatingValidatorID = targetValidatorID;
- }
-
- /**
- * Provides the delegate's ID.
- *
- * @return a string with the fully qualified class name of this validator
- * implementation.
- */
- public String getId() {
- return _id;
- }
-
- /**
- * Provides the delegate's name.
- *
- * @return a String with the validator's display name.
- */
- public String getName() {
- return _name;
- }
-
- /**
- * Retrieves the target validator's ID.
- *
- * @return a String with the fully qualified class name of the delegating
- * validator who will delegate its implementation to the validator
- * described by this descriptor.
- */
- public String getTargetID() {
- return _delegatingValidatorID;
- }
-
- /**
- * Provides the instance of the validator delegate pointed to by this descriptor.
- *
- * @return an IValidator instance.
- * @throws ValidationException
- */
- public IValidator getValidator() throws ValidationException {
- try {
- IValidator delegate = (IValidator) _delegateConfiguration
- .createExecutableExtension(ValidatorDelegatesRegistryReader.CLASS_ATTRIBUTE);
- return delegate;
- } catch (CoreException e) {
- handleException(e);
- }
- return null;
- }
-
- /**
- * Answer an AbstractValidator if one has been defined, otherwise answer null.
- */
- public AbstractValidator getValidator2() throws ValidationException {
- try {
- Object o = _delegateConfiguration
- .createExecutableExtension(ValidatorDelegatesRegistryReader.CLASS_ATTRIBUTE);
- if (o instanceof AbstractValidator)
- return (AbstractValidator) o;
- } catch (CoreException e) {
- handleException(e);
- }
- return null;
- }
-
- private void handleException(CoreException e) throws ValidationException {
- ValidationPlugin.getPlugin().handleException(e);
- String delegatingValidatorName = getTargetID();
- ValidatorMetaData vmd = ValidationRegistryReader.getReader()
- .getValidatorMetaData(getTargetID());
- if (vmd != null)delegatingValidatorName = vmd.getValidatorDisplayName();
- throw new ValidationException(new LocalizedMessage(
- IMessage.HIGH_SEVERITY, ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_CANNOT_INSTANTIATE_DELEGATE, new String[] { getName(), delegatingValidatorName })));
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistry.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistry.java
deleted file mode 100644
index 09bc63f..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistry.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.delegates;
-
-import java.util.HashMap;
-import java.util.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<String, Map<String,ValidatorDelegateDescriptor>> _delegatesByTarget =
- new HashMap<String, Map<String,ValidatorDelegateDescriptor>>();
-
- /**
- * Adds a descriptor to the registry.
- *
- * @param descriptor
- * The descriptor to add. Must not be null.
- */
- void add(ValidatorDelegateDescriptor descriptor) {
- if (descriptor == null)return;
-
- String targetID = descriptor.getTargetID();
-
- Map<String,ValidatorDelegateDescriptor> delegates = _delegatesByTarget.get(targetID);
-
- if (delegates == null) {
- delegates = new HashMap<String,ValidatorDelegateDescriptor>();
- _delegatesByTarget.put(targetID, delegates);
- }
-
- delegates.put(descriptor.getId(), descriptor);
- }
-
- /**
- * Provides the default delegate ID for the given delegating validator ID.
- *
- * @param targetID
- * The delegating validator's ID.
- * @return a String with the ID of the default delegate.
- */
- public String getDefaultDelegate(String targetID)
- {
- Map<String,ValidatorDelegateDescriptor> delegates = getDelegateDescriptors(targetID);
-
- if (delegates == null)return null;
-
- // TODO: Implement a default attribute and use that to get the default?
- // What happens if two or more delegates claim to be the default one?
- // For now, just pick the first one in the list.
-
- Iterator<ValidatorDelegateDescriptor> delegatesIterator = delegates.values().iterator();
-
- if (!delegatesIterator.hasNext())return null;
-
- return delegatesIterator.next().getId();
- }
-
- /**
- * Retrieves a delegate instance based on the target and delegate IDs.
- *
- * @param targetID
- * the delegating validator's ID.
- * @param delegateID
- * the delegate validator's ID.
- * @return an instance of the delegate validator or null if one cannot be
- * found.
- */
- public IValidator getDelegate(String targetID, String delegateID) throws ValidationException
- {
- ValidatorDelegateDescriptor descriptor = getDescriptor(targetID, delegateID);
-
- if (descriptor == null)return null;
-
- IValidator delegate = descriptor.getValidator();
-
- return delegate;
- }
-
- /**
- * Provides a map with all delegates descriptors for the given target, keyed
- * by their ID.
- *
- * @param targetID
- * the target (delegating) validator id. Must not be null.
- * @return a Map <string, ValidatorDelegateDescriptor>. May be null if the ID
- * passed in is not a delegating validator.
- */
- public Map<String,ValidatorDelegateDescriptor> getDelegateDescriptors(String targetID) {
- return _delegatesByTarget.get(targetID);
- }
-
- /**
- * Finds a delegate descriptor based on the target id and delegate id.
- *
- * @param targetID
- * the delegating validator's id
- * @param delegateID
- * the delegate id
- * @return a ValidatorDelegateDescriptor for the given target and id or null
- * if one cannot be found.
- */
- public ValidatorDelegateDescriptor getDescriptor(String targetID, String delegateID)
- {
- Map<String,ValidatorDelegateDescriptor> delegates = _delegatesByTarget.get(targetID);
-
- if (delegates == null || delegateID == null)return null;
-
- ValidatorDelegateDescriptor descriptor = (ValidatorDelegateDescriptor) delegates.get(delegateID);
-
- return descriptor;
- }
-
- /**
- * Determines if a given validator has delegates.
- *
- * @param targetID
- * the target validator id.
- * @return true if the target has registered delegates, false otherwise.
- */
- public boolean hasDelegates(String targetID)
- {
- Map<String,ValidatorDelegateDescriptor> delegatesByID = _delegatesByTarget.get(targetID);
-
- boolean hasDelegates = (delegatesByID != null && !delegatesByID.isEmpty());
- return hasDelegates;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java
deleted file mode 100644
index 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 66809bc..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/AllValidatorsOperation.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Implemented Validators must not be called directly by anyone other than instances of
- * ValidationOperation, because some initialization of the validator, and handling of error
- * conditions, is done in the operation. The initialization is separated because some of the
- * information needed to initialize the validator (i.e., the project) isn't known until runtime.
- *
- * This operation runs all validators: enabled validators, disabled validators, incremental
- * validators, full validators.
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class AllValidatorsOperation extends ValidatorSubsetOperation {
- /**
- * @deprecated Will be removed in Milestone 3. Use AllValidatorsOperation(IProject, boolean)
- */
- public AllValidatorsOperation(IProject project) {
- this(project, DEFAULT_ASYNC);
- }
-
- /**
- * Run all configured validators on the project, regardless of whether the validator is enabled
- * or disabled by the user.
- *
- * If async is true, the validation will run all thread-safe validators in a background thread.
- * If async is false, no validators will run in a background thread.
- */
- public AllValidatorsOperation(IProject project, boolean async) {
- super(project, true, async);// always force validation to run
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getValidators()));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null) {
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/DefaultResourceUtil.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/DefaultResourceUtil.java
deleted file mode 100644
index 39231d4..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/DefaultResourceUtil.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-/**
- * The default line number calculator (always returns "0").
- */
-public class DefaultResourceUtil implements IResourceUtil {
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.IResourceUtil#getLineNo(Object)
- */
- public int getLineNo(Object obj) {
- return 0;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java
deleted file mode 100644
index df5a832..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.FilterUtil;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Implemented Validators must not be called directly by anyone other than instances of
- * ValidationOperation, because some initialization of the validator, and handling of error
- * conditions, is done in the operation. The initialization is separated because some of the
- * information needed to initialize the validator (i.e., the project) isn't known until runtime.
- *
- * Instances of this operation load the project's configured validators, and run the validators if
- * they are both enabled and incremental.
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class EnabledIncrementalValidatorsOperation extends EnabledValidatorsOperation {
- /**
- * @deprecated Will be removed in Milestone 3. Use
- * EnabledIncrementalValidatorsOperation(IProject, IResourceDelta, boolean)
- */
- public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta) {
- this(project, delta, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use
- * EnabledIncrementalValidatorsOperation(IProject, IResourceDelta, int, boolean)
- */
- public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta, int ruleGroup) {
- this(project, delta, ruleGroup, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use
- * EnabledIncrementalValidatorsOperation(IProject, IResourceDelta, int, boolean)
- * instead.
- */
- public EnabledIncrementalValidatorsOperation(IProject project, Set validators, IResourceDelta delta, int ruleGroup) {
- this(project, delta, ruleGroup, DEFAULT_ASYNC);
- setEnabledValidators(validators);
- }
-
- /**
- * IProject must exist and be open.
- *
- * If delta is null, a full validation of the project using only the incremental validators is
- * performed. If delta is not null, all enabled incremental validators that validate resources
- * in the delta will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta, boolean async) {
- this(project, delta, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
- }
-
- /**
- * IProject must exist and be open.
- *
- * If delta is null, a full validation of the project using only the incremental validators is
- * performed. If delta is not null, all enabled incremental validators that validate resources
- * in the delta will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IProject project, IWorkbenchContext context, IResourceDelta delta, boolean async) {
- this(project,context, delta, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
- }
-
- /**
- * IProject must exist and be open.
- *
- * If delta is null, a full validation of the project using only the incremental validators is
- * performed. If delta is not null, all enabled incremental validators that validate resources
- * in the delta will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IProject project,IWorkbenchContext context, IResourceDelta delta, int ruleGroup, boolean async) {
- super(project, ruleGroup, shouldForce(delta), async);
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- setDelta(delta);
- setContext(context);
- }
-
- /**
- * IProject must exist and be open.
- *
- * If delta is null, a full validation of the project using only the incremental validators is
- * performed. If delta is not null, all enabled incremental validators that validate resources
- * in the delta will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta, int ruleGroup, boolean async) {
- super(project, ruleGroup, shouldForce(delta), async);
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- setDelta(delta);
- }
-
- /**
- * IProject must exist, be open, and contain all of the resources in changedResources. If some
- * of the resources in changedResources belong to different projects, the result is undefined.
- *
- * If changedResources is null, a full validation of the project using only the incremental
- * validators is performed. If changedResources is not null, all enabled incremental validators
- * that validate resources in the changedResources array will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IResource[] changedResources,IWorkbenchContext aWorkbenchContext, IProject project, boolean async) {
- super(project, RegistryConstants.ATT_RULE_GROUP_DEFAULT, shouldForce(changedResources), async);
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- //construct an array of IFileDelta[] to wrap the Object[]; one IFileDelta for each Object in the array
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
- setContext(aWorkbenchContext);
- }
-
- /**
- * IProject must exist, be open, and contain all of the resources in changedResources. If some
- * of the resources in changedResources belong to different projects, the result is undefined.
- *
- * If changedResources is null, a full validation of the project using only the incremental
- * validators is performed. If changedResources is not null, all enabled incremental validators
- * that validate resources in the changedResources array will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IResource[] changedResources,IProject project, boolean async) {
- super(project, RegistryConstants.ATT_RULE_GROUP_DEFAULT, shouldForce(changedResources), async);
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- //construct an array of IFileDelta[] to wrap the Object[]; one IFileDelta for each Object in the array
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledValidatorsOperation.java
deleted file mode 100644
index 9b8afb3..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledValidatorsOperation.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-
-
-/**
- * Implemented Validators must not be called directly by anyone other than instances of
- * ValidationOperation, because some initialization of the validator, and handling of error
- * conditions, is done in the operation. The initialization is separated because some of the
- * information needed to initialize the validator (i.e., the project) isn't known until runtime.
- *
- * Instances of this operation run every enabled validator (both full and incremental) on the
- * project.
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class EnabledValidatorsOperation extends ValidatorSubsetOperation {
-
-
- /**
- * @deprecated Will be removed in Milestone 3. Use EnabledValidatorsOperation(IProject, boolean)
- */
- public EnabledValidatorsOperation(IProject project) {
- this(project, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use EnabledValidatorsOperation(IProject, int,
- * boolean, boolean)
- */
- public EnabledValidatorsOperation(IProject project, int ruleGroup) {
- this(project, ruleGroup, DEFAULT_FORCE, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use EnabledValidatorsOperation(IProject, int,
- * boolean, boolean)
- */
- public EnabledValidatorsOperation(IProject project, int ruleGroup, boolean force) {
- this(project, ruleGroup, force, DEFAULT_ASYNC);
- }
-
- /**
- * Run all enabled validators on the project.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- public EnabledValidatorsOperation(IProject project, boolean async) {
- this(project, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async);
- }
-
- /**
- * Run all enabled validators on the project.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- public EnabledValidatorsOperation(IProject project, IWorkbenchContext aWorkbenchContext, boolean async) {
- this(project, aWorkbenchContext, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async);
- }
-
- /**
- * Run all enabled validators on the project with the identified ruleGroup.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- public EnabledValidatorsOperation(IProject project, IWorkbenchContext aWorkbenchContext, int ruleGroup, boolean force, boolean async) {
- this(project, aWorkbenchContext, ValidatorManager.getManager().getEnabledValidators(project), ruleGroup, force, async);
- }
-
-
- /**
- * Run all enabled validators on the project with the identified ruleGroup.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- public EnabledValidatorsOperation(IProject project, int ruleGroup, boolean force, boolean async) {
- this(project, ValidatorManager.getManager().getEnabledValidators(project), ruleGroup, force, async);
- }
-
- /**
- * Run the identified validators on the project.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- protected EnabledValidatorsOperation(IProject project, Set<ValidatorMetaData> enabledValidators, boolean async) {
- this(project, enabledValidators, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async);
- // true = force validation to run whether or not auto-validate is on
- }
-
- /**
- * Run the identified validators on the project.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- protected EnabledValidatorsOperation(IProject project,IWorkbenchContext aWorkbenchContext,
- Set<ValidatorMetaData> enabledValidators, boolean async) {
- this(project,aWorkbenchContext, enabledValidators, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async);
- // true = force validation to run whether or not auto-validate is on
- }
-
- /**
- * Run the identified validators on the project with the ruleGroup.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- protected EnabledValidatorsOperation(IProject project, Set<ValidatorMetaData> enabledValidators,
- int ruleGroup, boolean force, boolean async) {
-
- super(project, force, ruleGroup, async);
- setEnabledValidators(enabledValidators);
- }
-
- /**
- * Run the identified validators on the project with the ruleGroup.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- protected EnabledValidatorsOperation(IProject project, IWorkbenchContext aWorkbenchContext,
- Set<ValidatorMetaData> enabledValidators, int ruleGroup, boolean force, boolean async) {
- super(project,aWorkbenchContext,force, ruleGroup, async);
- setEnabledValidators(enabledValidators);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/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 2ee4b60..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IWorkbenchContext.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext;
-
-/**
- * In the eclipse environment, not only does the IValidationContext need to be able to load the MOF model, it
- * also needs to load items from the eclipse workbench. This interface should be extended by
- * workbench IHelpers, so that items can be added to, and from, the task list.
- */
-public interface IWorkbenchContext extends IProjectValidationContext {
- /**
- * When the validation is complete, this method will be called so that the IWorkbenchContext can
- * clean up any resources it allocated during the validation.
- *
- * If the cleanup is a long-running operation, subtask messages should be sent to the IReporter.
- */
- void cleanup(WorkbenchReporter reporter);
-
- /**
- * When the IProject is closing, perform any cleanup that needs to be done. When this method is
- * called, if the helper has cached any resources from the IProject, it should release those
- * resources. If you do not allocate resources in your helper, then this method should be a
- * no-op.
- */
- void closing();
-
- /**
- * When the IProject is being deleted, perform any cleanup that needs to be done. When this
- * method is called, if the helper has cached any resources from the IProject, it should release
- * those resources. If you do not allocate resources in your helper, then this method should be
- * a no-op.
- */
- void deleting();
-
- /**
- * Given an Object, if the object has a corresponding IFile in the workbench, return the IFile.
- * Otherwise return null.
- *
- * This method is used by the WorkbenchReporter. In eclipse, in order to add or remove a task
- * list entry, the IResource, to which the entry applies, must be identified. The IReporter
- * interface passes in an Object in these methods:
- *
- * addValidationMessage(IValidator, IMessage) // Object is a part of IMessage
- *
- * removeAllMessages(IValidator, Object),
- *
- * Thus, the WorkbenchReporter needs to know how, given the Object, which IFile that the Object
- * represents in the workbench, in order to be able to add the task list entry.
- *
- * If this method returns null, then the WorkbenchReporter will add the message to the IProject
- * instead of an IFile.
- *
- * @deprecated Implement getResource(Object) instead.
- */
- IFile getFile(Object object);
-
- /**
- * Given an Object, if the object has a corresponding IResource in the workbench, return the
- * IResourcee. Otherwise return null.
- *
- * This method is used by the WorkbenchReporter. In eclipse, in order to add or remove a task
- * list entry, the IResource, to which the entry applies, must be identified. The IReporter
- * interface passes in an Object in these methods:
- *
- * addValidationMessage(IValidator, IMessage) // Object is a part of IMessage
- *
- * removeAllMessages(IValidator, Object),
- *
- * Thus, the WorkbenchReporter needs to know how, given the Object, which IFile that the Object
- * represents in the workbench, in order to be able to add the task list entry.
- *
- * If this method returns null, then the WorkbenchReporter will add the message to the IProject
- * instead of an IResource.
- */
- IResource getResource(Object object);
-
- /**
- * Given an IMessage's target object, return the line number, of the IFile, which the target
- * object represents, if possible. If the object is null, or if access to line numbers is not
- * possible, return a text description of the location.
- *
- * This method will be called whether or not the IResource is an IFile, IFolder, or IProject.
- * Line numbers are valid only for IFile types; if the resource is not an IFile, then a text
- * description of the location must be returned.
- */
- String getLocation(Object object);
-
- /**
- * Return the name of the resource, without the project-specific information in front.
- * <p>
- * This method is used by ValidationOperation to calculate the non-environment specific names of
- * the files. Only the IWorkbenchContext implementation knows how much information to strip off
- * of the IResource name. For example, if there is an EJB Project named "MyEJBProject", and it
- * uses the default names for the source and output folders, "source" and "ejbModule",
- * respectively, then the current implementation of EJB Helper knows how much of that structure
- * is eclipse-specific.
- * </p><p>
- * Since the "source" folder contains Java source files, a portable name would be the
- * fully-qualified name of the Java class, without the eclipse-specific project and folder names
- * in front of the file name. The EJBHelper knows that everything up to the "source" folder, for
- * example, can be removed, because, according to the definition of the EJB Project, everything
- * contained in the source folder is java source code. So if there is an IResource in an EJB
- * Project named "/MyEJBProject/source/com/ibm/myclasses/MyJavaFile.java", this method would
- * make this name portable by stripping off the "/MyEJBProject/source", and returning
- * "com/ibm/myclasses/MyJavaFile.java".
- * </p><p>
- * The output of this method is used by the ValidationOperation, when it is calculating the list
- * of added/changed/deleted file names for incremental validation. If getPortableName(IResource)
- * returns null, that means that the IWorkbenchContext's implementation does not support that
- * particular type of resource, and the resource should not be included in the array of
- * IFileDelta objects in the IValidator's "validate" method.
- * </p>
- */
- String getPortableName(IResource resource);
-
- /**
- * Return the IProject which is about to be validated. Each IWorkbenchContext knows how to
- * traverse a certain type of IProject, for example, an EJB project or a web project.
- */
- IProject getProject();
-
- /**
- * When an IValidator associates a target object with an IMessage, the WorkbenchReporter
- * eventually resolves that target object with an IResource. Sometimes more than one target
- * object resolves to the same IResource (usually the IProject, which is the default IResource
- * when an IFile cannot be found). This method is called, by the WorkbenchReporter, so that the
- * WorkbenchReporter can distinguish between the IMessages which are on the same IResource, but
- * refer to different target objects. This is needed for the removeAllMessages(IValidator,
- * Object) method, so that when one target object removes all of its messages, that it doesn't
- * remove another target object's messages.
- *
- * This method may return null only if object is null. Otherwise, an id which can uniquely
- * identify a particular object must be returned. The id needs to be unique only within one
- * particular IValidator.
- */
- String getTargetObjectName(Object object);
-
- /**
- * Whether full or incremental validation is running, this method will be called, by the
- * Validation Framework, for every IResource which is filtered in by the IValidator, so that the
- * IValidationContext can receive notification that one of the resources, which validation will run on, is
- * being filtered in.
- */
- void registerResource(IResource resource);
-
- /**
- * This method is called by the Validation Framework, to initialize the IWorkbenchContext so that
- * it can gather information from the current project.
- */
- void setProject(IProject project);
-
- /**
- * Notifies this IWorkbenchContext that the Validation Framework is shutting down. There will be
- * calls to closing(IProject) and possibly deleting(IProject) following this call, but the
- * resources may already be closed by the time that those methods are called, so EVERYTHING
- * should be cleaned up in this method. The parameter passed in is the project which is about to
- * shut down. This method will be called once for every IProject in the workbench. The IProject
- * may, or may not, be closed.
- */
- void shutdown();
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/LocalizedMessage.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/LocalizedMessage.java
deleted file mode 100644
index 9b03057..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/LocalizedMessage.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import java.util.Locale;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.core.Message;
-
-/**
- * This class is provided for validators which run only in UI and whose messages, because they
- * come from another tool, are already localized. LocalizedMessage cannot be used by any validator
- * which needs to run in both WebSphere and WSAD.
- */
-public class LocalizedMessage extends Message {
- private String _message;
-
- public LocalizedMessage(int severity, String messageText) {
- this(severity, messageText, null);
- }
-
- public LocalizedMessage(int severity, String messageText, IResource targetObject) {
- this(severity, messageText, (Object) targetObject);
- }
-
- public LocalizedMessage(int severity, String messageText, Object targetObject) {
- super(null, severity, null);
- setLocalizedMessage(messageText);
- setTargetObject(targetObject);
- }
-
- public void setLocalizedMessage(String message) {
- _message = message;
- }
-
- public String getLocalizedMessage() {
- return _message;
- }
-
- public String getText() {
- return getLocalizedMessage();
- }
-
- public String getText(ClassLoader cl) {
- return getLocalizedMessage();
- }
-
- public String getText(Locale l) {
- return getLocalizedMessage();
- }
-
- public String getText(Locale l, ClassLoader cl) {
- return getLocalizedMessage();
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java
deleted file mode 100644
index 59d5f0f..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.internal.FilterUtil;
-
-
-/**
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class ManualIncrementalValidatorsOperation extends ManualValidatorsOperation {
-
- public ManualIncrementalValidatorsOperation(IProject project) {
- super( project );
- }
- public ManualIncrementalValidatorsOperation(IProject project, Object[] changedResources) {
- super( project, changedResources );
- setFileDeltas( FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false) );
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java
deleted file mode 100644
index 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 16b93c0..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/MessageInfo.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.operations;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class MessageInfo {
-
- private String messageOwnerId;
- private IResource resource;
- private String location;
- private String text;
- private String targetObjectName;
- private String markerId;
- private IMessage msg;
-
- public MessageInfo(){
- }
-
- public MessageInfo(String messageOwnerId, IResource resource, String location,
- String text, String targetObjectName, String markerId, IMessage msg){
-
- this.messageOwnerId = messageOwnerId;
- this.resource = resource;
- this.location = location;
- this.text = text;
- this.targetObjectName = targetObjectName;
- this.markerId = markerId;
- this.msg = msg;
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public String getMarkerId() {
- return markerId;
- }
-
- public void setMarkerId(String markerId) {
- this.markerId = markerId;
- }
-
- public String getMessageOwnerId() {
- return messageOwnerId;
- }
-
- public void setMessageOwnerId(String messageOwnerId) {
- this.messageOwnerId = messageOwnerId;
- }
-
- public IMessage getMsg() {
- return msg;
- }
-
- public void setMsg(IMessage msg) {
- this.msg = msg;
- }
-
- public IResource getResource() {
- return resource;
- }
-
- public void setResource(IResource resource) {
- this.resource = resource;
- }
-
- public String getTargetObjectName() {
- return targetObjectName;
- }
-
- public void setTargetObjectName(String targetObjectName) {
- this.targetObjectName = targetObjectName;
- }
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- @Override
- public String toString() {
- if (text != null)return "MessageInfo: " + text; //$NON-NLS-1$
- return super.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/OneValidatorOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/OneValidatorOperation.java
deleted file mode 100644
index 99d359b..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/OneValidatorOperation.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-
-
-/**
- * Implemented Validators must not be called directly by anyone other than instances of
- * ValidationOperation, because some initialization of the validator, and handling of error
- * conditions, is done in the operation. The initialization is separated because some of the
- * information needed to initialize the validator (i.e., the project) isn't known until runtime.
- *
- * This operation runs a single validator on a project.
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class OneValidatorOperation extends ValidatorSubsetOperation {
- /**
- * @deprecated Will be removed in Milestone 3. Use OneValidatorOperation(project, validatorId,
- * boolean, boolean)
- */
- public OneValidatorOperation(IProject project, String validatorId) throws IllegalArgumentException {
- this(project, validatorId, DEFAULT_FORCE, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use OneValidatorOperation(project, validatorId,
- * boolean, boolean)
- */
- public OneValidatorOperation(IProject project, String validatorId, boolean force) throws IllegalArgumentException {
- this(project, validatorId, force, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use OneValidatorOperation(IProject, String,
- * boolean, int, boolean)
- */
- public OneValidatorOperation(IProject project, String validatorId, boolean force, int ruleGroup) throws IllegalArgumentException {
- this(project, validatorId, force, ruleGroup, DEFAULT_ASYNC);
- }
-
- /**
- * @param validatorId
- * The plugin id of the validator which you wish to run.
- * @param force
- * If the value is "true", the validator should be run regardless of what the
- * environment settings are; if the value is "false", this operation should be run
- * only if the validation builder will not run the validator.
- *
- * IllegalArgumentException will be thrown if the named validator is not configured on the
- * project.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public OneValidatorOperation(IProject project, String validatorId, boolean force, boolean async) throws IllegalArgumentException {
- this(project, validatorId, force, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
- }
-
- /**
- * OneValidatorOperation constructor comment.
- *
- * @param project
- * The project to be validated. It must exist and be open.
- * @param validatorId
- * The plug-in id of the validator which you wish to run.
- * @param force
- * If the value is "true", the validator should be run regardless
- * of what the environment settings are; if the value is "false",
- * this operation should be run only if the validation builder
- * will not run the validator.
- * @param ruleGroup
- * Whether a FULL or FAST pass should be invoked.
- * @param async
- * If async is true, the validation will run all thread-safe
- * validators in the background validation thread, and all other
- * validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- *
- * IllegalArgumentException will be thrown if the named validator is not
- * configured on the project.
- *
- */
- public OneValidatorOperation(IProject project, String validatorId, boolean force, int ruleGroup, boolean async) throws IllegalArgumentException {
- super(project, force, ruleGroup, async);
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
- if (vmd == null) {
- // No validator, with that plug-in id, can be run on that project.
- // Either the validator isn't installed, or the IProject passed in
- // doesn't have the necessary nature.
- throw new IllegalArgumentException(validatorId);
- }
-
- if (!vmd.isConfiguredOnProject(project)) {
- // No validator, with that plug-in id, can be run on that project.
- // Either the validator isn't installed, or the IProject passed in
- // doesn't have the necessary nature.
- throw new IllegalArgumentException(validatorId);
- }
-
- Set<ValidatorMetaData> enabled = new HashSet<ValidatorMetaData>();
- enabled.add(vmd);
- setEnabledValidators(enabled);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidator.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidator.java
deleted file mode 100644
index c15609c..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 3, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.validation.internal.operations;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-
-/**
- * @author vijayb
- */
-public interface ReferencialFileValidator {
-
- /**
- * Answer the referenced files.
- *
- * @param inputFiles
- * @return a list of IFile's.
- */
- public List<IFile> getReferencedFile(List inputFiles);
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidatorHelper.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidatorHelper.java
deleted file mode 100644
index 99d66e1..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidatorHelper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.validation.internal.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author vijayb
- */
-public class ReferencialFileValidatorHelper {
- public ReferencialFileValidatorHelper() {
- }
-
- /**
- * Return a list of all files contained in project to infinite depth
- */
- public static List<IFile> getAllProjectFiles(IProject project) {
- List<IFile> result = new ArrayList<IFile>();
- if (project == null)return result;
-
- try {
- result = collectFiles(project.members(), result);
- } catch (CoreException e) {
- //Ignore
- }
- return result;
- }
-
- private static List<IFile> collectFiles(IResource[] members, List<IFile> result) throws CoreException {
- // recursively collect files for the given members
- for (IResource res : members) {
- if (res instanceof IFolder)collectFiles(((IFolder) res).members(), result);
- else if (res instanceof IFile)result.add((IFile)res);
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ResourceHandler.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ResourceHandler.java
deleted file mode 100644
index 8e942ea..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ResourceHandler.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-
-/**
- * @deprecated For use by the validation framework only. This class retrieves the Strings from the
- * .properties file appropriate for the machine's Locale.
- */
-public final class ResourceHandler extends org.eclipse.wst.validation.internal.ResourceHandler {
- //Default
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/TaskListHelper.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/TaskListHelper.java
deleted file mode 100644
index 8532dc1..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/TaskListHelper.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-
-
-
-/**
- * @deprecated This class is intended to be used only by the validation framework. The
- * TaskListHelper class will be removed in Milestone 4.
- */
-public class TaskListHelper {
- private static TaskListHelper _taskListHelper = null;
-
- public static TaskListHelper getTaskList() {
- if (_taskListHelper == null) {
- _taskListHelper = new TaskListHelper();
- }
- return _taskListHelper;
- }
-
- /**
- * This method adds a message to a resource in the task list.
- */
- public void addTask(String pluginId, IResource resource, String location, String messageId, String message, int markerType, String targetObjectName, String groupName, int offset, int length) throws CoreException {
- TaskListUtility.addTask(pluginId, resource, location, messageId, message, markerType, targetObjectName, groupName, offset, length);
- }
-
-
- public IMarker[] getValidationTasks(int severity, IProject project) {
- return TaskListUtility.getValidationTasks(severity, project);
- }
-
- public IMarker[] getValidationTasks(IResource resource, int severity) {
- return TaskListUtility.getValidationTasks(resource, severity);
- }
-
- public IMarker[] getValidationTasks(IResource resource, String messageOwner) {
- return TaskListUtility.getValidationTasks(resource, messageOwner);
- }
-
- public IMarker[] getValidationTasks(IResource resource, String[] messageOwners) {
- return TaskListUtility.getValidationTasks(resource, messageOwners);
- }
-
- /**
- * Remove all validation messages from the resource and its children.
- */
- public void removeAllTasks(IResource resource) {
- TaskListUtility.removeAllTasks(resource);
- }
-
- /**
- * This method removes all tasks from the resource. If the resource is an IProject, all tasks
- * are also removed from the project's children.
- */
- public void removeAllTasks(IResource resource, String[] owners) throws CoreException {
- TaskListUtility.removeAllTasks(resource, owners);
- }
-
- /**
- * This method removes all messages from a resource in the task list.
- */
- public void removeAllTasks(IResource resource, String owner, String objectName) throws CoreException {
- TaskListUtility.removeAllTasks(resource, owner, objectName);
- }
-
- public void removeAllTasks(IResource resource, String[] owners, String objectName) throws CoreException {
- TaskListUtility.removeAllTasks(resource, owners, objectName);
- }
-
- /**
- * This method removes a subset of tasks from the project, including child tasks. Every task
- * which belongs to the group, identified by groupName, will be removed.
- */
- public void removeTaskSubset(IResource resource, String[] owners, String objectName, String groupName) throws CoreException {
- TaskListUtility.removeTaskSubset(resource, owners, objectName, groupName);
- }
-
- /**
- * This method changes all validator markers which are owned by "from" to make their owner "to".
- */
- public void updateOwner(String from, String to) throws CoreException {
- TaskListUtility.updateOwner(from, to);
- }
-
- /**
- * This method changes all validator markers on the IResource and its children. All markers
- * owned by "from" have their owner reassigned to "to".
- */
- public void updateOwner(String from, String to, IResource resource) throws CoreException {
- TaskListUtility.updateOwner(from, to, resource);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java
deleted file mode 100644
index 51da556..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.ValBuilderJob;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValOperationManager;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Validation Framework Builder.
- * <p>
- * This builder is configured on J2EE IProjects automatically, and can be added to other types of
- * projects through the Properties page. It launches validation on the project if the project has
- * build validation enabled.
- * </p>
- * <p>
- * This launches a Job for the new V2 validators and also a Job for each of the Job based V1
- * validators. If there are any "in-line" V1 validations they are done as part of this builder.
- * Because of all the jobs that this builder spawns, the build will usually be finished long before
- * all the validation has finished.
- * </p>
- */
-public class ValidationBuilder extends IncrementalProjectBuilder {
- public static final int NO_DELTA_CHANGE = -1;
- protected List<IProject> referencedProjects;
- protected IWorkbenchContext workbenchContext = null;
-
- /** All the jobs that the validation framework spawns will belong to this family. */
- public static final Object FAMILY_VALIDATION_JOB = new Object();
-
- public ValidationBuilder() {
- }
-
- private IProject[] getAllReferencedProjects(IProject project, Set<IProject> visitedProjects) {
- if (visitedProjects == null)visitedProjects = new HashSet<IProject>();
- else if (visitedProjects.contains(project))return getReferencedProjects();
- else visitedProjects.add(project);
-
- if (referencedProjects == null)referencedProjects = new ArrayList<IProject>();
- try {
- if (project.isAccessible()) {
- IProject[] refProjArray = project.getReferencedProjects();
- collectReferecedProject(refProjArray);
- for (IProject refProject : refProjArray) {
- getAllReferencedProjects(refProject, visitedProjects);
- }
- }
- return getReferencedProjects();
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- return null;
- }
-
- public IWorkbenchContext getWorkbenchContext() {
- if(workbenchContext == null) {
- workbenchContext = new WorkbenchContext();
- workbenchContext.setProject(getProject());
- }
- return workbenchContext;
- }
-
- /**
- * Add the projects from refProjArray to the list of referenced projects (if they are not
- * already in the list).
- * @param refProjArray
- */
- private void collectReferecedProject(IProject[] refProjArray) {
- for (IProject project : refProjArray) {
- if (!referencedProjects.contains(project))referencedProjects.add(project);
- }
- }
-
- protected void clean(IProgressMonitor monitor) throws CoreException {
- newClean(monitor);
- 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 e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
-
- }
-
- private IProject[] getReferencedProjects() {
- IProject[] refProjArray = new IProject[referencedProjects.size()];
- return referencedProjects.toArray(refProjArray);
- }
-
- public IProject[] build(int kind, Map parameters, IProgressMonitor monitor) {
- IResourceDelta delta = null;
- IProject project = getProject();
- // GRK I wonder why this builder needs to know about all the other referenced projects?
- // won't they have builders of their own.
- IProject[] referenced = getAllReferencedProjects(project, null);
- if (ValidationFramework.getDefault().isSuspended(project) ||
- ValManager.getDefault().isDisabled(project))return referenced;
-
- try {
- newBuild(kind, monitor);
-
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- delta = getDelta(project);
- boolean doFullBuild = (kind == FULL_BUILD);
-
- // It is possible for kind to == AUTO_BUILD while delta is null
- // (saw this when creating a project by copying another project.)
- // However, a "Rebuild Project" will invoke this builder with
- // kind==FULL_BUILD and a null delta, and validation should run in that case.
- if (!doFullBuild && delta == null) {
- if (isReferencedProjectInDelta(referenced)) {
- performFullBuildForReferencedProjectChanged(monitor, prjp);
- } else {
- String[] msgParms = new String[]{project.getName()};
- monitor.subTask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_NULL_DELTA, msgParms));
- // A null delta means that a full build must be performed,
- // but this builder was invoked with an incremental or automatic
- // build kind. Return without doing anything so that the user
- // doesn't have to wait forever.
- }
- return referenced;
- }
- if (doFullBuild) {
- performFullBuild(monitor, prjp);
- } else {
- if (delta.getAffectedChildren().length == 0) {
- if (isReferencedProjectInDelta(referenced))
- performFullBuildForReferencedProjectChanged(monitor, prjp);
- return referenced;
- }
- EnabledIncrementalValidatorsOperation operation = new EnabledIncrementalValidatorsOperation(project, delta, true);
- operation.run(monitor);
- }
- return referenced;
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return referenced;
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- return referenced;
- } finally {
- referencedProjects = null;
- }
- }
-
- private 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);
- }
- }
-
- /**
- * Run the new validation builder. This is a transition method, while we continue to have
- * the old and new validation builders.
- *
- * @param kind the kind of build
- *
- * @see IncrementalProjectBuilder#AUTO_BUILD
- * @see IncrementalProjectBuilder#CLEAN_BUILD
- * @see IncrementalProjectBuilder#FULL_BUILD
- * @see IncrementalProjectBuilder#INCREMENTAL_BUILD
- */
- private void newBuild(int kind, IProgressMonitor monitor) throws CoreException {
-
- IResourceDelta delta = null;
- IProject project = getProject();
-
- switch (kind){
- case AUTO_BUILD:
- case INCREMENTAL_BUILD:
- delta = getDelta(project);
- break;
- }
-
- ValBuilderJob.validateProject(project, delta, kind, ValOperationManager.getDefault().getOperation());
- }
-
-
- /**
- * Run the new clean method. This is a transition method, while we continue to have
- * the old and new validation builders.
- */
- private void newClean(IProgressMonitor monitor) throws CoreException {
- ValManager.getDefault().clean(getProject(), monitor);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationConstants.java
deleted file mode 100644
index 260fa72..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationConstants.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-
-import org.eclipse.wst.validation.internal.ResourceConstants;
-
-/**
- * @deprecated For use by the validation framework only.
- *
- * Constants used to access the string resources associated with the plugin.
- *
- * See the plugin.properties file, in the plugin's directory, for the contents of the strings.
- */
-public interface ValidationConstants extends ResourceConstants {
- //Default
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
deleted file mode 100644
index 8682222..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
+++ /dev/null
@@ -1,1413 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.FilterUtil;
-import org.eclipse.wst.validation.internal.IProjectValidationHelper;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.ReferencialFileValidatorRegistryReader;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.core.IFileDelta;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.core.ValidatorLauncher;
-import org.eclipse.wst.validation.internal.plugin.ValidationHelperRegistryReader;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * 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.
- * <p>
- * 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$
-
- // For the depreciated constructors, by default the operation will not fork.
- protected static final boolean DEFAULT_ASYNC = true;
-
- protected static final boolean DEFAULT_FORCE = true;
-
- class ValidationLauncherJob extends Job {
- private Job validationJob;
- public ValidationLauncherJob(Job validationJob) {
- super(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_VALIDATION_JOB_MSG));
-
- setSystem(true);
- setRule(ResourcesPlugin.getWorkspace().getRoot());
- this.validationJob= validationJob;
- }
-
- protected IStatus run(IProgressMonitor monitor) {
- validationJob.schedule();
- return Status.OK_STATUS;
- }
-
- @Override
- public boolean belongsTo(Object family) {
- if (family == ResourcesPlugin.FAMILY_MANUAL_BUILD)return true;
- if (family == ValidationBuilder.FAMILY_VALIDATION_JOB){
- return true;
- }
- return super.belongsTo(family);
- }
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use DEFAULT_ASYNC
- */
- protected static final boolean DEFAULT_FORK = false; // @deprecated
- private IProject _project; // project to be validated
- private int _ruleGroup = RegistryConstants.ATT_RULE_GROUP_DEFAULT;
- private boolean _fork = DEFAULT_ASYNC; // do not fork the validation into a
- // different thread by default
- private Map<ValidatorMetaData, Set<IFileDelta>> _fileDeltas; // To reduce object creation,
- private IResourceDelta _delta;
-
- // the resource delta tree to be processed, or null if a full build/menu
- // option was triggered. This value is cached so that validation can be run
- // either from a builder, or from a menu item. (The Operation interface
- // doesn't allow any parameter on execute except the IProgressMonitor.)
- private Set<ValidatorMetaData> _enabledValidators;
-
- private boolean _force = DEFAULT_FORCE; // force this operation to run even if it doesn't need to?
- private boolean _isFullValidate; // Run a full validation or an incremental? (true = full)
- private Boolean _isAutoBuild; // Is the global auto-build preference enabled?
- private Set<ValidatorMetaData> _launchedValidators;
-
- protected IWorkbenchContext context;
-
- // are enabled and were launched (i.e., that have input to validate). For internal
- // validation framework use only;
- // it's needed for the automatic tests.
- /**
- * This method is used for FINEST logging, to report exactly what deltas were about to be
- * validated.
- */
- private static final String getDeltaAsString(IFileDelta[] delta) {
- String args = ""; //$NON-NLS-1$
- int numArgs = 0;
- if (delta != null) {
- numArgs = delta.length;
- StringBuffer buffer = new StringBuffer();
- for (int i = 0; i < delta.length; i++) {
- buffer.append(COMMA);
- buffer.append(delta[i].toString());
- }
- buffer.replace(0, 1, ""); //$NON-NLS-1$ // magic numbers 0 and 1 => Remove first COMMA from the list (hence index 0); length of COMMA is 2, hence index 0, 1.
- args = buffer.toString();
- }
- return MessageFormat.format(DELTA_AS_STRING, new Object[]{String.valueOf(numArgs), args});
- }
-
- protected static void checkCanceled(WorkbenchReporter reporter) throws OperationCanceledException {
- if (reporter == null)return;
- else if (reporter.getProgressMonitor().isCanceled()) {
- throw new OperationCanceledException(""); //$NON-NLS-1$
- }
- }
-
- protected static boolean shouldForce(IResourceDelta delta) {
- return ((delta == null) ? DEFAULT_FORCE : false);
- }
-
- protected static boolean shouldForce(Object[] changedResources) {
- return (((changedResources == null) || (changedResources.length == 0)) ? DEFAULT_FORCE : false);
- }
-
- /**
- * @deprecated. Will be removed in Milestone 3. Use ValidationOperation(project, boolean)
- */
- public ValidationOperation(IProject project) {
- this(project, DEFAULT_ASYNC, DEFAULT_FORCE);
- }
-
- /**
- * Internal.
- */
- public ValidationOperation(IProject project, boolean force, boolean async) {
- this(project, null, null, RegistryConstants.ATT_RULE_GROUP_DEFAULT, force, async);
- }
-
- /**
- * @deprecated. Will be removed in Milestone 3. Use ValidationOperation(project, int, boolean)
- */
- public ValidationOperation(IProject project, int ruleGroup) {
- this(project, null, null, ruleGroup, DEFAULT_FORCE, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated. Will be removed in Milestone 3. Use ValidationOperation(IProject,
- * IResourceDelta, Boolean, int, boolean, boolean)
- */
- public ValidationOperation(IProject project, IResourceDelta delta, boolean isAutoBuild, int ruleGroup, boolean force, boolean fork) {
- this(project, delta, ((isAutoBuild) ? Boolean.TRUE : Boolean.FALSE), ruleGroup, fork, force);
- }
-
- /**
- * Internal.
- */
- protected ValidationOperation(IProject project, IResourceDelta delta, Boolean isAutoBuild, int ruleGroup, boolean force, boolean fork) {
- super();
- _project = project;
- _delta = delta;
- _isAutoBuild = isAutoBuild;
- _ruleGroup = ruleGroup;
- _fork = fork;
- _force = force;
- _enabledValidators = new HashSet<ValidatorMetaData>();
- }
-
- /**
- * Internal.
- */
- protected ValidationOperation(IProject project, IWorkbenchContext aContext, IResourceDelta delta, Boolean isAutoBuild, int ruleGroup, boolean force, boolean fork) {
- super();
- _project = project;
- _delta = delta;
- _isAutoBuild = isAutoBuild;
- _ruleGroup = ruleGroup;
- _fork = fork;
- _force = force;
- _enabledValidators = new HashSet<ValidatorMetaData>();
- context = aContext;
- }
-
- /**
- * @deprecated Will be removed in Milestone 3.
- */
- protected void terminateCleanup(WorkbenchReporter reporter) {
- for (ValidatorMetaData vmd : getEnabledValidators()) {
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_CLEANUP, new String[]{vmd.getValidatorDisplayName()}));
- try {
- reporter.removeAllMessages(vmd.getValidator());
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
- addCancelTask(vmd);
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()}));
- }
- }
-
-
- /**
- * @param vmd
- * @param delta
- * @param logger
- * @param start
- */
-// private void logValidationInfo(ValidatorMetaData vmd, IFileDelta[] delta, Logger logger, long start) {
-// long finish = System.currentTimeMillis();
-// TimeEntry entry = ValidationPlugin.getTimeEntry();
-// entry.setSourceID("ValidationOperation.launchValidator"); //$NON-NLS-1$
-// entry.setProjectName(getProject().getName());
-// entry.setToolName(vmd.getValidatorUniqueName());
-// entry.setElapsedTime(finish - start);
-// if (logger.isLoggingLevel(Level.FINE)) {
-// StringBuffer buffer = new StringBuffer();
-// if (isFullValidate()) {
-// buffer.append("EVERYTHING"); //$NON-NLS-1$
-// } else {
-// if (delta.length == 0) {
-// buffer.append("NOTHING"); //$NON-NLS-1$
-// } else {
-// buffer.append(getDeltaAsString(delta));
-// }
-// }
-// entry.setDetails(buffer.toString());
-// }
-// logger.write(Level.INFO, entry);
-// }
-
- /**
- * @param reporter
- * @param vmd
- * @param logger
- * @param exc
- */
-// private void handleThrowables(WorkbenchReporter reporter, ValidatorMetaData vmd, Logger logger, Throwable exc) {
-// // If a runtime exception has occured, e.g. NullPointer or ClassCast,
-// // display it with the "A runtime exception has occurred " messsage.
-// // This will provide more information to the user when he/she calls IBM
-// // Service.
-// if (logger.isLoggingLevel(Level.SEVERE)) {
-// LogEntry entry = ValidationPlugin.getLogEntry();
-// entry.setSourceID("ValidationOperation::launchValidator"); //$NON-NLS-1$
-// entry.setTargetException(exc);
-// logger.write(Level.SEVERE, entry);
-// }
-// String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
-// Message message = ValidationPlugin.getMessage();
-// message.setSeverity(IMessage.NORMAL_SEVERITY);
-// message.setId(ResourceConstants.VBF_EXC_RUNTIME);
-// message.setParams(msgParm);
-// try {
-// reporter.addMessage(vmd.getValidator(), message);
-// } catch (InstantiationException exc2) {
-// handleInstantiationException(vmd, logger, exc2);
-// } catch (MessageLimitException e) {
-// throw e;
-// }
-// return;
-// }
-
- /**
- * @param vmd
- * @param logger
- * @param exc2
- */
-// private void handleInstantiationException(ValidatorMetaData vmd, Logger logger, InstantiationException exc2) {
-// // Remove the vmd from the reader's list
-// ValidationRegistryReader.getReader().disableValidator(vmd);
-// // Log the reason for the disabled validator
-// if (logger.isLoggingLevel(Level.SEVERE)) {
-// LogEntry entry = ValidationPlugin.getLogEntry();
-// entry.setSourceID("ValidationOperation::launchValidator (deprecated)"); //$NON-NLS-1$
-// entry.setTargetException(exc2);
-// logger.write(Level.SEVERE, entry);
-// }
-// }
-
- /**
- * @param reporter
- * @param vmd
- * @param logger
- * @param exc
- */
-// private void handleValidationExceptions(WorkbenchReporter reporter, ValidatorMetaData vmd, Logger logger, ValidationException exc) {
-// // First, see if a validator just caught all Throwables and
-// // accidentally wrapped a MessageLimitException instead of propagating
-// // it.
-// if (exc.getAssociatedException() != null) {
-// if (exc.getAssociatedException() instanceof MessageLimitException) {
-// MessageLimitException mssgExc = (MessageLimitException) exc.getAssociatedException();
-// throw mssgExc;
-// } else if (exc.getAssociatedException() instanceof ValidationException) {
-// try {
-// ValidationException vexc = (ValidationException) exc.getAssociatedException();
-// vexc.setClassLoader(vmd.getValidator().getClass().getClassLoader()); // first,
-// // set the class loader,so that the exception's getMessage() method can retrieve
-// // the resource bundle
-// } catch (InstantiationException exc2) {
-// handleInstantiationException(vmd, logger, exc2);
-// }
-// }
-// }
-// // If there is a problem with this particular validator, log the error
-// // and continue
-// // with the next validator.
-// try {
-// exc.setClassLoader(vmd.getValidator().getClass().getClassLoader()); // first,
-// // set the class loader,so that the exception's getMessage() method can retrieve the
-// // resource bundle
-// } catch (InstantiationException exc2) {
-// handleInstantiationException(vmd, logger, exc2);
-// }
-// if (logger.isLoggingLevel(Level.SEVERE)) {
-// LogEntry entry = ValidationPlugin.getLogEntry();
-// entry.setSourceID("ValidationOperation.validate(WorkbenchMonitor)"); //$NON-NLS-1$
-// entry.setTargetException(exc);
-// logger.write(Level.SEVERE, entry);
-// if (exc.getAssociatedException() != null) {
-// entry.setTargetException(exc.getAssociatedException());
-// logger.write(Level.SEVERE, entry);
-// }
-// }
-// String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
-// reporter.displaySubtask(message);
-// if (exc.getAssociatedMessage() != null) {
-// try {
-// reporter.addMessage(vmd.getValidator(), exc.getAssociatedMessage());
-// } catch (InstantiationException exc2) {
-// handleInstantiationException(vmd, logger, exc2);
-// }
-// }
-// }
-
- /**
- * @param reporter
- * @param vmd
- * @param logger
- * @param exc
- */
-// private void handleHelperCleanupExceptions(WorkbenchReporter reporter, ValidatorMetaData vmd, Logger logger, Throwable exc) {
-// // If a runtime exception has occured, e.g. NullPointer or ClassCast,
-// // display it with the "A runtime exception has occurred " messsage.
-// // This will provide more information to the user when he/she calls IBM
-// // Service.
-// if (logger.isLoggingLevel(Level.SEVERE)) {
-// LogEntry entry = ValidationPlugin.getLogEntry();
-// entry.setSourceID("ValidationOperation::launchValidator"); //$NON-NLS-1$
-// entry.setTargetException(exc);
-// logger.write(Level.SEVERE, entry);
-// }
-// String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
-// Message message = ValidationPlugin.getMessage();
-// message.setSeverity(IMessage.NORMAL_SEVERITY);
-// message.setId(ResourceConstants.VBF_EXC_RUNTIME);
-// message.setParams(msgParm);
-// try {
-// reporter.addMessage(vmd.getValidator(), message);
-// } catch (InstantiationException exc2) {
-// handleInstantiationException(vmd, logger, exc2);
-// } catch (MessageLimitException e) {
-// throw e;
-// }
-// return;
-// }
-
- public boolean isFork() {
- return _fork;
- }
-
- public boolean isForce() {
- return _force;
- }
-
- public void setForce(boolean force) {
- _force = force;
- }
-
- /**
- * If the code that invoked this operation suspended auto-build before invoking this operation,
- * the user's auto-build setting is stored in the following methods.
- */
- public boolean isAutoBuild() {
- if (_isAutoBuild == null) {
- return ValidatorManager.getManager().isGlobalAutoBuildEnabled();
- }
- return _isAutoBuild.booleanValue();
- }
-
- protected void setAutoBuild(boolean autoOn) {
- _isAutoBuild = ((autoOn) ? Boolean.TRUE : Boolean.FALSE);
- }
-
- protected boolean isFullValidate() {
- return _isFullValidate;
- }
-
- private void setFullValidate(boolean b) {
- _isFullValidate = b;
- }
-
- protected int getRuleGroup() {
- return _ruleGroup;
- }
-
- /**
- * Return true if the given validator must run (i.e., it has changes to validate, and it was not
- * run automatically.)
- */
- private boolean isValidationNecessary(ValidatorMetaData vmd, IFileDelta[] delta) {
- // Validation is not necessary if there are no files for the validator to validate.
- return isFullValidate() || (delta.length > 0);
- }
-
- /**
- * Return true if, given the enabled validators and file deltas, there is work for this
- * operation to do.
- */
- public boolean isNecessary(IProgressMonitor monitor) throws CoreException, OperationCanceledException {
- Set<ValidatorMetaData> enabledValidators = getEnabledValidators();
- if ((enabledValidators == null) || (enabledValidators.size() == 0)) {
- return false;
- }
- if (isFullValidate())return true;
-
- for (ValidatorMetaData vmd : enabledValidators) {
- if (isValidationNecessary(vmd, getFileDeltas(monitor, vmd)))return true;
- }
- return false;
- }
-
- private Map<ValidatorMetaData, Set<IFileDelta>> getFileDeltas(IProgressMonitor monitor) throws CoreException {
- if (_fileDeltas == null)loadFileDeltas(monitor);
- return _fileDeltas;
- }
-
- private IFileDelta[] getFileDeltas(IProgressMonitor monitor, ValidatorMetaData vmd) throws CoreException {
- Set<IFileDelta> result = getFileDeltas(monitor).get(vmd);
- if (result == null)return new IFileDelta[0];
-
- IFileDelta[] temp = new IFileDelta[result.size()];
- result.toArray(temp);
- return temp;
- }
-
- /**
- * Store the file deltas (VMD <=>Set[IFileDelta]) if the file deltas haven't been loaded. If the
- * deltas have already been loaded, return without doing anything.
- */
- private void loadFileDeltas(IProgressMonitor monitor) throws CoreException {
- // Although, for a full build, we don't build up a list of changed
- // files, we do need to notify each IWorkbenchContext that an
- // IResource has been filtered in.
- // It's a full validation if the IResourceDelta is null and the
- // Object[] (or IResource[]) is also null.
- // i.e., it's a full validation if no incremental input has been set.
- setFullValidate((getDelta() == null) && (_fileDeltas == null));
- if (isFullValidate()) {
- _fileDeltas = FilterUtil.loadDeltas(monitor, getEnabledValidators(), getProject());
- } else {
- _fileDeltas = FilterUtil.loadDeltas(monitor, getEnabledValidators(), getDelta()); // traverse,
- // and process, each resource in the delta tree
- }
- }
-
- protected void setFileDeltas(Map<ValidatorMetaData, Set<IFileDelta>> deltas) {
- _fileDeltas = deltas;
- }
-
- protected IResourceDelta getDelta() {
- return _delta;
- }
-
- protected void setDelta(IResourceDelta delta) {
- _delta = delta;
- }
-
- protected boolean areValidatorsEnabled() {
- return (getEnabledValidators().size() != 0);
- }
-
- /**
- * Return the validators which are both configured on this type of project, (as stored in
- * getProject()), and enabled by the user on this project.
- */
- public Set<ValidatorMetaData> getEnabledValidators() {
- return _enabledValidators;
- }
-
- /**
- * This is an internal method, subject to change without notice. It is provided only for the
- * automated validation framework tests.
- */
- public Set<ValidatorMetaData> getLaunchedValidators() {
- if (_launchedValidators == null) {
- _launchedValidators = new HashSet<ValidatorMetaData>();
- }
- return _launchedValidators;
- }
-
- protected void setEnabledValidators(Set<ValidatorMetaData> evmds) {
- // Check that every VMD in the set is configured on this project.
- // Necessary because the user can manually choose which validators
- // to launch, and the validator may not be installed.
- _enabledValidators.clear();
- for (ValidatorMetaData vmd : evmds) {
- if (ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, getProject())) {
- _enabledValidators.add(vmd);
- }
- }
- }
-
- /**
- * This method returns the IProject that this ValidationOperation was created with.
- */
- public IProject getProject() {
- return _project;
- }
-
- protected int getUnitsOfWork() {
- /*
- * Let one unit of work equal one resource. number of enabled validators. i.e., each
- * enabled validator must process (at most) each resource in the project; count each process
- * as one unit of work. Note that this is a ceiling number, because if we're doing an
- * incremental validation, not all resources will be validated.
- * setNumResources(countResources(getProject())); getEnabledValidators().size();
- */
- // Until the validators can report units-of-work complete,
- // initialize the monitor with an unknown amount of work.
- // (So the user will see movement in the progress bar, even
- // if the movement doesn't indicate the amount of work done.)
- return IProgressMonitor.UNKNOWN;
- }
-
- /**
- * If the user is cancelling validation on the current project/resource, Add an information task
- * to the task list informing the user that validation has not been run on the current project.
- */
- protected void addCancelTask(ValidatorMetaData vmd) {
- InternalValidatorManager.getManager().addOperationTask(getProject(), vmd, ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- }
-
- /**
- * This method starts the validation of each configured enabled validator on the current
- * project.
- *
- * The IProgressMonitor passed in must not be null.
- */
- public void run(IProgressMonitor progressMonitor) throws OperationCanceledException {
- try {
- // In order to check whether or not the monitor has been canceled, the monitor must not be null.
- if (progressMonitor == null)return;
- IProject project = getProject();
- if (ValidationFramework.getDefault().isSuspended(project))return;
- if (ValManager.getDefault().isDisabled(project))return;
-
- if (!areValidatorsEnabled()) {
- // save some processing time...
- return;
- }
-
- final WorkbenchReporter reporter = new WorkbenchReporter(getProject(), progressMonitor);
-
- try {
- // Periodically check if the user has canceled the operation
- checkCanceled(reporter);
- preValidate(reporter);
- validate(reporter);
- validateReferencialFiles(reporter);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- } finally {
- //TODO GRK determine if timing info should be added here
-// if (logger.isLoggingLevel(Level.FINE)) {
-// long finish = System.currentTimeMillis();
-// TimeEntry entry = ValidationPlugin.getTimeEntry();
-// entry.setSourceID("ValidationOperation.run(WorkbenchMonitor)"); //$NON-NLS-1$
-// entry.setProjectName(getProject().getName());
-// entry.setToolName("ValidationOperation"); //$NON-NLS-1$
-// entry.setElapsedTime(finish - start);
-// logger.write(Level.FINE, entry);
-// }
- }
- }
-
- private void validateReferencialFiles(WorkbenchReporter reporter) {
- ReferencialFileValidatorRegistryReader reader = ReferencialFileValidatorRegistryReader.getInstance();
- if (reader != null) {
- reader.readRegistry();
- ReferencialFileValidator refFileValidator = reader.getReferencialFileValidator();
- if (refFileValidator != null) {
- if (_delta != null) {
- refFileValidateFileDelta(reporter, refFileValidator);
- } else if (_project != null) {
- postValidateProject(reporter, refFileValidator);
- }
- }
- }
- }
-
- private void refFileValidateFileDelta(WorkbenchReporter reporter, ReferencialFileValidator refFileValidator) {
- IResourceDelta[] resourceDelta = _delta.getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.CHANGED | IResourceDelta.REMOVED);
- List<IResource> inputFiles = new ArrayList<IResource>();
-
- List<IFile> referencingFiles = new ArrayList<IFile>();
- if (resourceDelta != null && resourceDelta.length > 0) {
- for (int i = 0; i < resourceDelta.length; i++) {
- IResource resource = resourceDelta[i].getResource();
- if (resource instanceof IFolder) {
- getFileResourceDeltaInFolder(resourceDelta[i], inputFiles);
- } else if (resource instanceof IFile)
- inputFiles.add(resource);
- }
- List<IFile> rFilesToValidate = refFileValidator.getReferencedFile(inputFiles);
- if (rFilesToValidate != null && !rFilesToValidate.isEmpty())
- referencingFiles.addAll(rFilesToValidate);
- try {
- if (!referencingFiles.isEmpty())
- validateReferencingFiles(reporter, referencingFiles);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- private void getFileResourceDeltaInFolder(IResourceDelta delta, List<IResource> inputFiles) {
- IResourceDelta[] resourceDelta = delta.getAffectedChildren();
- for (int i = 0; i < resourceDelta.length; i++) {
- IResource resource = resourceDelta[i].getResource();
- if (resource instanceof IFile)inputFiles.add(resource);
- else if (resource instanceof IFolder)getFileResourceDeltaInFolder(resourceDelta[i], inputFiles);
- }
- }
-
- private void postValidateProject(WorkbenchReporter reporter, ReferencialFileValidator refFileValidator) {
- Set<ValidatorMetaData> set = ValidationRegistryReader.getReader().getValidatorMetaData(_project);
- for (ValidatorMetaData data : set) {
- List<String> filters = data.getNameFilters();
- List<IFile> files = getAllFilesForFilter(filters);
- if (!files.isEmpty()) {
- List<IFile> fileForValidation = refFileValidator.getReferencedFile(files);
- try {
- validateReferencingFiles(reporter, fileForValidation);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
- }
-
- private List<IFile> getAllFilesForFilter(List<String> filters) {
- if (!filters.isEmpty()) {
- List<IFile> allProjectFiles = ReferencialFileValidatorHelper.getAllProjectFiles(_project);
- List<IFile> filterFiles = new ArrayList<IFile>();
- for (String fileName : filters) {
- if (fileName == null)continue;
-
- for (IFile projectFile : allProjectFiles) {
- if (fileName.charAt(0) == '*') {
- String extName = fileName.substring(2, fileName.length());
- String ext = projectFile.getFileExtension();
- if (ext != null && ext.equals(extName))filterFiles.add(projectFile);
- } else if (fileName.equals(projectFile.getName()))filterFiles.add(projectFile);
- }
- }
- return filterFiles;
- }
- return new LinkedList<IFile>();
- }
-
- private void validateReferencingFiles(IReporter reporter, List<IFile> referencingFiles) throws Exception {
- Set<IFile> validatedFiles = new HashSet<IFile>();
- for (IFile refFile : referencingFiles) {
- if (!validatedFiles.contains(refFile)) {
- IResource resource = refFile.getParent();
- IProject project = null;
- if (resource != null && !(resource instanceof IProject))
- project = getProjectContainer(resource);
- else
- project = (IProject) resource;
- if (project != null) {
- Set<ValidatorMetaData> set = ValidationRegistryReader.getReader().getValidatorMetaData(project);
- for (ValidatorMetaData data : set) {
- if (data.isApplicableTo(refFile)) {
- IValidator validator = data.getValidator();
- validator.validate(data.getHelper(project),reporter);
- validatedFiles.add(refFile);
- }
- }
- }
- }
- }
- }
-
- private IProject getProjectContainer(IResource resource) {
- IResource pResource = resource.getParent();
- if (!(pResource instanceof IProject))
- return getProjectContainer(pResource);
- return (IProject) pResource;
- }
-
- protected void preValidate(WorkbenchReporter reporter) throws CoreException, OperationCanceledException {
- // Load the input.
- getFileDeltas(reporter.getProgressMonitor());
- }
-
- /**
- * Iterate over all of the enabled validators and run the thread-safe validators in a background
- * thread, and the not-thread-safe validators in this thread.
- */
- protected void validate(WorkbenchReporter reporter) throws OperationCanceledException {
- if (reporter == null)return;
- checkCanceled(reporter);
- reporter.getProgressMonitor().beginTask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_PROGRESSMONITOR_TITLE), getUnitsOfWork());
- IValidator validator = null;
- Iterator<ValidatorMetaData> iterator = null;
- IFileDelta[] delta = null;
-
- Set<ValidatorMetaData> jobValidators = new HashSet<ValidatorMetaData>();
- Set<ValidatorMetaData> validators = new HashSet<ValidatorMetaData>();
-
- for(ValidatorMetaData vmd : getEnabledValidators()){
- IValidator valInstance = null;
- try {
- valInstance = vmd.getValidator();
- }
- catch (InstantiationException e1) {
- if(!ValidatorManager.getManager().getProblemValidators().contains(vmd)) {
- ValidatorManager.getManager().getProblemValidators().add(vmd);
- System.out.println(e1.getMessage());
- }
- }
-
- if( isFork() && (valInstance != null) && valInstance instanceof IValidatorJob ){
- try {
- delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
- if( willRun )jobValidators.add( vmd );
- }
- else if (valInstance != null){
- validators.add( vmd );
- }
- }
- if( jobValidators.size() > 0 ){
- launchJobs( jobValidators, reporter );
- }
-
- ValidatorMetaData currentVmd = null;
- try {
- for (ValidatorMetaData vmd : validators) {
- currentVmd = vmd;
- // Is validation about to be run on this validator?
- // Validation will run either if this operation forces regardless
- // of need, or if the validator was not run automatically.
- // If validation is not about to be run, then don't activate
- // the plug-in
- try {
- delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
- boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
- if (Tracing.isTraceV1()) {
- StringBuffer buffer = new StringBuffer();
- buffer.append("ValidationOperation-01: will run? "); //$NON-NLS-1$
- buffer.append(willRun);
- buffer.append(" "); //$NON-NLS-1$
- buffer.append("is force? "); //$NON-NLS-1$
- buffer.append(isForce());
- buffer.append(" "); //$NON-NLS-1$
- buffer.append("isAutoBuild? "); //$NON-NLS-1$
- buffer.append(_isAutoBuild);
- buffer.append(" "); //$NON-NLS-1$
- buffer.append("isAutoValidate? "); //$NON-NLS-1$
- buffer.append(" "); //$NON-NLS-1$
- buffer.append("isIncremental? "); //$NON-NLS-1$
- buffer.append(vmd.isIncremental());
- buffer.append(" "); //$NON-NLS-1$
- if (isFullValidate()) {
- buffer.append("EVERYTHING"); //$NON-NLS-1$
- } else {
- if (delta.length == 0) {
- buffer.append("NOTHING"); //$NON-NLS-1$
- } else {
- buffer.append(getDeltaAsString(delta));
- }
- }
- Tracing.log(buffer);
- }
- if (!willRun) {
- continue;
- }
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
- continue;
- }
- try {
- context = vmd.getHelper(getProject());
- initValidateContext(delta);
- validator = vmd.getValidator();
-
- checkCanceled(reporter);
-
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
-
-// if (isFork() && vmd.isAsync()) {
-// // Don't appear to run in the foreground by sending
-// // progress to the IProgressMonitor in the
-// // WorkbenchMonitor. Suppress the status messages by
-// // changing the IProgressMonitor to a
-// // NullProgressMonitor.
-// VThreadManager.getManager().queue(wrapInRunnable(nullReporter, validator, vmd,(WorkbenchContext)getContext(),delta, iterator));
-// } else {
-// internalValidate(reporter, validator, vmd, context, delta);
-// }
- internalValidate(reporter, validator, vmd, context, delta);
- }
- }
- catch (OperationCanceledException exc) {
- handleOperationCancelledValidateException(reporter, validator, currentVmd, iterator, exc);
- }
- finally {
- releaseCachedMaps();
- }
- }
-
- private void releaseCachedMaps() {
- 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<String>());
- for(IFileDelta file : delta) {
- if(file.getDeltaType() != IFileDelta.DELETED ) {
- ((WorkbenchContext)context).getValidationFileURIs().add(file.getFileName());
- }
- }
- }
- }
-
- /**
- * @param reporter
- * @param validator
- * @param vmd
- * @param iterator
- * @param logger
- * @param exc
- */
- private void handleOperationCancelledValidateException(WorkbenchReporter reporter, IValidator validator,
- ValidatorMetaData vmd, Iterator<ValidatorMetaData> iterator, OperationCanceledException exc) {
- /*
- * If the user terminates validation (i.e., presses "cancel" on the progress monitor) before
- * the validation completes, perform clean up on each configured enabled validator.
- *
- * To clean up, several steps are performed: 1. call <code></code> on each configured
- * enabled validator, so that each validator can perform cleanup that it knows is necessary.
- * 2. remove all tasks that this validator has added to the task list 3. add another task to
- * the task list to say that validation, using this validator on this project, was
- * terminated.
- *
- * Steps 2 and 3 are done so that it's clear what has, and has not, been validated. If these
- * steps weren't performed, validation could be done on some items in the project, but not
- * others; and the user could mistakenly believe that those are the only problems with the
- * project. Unless the user knows that a full verification needs to be done, he/she could
- * continue to rely on automatic verification, and never know that there are problems with a
- * resource which hasn't been validated.
- */
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_CLEANUP, new String[]{vmd.getValidatorDisplayName()}));
- reporter.removeAllMessages(validator);
- addCancelTask(vmd);
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()}));
- while (iterator.hasNext()) {
- vmd = (ValidatorMetaData) iterator.next();
- try {
- validator = vmd.getValidator();
- } catch (InstantiationException exc2) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(exc2);
- continue;
- }
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_CLEANUP, new String[]{vmd.getValidatorDisplayName()}));
- reporter.removeAllMessages(validator);
- addCancelTask(vmd);
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()}));
- }
- throw exc; // propagate the exception up to the framework so that
- // the framework can display the correct "canceled"
- // message in the dialog
-
- }
-
- /* package */
- void internalValidate(final WorkbenchReporter reporter, final IValidator validator, final ValidatorMetaData vmd,final IWorkbenchContext aContext, final IFileDelta[] delta) throws OperationCanceledException {
- try {
- checkCanceled(reporter);
- removeOldMessages(reporter, validator, vmd, delta);
- // Do NOT check if the message limit is exceeded before launching
- // the validator.
- // Even if the limit is exceeded when the messages are removed from
- // the delta
- // files, it could be that the validator itself will remove
- // messages before
- // proceeding. Let the validator run so that it can remove messages
- // if it
- // needs to, and if it tries to add a message when the limit is
- // exceeded, let
- // the WorkbenchReporter take care of it.
- launchValidator(reporter, validator, vmd, aContext, delta);
- } catch (OperationCanceledException exc) {
- // This is handled in the validate(WorkbenchReporter) method.
- throw exc;
- }catch (Exception e) {
- // If there is a problem with this particular validator, log the
- // error and continue with the next validator.
- // If a runtime exception has occurred, e.g. NullPointer or
- // ClassCast, display it with the "A runtime exception has occurred" message.
- // This will provide more information to the user when he/she calls Service.
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
-
- /*
- The code below causes bundle not found exception since, the bundle here is
- validate_base and we are trying to load that bundle from the classloader of
- the Validator.
-
- String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
- Message message = ValidationPlugin.getMessage();
- message.setSeverity(IMessage.NORMAL_SEVERITY);
- message.setId(ResourceConstants.VBF_EXC_RUNTIME);
- message.setParams(msgParm);
- reporter.addMessage(validator, message);
- */
- } finally {
- // If user fixes problem, and limit exceeded, add "exceeded"
- // message, or
- // if limit not exceeded any more, remove "exceeded" message.
- //Message Limit is removed from the framework
- //ValidatorManager.getManager().checkMessageLimit(getProject(), true);
- reporter.getProgressMonitor().done();
- }
- }
-
- /**
- * In order to allow validators to run, must first check if there's space for new markers. But
- * the old markers must not prevent validation from running again (limit exceeded), so delete
- * all of the old markers first, and then run validation.
- */
- private final void removeOldMessages(WorkbenchReporter reporter, IValidator validator, ValidatorMetaData vmd, IFileDelta[] delta) {
- if (reporter == null) {
- return;
- }
- // If the validator has been enabled, remove the "cancel" task.
- // If the validator, on the last run, threw a Throwable, remove the
- // "internal error" task. (For the same reasons we remove the "cancel"
- // task.
- InternalValidatorManager.getManager().removeOperationTasks(getProject(), vmd);
- checkCanceled(reporter);
- try {
- // Check to see if a full build must be performed, or if a delta
- // build is to be performed, if there are files to verify for that
- // validator. (If it's delta, but there are no files, calling
- // validate on that validator starts a full build, instead of just
- // returning.)
- if (isFullValidate()) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_START_REMOVING_OLD_MESSAGES, new String[]{vmd.getValidatorDisplayName(), getProject().getName()});
- reporter.displaySubtask(message);
- reporter.removeAllMessages(validator);
- message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(message);
- } else {
- // Don't need to check that there are deltas to validate
- // because that's already checked in isValidationNecessary
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_START_REMOVING_OLD_MESSAGES, new String[]{vmd.getValidatorDisplayName(), getProject().getName()});
- reporter.displaySubtask(message);
- for (int i = 0; i < delta.length; i++) {
- WorkbenchFileDelta fd = (WorkbenchFileDelta) delta[i];
- if (fd.getDeltaType() != IFileDelta.DELETED) {
- // If the file has been deleted, eclipse erases all
- // markers on the file.
- // Also, when a resource doesn't exist,
- // WorkbenchReporter's getMessageResource()
- // returns the IProject, which means that removing the
- // messages from this
- // file removes all of this validator's messages on
- // this IProject (aix defect 206157)
- IResource resource = reporter.getMessageResource(validator, fd);
- if (fd.getObject().equals(fd.getResource())) {
- WorkbenchReporter.removeAllMessages(resource, validator); // remove
- } else {
- reporter.removeAllMessages(validator, fd.getObject());
- }
- }
- }
- message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(message);
- }
- } catch (OperationCanceledException exc) {
- throw exc;
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
- return;
- }
- }
-
- /**
- * Whether a full verification or a delta verification is in progress, both will call this
- * method to process the resource. This method calls the current Validator to filter the
- * resource (i.e., this method returns if the resource fails the filter test).
- * <code>process</code> also sends output to the <code>IProgressMonitor</code>, and calls
- * the current Validator to validate the resource.
- *
- * 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);
- // Check to see if a full build must be performed, or if a delta
- // build is to be performed, if there are files to verify for that
- // validator. (If it's delta, but there are no files, calling
- // validate on that validator starts a full build, instead of just
- // returning.)
- try {
- // Validate the resource; this step will add errors/warnings to the
- // task list, and remove errors/warnings from the task list.
- if (helper instanceof WorkbenchContext) {
- // Initialize the "loadRuleGroup" method with the group of rules
- // which the validator should validate.
- ((WorkbenchContext) helper).setRuleGroup(getRuleGroup());
- }
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_STARTING_VALIDATION, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(message);
- if (Tracing.isLogging()) {
- // This internal "launched validators" value is used only in tests.
- getLaunchedValidators().add(vmd);
- }
- //initValidateContext(delta);
- ValidatorLauncher.getLauncher().start(helper, validator, reporter);
- //TODO GRK determine if timing info should be added here
-// if (logger.isLoggingLevel(Level.INFO)) {
-// TimeEntry entry = ValidationPlugin.getTimeEntry();
-// entry.setSourceID("ValidationOperation.launchValidator"); //$NON-NLS-1$
-// entry.setProjectName(getProject().getName());
-// entry.setToolName(vmd.getValidatorUniqueName());
-// entry.setElapsedTime(finish - start);
-// if (logger.isLoggingLevel(Level.FINE)) {
-// StringBuffer buffer = new StringBuffer();
-// if (isFullValidate()) {
-// buffer.append("EVERYTHING"); //$NON-NLS-1$
-// } else {
-// if (delta.length == 0) {
-// buffer.append("NOTHING"); //$NON-NLS-1$
-// } else {
-// buffer.append(getDeltaAsString(delta));
-// }
-// }
-// entry.setDetails(buffer.toString());
-// }
-// logger.write(Level.INFO, entry);
-// }
- message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(message);
- } catch (OperationCanceledException exc) {
- throw exc;
- } catch (ValidationException exc) {
- // First, see if a validator just caught all Throwables and
- // accidentally wrapped a MessageLimitException instead of
- // propagating it.
- if (exc.getAssociatedException() != null) {
- if (exc.getAssociatedException() instanceof ValidationException) {
- ValidationException vexc = (ValidationException) exc.getAssociatedException();
- vexc.setClassLoader(validator.getClass().getClassLoader()); // first,
- // set the class loader, so that the exception's getMessage() method
- // can retrieve the resource bundle
- }
- }
- // If there is a problem with this particular validator, log the
- // error and continue with the next validator.
- exc.setClassLoader(validator.getClass().getClassLoader()); // first,
- ValidationPlugin.getPlugin().handleException(exc);
- ValidationPlugin.getPlugin().handleException(exc.getAssociatedException());
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(message);
- if (exc.getAssociatedMessage() != null) {
- reporter.addMessage(validator, exc.getAssociatedMessage());
- }
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
-
- /*
- The code below causes bundle not found exception since, the bundle here is
- validate_base and we are trying to load that bundle from the classloader of
- the Validator.
-
- String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
- Message message = ValidationPlugin.getMessage();
- message.setSeverity(IMessage.NORMAL_SEVERITY);
- message.setId(ResourceConstants.VBF_EXC_RUNTIME);
- message.setParams(msgParm);
- reporter.addMessage(validator, message);
- */
-
- } finally {
- try {
- validator.cleanup(reporter);
- } catch (OperationCanceledException e) {
- throw e;
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- return;
- }
- try {
- helper.cleanup(reporter);
- } catch (OperationCanceledException e) {
- throw e;
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- return;
- } finally {
- // Now that cleanup has been called, set the project to null.
- // This project's
- // resources have been freed so this project should also be
- // cleared on the helper.
- // If it isn't set to null, then the next time that the helper
- // is retrieved from
- // the ValidatorMetaData, the resources allocated for this
- // project, in the
- // helper's initialize method, will not be reallocated if the
- // project is the same.
- helper.setProject(null);
- }
- // Tell the progress monitor that we've completed n units of work
- // (i.e., n resources validated by one validator).
- reporter.getProgressMonitor().worked(((delta == null) ? 1 : delta.length));
- }
- }
-
-// private Runnable wrapInRunnable(final WorkbenchReporter reporter, final IValidator validator, final ValidatorMetaData vmd, final IWorkbenchContext helper, final IFileDelta[] delta, final Iterator iterator) {
-// // Need to create a new Runnable each time because several Runnable
-// // instances may exist at the same time.
-// Runnable runnable = new ProjectRunnable(reporter, validator, vmd, helper, delta, iterator);
-// return runnable;
-// }
-
- /*
- * // For convenience, keep this method in the class but commented out. // When async needs to
- * be tested, this method may be needed again. private static void debug(String prefix,
- * IWorkbenchContext helper) { IProject hProject = helper.getProject(); System.err.println(prefix +
- * "Start ValidationOperation "+Thread.currentThread().getName() + "::" + hProject.getName());
- * if( Thread.currentThread().getName().equals("ValidationThread") &&
- * (hProject.getName().indexOf("noFork") > -1)) { Thread.dumpStack(); } else
- * if((!Thread.currentThread().getName().equals("ValidationThread")) &&
- * (hProject.getName().indexOf("fork") > -1)) { Thread.dumpStack(); } System.err.println(prefix +
- * "End ValidationOperation"); }
- */
- public class ProjectRunnable implements Runnable {
- private WorkbenchReporter _reporter;
- private IValidator _validator;
- private ValidatorMetaData _vmd;
- private IFileDelta[] _delta;
-
- public ProjectRunnable(WorkbenchReporter reporter, IValidator validator,
- ValidatorMetaData vmd, IWorkbenchContext helper, IFileDelta[] delta, Iterator iterator) {
- _reporter = reporter;
- _validator = validator;
- _vmd = vmd;
- _delta = delta;
- }
-
- public void run() {
- try {
- internalValidate(_reporter, _validator, _vmd, context,_delta);
- } catch (OperationCanceledException exc) {
- // User can't cancel a job in a background thread, so ignore this exception.
- }
- }
-
- public IProject getProject() {
- return _reporter.getProject();
- }
- }
-
- /**
- * @return Returns the context.
- */
- public IValidationContext getContext() {
- return context;
- }
-
- /**
- * @param context The context to set.
- */
- public void setContext(IWorkbenchContext context) {
- this.context = context;
- }
-
- void launchJobs(Set<ValidatorMetaData> validators, final WorkbenchReporter reporter) throws OperationCanceledException{
-
- IValidator validator = null;
- IFileDelta[] delta = null;
- IWorkbenchContext workbenchcontext = null;
-
- for (ValidatorMetaData vmd : validators) {
- checkCanceled(reporter);
-
- try {
- delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
- boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
- if (!willRun)continue;
-
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
- continue;
- }
-
- try {
- validator = vmd.createValidator();
- workbenchcontext = vmd.createHelper( getProject() );
- initValidateContext( delta, workbenchcontext );
- vmd.addHelper((IValidatorJob)validator, workbenchcontext);
- checkCanceled(reporter);
-
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
-
- try {
- checkCanceled(reporter);
- removeOldMessages(reporter, validator, vmd, delta);
-
- if( validator instanceof IValidatorJob ){
- launchValidatorJob( reporter, (IValidatorJob)validator, vmd, workbenchcontext, delta);
- }
-
-
- } catch (OperationCanceledException exc) {
- throw exc;
-
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
- } catch (Error e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
- throw e;
- } finally {
- // If user fixes problem, and limit exceeded, add "exceeded"
- // message, or if limit not exceeded any more, remove "exceeded" message.
- reporter.getProgressMonitor().done();
- }
- }
- }
-
- private void initValidateContext(IFileDelta[] delta, IWorkbenchContext context ) {
- if (context instanceof WorkbenchContext) {
- ((WorkbenchContext)context).setValidationFileURIs(new ArrayList<String>());
- for(IFileDelta file : delta) {
- if(file.getDeltaType() != IFileDelta.DELETED ) {
- ((WorkbenchContext)context).getValidationFileURIs().add(file.getFileName());
- }
- }
- }
- }
-
- private final void launchValidatorJob(WorkbenchReporter reporter,
- IValidatorJob validator, ValidatorMetaData vmd, IWorkbenchContext helper, IFileDelta[] delta) {
-
- if (reporter == null)return;
- checkCanceled(reporter);
-
- if (helper instanceof WorkbenchContext) {
- ((WorkbenchContext) helper).setRuleGroup(getRuleGroup());
- }
- if (Tracing.isLogging()) {
- // This internal "launched validators" value is used only in tests.
- getLaunchedValidators().add(vmd);
- }
-
- ValidatorJob validatorjob = new ValidatorJob( validator, vmd.getValidatorDisplayName(),
- vmd.getValidatorUniqueName(), helper.getProject(), helper );
-
- ISchedulingRule schedulingRule = validator.getSchedulingRule(helper);
- validatorjob.setRule( schedulingRule );
- QualifiedName validatorKey = new QualifiedName(null, "Validator"); //$NON-NLS-1$
- validatorjob.setProperty( validatorKey, validator );
- validatorjob.addJobChangeListener(
- new JobChangeAdapter(){
-
- public void done(IJobChangeEvent event){
- Job job = event.getJob();
- QualifiedName validatorKey = new QualifiedName(null, "Validator"); //$NON-NLS-1$
- IValidatorJob validator = (IValidatorJob)job.getProperty( validatorKey );
- ValidatorManager mgr = ValidatorManager.getManager();
- final List<MessageInfo> list = mgr.getMessages(validator);
-
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
-
- for(MessageInfo info : list){
- try {
- TaskListUtility.addTask( info.getMessageOwnerId(), info.getResource(),
- info.getLocation(), info.getMsg().getId(), info.getText(),
- info.getMsg().getSeverity(),
- info.getMarkerId(),
- info.getTargetObjectName(),
- info.getMsg().getGroupName(),
- info.getMsg().getOffset(),
- info.getMsg().getLength());
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
- };
- try {
-
- ResourcesPlugin.getWorkspace().run(runnable, null, IWorkspace.AVOID_UPDATE, null);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- mgr.clearMessages( validator );
- validator = null;
- }
- }
- );
- validatorjob.setPriority(Job.DECORATE);
-
- ValidationLauncherJob validationLauncherJob = new ValidationLauncherJob(validatorjob);
- validationLauncherJob.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 4e53471..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationUtility.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.ConfigurationConstants;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * This class contains utility methods that are intended to be used by validators and code outside
- * of the validation framework.
- */
-public final class ValidationUtility {
- //TODO Make the ValidationUtility constructor private in Milestone 4.
-
- /**
- * Given an IResource and one of the org.eclipse.wst.validation.internal.core.core.SevertyEnum constants,
- * return an array containing the fully-qualified class names of the validators which have
- * reported messages, of the given severity, against the resource and the resource's children.
- */
- public static String[] listValidatorClasses(IResource resource, int severity) {
- IMarker[] markers = TaskListUtility.getValidationTasks(resource, severity);
- if ((markers == null) || (markers.length == 0)) {
- return new String[0];
- }
-
- Set<String> tempSet = new HashSet<String>();
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- try {
- Object owner = marker.getAttribute(ConfigurationConstants.VALIDATION_MARKER_OWNER);
- if ((owner == null) || !(owner instanceof String)) {
- // The ValidationMigrator will remove any "unowned" validation markers.
- continue;
- }
- tempSet.add((String)owner);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
-
- if (tempSet.size() > 0) {
- String[] result = new String[tempSet.size()];
- tempSet.toArray(result);
- tempSet.clear();
- return result;
- }
- return new String[0];
- }
-
- /**
- * @deprecated This instance method will be made static in Milestone 4.
- */
- public boolean isEnabled(IProject project, String validatorClassName) {
- return isEnabled(project, new String[]{validatorClassName});
- }
-
- /**
- * Return true if all of the validators, identified by their fully-qualified class names, are
- * enabled on the project. If a validator isn't enabled, or if there's an internal error while
- * retrieving the user's configuration, return false.
- */
- public static boolean isEnabled(IProject project, String[] validatorClassNames) {
- if ((validatorClassNames == null) || (validatorClassNames.length == 0)) {
- return false;
- }
-
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- for (int i = 0; i < validatorClassNames.length; i++) {
- if (!prjp.isEnabled(validatorClassNames[i])) {
- return false;
- }
- }
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return false;
- }
-
- return true;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java
deleted file mode 100644
index 048dd39..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.validation.IPerformanceMonitor;
-import org.eclipse.wst.validation.PerformanceCounters;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.Misc;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-public class ValidatorJob extends Job {
-
-
- private IProject project;
- private IWorkbenchContext helper;
- private IValidatorJob validator;
-
- public ValidatorJob(String name) {
- super(name);
- }
-
- public ValidatorJob( IValidatorJob validator, String displayName, String name, IProject project, IWorkbenchContext aHelper ){
- super(displayName);
- this.project = project;
- this.helper = aHelper;
- this.validator = validator;
- }
-
- //revisit reporter in the code below
- //subtask information is displayed in the monitor created by the Job
- //error information is reported by the IReporter
-
- protected IStatus run(IProgressMonitor monitor) {
-
- IPerformanceMonitor pm = ValidationFramework.getDefault().getPerformanceMonitor();
- long elapsed = -1;
- long cpuTime = -1;
- if (pm.isCollecting()){
- elapsed = System.currentTimeMillis();
- cpuTime = Misc.getCPUTime();
- }
-
- monitor.beginTask("Validating", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
- IStatus status = IValidatorJob.OK_STATUS;
- WorkbenchReporter reporter = new WorkbenchReporter( project, monitor );
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
-
- try {
-
- String message = ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_STATUS_STARTING_VALIDATION,
- new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName()});
-
- monitor.subTask(message);
- status = validator.validateInJob(helper, reporter);
-
- message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION,
- new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName()});
- monitor.subTask(message);
-
- } catch (OperationCanceledException exc) {
- throw exc;
- } catch (ValidationException exc) {
- // First, see if a validator just caught all Throwables and
- // accidentally wrapped a MessageLimitException instead of
- // propagating it.
- if (exc.getAssociatedException() != null) {
- if (exc.getAssociatedException() instanceof ValidationException) {
- ValidationException vexc = (ValidationException) exc.getAssociatedException();
- vexc.setClassLoader(validator.getClass().getClassLoader());
- }
- }
- // If there is a problem with this particular validator, log the
- // error and continue with the next validator.
- exc.setClassLoader(validator.getClass().getClassLoader());
-
- ValidationPlugin.getPlugin().handleException(exc);
- ValidationPlugin.getPlugin().handleException(exc.getAssociatedException());
- String message = ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY,
- new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName()});
-
- monitor.subTask(message);
- if (exc.getAssociatedMessage() != null) {
- reporter.addMessage(validator, exc.getAssociatedMessage());
- }
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY,
- new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName() });
-
- monitor.subTask(mssg);
-
- } finally {
- try {
- validator.cleanup(reporter);
- } catch (OperationCanceledException e) {
- throw e;
- } catch (Exception exc) {
- ValidationPlugin.getPlugin().handleException(exc);
-
- String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
- Message message = ValidationPlugin.getMessage();
- message.setSeverity(IMessage.NORMAL_SEVERITY);
- message.setId(ResourceConstants.VBF_EXC_RUNTIME);
- message.setParams(msgParm);
- status = WTPCommonPlugin.createErrorStatus(message.getText());
- return status;
- } finally {
- try {
- helper.cleanup(reporter);
- vmd.removeHelper( validator );
- }catch (OperationCanceledException e) {
- throw e;
- } catch (Exception exc) {
- ValidationPlugin.getPlugin().handleException(exc);
- String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
- Message message = ValidationPlugin.getMessage();
- message.setSeverity(IMessage.NORMAL_SEVERITY);
- message.setId(ResourceConstants.VBF_EXC_RUNTIME);
- message.setParams(msgParm);
- reporter.addMessage(validator, message);
-
- status = WTPCommonPlugin.createErrorStatus(message.getText());
- return status;
- } finally {
- helper.setProject(null);
- vmd.removeHelper( validator );
- helper = null;
- reporter = null;
- }
- }
- //reporter.getProgressMonitor().worked(((delta == null) ? 1 : delta.length)); // One
- //monitor.worked(((delta == null) ? 1 : delta.length)); // One
- monitor.done();
- }
- if (pm.isCollecting()){
- if (cpuTime != -1){
- cpuTime = Misc.getCPUTime() - cpuTime;
- }
- String projectName = null;
- if (project != null)projectName = project.getName();
- pm.add(new PerformanceCounters(vmd.getValidatorUniqueName(),
- vmd.getValidatorDisplayName(),projectName, -1,
- System.currentTimeMillis()-elapsed, cpuTime));
- }
- return status;
- }
-
- public boolean belongsTo(Object family) {
- return (project.getName() + ValidatorManager.VALIDATOR_JOB_FAMILY).equals(family);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java
deleted file mode 100644
index 86bbbf3..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java
+++ /dev/null
@@ -1,1006 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * A centralized class for accessing validation metadata.
- *
- * This class is not intended to be subclassed outside of the validation framework.
- */
-public final class ValidatorManager {
- public static final String VALIDATOR_JOB_FAMILY = "validators"; //$NON-NLS-1$
- private static ValidatorManager inst;
- private static IResourceUtil _resourceUtil; // a common utility, different whether or not
- // WSAD is running in headless or UI mode, which can retrieve the line number of some MOF objects.
- private static final Class RESOURCEUTIL_DEFAULTCLASS = org.eclipse.wst.validation.internal.operations.DefaultResourceUtil.class;
- private static Class _resourceUtilClass = RESOURCEUTIL_DEFAULTCLASS;
-
- // an empty set, provided for convenience, so that we only construct one empty set once.
- private static final Set<ValidatorMetaData> EMPTY_SET = new HashSet<ValidatorMetaData>();
-
- private static Class _messageLimitOwner;
- private String[] _internalOwners;
- private Map<IValidatorJob, List<MessageInfo>> _validatorMsgs =
- Collections.synchronizedMap( new HashMap<IValidatorJob, List<MessageInfo>>() );
- private Set<ValidatorMetaData> _problemValidators = new HashSet<ValidatorMetaData>();
-
- private ValidatorManager() {
- super();
- _internalOwners = new String[0];
-
- addInternalOwner(getMessageLimitOwner());
- }
-
- /**
- * Disable all validators for the current project, and does not touch the auto-validate setting.
- */
- public void disableAllValidators(IProject currentProject, IProgressMonitor monitor) {
- // Disable the individual validators
- setEnabledValidators(currentProject, EMPTY_SET, monitor);
- }
-
- public void enableValidator(String validatorId) {
-
- try {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
- GlobalConfiguration gf = ConfigurationManager.getManager().getGlobalConfiguration();
- gf.enableSingleValidator(vmd);
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
-
-
- public void disableValidator(String validatorId){
-
- try {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
- GlobalConfiguration gf = ConfigurationManager.getManager().getGlobalConfiguration();
- gf.disableSingleValidator(vmd);
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
-
-
- public void enableValidator(String validatorId, IProject project, boolean manualValidation, boolean buildValidation) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- prjp.setDoesProjectOverride(true);
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
-
- if(manualValidation)prjp.enableSingleManualValidator(vmd);
- if (buildValidation)prjp.enableSingleBuildValidator(vmd);
- prjp.store();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
-
- public void disableValidator(String validatorId, IProject project, boolean manualValidation, boolean buildValidation){
-
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- prjp.setDoesProjectOverride(true);
- ValidatorMetaData vmd = ValidationRegistryReader.getReader()
- .getValidatorMetaData(validatorId);
-
- if(manualValidation){
- prjp.disableSingleManualValidator(vmd);
- }
- if (buildValidation){
- prjp.disableSingleBuildValidator(vmd);
- }
- prjp.store();
-
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
-
- }
-
-
-
- /**
- * Given an IProject, if the IProject does not support build validation, add the validation
- * builder to the project description so that the project can support build validation.
- */
- public static void addProjectBuildValidationSupport(IProject project) {
- /*
- * I'm working my way through the code to see where this gets called. One place was in ModuleCoreNature
- * which had hard coded the builder id.
- */
- if (project == null)return;
-
- boolean isBuilderAdded = false;
- try {
- IProjectDescription description = project.getDescription();
- ICommand[] commands = description.getBuildSpec();
- if (commands != null) {
- for (ICommand command : commands) {
- String builderName = command.getBuilderName();
- if (builderName == null) {
- // builder name will be null if it has not been set
- continue;
- }
-
- if (builderName.equals(ValidationPlugin.VALIDATION_BUILDER_ID)) {
- isBuilderAdded = true;
- break;
- }
- }
- }
-
- if (!isBuilderAdded) {
- ICommand newCommand = description.newCommand();
- newCommand.setBuilderName(ValidationPlugin.VALIDATION_BUILDER_ID);
-
- ICommand[] newCommands = null;
- if (commands != null) {
- newCommands = new ICommand[commands.length + 1];
- System.arraycopy(commands, 0, newCommands, 0, commands.length);
- newCommands[commands.length] = newCommand;
- } else {
- newCommands = new ICommand[1];
- newCommands[0] = newCommand;
- }
- description.setBuildSpec(newCommands);
-
- project.setDescription(description, null);
- }
- } catch (CoreException exc) {
- // if we can't read the information, the project isn't open, so it can't run
- // auto-validate
- return;
- }
- }
-
-
- /**
- * Given an IProject, this method returns true if the project can run build validation (i.e.,
- * incremental validation), and false otherwise. The test, to find out if the project supports
- * build validation or not, is to see if the ValidationBuilder is configured on that type of
- * project.
- * <p>
- * This is a long-running process - is there any way that I can shorten the amount of time this
- * takes?
- */
- public static boolean doesProjectSupportBuildValidation(IProject project) {
- boolean canRunAV = false;
- if (project == null) {
- return canRunAV;
- }
-
- try {
- IProjectDescription description = project.getDescription();
- ICommand[] commands = description.getBuildSpec(); // don't need to check if description
- // is null, because it's never null
- if (commands == null) {
- return canRunAV;
- }
-
- for (int i = 0; i < commands.length; i++) {
- String builderName = commands[i].getBuilderName();
- if (builderName == null) {
- // builder name will be null if it has not been set
- continue;
- }
-
- if (builderName.equals(ValidationPlugin.VALIDATION_BUILDER_ID)) {
- canRunAV = true;
- break;
- }
- }
- } catch (CoreException exc) {
- // if we can't read the information, the project isn't open, so it can't run
- // auto-validate
- return false;
- }
-
- return canRunAV;
- }
-
- /**
- * Enable all validators for the current project, and does not touch the auto-validate setting.
- */
- public void enableAllValidators(IProject project, IProgressMonitor monitor) {
- // Turn auto-validate off
- // setAutoValidate(currentProject, false);
-
- // Enable the individual validators
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- prjp.setEnabledValidators(prjp.getValidators());
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Return a collection of incremental ValidatorMetaData configured on a certain type of IProject
- * (e.g. EJB Project vs. Web Project).
- */
- public Set getProjectConfiguredIncrementalValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return InternalValidatorManager.wrapInSet(prjp.getIncrementalValidators());
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Return a collection of ValidatorMetaData configured on a certain type of IProject (e.g. EJB
- * Project vs. Web Project).
- *
- * If the collection has not been calculated before, calculate it now, and cache the result.
- */
- public Set getProjectConfiguredValidatorMetaData(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return InternalValidatorManager.wrapInSet(prjp.getValidators());
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Return a collection of ValidatorMetaData enabled on a certain type of IProject (e.g. EJB
- * Project vs. Web Project). The second parameter, isIncremental, identifies whether it's the
- * incremental, or non-incremental, validators which should be returned. If the parameter is
- * true, return incremental validators. If the parameter is false, return nonincremental
- * validators.
- */
- public Set getProjectEnabledIncrementalValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Return a collection of ValidatorMetaData enabled on a certain type of IProject (e.g. EJB
- * Project vs. Web Project). The second parameter, isIncremental, identifies whether it's the
- * incremental, or non-incremental, validators which should be returned. If the parameter is
- * true, return incremental validators. If the parameter is false, return nonincremental
- * validators.
- */
- public Collection getProjectEnabledNonIncrementalValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(false));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Returns a Vector of all ValidatorMetaData who are both configured on this type of project,
- * and who are also enabled by this project. If the list of enabled validators hasn't been
- * loaded into the cache, load it now. Otherwise, just return it.
- */
- public Set getProjectEnabledValidators(IProject project) {
- return getEnabledValidators(project);
- }
-
- public static ValidatorManager getManager() {
- if (inst == null) {
- inst = new ValidatorManager();
- }
- return inst;
- }
-
- public static IResourceUtil getResourceUtil() {
- if (_resourceUtil == null) {
- if (_resourceUtilClass == null) {
- // Since the value returned from this method must never be null,
- // default the resource util to the headless resource util.
- _resourceUtilClass = RESOURCEUTIL_DEFAULTCLASS;
- }
-
- try {
- _resourceUtil = (IResourceUtil) _resourceUtilClass.newInstance();
- } catch (ClassCastException e) {
- _resourceUtil = null;
- } catch (InstantiationException e) {
- _resourceUtil = null;
- } catch (IllegalAccessException e) {
- _resourceUtil = null;
- }
- }
- return _resourceUtil;
- }
-
- /**
- * @deprecated This method is intended for use only by the validation framework. It will be
- * moved to a class in the "internal" package at some time.
- */
- public IMarker[] getValidationTasks(int severity, IProject project) {
- return getValidationTasks(project, severity);
- }
-
- /**
- * @deprecated This method is intended for use only by the validation framework. It will be
- * moved to a class in the "internal" package at some time.
- */
- public IMarker[] getValidationTasks(IResource resource, int severity) {
- return TaskListUtility.getValidationTasks(resource, severity);
- }
-
- /**
- * @deprecated This method is intended for use only by the validation framework. It will be
- * moved to a class in the "internal" package at some time.
- */
- public IMarker[] getValidationTasks(IResource resource, String[] validatorNames) {
- return TaskListUtility.getValidationTasks(resource, validatorNames);
- }
-
- /**
- * @deprecated For use by the validation framework only.
- */
- public ValidatorMetaData getValidatorMetaData(IValidator validator) {
- return ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- }
-
- /**
- * @deprecated For use by the validation framework only.
- */
- public Set<ValidatorMetaData> getIncrementalValidators(Collection vmds) {
- if (vmds == null)return new HashSet<ValidatorMetaData>();
-
- Set<ValidatorMetaData> result = new HashSet<ValidatorMetaData>();
- Iterator iterator = vmds.iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- if (vmd.isIncremental()) {
- result.add(vmd);
- }
- }
- return result;
- }
-
-
- /**
- * Return true if the validator identified by validatorId will validate the given resource. If
- * either parameter is null, false is returned. If the validator is not registered with the
- * validation framework (i.e., either no validator in the activated plugins is identified by
- * that plugin id, or the given IResource's project does not run that particular validator),
- * then this method will return false.
- */
- public boolean isApplicableTo(String validatorId, IResource res) {
- if ((validatorId == null) || (res == null)) {
- return false;
- }
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
- if (vmd == null) {
- // validator not registered with the framework
- return false;
- }
-
- if (!ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, res.getProject())) {
- return false;
- }
-
- return vmd.isApplicableTo(res);
- }
-
-
- public boolean isAutoValidate(IProject project) {
- return isAutoValidate(project, isGlobalAutoBuildEnabled());
- }
-
- /**
- * Keeping this API around so as not to break existing code.
- *
- * @deprecated use isAutoValidate
- */
- public boolean isAutoValidateChecked(IProject project) {
- return isAutoValidate(project);
- }
-
- /**
- * Keeping this API around so as not to break existing code.
- *
- * @deprecated use isAutoValidate
- */
- public boolean isAutoValidateChecked(IProject project, boolean isGlobalAutoBuildOn) {
- return isAutoValidate(project, isGlobalAutoBuildOn);
- }
-
- /**
- * This method returns true if validate will run when there is a resource change. The following
- * attributes are checked: 1. does this project have auto-validate on or off? 2. if this project
- * does not have an auto-validate value set, is the global auto-validate preference on? 3. if 1
- * or 2 is true, does the project support auto-validate? 4. if 1/2, & 3, is auto-build on? 5. if
- * 1/2, 3, and 4, is there at least one incremental validator enabled on the project?
- *
- * @deprecated auto validate is not used any more
- */
- public boolean isAutoValidate(IProject project, boolean isGlobalAutoBuildOn) {
- /*try {
- // 1. does the project have auto-validate on or off?
- boolean isAutoValidate = ConfigurationManager.getManager().getProjectConfiguration(project).isAutoValidate();
- if (!isAutoValidate) {
- return false;
- }
-
- // 3. does the project support auto-validate?
- // 4. is auto-build on?
- // 5. is there at least one incremental validator enabled on the project?
-
- * Auto-validation, on the properties page, can be enabled under these conditions: 1.
- * the project supports auto-validation, AND 2. fhe platform's global "automatically
- * build" is selected, AND 3. at least one of the project's validators supports
- * incremental validation. Without #1, the ValidationBuilder is never called because
- * it's not configured on the project. Without #2, the ValidationBuilder will not be
- * called because auto-building is turned off. Without #3, the ValidationBuilder will be
- * called, but there's no point because no validators can run.
-
- return canAutoValidateButtonBeEnabled(project, isGlobalAutoBuildOn);
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager.canAutoValidateButtonBeEnabled(" + project.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
-
- // If the user's setting can't be retrieved, return the default
- return ValidationConfiguration.getAutoValidateDefault();
- }*/
- return false;
- }
-
- public boolean canAutoValidateButtonBeEnabled(IProject project) {
- return canAutoValidateButtonBeEnabled(project, isGlobalAutoBuildEnabled());
- }
-
- /**
- * @deprecated For use by the validation framework only.
- */
- public Set getEnabledIncrementalValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = prjp.getEnabledIncrementalValidators(true);
- return InternalValidatorManager.wrapInSet(vmds);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Given a checked list of enabled validators, return a set of the ones which are configured on
- * the project and, if getIncremental is true, which also run incrementally.
- */
- public Set<ValidatorMetaData> getProjectConfiguredValidators(IProject project, Object[] enabledVal,
- boolean getIncremental) {
- if ((project == null) || (enabledVal == null) || (enabledVal.length == 0)) {
- return new HashSet<ValidatorMetaData>();
- }
-
- Set<ValidatorMetaData> val = new HashSet<ValidatorMetaData>();
- for (int i = 0; i < enabledVal.length; i++) {
- ValidatorMetaData vmd = (ValidatorMetaData) enabledVal[i];
- if (!vmd.isConfiguredOnProject(project))continue;
-
- if (!getIncremental || vmd.isIncremental())val.add(vmd);
- }
- return val;
- }
-
- public boolean containsIncrementalValidators(Object[] enabledVal) {
- if ((enabledVal == null) || (enabledVal.length == 0)) {
- return false;
- }
-
- for (int i = 0; i < enabledVal.length; i++) {
- ValidatorMetaData vmd = (ValidatorMetaData) enabledVal[i];
-
- if (vmd.isIncremental()) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * For use by the validation framework only.
- */
- protected Set<ValidatorMetaData> getEnabledValidators(IProject project) {
- try {
- ValidatorMetaData[] vmds = null;
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- if(!prjp.useGlobalPreference())
- vmds = prjp.getEnabledValidators();
- else
- vmds = getStateOfProjectLevelValidatorsFromGlobal(prjp);
- return InternalValidatorManager.wrapInSet(vmds);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- private ValidatorMetaData[] getStateOfProjectLevelValidatorsFromGlobal(ProjectConfiguration prjp) throws InvocationTargetException {
- List<ValidatorMetaData> enabledGlobalValidatorsForProject = new ArrayList<ValidatorMetaData>();
- GlobalConfiguration gf = ConfigurationManager.getManager().getGlobalConfiguration();
- List allProjectValidator = getAllValidatorUniqueNames(prjp.getValidators());
- for(ValidatorMetaData vmd : gf.getBuildEnabledValidators()) {
- if(allProjectValidator.contains(vmd.getValidatorUniqueName())) {
- enabledGlobalValidatorsForProject.add(vmd);
- }
- }
- return (ValidatorMetaData[]) enabledGlobalValidatorsForProject.toArray(new ValidatorMetaData[enabledGlobalValidatorsForProject.size()]);
- }
-
- private List<String> getAllValidatorUniqueNames(ValidatorMetaData[] metaData) {
- List<String> names = new ArrayList<String>();
- for(ValidatorMetaData vmd : metaData) {
- names.add(vmd.getValidatorUniqueName());
- }
- return names;
- }
-
-
-
- protected Set<ValidatorMetaData> getManualEnabledValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = prjp.getManualEnabledValidators();
- return InternalValidatorManager.wrapInSet(vmds);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- protected Set<ValidatorMetaData> getBuildEnabledValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = prjp.getBuildEnabledValidators();
- return InternalValidatorManager.wrapInSet(vmds);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * This method is for use only by the validation framework. Update the task list based on which
- * validators are enabled or disabled. This method should be called only by the validation
- * framework UI classes. Remove the messages belonging to disabled validators.
- */
- public void updateTaskList(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = prjp.getDisabledValidators();
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- // For validators who aren't going to run, clear their messages from the task list.
- // Don't need to check for duplicate entries because each Validator must be unique.
- // The uniqueness of each Validator is checked by the plugin registry.
- WorkbenchReporter.removeAllMessages(project, vmd.getValidatorNames(), null);
- }
- //Message Limit is removed from the framework - WTP1.5M5
- /*if (prjp.numberOfEnabledValidators() > 0) {
- ValidatorManager.getManager().checkMessageLimit(project, false); // Do not remove
- // the exceeded
- // message; only
- // ValidationOperation
- // should do that
- // because it's
- // about to run
- // validation. If
- // the limit is
- // increased,
- // messages may
- // still be
- // missing, so
- // don't remove the
- // "messages may be
- // missing"
- // message.
- } else {
- // Can't run validation, so remove the "exceeded" message
- ValidatorManager.getManager().removeMessageLimitExceeded(project);
- }*/
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
-
-
- public boolean canAutoValidateButtonBeEnabled(IProject project, boolean isGlobalAutoBuildOn) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- boolean incrementalValEnabled = (prjp.numberOfEnabledIncrementalValidators() > 0);
- return canAutoValidateButtonBeEnabled(project, isGlobalAutoBuildOn, incrementalValEnabled);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return false;
- }
- }
-
- public boolean canAutoValidateButtonBeEnabled(IProject project, boolean isGlobalAutoBuildOn, boolean incrementalValEnabled) {
- boolean doesProjectSupportAutoValidate = doesProjectSupportBuildValidation(project);
- return (doesProjectSupportAutoValidate && isGlobalAutoBuildOn && incrementalValEnabled);
- }
-
- /**
- * Return true if the validator identified by the String is configured on the IProject and
- * enabled on the IProject. Otherwise return false;
- */
- public boolean isEnabled(IProject project, String validatorName) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return prjp.isEnabled(validatorName);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return false;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only. Return true if the ValidatorMetaData is
- * enabled for the given project
- */
- public boolean isEnabled(IProject project, ValidatorMetaData vmd) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return prjp.isEnabled(vmd);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return false;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- */
- public boolean isConfigured(IProject project, ValidatorMetaData vmd) {
- return ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, project);
- }
-
- /**
- * This method returns true if the global auto-build setting is turned on.
- */
- public boolean isGlobalAutoBuildEnabled() {
- return ResourcesPlugin.getWorkspace().isAutoBuilding();
- }
-
- /**
- * Returns the number of enabled validators on the given project.
- */
- public int numberProjectEnabledValidators(IProject project) {
- if (project == null) {
- return 0;
- }
-
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return prjp.numberOfEnabledValidators();
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return 0;
- }
- }
-
-
- /**
- * @deprecated Use ValidationFramework.suspendValidation(project, suspend) directly.
- * @see ValidationFramework#suspendValidation(IProject, boolean)
- */
- public void suspendValidation(IProject project, boolean suspend) {
- ValidationFramework.getDefault().suspendValidation(project, suspend);
- }
-
- /**
- * @deprecated Use ValidationFramework.getDefault().suspendAllValidation(suspend) directly.
- * @see ValidationFramework#suspendAllValidation(boolean)
- */
- public void suspendAllValidation(boolean suspend) {
- ValidationFramework.getDefault().suspendAllValidation(suspend);
- }
-
- /**
- * @deprecated Use ValidationFramework.getDefault().isSuspended() directly.
- * @see ValidationFramework#isSuspended()
- */
- public boolean isSuspended() {
- return ValidationFramework.getDefault().isSuspended();
- }
-
- /**
- * @deprecated Use ValidationFramework.getDefault().isSuspended(project) directly.
- * @see ValidationFramework#isSuspended(IProject)
- */
- public boolean isSuspended(IProject project) {
- return ValidationFramework.getDefault().isSuspended(project);
- }
-
- /**
- * @deprecated Use ValidationFramework.getDefault().isProjectSuspended(project) directly.
- * @see ValidationFramework#isProjectSuspended(IProject)
- */
- public boolean isProjectSuspended(IProject project) {
- return ValidationFramework.getDefault().isProjectSuspended(project);
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Given a list of validators' plugin ids, make those validators enabled for this project. All
- * others, disable for this project.
- */
- public void setEnabledValidators(IProject project, Set<ValidatorMetaData> vmdsSet, IProgressMonitor monitor) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = null;
- if (vmdsSet == null) {
- vmds = new ValidatorMetaData[0];
- } else {
- vmds = new ValidatorMetaData[vmdsSet.size()];
- vmdsSet.toArray(vmds);
- }
-
- prjp.setEnabledValidators(vmds);
-
- updateTaskList(project);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
-
- public static void setResourceUtilClass(Class clazz) {
- _resourceUtilClass = clazz;
- }
-
- /**
- * This method is for use by batch EJB deploy only. Only in batch mode is an infinite number of
- * messages allowed.
- *
- * Enable a project to have an infinite number of messages.
- * @deprecated
- */
- public void setNoMessageLimit(IProject project) {/*
- setMessageLimit(project, WorkbenchReporter.NO_MESSAGE_LIMIT);
- */}
-
- /**
- * This message is for use only by the validation framework. If the "max messages were reported"
- * IMarker exists, return it. Otherwise return null.
- */
- private IMarker[] getLimitMessage(IProject project) {
- IMarker[] exceededMessage = TaskListUtility.getValidationTasks(project, WorkbenchReporter.getUniqueId(getMessageLimitOwner()));
- if ((exceededMessage != null) && (exceededMessage.length != 0)) {
- return exceededMessage;
- }
-
- return null;
- }
-
-// /**
-// * Return true if the given IMarker is a "limit was exceeded" message, false otherwise.
-// */
-// private boolean isLimitMessage(IMarker marker) {
-// if (marker == null) {
-// return false;
-// }
-//
-// return TaskListUtility.isOwner(marker, WorkbenchReporter.getUniqueId(getMessageLimitOwner()));
-// }
-
-// /**
-// * Return all of the IMarkers on the IProject excluding the "limit was exceeded" message. If
-// * there are no markers, return null.
-// */
-// private IMarker[] getValidationTasksWithoutLimitMessage(IProject project) {
-// IMarker[] allTasks = TaskListUtility.getValidationTasks(project, IMessage.ALL_MESSAGES);
-// if ((allTasks == null) || (allTasks.length == 0)) {
-// return null;
-// }
-//
-// // Don't check if the limit message exists because
-// // any interaction with markers is costly. Since the
-// // interaction has to be done at least once, make that
-// // single occasion in the for loop below.
-// IMarker[] validatorMessages = new IMarker[allTasks.length];
-// int count = 0; // how many markers have been added to the result array?
-// for (int i = 0; i < allTasks.length; i++) {
-// IMarker marker = allTasks[i];
-// if (isLimitMessage(marker)) {
-// continue;
-// }
-// validatorMessages[count++] = marker;
-// }
-//
-// IMarker[] result = new IMarker[count];
-// System.arraycopy(validatorMessages, 0, result, 0, count);
-// return result;
-// }
-
- /**
- * This method should be called only by the validation framework. Return true if the message was
- * removed, false if the message didn't exist.
- * @deprecated This method should be not be used anymore as Message Limit is removed from
- * the framework - WTP1.5M5
- */
- public boolean removeMessageLimitExceeded(IProject project) {
- IMarker[] exceededMessage = getLimitMessage(project);
- if (exceededMessage != null) {
- try {
- ResourcesPlugin.getWorkspace().deleteMarkers(exceededMessage);
- return true;
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- return false;
- }
-
- /**
- * Return true if the last validation operation terminated due to the maximum number of messages
- * having already been reported.
- */
- public boolean wasValidationTerminated(IProject project) {
- IMarker[] exceededMessage = getLimitMessage(project);
- return (exceededMessage != null); // Validation was terminated if the message exists.
- }
-
- private Class getMessageLimitOwner() {
- if (_messageLimitOwner == null) {
- _messageLimitOwner = getClass();
- }
- return _messageLimitOwner;
- }
-
- /**
- * Return true if owner is the name of the class which owns validation framework status
- * messages.
- *
- * ONLY the validation framework should use this method.
- */
- public boolean isInternalOwner(String owner) {
- if (owner == null) {
- return false;
- }
-
- for (int i = 0; i < _internalOwners.length; i++) {
- String internalOwner = _internalOwners[i];
- if (owner.equals(internalOwner)) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Add a class to the list of owners of validation messages. ONLY by the validation framework
- * should use this method (it is used for messages owned by framework classes or classes used by
- * the TVT plugin.)
- */
- public void addInternalOwner(Class clazz) {
- if (clazz == null) {
- return;
- }
-
- String[] tempInternalOwners = new String[_internalOwners.length + 1];
- if (_internalOwners.length > 0) {
- System.arraycopy(_internalOwners, 0, tempInternalOwners, 0, _internalOwners.length);
- }
- tempInternalOwners[_internalOwners.length] = WorkbenchReporter.getUniqueId(clazz);
-
- _internalOwners = tempInternalOwners;
- }
-
- public void cacheMessage(IValidatorJob validator, MessageInfo info){
- List<MessageInfo> list = _validatorMsgs.get(validator);
- if( list == null ){
- list = new ArrayList<MessageInfo>();
- _validatorMsgs.put(validator, list);
- }
- list.add(info);
- }
-
- public List<MessageInfo> getMessages(IValidatorJob validator){
- List<MessageInfo> list = _validatorMsgs.get(validator);
- if( list == null )list = new ArrayList<MessageInfo>();
- return list;
- }
-
- public void clearMessages(IValidatorJob validator){
- List<MessageInfo> list = _validatorMsgs.get(validator);
- if( list != null ){
- list.clear();
- }
- _validatorMsgs.remove( validator );
- }
-
-
- public Set<ValidatorMetaData> getProblemValidators() {
- return _problemValidators;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorSubsetOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorSubsetOperation.java
deleted file mode 100644
index 274ddec..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorSubsetOperation.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.FilterUtil;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-
-
-/**
- * Run some validators on a given IProject. Any validators which cannot be loaded or which are not
- * registered against this type of project will be ignored.
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class ValidatorSubsetOperation extends ValidationOperation {
- // By default, assume that there is no default fallback extension
- protected static final String DEFAULT_DEFAULTEXTENSION = null;
-
- /**
- * Create an operation that runs a full validation on the named validators either if validation
- * needs to (@see ValidatorSubsetOperation(IProject)) or if <code>force</code> is true.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, boolean force, boolean async) {
- this(project, force, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
- }
-
- /**
- * Create an operation that runs a full validation on the named validators using the
- * <code>ruleGroup</code> pass. Use this constructor only if you want to run a validator that
- * supports the two passes: FAST and FULL.
- *
- * If force is true, validation is run whether or not it needs to.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, IWorkbenchContext aWorkenchContext, boolean force, int ruleGroup, boolean async) {
- super(project, aWorkenchContext, null, null, ruleGroup, force, async);
- }
-
-
- /**
- * Create an operation that runs a full validation on the named validators using the
- * <code>ruleGroup</code> pass. Use this constructor only if you want to run a validator that
- * supports the two passes: FAST and FULL.
- *
- * If force is true, validation is run whether or not it needs to.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, boolean force, int ruleGroup, Object[] changedResources, boolean async) {
- super(project, null, null, ruleGroup, force, async);
- setEnabledValidators(ValidatorManager.getManager().getManualEnabledValidators(project));
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
- }
-
- /**
- * Create an operation that runs a full validation on the named validators using the
- * <code>ruleGroup</code> pass. Use this constructor only if you want to run a validator that
- * supports the two passes: FAST and FULL.
- *
- * If force is true, validation is run whether or not it needs to.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, boolean force, int ruleGroup, boolean async) {
- super(project, null, null, ruleGroup, force, async);
- }
-
- /**
- * The fileExtension parameter must be ".X", where X is the extension. Do not type "*.X" or "X"
- * (i.e., without the dot). The parameter could also be the file name, e.g. "foo.X".
- *
- * This constructor should be used when the invoker wishes to force validation on certain
- * resources, without waiting for the user to save their changes.
- *
- * An IllegalArgumentException is thrown if there are no validators registered for the
- * fileExtension on the given IProject.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, String fileExtension, Object[] changedResources, boolean async) throws IllegalArgumentException {
- this(project, fileExtension, DEFAULT_DEFAULTEXTENSION, changedResources, async);
- }
-
- /**
- * The fileExtension parameter must be ".X", where X is the extension. Do not type "*.X" or "X"
- * (i.e., without the dot). The parameter could also be the file name, e.g. "foo.X".
- *
- * This constructor should be used when the invoker wishes to force validation on certain
- * resources, without waiting for the user to save their changes.
- *
- * If there are no validators configured on files named ".X", then use the validators configured
- * on validators named ".Y", where defaultExtension identifies the fallback extension to use.
- * defaultExtension follows the same syntax as fileExtension.
- *
- * An IllegalArgumentException is thrown if there are no validators registered for the
- * fileExtension or defaultExtension on the given IProject.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, String fileExtension, String defaultExtension, Object[] changedResources, boolean async) throws IllegalArgumentException {
- super(project, shouldForce(changedResources), async);
-
- // force the resources to be filtered in even if the validator doesn't normally take them?
- boolean filterIn = false;
-
- // a list of validators which are configured to run on files with that extension.
- // A validator will be in the list whether it has been enabled or disabled by the user.
- ValidatorMetaData[] vmds = InternalValidatorManager.getManager().getValidatorsForExtension(project, fileExtension);
- if ((defaultExtension != null) && ((vmds == null) || (vmds.length == 0))) {
- filterIn = true;
- vmds = InternalValidatorManager.getManager().getValidatorsForExtension(project, defaultExtension);
- }
-
- if ((vmds == null) || (vmds.length == 0)) {
- throw new IllegalArgumentException();
- }
-
- setEnabledValidators(InternalValidatorManager.wrapInSet(vmds));
-
- // construct an array of IFileDelta[] to wrap the Object[];
- // one IFileDelta for each Object in the array
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, filterIn));
- }
-
- /**
- * This constructor is provided for the validation async testing, and is not intended to be
- * called outside the validation framework.
- *
- * Run validation on the changed resources with the given validators. All resources must be from
- * the same project; if they're not, an IllegalArgumentException will be thrown. All validators
- * must be able to run on the resources' project; if not, an IllegalArgumentException will be
- * thrown. If the vmds are either empty or null, an IllegalArgumentExeption will be thrown. If
- * the project is closed or doesn't exist then an IllegalArgumentException will be thrown.
- *
- * The ifileDeltaType is one of the IFileDelta constants: ADDED, CHANGED, or DELETED.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, ValidatorMetaData[] vmds, IResource[] changedResources, int ifileDeltaType, boolean force, boolean async) throws IllegalArgumentException {
- // Have to have the IProject as a parameter because ValidationOperation needs the IProject,
- // and the super(..)
- // must be called before anything else in this constructor is called.
- super(project, force, async);
-
- if ((vmds == null) || (vmds.length == 0)) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_BADVMD));
- }
-
- if (!project.isOpen()) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_OPENPRJ, new String[]{project.getName()}));
- }
- if (!project.exists()) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_EXISTPRJ, new String[]{project.getName()}));
- }
-
- if ((changedResources != null) && (changedResources.length > 0)) {
- Set<IProject> tempSet = new HashSet<IProject>();
- for (int i = 0; i < changedResources.length; i++) {
- IProject p = changedResources[i].getProject();
- if (!p.isOpen()) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_OPENPRJ, new String[]{p.getName()}));
- }
- if (!p.exists()) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_EXISTPRJ, new String[]{p.getName()}));
- }
- tempSet.add(project);
- }
-
- if (!tempSet.contains(project)) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_BADPRJ, new String[]{project.getName()}));
- }
- if (tempSet.size() != 1) {
- StringBuffer buffer = new StringBuffer("\n"); //$NON-NLS-1$
- Iterator<IProject> iterator = tempSet.iterator();
- while (iterator.hasNext()) {
- IProject p = iterator.next();
- buffer.append("\t"); //$NON-NLS-1$
- buffer.append(p.getName());
- if (iterator.hasNext()) {
- buffer.append(", "); //$NON-NLS-1$
- }
- }
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_MULTIPRJ, new String[]{buffer.toString()}));
- }
- }
-
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- if (!ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, project)) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_BADVAL, new String[]{vmd.getValidatorDisplayName(), project.getName()}));
- }
- }
-
- setEnabledValidators(InternalValidatorManager.wrapInSet(vmds));
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, ifileDeltaType)); // construct
- // an array of IFileDelta[] to wrap the IResource[]; one IFileDelta for each IResource in the array
- }
-
- /**
- * Given an array of fully-qualified class names of validators, create the list of validators to
- * be run. The array is not checked for duplicates or for invalid validators (i.e., a validator
- * of that class type is not loaded, or the validator is loaded but cannot run against this type
- * of IProject.)
- */
- public void setValidators(String[] validatorNames) throws IllegalArgumentException {
- Set<ValidatorMetaData> enabled = new HashSet<ValidatorMetaData>();
- for (String name : validatorNames) {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(name);
- if (vmd == null) {
- // No validator, with that plug-in id, can be run on that project.
- // Either the validator isn't installed, or the IProject passed in
- // doesn't have the necessary nature.
- throw new IllegalArgumentException(name);
- }
- enabled.add(vmd);
- }
- setEnabledValidators(enabled);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use setForce(boolean)
- */
- public void setAlwaysRun(boolean force) {
- setForce(force);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java
deleted file mode 100644
index eea36c1..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java
+++ /dev/null
@@ -1,729 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * Abstract base class for registration of symbolic model names, and also provides the mechanism for
- * registering the load model method which loads a specific type of MOF model, as identified by the
- * symbolic model name.
- */
-public class WorkbenchContext implements IWorkbenchContext {
- private IProject _project;
- private Hashtable<String,Method> _modelRegistry;
- private int _ruleGroup = RegistryConstants.ATT_RULE_GROUP_DEFAULT;
- public List<String> validationFileURIs;
- public static final String GET_PROJECT_FILES = "getAllFiles"; //$NON-NLS-1$
- public static final String GET_FILE = "getFile"; //$NON-NLS-1$
- public static final String VALIDATION_MARKER = "com.ibm.etools.validation.problemmarker"; //$NON-NLS-1$
- public static final String VALIDATION_MARKER_OWNER = "owner"; //$NON-NLS-1$
-
- public WorkbenchContext() {
- super();
- _modelRegistry = new Hashtable<String, Method>();
-
- registerModel(IRuleGroup.PASS_LEVEL, "loadRuleGroup"); //$NON-NLS-1$
-
- //the following will register the helper's symbolic methods
- Class [] args = new Class[1] ;
- args[0] = String.class ; // a string argument denoting a specific JSP.
- registerModel(GET_FILE, "getFile", args);//$NON-NLS-1$
- registerModel(GET_PROJECT_FILES, "getFiles", args);//$NON-NLS-1$
- }
-
- /**
- * When the validation is complete, this method will be called so that the IWorkbenchContext can
- * clean up any resources it allocated during the validation.
- *
- * If the cleanup is a long-running operation, subtask messages should be sent to the IReporter.
- */
- public void cleanup(WorkbenchReporter reporter) {
- // Default: nothing to clean up
- }
-
- /**
- * When the IProject is closing, perform any cleanup that needs to be done. When this method is
- * called, if the helper has cached any resources from the IProject, it should release those
- * resources. If you do not allocate resources in your helper, then this method should be a
- * no-op.
- */
- public void closing() {
- closing(getProject());
- }
-
- /**
- * When the IProject is closing, perform any cleanup that needs to be done. When this method is
- * called, if the helper has cached any resources from the IProject, it should release those
- * resources. If you do not allocate resources in your helper, then this method should be a
- * no-op.
- *
- * @deprecated Override closing() instead, and use getProject()
- */
- public void closing(IProject project) {
- //do nothing
- }
-
- /**
- * When the IProject is being deleted, perform any cleanup that needs to be done. When this
- * method is called, if the helper has cached any resources from the IProject, it should release
- * those resources. If you do not allocate resources in your helper, then this method should be
- * a no-op.
- */
- public void deleting() {
- deleting(getProject());
- }
-
- /**
- * When the IProject is being deleted, perform any cleanup that needs to be done. When this
- * method is called, if the helper has cached any resources from the IProject, it should release
- * those resources. If you do not allocate resources in your helper, then this method should be
- * a no-op.
- *
- * @deprecated Override deleting() instead, and use getProject()
- */
- public void deleting(IProject project) {
- //do nothing
- }
-
- /**
- * Returns the IPath of a resource, relative to the container. If the IResource is not a member
- * of the container, return null. This method should be useful for implementors of this class;
- * specifically, in their getPortableName method.
- */
- public static String getContainerRelativePath(String fullPath, IContainer container) {
- if ((fullPath == null) || (container == null))
- return null;
- IPath relPath = getContainerRelativePath(new Path(fullPath), container);
- if (relPath != null)
- return relPath.toString();
- return null;
- }
-
- /**
- * Returns the IPath of a resource, relative to the container. If the IResource is not a member
- * of the container, return null. This method should be useful for implementors of this class;
- * specifically, in their getPortableName method.
- */
- public static IPath getContainerRelativePath(IResource resource, IContainer container) {
- if ((resource == null) || (container == null)) {
- return null;
- }
-
- IResource foundResource = null;
- IPath relPath = getContainerRelativePath(resource.getFullPath(), container);
- if (relPath != null) {
- // if relPath is null, the resource is not a direct member of the container
- try {
- if (!resource.exists()) { // findMember won't work
- if (resource instanceof IFile) {
- foundResource = container.getFile(relPath);
- } else if (resource instanceof IFolder) {
- foundResource = container.getFolder(relPath);
- }
- } else {
- foundResource = container.findMember(relPath, true); // true means include
- // phantom resources
- if ((foundResource != null) && !foundResource.exists()) {
- foundResource = null;
- }
- }
- } catch (IllegalArgumentException e) {
- foundResource = null;
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- if (foundResource == null) {
- return null;
- }
-
- // file has been found
- int matchingFirstSegments = container.getProjectRelativePath().matchingFirstSegments(resource.getProjectRelativePath());
- return resource.getProjectRelativePath().removeFirstSegments(matchingFirstSegments);
- }
-
- /**
- * Given an IPath, if the IPath is absolute, and is a part of the IContainer, return an IPath
- * which is relative to the container. If the IPath is not part of the IContainer, return null.
- */
- public static IPath getContainerRelativePath(IPath path, IContainer container) {
- if ((path == null) || (container == null)) {
- return null;
- }
-
- if (path.isAbsolute()) {
- // Is the path part of the IContainer?
- int matchingFirstSegments = path.matchingFirstSegments(container.getFullPath());
- if ((matchingFirstSegments > 0) && (matchingFirstSegments == container.getFullPath().segmentCount())) {
- // part of the IContainer
- return path.removeFirstSegments(matchingFirstSegments);
- }
- // not part of the IContainer
- return null;
- }
- // path is relative
- // Is the path part of the IContainer?
- //TODO don't have time to implement this now, but should in future. - Ruth
- return null;
- }
-
- /**
- * Given an IMessage's target object, return a string which identifies the object, so that the
- * user can locate it.
- */
- public String getDescription(Object object) {
- if (object == null) {
- return ""; //$NON-NLS-1$
- }
-
- if (object instanceof WorkbenchFileDelta) {
- WorkbenchFileDelta wfd = (WorkbenchFileDelta) object;
- if (wfd.getResource() != null) {
- // resource will be null if WorkbenchFileDelta was constructed from an Object
- // instead of an IResource
- return wfd.getResource().getFullPath().toString();
- }
- }
-
- return object.toString();
- }
-
- /**
- * Given an Object, if the object has a corresponding IFile in the workbench, return the IFile.
- * Otherwise return null.
- *
- * This method is used by the WorkbenchReporter. In eclipse, in order to add or remove a task
- * list entry, the IResource, to which the entry applies, must be identified. The IReporter
- * interface passes in an Object in these methods:
- *
- * addValidationMessage(IValidator, IMessage) // Object is a part of IMessage
- *
- * removeAllMessages(IValidator, Object),
- *
- * Thus, the WorkbenchReporter needs to know how, given the Object, which IFile that the Object
- * represents in the workbench, in order to be able to add the task list entry.
- *
- * If this method returns null, then the WorkbenchReporter will add the message to the IProject
- * instead of an IFile.
- *
- */
- public IFile getFile(Object obj) {
- return null;
- }
-
- public IResource getResource(Object obj) {
- if (obj == null) {
- return null;
- }
-
- IResource res = null;
- if (obj instanceof WorkbenchFileDelta) {
- // resource may be null if WorkbenchFileDelta was constructed from an Object instead of
- // an IResource
- res = ((WorkbenchFileDelta) obj).getResource();
- } else if (obj instanceof IResource) {
- res = (IResource) obj;
- }
-
- if ((res == null) || (!res.exists())) {
- return getFile(obj);
- }
-
- return res;
- }
-
- /**
- * If the IProject is associated with an EJBNatureRuntime, return the IJavaProject which
- * represents it.
- */
-// public static IJavaProject getJavaProject(IProject project) {
-// if (project == null) {
-// return null;
-// }
-// return JavaCore.create(project);
-// }
-
- /**
- * Given an IMessage's target object, return the line number, of the IFile, which the target
- * object represents. If the object is null, or if access to line numbers is not possible,
- * return "0".
- */
- public int getLineNo(Object object) {
- IResourceUtil util = ValidatorManager.getResourceUtil();
- if (util == null) {
- return IMessage.LINENO_UNSET;
- }
- try {
- return util.getLineNo(object);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- return IMessage.LINENO_UNSET;
- }
-
- }
-
- /**
- * Given an IMessage's target object, return the line number, of the IFile, which the target
- * object represents, if possible. If the object is null, or if access to line numbers is not
- * possible, return a text description of the location.
- *
- * This method will be called whether or not the IResource is an IFile, IFolder, or IProject.
- * Line numbers are valid only for IFile types; if the resource is not an IFile, then a text
- * description of the location must be returned.
- */
- public String getLocation(Object object) {
- IResource res = getResource(object);
- if ((res == null) || !(res instanceof IFile))
- // return a text description
- return getDescription(object);
- // default to a line number, if it's available. Else, use a text description.
- int lineNumber = getLineNo(object);
- if (lineNumber == IMessage.LINENO_UNSET) {
- return getDescription(object);
- }
- // return the line number
- return String.valueOf(lineNumber);
- }
-
- /**
- * Given a name of a load method, and the types of parameters it takes (this method is always
- * called with null as the second parameter), return the java.lang.reflect.Method which
- * represents the load method.
- */
- private final Method getMethod(String methodName, Class[] parmTypes) {
- Method m = null;
- try {
- m = getClass().getMethod(methodName, parmTypes);
- } catch (NoSuchMethodException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
-
- return m;
- }
-
- /**
- * @see IWorkbenchContext.getPortableName(IResource)
- */
- public String getPortableName(IResource resource) {
- return resource.getFullPath().toString();
- }
-
- /**
- * Return the IProject which is about to be validated. Each IWorkbenchContext knows how to
- * traverse a certain type of IProject, for example, an EJB project or a web project.
- */
- public final IProject getProject() {
- return _project;
- }
-
- /**
- * Get the IFile for the given filename.
- *
- * @param filename The name of the file to retrieve.
- * @return An IFile representing the file specified or null if it can't be resolved.
- */
- public IFile getFile(String filename)
- {
- // System.out.println("file name = " + filename);
- IResource res = getProject().findMember(filename, true); // true means include phantom resources
- if (res instanceof IFile)
- {
- return (IFile) res;
- }
- return null;
- }
-
- /**
- * Get the collection of files from the project that are relevant for the
- * validator with the given class name.
- *
- * @param validatorClassName The name of the validator class.
- * @return The collection of files relevant for the validator class specified.
- */
- public Collection<IFile> getFiles(String validatorClassName)
- {
- IProject project = getProject();
- List<IFile> files = new ArrayList<IFile>();
- getFiles(files, project, validatorClassName);
- return files;
- }
-
- /**
- * Get the collection of files from the project that are relevant for the
- * validator with the given class name.
- *
- * @param files The files relevant for the class name.
- * @param resource The resource to look for files in.
- * @param validatorClassName The name of the validator class.
- */
- protected void getFiles(Collection<IFile> files, IContainer resource, String validatorClassName)
- {
- try
- {
- IResource [] resourceArray = resource.members(false);
- for (int i=0; i<resourceArray.length; i++)
- {
- if (ValidatorManager.getManager().isApplicableTo(validatorClassName, resourceArray[i]))
- {
- if (resourceArray[i] instanceof IFile)
- files.add((IFile)resourceArray[i]);
- }
- if (resourceArray[i].getType() == IResource.FOLDER)
- getFiles(files,(IContainer)resourceArray[i], validatorClassName) ;
- }
- }
- catch (Exception e) {}
- }
-
-
-// /**
-// * Return the folders (or project) which contain the .java source files.
-// */
-// public static IContainer[] getProjectSourceContainers(IProject project) {
-// if (project == null) {
-// return NO_CONTAINERS;
-// }
-//
-// IJavaProject jp = getJavaProject(project);
-// if (jp == null) {
-// return NO_CONTAINERS;
-// }
-//
-// return getProjectSourceContainers(jp);
-// }
-
- /**
- * Return the folders (or project) which contain the .java source files.
- */
-// public static IContainer[] getProjectSourceContainers(IJavaProject javaProject) {
-// if (javaProject == null) {
-// return NO_CONTAINERS;
-// }
-// IProject project = javaProject.getProject();
-//
-// IClasspathEntry[] classpath = null;
-// try {
-// classpath = javaProject.getResolvedClasspath(true); // true means ignore unresolved
-// // (missing) variables, instead of
-// // throwing an exception
-// } catch (JavaModelException exc) {
-// Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
-// if (logger.isLoggingLevel(Level.SEVERE)) {
-// LogEntry entry = ValidationPlugin.getLogEntry();
-// entry.setSourceID("WorkbenchContext::getProjectSourceContainers(IJavaProject)"); //$NON-NLS-1$
-// entry.setTargetException(exc);
-// logger.write(Level.SEVERE, entry);
-// }
-// return NO_CONTAINERS;
-// }
-//
-// if (classpath == null) {
-// return NO_CONTAINERS;
-// }
-//
-// // Traverse the classpath, and calculate a list of just the
-// // IFolders and IProjects (i.e., IContainers) which contain source
-// IContainer[] icontainers = new IContainer[classpath.length];
-// int validCount = 0;
-// for (int i = 0; i < classpath.length; i++) {
-// IClasspathEntry entry = classpath[i];
-// if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-// IPath entryPath = entry.getPath();
-// IPath relEntryPath = getContainerRelativePath(entryPath, project);
-// if (relEntryPath == null) {
-// // classpath entry refers to something which doesn't exist
-// continue;
-// }
-//
-// IResource outputResource = project.findMember(relEntryPath);
-// if (outputResource == null) {
-// // classpath entry refers to something which doesn't exist
-// continue;
-// }
-//
-// if (outputResource instanceof IContainer) {
-// icontainers[validCount++] = (IContainer) outputResource;
-// }
-// }
-// }
-//
-// // following line causes a ClassCastException, so construct an array of IContainers
-// // explicitly
-// // return (IContainer[])icontainers.toArray();
-// IContainer[] containers = new IContainer[validCount];
-// System.arraycopy(icontainers, 0, containers, 0, validCount);
-// return containers;
-// }
-
- public int getRuleGroup() {
- return _ruleGroup;
- }
-
- /**
- * This method can be overriden by AWorkbenchHelpers, if they wish to perform some
- * initialization once the IProject is set. Default is to do nothing.
- *
- * For example, if this IWorkbenchContext delegates to another IWorkbenchContext, then that
- * IWorkbenchContext's setProject() method should be called here.
- */
- public void initialize() {
- //do nothing
- }
-
- /**
- * Return true if the given resource is in an IJavaProject, and if it is in one of the source
- * folders in the IJavaProject. If the project's source folder happens to be the project's
- * output folder too, this method will return true. If res is null, or is not found in one of
- * the source containers, this method will return false.
- */
-// public boolean isInJavaSourcePath(IResource res) {
-// if (res == null) {
-// return false;
-// }
-//
-// IContainer[] containers = getProjectSourceContainers(res.getProject());
-// for (int c = 0; c < containers.length; c++) {
-// IPath resourcePath = getContainerRelativePath(res, containers[c]);
-// if (resourcePath != null) {
-// // file has been found
-// return true;
-// }
-// }
-//
-// return false;
-// }
-
- /**
- * Return true if the given symbolic name is registered, and can be loaded by WorkbenchContext's
- * "loadModel" method. For further information, see the comment above WorkbenchContext's
- * "registerModel" method.
- */
- public final boolean isRegistered(String symbolicName) {
- if (symbolicName == null)return false;
- return _modelRegistry.containsKey(symbolicName);
- }
-
- /**
- * Given a symbolic name, load the MOF model which is identified by that name.
- *
- * For support of dynamic symbolic names, such as file names, read the comment above the
- * registerModel method.
- *
- * @see registerModel
- */
- public Object loadModel(String symbolicName) {
- return loadModel(symbolicName, null);
- }
-
- /**
- * Given a symbolic name, load the MOF model which is identified by that name.
- *
- * For support of dynamic symbolic names, such as file names, read the comment above the
- * registerModel method.
- *
- * @see registerModel
- */
- public Object loadModel(String symbolicName, Object[] parms) {
- try {
- Method loader = _modelRegistry.get(symbolicName);
- if (loader == null)return null;
-
- return loader.invoke(this, parms);
- } catch (IllegalAccessException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return null;
- } catch (NullPointerException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- } catch (ExceptionInInitializerError e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- }
-
- public Object loadRuleGroup() {
- return new Integer(getRuleGroup()); // have to wrap the int in an Integer because can't cast
- // an int to an Object
- }
-
- /**
- * This method should be used only by the validation framework. This method will be called by
- * ValidationOperation, before the IValidator's validate method is called, to set the group of
- * rules which the IValidator should check.
- */
- public void setRuleGroup(int rg) {
- _ruleGroup = rg;
- }
-
- /**
- * Register a load method for a symbolic name. A load method is defined as a method which takes
- * no parameters and returns a RefObject.
- *
- * Every subclass of WorkbenchContext, for every static type of symbolic name which it supports,
- * should call registerModel. For IWorkbenchHelpers which support dynamic symbolic names, such
- * as file names, each IWorkbenchContext should override the "loadModel" method. Their
- * "loadModel" should first call this class' "isRegistered" method to see if they're dealing
- * with a static symbolic name, or a dynamic one. If the symbolic name is registered, the
- * child's "loadModel" method should just return the result of WorkbenchContext's "loadModel"
- * method. Otherwise, it should return the result based on its own processing.
- *
- * When this method is called, the load method identified by loadMethodName is located & stored
- * for future retrieval by the "loadModel" method. When the IValidator calls "loadModel" with a
- * symbolic name, the java.lang.reflect.Method which was loaded by this method is invoked, and
- * the result (RefObject) returned by that method is returned by "loadModel".
- *
- * symbolicName must not be null or the empty string. loadMethodName must not be null or the
- * empty string.
- */
- protected final void registerModel(String symbolicName, String loadMethodName) {
- registerModel(symbolicName, loadMethodName, null);
- }
-
- /**
- * Register a load method for a symbolic name. A load method is defined as a method which takes
- * no parameters and returns a RefObject.
- *
- * Every subclass of WorkbenchContext, for every static type of symbolic name which it supports,
- * should call registerModel. For IWorkbenchHelpers which support dynamic symbolic names, such
- * as file names, each IWorkbenchContext should override the "loadModel" method. Their
- * "loadModel" should first call this class' "isRegistered" method to see if they're dealing
- * with a static symbolic name, or a dynamic one. If the symbolic name is registered, the
- * child's "loadModel" method should just return the result of WorkbenchContext's "loadModel"
- * method. Otherwise, it should return the result based on its own processing.
- *
- * When this method is called, the load method identified by loadMethodName is located & stored
- * for future retrieval by the "loadModel" method. When the IValidator calls "loadModel" with a
- * symbolic name, the java.lang.reflect.Method which was loaded by this method is invoked, and
- * the result (RefObject) returned by that method is returned by "loadModel".
- *
- * symbolicName must not be null or the empty string. loadMethodName must not be null or the
- * empty string.
- */
- protected final void registerModel(String symbolicName, String loadMethodName, Class[] parms) {
- Method method = getMethod(loadMethodName, parms);
- if (method == null) {
- if (Tracing.isLogging()) {
- StringBuffer buffer = new StringBuffer("WorkbenchContext-01: load method "); //$NON-NLS-1$
- buffer.append(loadMethodName);
- buffer.append("("); //$NON-NLS-1$
- for (int i = 0; (parms != null) && (i < parms.length); i++) {
- buffer.append(parms[i]);
- }
- buffer.append(") must exist. " + getClass().getName() + " cannot support model " + symbolicName); //$NON-NLS-1$ //$NON-NLS-2$
-
- Tracing.log(buffer);
- }
- } else {
- _modelRegistry.put(symbolicName, method);
- }
- }
-
- /**
- * Whether full or incremental validation is running, this method will be called, for every
- * IResource which is filtered in by the IValidator, so that the IValidationContext can receive
- * notification that one of the resources, which validation will run on, is being filtered in.
- */
- public void registerResource(IResource resource) {
- // default: do nothing
- }
-
- /**
- * This method is called by the Validation Framework, to initialize the IWorkbenchContext so that
- * it can gather information from the current project.
- *
- * If an IWorkbenchContext delegates some model loading to another IWorkbenchContext, this method
- * should be overriden so that the delegatee IWorkbenchContext is initialized with the IProject.
- */
- public final void setProject(IProject project) {
- _project = project;
-
- if (project != null) {
- // Project will be set back to null once the validation of the project is complete.
- initialize();
- }
- }
-
- /**
- * Notifies this IWorkbenchContext that the Validation Framework is shutting down. There will be
- * calls to closing(IProject) and possibly deleting(IProject) following this call, but the
- * resources may already be closed by the time that those methods are called, so EVERYTHING
- * should be cleaned up in this method. The parameter passed in is the project which is about to
- * shut down. This method will be called once for every IProject in the workbench. The IProject
- * may, or may not, be closed.
- */
- public void shutdown() {
- // Default is to assume that no resources were allocated; therefore,
- // no cleanup needs to be done.
- shutdown(getProject());
- }
-
- /**
- * Notifies this IWorkbenchContext that the Validation Framework is shutting down. There will be
- * calls to closing(IProject) and possibly deleting(IProject) following this call, but the
- * resources may already be closed by the time that those methods are called, so EVERYTHING
- * should be cleaned up in this method. The parameter passed in is the project which is about to
- * shut down. This method will be called once for every IProject in the workbench. The IProject
- * may, or may not, be closed.
- *
- * @deprecated Override shutdown() instead, and use getProject()
- */
- public void shutdown(IProject project) {
- // Default is to assume that no resources were allocated; therefore,
- // no cleanup needs to be done.
- }
-
- public String getTargetObjectName(Object object) {
- return null;
- }
-
- public String[] getURIs() {
- String[] uris = new String[validationFileURIs.size()];
- validationFileURIs.toArray(uris);
- return uris;
- }
-
- /**
- * @return Returns the validationFileURIs.
- */
- public List<String> getValidationFileURIs() {
- return validationFileURIs;
- }
-
- /**
- * @param validationFileURIs The validationFileURIs to set.
- */
- public void setValidationFileURIs(List<String> validationFileURIs) {
- this.validationFileURIs = validationFileURIs;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchFileDelta.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchFileDelta.java
deleted file mode 100644
index 0953e0a..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchFileDelta.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.core.FileDelta;
-import org.eclipse.wst.validation.internal.core.IFileDelta;
-
-
-/**
- * Eclipse-specific implementation of FileDelta which also caches the IResource which is associated
- * with the FileDelta.
- */
-public class WorkbenchFileDelta extends FileDelta {
- private IResource _resource;
- private Object _changedResource;
-
- private static final String FILE_NAME = "FILE NAME:"; //$NON-NLS-1$
- private static final String DELTA = " DELTA: "; //$NON-NLS-1$
- private static final String RESOURCE = " RESOURCE: "; //$NON-NLS-1$
- private static final String OBJECT = " OBJECT: "; //$NON-NLS-1$
-
- public WorkbenchFileDelta(String aFileName, int aFileDelta, IResource resource) {
- super(aFileName, aFileDelta);
- setResource(resource);
- setObject(resource);
- }
-
- public WorkbenchFileDelta(Object changedResource) {
- super(null, IFileDelta.CHANGED);
- setObject(changedResource);
- }
-
- public IResource getResource() {
- return _resource;
- }
-
- public void setResource(IResource resource) {
- _resource = resource;
- }
-
- /**
- * If the changed resource is not an IResource (e.g., a RefObject), then the getFileName method
- * will return null, getResource will return null, and this method will return the object. If
- * the changedResource is an IResource, then both this method and the getResource method will
- * return the resource.
- */
- public Object getObject() {
- return _changedResource;
- }
-
- /**
- * @see getObject()
- */
- public void setObject(Object o) {
- _changedResource = o;
- }
-
- public String toString() {
- StringBuffer buffer = new StringBuffer(FILE_NAME);
- buffer.append(String.valueOf(getFileName()));
- buffer.append(DELTA);
- buffer.append(getDeltaType());
- buffer.append(RESOURCE);
- buffer.append(String.valueOf(getResource()));
- buffer.append(OBJECT);
- buffer.append(String.valueOf(getObject()));
- return buffer.toString();
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java
deleted file mode 100644
index f9162f3..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java
+++ /dev/null
@@ -1,597 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * IValidator instances will interact with an instance of this class, but should never cast that
- * IReporter instance to WorkbenchReporter.
- * <p>
- * This class handles interaction between the user and the IValidator in the eclipse workbench
- * environment.
- * <p>
- * This class must not be called outside of an IWorkspaceRunnable or IRunnableWithProgress. Many
- * resource deltas can be generated by the methods in this class.
- * <p>
- * Only the validation framework may instantiate or alter instances of this class.
- */
-
-public class WorkbenchReporter implements IReporter {
- public static final String DEFAULT_LOCATION = ""; //$NON-NLS-1$
- public static final int NO_MESSAGE_LIMIT = -1;
-
- private IProject _project;
- private IProgressMonitor _monitor;
-
- public static void addMessage(IResource resource, Class messageOwner, IMessage message) {
- addMessage(resource, messageOwner, null, message);
- }
-
- public static void addMessage(IResource resource, Class messageOwner, ClassLoader cl, IMessage message) {
- addMessage(resource, messageOwner, cl, message, null, ""); //$NON-NLS-1$
- }
-
- public static void addMessage(IResource resource, Class clazz, IMessage message,
- String targetObjectName, String location) {
- addMessage(resource, clazz, null, message, targetObjectName, location);
- }
-
- public static void addMessage(IResource resource, Class clazz, IMessage message,
- String targetObjectName, String location,String markerId) {
- addMessage(resource, clazz, null, message, targetObjectName, location,markerId);
- }
-
- public static void addMessage(IResource resource, Class clazz, ClassLoader cl, IMessage message,
- String targetObjectName, String location) {
- if ((clazz == null) || (message == null) || (resource == null))return;
-
- if (cl == null)cl = clazz.getClassLoader();
-
- addMessage(resource, getUniqueId(clazz), cl, message, targetObjectName, location);
- }
-
- public static void addMessage(IResource resource, Class clazz, ClassLoader cl, IMessage message,
- String targetObjectName, String location, String markerId) {
- if ((clazz == null) || (message == null) || (resource == null))return;
-
- if (cl == null)cl = clazz.getClassLoader();
-
- addMessage(resource, getUniqueId(clazz), cl, message, targetObjectName, location, markerId);
- }
-
- public static void addMessage(IResource resource, String messageOwnerId, ClassLoader cl, IMessage message) {
- addMessage(resource, messageOwnerId, cl, message, null, ""); //$NON-NLS-1$
- }
-
- public static void addMessage(IResource resource, String messageOwnerId, ClassLoader cl,
- IMessage message, String targetObjectName, String location) {
- int severity = message.getSeverity();
- try {
- TaskListUtility.addTask(messageOwnerId, resource, location, message.getId(),
- message.getText(cl), severity,targetObjectName, message.getGroupName(),
- message.getOffset(), message.getLength());
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public static void addMessage(IResource resource, String messageOwnerId, ClassLoader cl,
- IMessage message, String targetObjectName, String location, String markerId) {
- int severity = message.getSeverity();
- try {
- TaskListUtility.addTask(messageOwnerId, resource, location, message.getId(),
- message.getText(cl), severity,markerId,targetObjectName, message.getGroupName(),
- message.getOffset(), message.getLength());
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public static void removeAllMessages(IResource resource, IValidator validator) {
- if (resource == null)return;
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- if (vmd == null) {
- // log
- return;
- }
-
- String[] validatorNames = vmd.getValidatorNames();
- try {
- TaskListUtility.removeAllTasks(resource, validatorNames);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Should not be called outside of the validation
- * framework.
- */
- public static void removeAllMessages(IResource resource, IValidator validator, Object object) {
- if (resource == null) {
- return;
- }
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- if (vmd == null) {
- // log
- return;
- }
-
- String[] validatorNames = vmd.getValidatorNames();
- try {
- //String targetObjectName = getTargetObjectName(vmd.getHelper(resource.getProject()), object);
- String targetObjectName = getTargetObjectName( getHelper( resource.getProject(), validator), object);
- removeAllMessages(resource, validatorNames, targetObjectName);
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public static void removeAllMessages(IResource resource, String[] validatorNames, String targetObjectName) {
- try {
- TaskListUtility.removeAllTasks(resource, validatorNames, targetObjectName);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public static void removeMessageSubset(IResource resource, Class messageOwner, String groupName) {
- // Since the addMessage(Class, IMessage) is defaulted to the IProject,
- // remove the message subsets from the IProject
- removeMessageSubset(resource, new String[]{getUniqueId(messageOwner)}, null, groupName);
- }
-
- public static void removeMessageSubset(IResource resource, String messageOwnerId, String groupName) {
- // Since the addMessage(Class, IMessage) is defaulted to the IProject,
- // remove the message subsets from the IProject
- removeMessageSubset(resource, new String[]{messageOwnerId}, null, groupName);
- }
-
- public static void removeMessageSubset(IResource resource, String[] ownerId, String targetObjectName, String groupName) {
- try {
- TaskListUtility.removeTaskSubset(resource, ownerId, targetObjectName, groupName);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Given a Class instance, return the id that uniquely identifies this instance. (Used as the
- * value for the message owner.)
- */
- public static String getUniqueId(Class clazz) {
- if (clazz == null) {
- return ""; //$NON-NLS-1$
- }
-
- // It is safe to load this String into the constants space because
- // the Class name will not change during WSAD's session.
- return clazz.getName().intern();
- }
-
- public static String getUniqueId(IValidator validator) {
- if (validator == null) {
- return ""; //$NON-NLS-1$
- }
- return getUniqueId(validator.getClass());
- }
-
- public static String getLocation(IWorkbenchContext helper, IMessage message) {
- if (message == null) {
- return getLocationText(helper, null);
- }
- int lineNo = message.getLineNumber();
- if (lineNo == IMessage.LINENO_UNSET) {
- return getLocationText(helper, message.getTargetObject());
- }
- return String.valueOf(lineNo);
- }
-
- public static String getLocationText(IWorkbenchContext helper, Object targetObject) {
- String location = null;
- try {
- location = helper.getLocation(targetObject);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- if ((location == null) || (location.trim().equals(""))) { //$NON-NLS-1$
- location = DEFAULT_LOCATION;
- }
- return location;
- }
-
- // TODO This method was made protected for the SaberReporter. Make this method private again
- // once the framework supports IMarker.PRIORITY.
- protected static String getTargetObjectName(IWorkbenchContext helper, IMessage message) {
- if (message == null) {
- return getTargetObjectName(helper, null);
- }
- return getTargetObjectName(helper, message.getTargetObject());
- }
-
- private static String getTargetObjectName(IWorkbenchContext helper, Object targetObject) {
- String targetObjectName = null;
- try {
- targetObjectName = helper.getTargetObjectName(targetObject);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- return targetObjectName;
- }
-
- // TODO This method was made "protected" for the SaberReporter. Do not call this method! This
- // method will be made private once support for marker PRIORITY attributes is in the framework.
- protected static ValidatorMetaData getVMD(IValidator validator) throws IllegalArgumentException {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- if (vmd == null) {
- throw new IllegalArgumentException(); // already logged in the ValidationRegistryReader
- }
- return vmd;
- }
-
- /**
- * @deprecated. The IValidationContext will be ignored.
- */
- public WorkbenchReporter(IWorkbenchContext helper, IProgressMonitor monitor, IProject project) {
- this(project, monitor);
- }
-
- /**
- * An IReporter instance must exist for each Runnable in order for the validator to report
- * status messages. IProject and IProgressMonitor must not be null.
- */
- public WorkbenchReporter(IProject project, IProgressMonitor monitor) {
- super();
- _project = project;
- _monitor = monitor;
- }
-
- // TODO This method was made protected for the SaberReporter. Make it private again once the
- // framework support IMarker.PRIORITY.
- protected IWorkbenchContext getHelper(IValidator validator) throws InstantiationException, IllegalArgumentException {
- ValidatorMetaData vmd = getVMD(validator);
- IWorkbenchContext helper = vmd.getHelper( getProject(), validator );
- return helper;
- }
-
- protected static IWorkbenchContext getHelper(IProject project, IValidator validator) throws InstantiationException, IllegalArgumentException {
- ValidatorMetaData vmd = getVMD(validator);
- IWorkbenchContext helper = vmd.getHelper( project, validator );
- return helper;
- }
-
- public IProject getProject() {
- return _project;
- }
-
- public IProgressMonitor getProgressMonitor() {
- return _monitor;
- }
-
- /**
- * This method will never return null.
- */
- private IResource getDefaultResource() {
- IResource prj = getProject();
- if (prj != null) {
- return prj;
- }
- // return the workspace root
- return ResourcesPlugin.getWorkspace().getRoot();
- }
-
- /**
- * When an IMessage is created, the user has the option of creating it with a target object.
- * That target object is used to identify which object has the problem identified by the
- * IMessage. This method, given the target object, returns the IResource which represents that
- * object in the workbench.
- */
- public IResource getMessageResource(IValidator validator, Object object) {
- if (validator == null) {
- return null;
- }
-
- IResource resource = null;
- if (object != null) {
- if (object instanceof IResource) {
- resource = (IResource) object;
- } else if (object instanceof WorkbenchFileDelta) {
- // resource may be null if the WorkbenchFileDelta was constructed from an Object
- // instead of an IResource
- resource = ((WorkbenchFileDelta) object).getResource();
- }
-
- if (resource == null) {
- try {
- IWorkbenchContext helper = getHelper(validator);
- resource = helper.getResource(object);
- } catch (InstantiationException e) {
- try {
- // Unlikely that an exception will be thrown, because this method is
- // invoked by the validator, and if the validator is invoked, it's likely
- // that the helper has been loaded too.
- ValidatorMetaData vmd = getVMD(validator);
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
-
- ValidationPlugin.getPlugin().handleException(e);
- } catch (IllegalArgumentException e2) {
- // Even the IValidator is invalid. Unfortunately, can't disable the
- // validator because it can't be found by the registry reader.
- // Log the reason for the disabled validator
- ValidationPlugin.getPlugin().handleException(e2);
- }
- } catch (IllegalArgumentException e) {
- // Even the IValidator is invalid. Unfortunately, can't disable the
- // validator because it can't be found by the registry reader.
- // Log the reason for the disabled validator
- ValidationPlugin.getPlugin().handleException(e);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- if (resource == null) {
- resource = getDefaultResource();
- }
-
- if (!resource.exists()) {
- resource = getDefaultResource();
- }
-
- return resource;
- }
-
- /**
- * Show a message to the user indicating which subtask is currently being processed. <br>
- * <br>
- * <code>message</code> may not be null or the empty string (""). <br>
- */
- public void displaySubtask(String message) {
- if ((message == null) || (message.equals(""))) { //$NON-NLS-1$
- return;
- }
-
- if (getProgressMonitor() != null) {
- getProgressMonitor().subTask(message);
- } else {
- System.out.println(message);
- }
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#getMessages()
- */
- public List getMessages() {
- return null;
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#isCancelled()
- */
- public boolean isCancelled() {
- if (getProgressMonitor() != null) {
- return getProgressMonitor().isCanceled();
- }
- return false;
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#addMessage(IValidator, IMessage)
- */
- public void addMessage(IValidator validator, IMessage message) {
- IResource resource = getMessageResource(validator, message.getTargetObject());
- IWorkbenchContext helper = null;
- ValidatorMetaData vmd = getVMD(validator);
- try {
- helper = getHelper(validator);
- } catch (InstantiationException e) {
- try {
- // Unlikely that an exception will be thrown, because this method is
- // invoked by the validator, and if the validator is invoked, it's likely
- // that the helper has been loaded too
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- return;
- } catch (IllegalArgumentException exc2) {
- logDisabledValidator(exc2);
- return;
- }
- } catch (IllegalArgumentException exc) {
- logDisabledValidator(exc);
- return;
- }
-
- if (resource == null) {
- if (Tracing.isLogging()) {
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_EXC_INVALID_RESOURCE),
- new Object[]{message.getText(), getTargetObjectName(helper, message)});
- Tracing.log("WorkbenchReporter-01: ", result); //$NON-NLS-1$
- }
- return;
- }
-
- if( validator instanceof IValidatorJob ){
- cacheMessage( (IValidatorJob)validator, resource, validator.getClass(), message,
- getTargetObjectName(helper, message), getLocation(helper, message), getMarkerId(vmd, message) );
- }else
- addMessage(resource, validator.getClass(), message, getTargetObjectName(helper, message),
- getLocation(helper, message),getMarkerId(vmd,message));
- }
-
- private String getMarkerId(ValidatorMetaData vmd, IMessage message) {
- if (vmd.getMarkerIds() != null) {
- if (vmd.getMarkerIds().length == 1)
- return vmd.getMarkerIds()[0];
- else if (vmd.getMarkerIds().length > 1) {
- String messageMarkerId = message.getMarkerId();
- if (messageMarkerId != null && messageMarkerId.length() > 0) {
- String firstMarkerId = vmd.getMarkerIds()[0];
- String pluginQualifier = firstMarkerId.substring(0, firstMarkerId.lastIndexOf(".")); //$NON-NLS-1$
- String qualifiedMessageMarkerId = null;
- if (messageMarkerId.indexOf(pluginQualifier) == -1)
- qualifiedMessageMarkerId = pluginQualifier + "." + messageMarkerId; //$NON-NLS-1$
- else
- qualifiedMessageMarkerId = messageMarkerId;
- if (Arrays.asList(vmd.getMarkerIds()).contains(qualifiedMessageMarkerId))
- return qualifiedMessageMarkerId;
- }
- }
- }
- return null;
- }
-
- private void logDisabledValidator(IllegalArgumentException e) {
- // Even the IValidator is invalid. Unfortunately, can't disable the
- // validator because it can't be found by the registry reader.
- // Log the reason for the disabled validator
- ValidationPlugin.getPlugin().handleException(e);
- return;
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#displaySubtask(IValidator, IMessage)
- */
- public void displaySubtask(IValidator validator, IMessage message) {
- if ((message == null) || (message.equals(""))) { //$NON-NLS-1$
- return;
- }
-
- displaySubtask(message.getText(validator.getClass().getClassLoader()));
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#removeAllMessages(IValidator)
- */
- public void removeAllMessages(IValidator validator) {
- if (validator == null) { // getHelper could be null if the user cancelled before something
- // was fully initialized
- return;
- }
-
- removeAllMessages(validator, null);
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#removeAllMessages(IValidator, Object)
- */
- public void removeAllMessages(IValidator validator, Object object) {
- IResource resource = getMessageResource(validator, object);
- if (resource == null) {
- return;
- }
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- if (vmd == null) {
- return;
- }
-
- IWorkbenchContext helper = null;
- try {
- //helper = vmd.getHelper(resource.getProject());
- helper = getHelper(validator);
- } catch (InstantiationException e) {
- // Unlikely that an exception will be thrown, because this method is
- // invoked by the validator, and if the validator is invoked, it's likely
- // that the helper has been loaded too.
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
-
- return;
- }
-
- String[] validatorNames = vmd.getValidatorNames();
- String targetObjectName = getTargetObjectName(helper, object);
- removeAllMessages(resource, validatorNames, targetObjectName);
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#removeMessageSubset(IValidator, Object, String)
- */
- public void removeMessageSubset(IValidator validator, Object obj, String groupName) {
- IResource resource = getMessageResource(validator, obj);
- if (resource == null) {
- return;
- }
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- if (vmd == null) {
- return;
- }
-
-
- IWorkbenchContext helper = null;
- try {
- //helper = vmd.getHelper(resource.getProject());
- helper = getHelper( resource.getProject(), validator );
- }
- catch (InstantiationException e) {
- // Unlikely that an exception will be thrown, because this method is
- // invoked by the validator, and if the validator is invoked, it's likely
- // that the helper has been loaded too.
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
-
- return;
- }
-
- String[] validatorNames = vmd.getValidatorNames();
- String targetObjectName = getTargetObjectName(helper, obj);
- removeMessageSubset(resource, validatorNames, targetObjectName, groupName);
- }
-
- private static void cacheMessage( IValidatorJob validator,
- IResource resource, Class clazz, IMessage message,
- String targetObjectName, String location, String markerId ){
-
- if ((clazz == null) || (message == null) || (resource == null))return;
-
- ClassLoader cl = clazz.getClassLoader();
- String text = message.getText(cl);
- MessageInfo msgInfo = new MessageInfo(getUniqueId(clazz), resource, location,
- text, targetObjectName, markerId, message );
-
- ValidatorManager.getManager().cacheMessage( validator, msgInfo );
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationHelperRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationHelperRegistryReader.java
deleted file mode 100644
index 887f7cd..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationHelperRegistryReader.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.plugin;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.internal.IProjectValidationHelper;
-
-public class ValidationHelperRegistryReader {
-
- /** validationHelper - extension point name. */
- public static final String VALIDATION_HELPER = "validationHelper"; //$NON-NLS-1$
-
- static final String ATT_ID = "id"; //$NON-NLS-1$
-
- /** helperClass - class that implements the extension. */
- static final String ATT_HELPER_CLASS = "helperClass"; //$NON-NLS-1$
-
- private static ValidationHelperRegistryReader INSTANCE = null;
- private List<IProjectValidationHelper> _validationHelpers;
-
- public ValidationHelperRegistryReader() {
- }
-
- public static ValidationHelperRegistryReader getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new ValidationHelperRegistryReader();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- /**
- * Read the extension point and parse it.
- */
- public void readRegistry() {
- IExtensionPoint point = Platform.getExtensionRegistry()
- .getExtensionPoint(ValidationPlugin.PLUGIN_ID, VALIDATION_HELPER);
- if (point == null)return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- internalReadElement(elements[i]);
- }
- }
-
- private void internalReadElement(IConfigurationElement element) {
- boolean recognized = this.readElement(element);
- if (!recognized) {
- logError(element, "Error processing extension: " + element); //$NON-NLS-1$
- }
- }
-
- /*
- * Logs the error in the desktop log using the provided text and the information in the configuration element.
- */
- protected void logError(IConfigurationElement element, String text) {
- IExtension extension = element.getDeclaringExtension();
- StringBuffer buf = new StringBuffer();
- buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
- buf.append("\n" + text); //$NON-NLS-1$
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, buf.toString());
- }
-
- private List<IProjectValidationHelper> getValidationHelpers() {
- if (_validationHelpers == null)
- _validationHelpers = new ArrayList<IProjectValidationHelper>();
- return _validationHelpers;
- }
-
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(VALIDATION_HELPER))
- return false;
- IProjectValidationHelper helper = null;
- try {
- helper = (IProjectValidationHelper) element.createExecutableExtension(ATT_HELPER_CLASS);
- getValidationHelpers().add(helper);
- return true;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
-
- public IProjectValidationHelper getValidationHelper() {
- if (getValidationHelpers().isEmpty())return null;
- return getValidationHelpers().get(0);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationPlugin.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationPlugin.java
deleted file mode 100644
index 7adcc49..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationPlugin.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.plugin;
-
-import org.eclipse.core.resources.IResourceChangeEvent;
-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.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.DependencyIndex;
-import org.eclipse.wst.validation.internal.EventManager;
-import org.eclipse.wst.validation.internal.ProjectUnavailableError;
-import org.eclipse.wst.validation.internal.ResourceUnavailableError;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValOperationManager;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * How does this plug-in get activated? There are many other plug-ins that depend on this plug-in, so there are
- * many paths that will activate it. One common path is the J2EE perspective. If the J2EE plug-in start method, they
- * reference a class in this plug-in, which activates the plug-in. For that case this plug-in will be active even before
- * the workbench is up.
- */
-public class ValidationPlugin extends Plugin {
- public static final String VALIDATION_PROP_FILE_NAME = "validate_base"; //$NON-NLS-1$
-
- /** org.eclipse.wst.validation - the plug-in id */
- public static final String PLUGIN_ID = "org.eclipse.wst.validation"; //$NON-NLS-1$
- private static ValidationPlugin _plugin;
- private static Message _message;
- public static final String VALIDATION_BUILDER_ID = PLUGIN_ID + ".validationbuilder"; //$NON-NLS-1$// plugin id of the validation builder
- public static final String VALIDATOR_EXT_PT_ID = "validator"; //$NON-NLS-1$// extension point declaration of the validator
-
- public ValidationPlugin() {
- super();
- if (_plugin == null)_plugin = this;
- }
-
- /**
- * Answer the name of the bundle's property file.
- *
- * @deprecated Use getBundlePropertyFileName() instead.
- */
- public static String getBundleName() {
- return getBundlePropertyFileName();
- }
-
- /**
- * Answer the name of the bundle's property file.
- */
- public static String getBundlePropertyFileName() {
- return VALIDATION_PROP_FILE_NAME;
- }
-
- public static Message getMessage() {
- if (_message == null) {
- _message = new Message();
- _message.setBundleName(getBundlePropertyFileName());
- }
- // clear the message for reuse
- _message.setId(null);
- _message.setParams(null);
- _message.setTargetObject(null);
- _message.setGroupName(null);
- _message.setSeverity(IMessage.LOW_SEVERITY);
- return _message;
- }
-
- public static ValidationPlugin getPlugin() {
- return _plugin;
- }
-
- public static boolean isActivated() {
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- return bundle.getState() == Bundle.ACTIVE;
- return false;
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- ResourcesPlugin.getWorkspace().addResourceChangeListener(EventManager.getManager(),
- IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE |
- IResourceChangeEvent.POST_BUILD | IResourceChangeEvent.PRE_BUILD | IResourceChangeEvent.POST_CHANGE);
-
- DependencyIndex di = (DependencyIndex)ValidationFramework.getDefault().getDependencyIndex();
- IWorkspace ws = ResourcesPlugin.getWorkspace();
- ws.addSaveParticipant(this, di);
- ws.addResourceChangeListener(ValOperationManager.getDefault(),
- IResourceChangeEvent.POST_BUILD | IResourceChangeEvent.PRE_BUILD);
-
- }
-
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- ResourcesPlugin.getWorkspace().removeResourceChangeListener( EventManager.getManager() );
- ResourcesPlugin.getWorkspace().removeResourceChangeListener( ValOperationManager.getDefault() );
- EventManager.getManager().shutdown();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- /**
- * Write this exception to the log.
- * <p>
- * We are in the transition of moving to a new approach for localized messages. This is the new
- * approach for exceptions.
- *
- * @param e the throwable, this can be null in which case it is a nop.
- */
- public void handleException(Throwable e){
- if (e == null)return;
- Status status = new Status(IStatus.ERROR, PLUGIN_ID, e.getLocalizedMessage(), e);
- getLog().log(status);
- }
-
- public void handleProjectUnavailableError(ProjectUnavailableError e){
- if (Tracing.isLogging())handleException(e);
- }
-
- public void handleResourceUnavailableError(ResourceUnavailableError e){
- if (Tracing.isLogging())handleException(e);
- }
-
- /**
- * Write a message into the log.
- *
- * We are in the transition of moving to a new approach for localized messages. This is the new
- * approach for exceptions.
- *
- * @param severity message severity, see IStaus
- * @param message a localized message
- */
- public void logMessage(int severity, String message){
- Status status = new Status(severity, PLUGIN_ID, message);
- getLog().log(status);
-
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/provisional/ValidationFactory.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/provisional/ValidationFactory.java
deleted file mode 100644
index caa4614..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/provisional/ValidationFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.provisional;
-
-import org.eclipse.wst.validation.internal.ValidationFactoryImpl;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * This interface provides a way to access an instance of the ValidationFactoryImpl
- * instance, an internal implementation that provides access to some of the internal state
- * of validators.
- *
- * @plannedfor 1.0
- *
- * [issue: LM - 2 issues.
- * 1. I don't think the name 'factory' provides a good description of
- * this interface. Unless I'm mistaken the ValidationFactory doesn't
- * actually create validators but simply returns existing validators.
- * Looking at the implementation this is currently the case. I suggest
- * renaming this to ValidatorRegistry or something similar.
- * 2. I think the common way for creating a factory is to create a class
- * with a static method such as getFactory. If this is to be a factory
- * it should probably be structured as per the convention.]
- */
-public interface ValidationFactory {
-
- ValidationFactory instance = ValidationFactoryImpl.getInstance();
- /**
- * This api returns the IValidator given the validatorUniqueName id. The unique
- * id name is the class name that is defined in the class name element in the
- * plugin extension of the validator.
- * @param validatorUniqueId
- * @return IValidator
- * @plannedfor WTP 1.0
- */
- public IValidator getValidator(String validatorUniqueId) throws InstantiationException;
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/EmptySchedulingRule.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/EmptySchedulingRule.java
deleted file mode 100644
index dacb599..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/EmptySchedulingRule.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-public class EmptySchedulingRule implements ISchedulingRule {
-
- public boolean contains(ISchedulingRule rule)
- {
- return rule == this;
- }
-
- public boolean isConflicting(ISchedulingRule rule) {
- return rule == this;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/FileDelta.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/FileDelta.java
deleted file mode 100644
index 04e6ba7..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/FileDelta.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-
-
-/**
- * <p>
- * Default implementation of the IFileDelta
- * </p>
- *
- * @see org.eclipse.wst.validation.internal.core.IFileDelta
- *
- * [issue: CS - is there a reason that we need to expose this impl class as an API?
- * It would seem better to only expose IFileDelta. I can't think of a reason where
- * a typical client would need to create one of these.]
- */
-public class FileDelta implements IFileDelta {
- private int fileDelta;
- private String fileName;
-
- /**
- * <p>
- * Creates a default instance of the FileDelta
- * </p>
- */
- public FileDelta() {
- super();
- }
-
- /**
- * <p>
- * Constructor is used to initialize the fields.
- * </p>
- *
- * @param aFileName specifies the file name
- * @param aFileDelta specifies the
- */
- public FileDelta(String aFileName, int aFileDelta) {
- fileName = aFileName;
- fileDelta = aFileDelta;
- }
-
- /**
- * @see IFileDelta#getDeltaType()
- */
- public int getDeltaType() {
- return fileDelta;
- }
-
- /**
- * @see IFileDelta#getFileName()
- */
- public String getFileName() {
- return fileName;
- }
-
- /**
- * <p>
- * Set the flag which indicates the type of change that the file
- * has undergone.
- * </p>
- */
- public void setDeltaType(int deltaType) {
- fileDelta = deltaType;
- }
-
- /**
- * <p>
- * Set the name of the file which has changed.
- * </p>
- */
- public void setFileName(String aFileName) {
- fileName = aFileName;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IFileDelta.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IFileDelta.java
deleted file mode 100644
index b848eed..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IFileDelta.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-/**
- * <p>
- * This interface is used, for incremental validation, to encapsulate the change
- * status of a resource. IFileDelta contains the name of the file which has
- * changed, and a flag which indicates the type of change which has occurred.
- *
- * @plannedfor 1.0
- * </p>
- * [issue: LM - From speaking with Vijay the name IFileDelta doesn't really capture
- * what this interface is for. Validation may occur of files, it may occur on resources,
- * or it may occur on something more abstract simply known as an artifact. The delta part
- * of the name also seems misleading as this interface doesn't provide the delta but
- * rather provides the type of change. I suggest renaming this interface to IModifiedArtifact
- * or something along those lines to better capture its use. ]
- */
-public interface IFileDelta {
-
- /** 1 - the file has been added */
- int ADDED = 1;
-
- /** 2 - the file has been changed */
- int CHANGED = 2;
-
- /** 3 - the file has been deleted */
- int DELETED = 3;
-
- /**
- * <p>
- * Returns the flag which indicates the type of change which has occurred:
- * IFileDelta.ADDED, IFileDelta.CHANGED, or IFileDelta.DELETED.
- * </p>
- * @return returns the delta type.
- * @plannedfor WTP 1.0
- *
- * [issue: LM - From my experience a validator simply needs to know what artifact needs
- * to be validated. Can you provide a use case where the type of change is needed for
- * validation? ]
- */
- int getDeltaType();
-
- /**
- * <p>
- * Returns the name of the eclipse resource file which has changed. The return value must not be
- * null or the empty string ("").
- * </p>
- * @return returns the file name.
- * @plannedfor WTP 1.0
- *
- * [issue: LM - Following my comments above this method should be renamed to getArtifactName or
- * something that follows along with the interface rename. ]
- */
- String getFileName();
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IMessageAccess.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IMessageAccess.java
deleted file mode 100644
index af85f64..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IMessageAccess.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-
-import java.util.List;
-import java.util.Locale;
-
-
-/**
- * <p>
- * Interface which can be used to access messages which are stored within a reporter which retains
- * its message history.
- * </p>
- *
- * [issue: CS - This interface seems like overkill. I'd think that an IReport should simply have a getMessages() method.
- * I think MessageFiltering should take place at the 'display' level and not at this level of the API.]
- */
-public interface IMessageAccess {
- /**
- * @param filter
- * A filter which specifies a subset of messages to retrieve. null specifies, "all
- * messages".
- * @return List list of messages related to the target object
- */
- abstract List getMessages(MessageFilter filter);
-
- /**
- * @param filter
- * A filter which specifies a subset of messages to retrieve. null specifies, "all
- * messages".
- * @param locale
- * The target local to translate the messages into. null specifies, "use default
- * locale".
- * @return List a list of messages related to the target object, translated into the specified
- * locale.
- */
- abstract List getMessagesAsText(MessageFilter filter, Locale targetLocale);
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/Message.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/Message.java
deleted file mode 100644
index 8998112..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/Message.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * <p>
- * Default implementation of the IMessage interface, provided for the convenience of the
- * IValidators. If an IValidator needs to run in both AAT and WSAD then this IMessage implementation
- * should be used; if the IValidator runs in WSAD alone, the WSAD LocalizedMessage may be used in
- * place of this implementation.
- * <p>
- * @see org.eclipse.wst.validation.internal.provisional.core.IMessage
- *
- * [issue: CS - I'd suggest splitting this class into Message and BundleMessage (where the latter inherits
- * from the former. We have many messages that come (from xerces) pretranslated and don't require 'bundle'
- * related fields and methods. Splitting this class would make it easier to understand where bundle related
- * function is coming into play. Below I've listed out what would go into BundleMessage to demonstrate how
- * we can simplify the 'Message' class by factoring out the bundle related details.
- *
- * Message
- * private Object targetObject = null;
- * private String groupName = null;
- * private int lineNumber = IMessage.LINENO_UNSET;
- * private int length = IMessage.OFFSET_UNSET;
- * private int offset = IMessage.OFFSET_UNSET;
- *
- *
- * BundleMessage
- * private String id = null;
- * private String[] params = null;
- * private String bundleName = null;
- *
- * - getId()
- * - getBundle(...)
- * - getBundleName()
- * - getParams()
- * - getText(Locale)
- * - getText(ClassLoader)
- * - getText(Locale, ClassLoader)
- * - setId(String)
- * - setBundleName(String)
- * - setParams(String[])
- * ]
- */
-public class Message implements IMessage {
- private String id;
- private String[] params;
- private int severity = MessageFilter.ANY_SEVERITY;
- private Object targetObject;
- private String bundleName;
- private String groupName;
- private int lineNumber = IMessage.LINENO_UNSET;
- private int length = IMessage.OFFSET_UNSET;
- private int offset = IMessage.OFFSET_UNSET;
- private HashMap<String, Object> messageAttributes;
- private String markerId;
-
- /**
- * <p>
- * Creates a default instance of the Message
- * </p>
- */
- public Message() {
- super();
- }
-
- /**
- * <p>
- * Creates a Message object with bundle name, severity and a unique id
- * </p>
- *
- * @param aBundleName
- * Must not be null or the empty string ("").
- * @param aSeverity
- * Must be one of the severities specified in IMessage.
- * @param anId
- * Must not be null or the empty string ("").
- */
- public Message(String aBundleName, int aSeverity, String anId) {
- this(aBundleName, aSeverity, anId, null, null);
- }
-
- /**
- * <p>
- * Creates a Message object with bundle name, severity, a unique id, and
- * a list of parameters.
- * </p>
- *
- * @param aBundleName
- * Must not be null or the empty string ("").
- * @param aSeverity
- * Must be one of the severities specified in IMessage.
- * @param anId
- * Must not be null or the empty string ("").
- * @param aParams
- * May be null, if there are no parameters in the message.
- */
- public Message(String aBundleName, int aSeverity, String anId, String[] aParams) {
- this(aBundleName, aSeverity, anId, aParams, null);
- }
-
- /**
- * <p>
- * Creates a Message object with bundle name, severity, a unique id, and
- * a list of parameters and the target object.
- * </p>
- *
- * @param aBundleName
- * Must not be null or the empty string ("").
- * @param aSeverity
- * Must be one of the severities specified in IMessage.
- * @param anId
- * Must not be null or the empty string ("").
- * @param aParams
- * May be null, if there are no parameters in the message.
- * @param targetObject
- * May be null, if the message does not pertain to a particular
- * object.
- */
- public Message(String aBundleName, int aSeverity, String anId, String[] aParams, Object aTargetObject) {
- bundleName = aBundleName;
- severity = aSeverity;
- id = anId;
- params = aParams;
- targetObject = aTargetObject;
- }
-
- public Message(String aBundleName, int aSeverity, String anId, String[] aParams, Object aTargetObject, String aGroupName) {
- bundleName = aBundleName;
- severity = aSeverity;
- id = anId;
- params = aParams;
- targetObject = aTargetObject;
- groupName = aGroupName;
- }
-
- /**
- * @return the resource bundle which contains the messages, as identified by
- *
- * @link #getBundleName()
- */
- public ResourceBundle getBundle(Locale locale, ClassLoader classLoader) {
- ResourceBundle bundle = null;
- try {
- if (classLoader == null) {
- bundle = ResourceBundle.getBundle(getBundleName(), locale);
- } else {
- bundle = ResourceBundle.getBundle(getBundleName(), locale, classLoader);
- }
- } catch (MissingResourceException e) {
- //try to load the bundle from the validation framework plugin
- bundle = getFrameworkBundle(locale);
- }
- return bundle;
- }
-
- private ResourceBundle getFrameworkBundle(Locale locale) {
- ResourceBundle bundle = null;
- try {
- bundle = ResourceBundle.getBundle(getBundleName(), locale, this.getClass().getClassLoader());
-
- } catch (MissingResourceException e) {
- e.printStackTrace();
- }
- return bundle;
- }
-
- /**
- * @see IMessage#getBundleName()
- */
- public String getBundleName() {
- return bundleName;
- }
-
- /**
- * @see IMessage#getGroupName()
- */
- public String getGroupName() {
- return groupName;
- }
-
- /**
- * @see IMessage#getId()
- */
- public String getId() {
- return id;
- }
-
- /**
- * @see IMessage#getLength()
- */
- public int getLength() {
- return length;
- }
-
- /**
- * @see IMessage#getLineNumber()
- */
- public int getLineNumber() {
- return lineNumber;
- }
-
- /**
- * @see IMessage#getOffset()
- */
- public int getOffset() {
- return offset;
- }
-
- /**
- * @see IMessage#getParams()
- */
- public String[] getParams() {
- return params;
- }
-
- /**
- * @see IMessage#getSeverity()
- */
- public int getSeverity() {
- return severity;
- }
-
- /**
- * @see IMessage#getTargetObject()
- */
- public Object getTargetObject() {
- return targetObject;
- }
-
- /**
- * @see IMessage#getText()
- */
- public String getText() {
- return getText(Locale.getDefault(), null);
- }
-
- /**
- * @see IMessage#getText(ClassLoader)
- */
- public String getText(ClassLoader classLoader) {
- return getText(Locale.getDefault(), classLoader);
- }
-
- /**
- * @see IMessage#getText(Locale)
- */
- public String getText(Locale locale) {
- return getText(locale, null);
- }
-
- /**
- * @see IMessage#getText(Locale, ClassLoader)
- */
- public java.lang.String getText(Locale locale, ClassLoader classLoader) {
- String message = ""; //$NON-NLS-1$
-
- if (locale == null) {
- return message;
- }
-
- ResourceBundle bundle = getBundle(locale, classLoader);
- if (bundle == null) {
- return message;
- }
-
- try {
- message = bundle.getString(getId());
-
- if (getParams() != null) {
- message = java.text.MessageFormat.format(message, (Object[])getParams());
- }
- } catch (MissingResourceException exc) {
- System.err.println(exc.getMessage());
- System.err.println(getId());
- } catch (NullPointerException exc) {
- System.err.println(exc.getMessage());
- System.err.println(getId());
- }
-
- return message;
- }
-
- /**
- * @see IMessage#setBundleName(String)
- */
- public void setBundleName(String aBundleName) {
- bundleName = aBundleName;
- }
-
- /**
- * @see IMessage#setGroupName(String)
- */
- public void setGroupName(String name) {
- groupName = name;
- }
-
- /**
- * @see IMessage#setId(String)
- */
- public void setId(String newId) {
- id = newId;
- }
-
- /**
- * @see IMessage#setLength(int)
- */
- public void setLength(int length) {
- if (length < 0) {
- length = IMessage.OFFSET_UNSET;
- }
- this.length = length;
- }
-
- /**
- * @see IMessage#setLineNo(int)
- */
- public void setLineNo(int lineNumber) {
- if (lineNumber < 0) {
- this.lineNumber = IMessage.LINENO_UNSET;
- } else {
- this.lineNumber = lineNumber;
- }
- }
-
- /**
- * @see IMessage#setOffset(int)
- */
- public void setOffset(int offset) {
- if (offset < 0) {
- offset = IMessage.OFFSET_UNSET;
- }
- this.offset = offset;
- }
-
- /**
- * @see IMessage#setParams(String[])
- */
- public void setParams(String[] newParams) {
- params = newParams;
- }
-
- /**
- * @see IMessage#setSeverity(int)
- */
- public void setSeverity(int newSeverity) {
- severity = newSeverity;
- }
-
- /**
- * @see IMessage#setTargetObject(Object)
- */
- public void setTargetObject(Object obj) {
- targetObject = obj;
- }
-
- public Object getAttribute(String attributeName) {
- if(messageAttributes != null) {
- return messageAttributes.get(attributeName);
- }
- return null;
- }
-
- public void setAttribute(String attributeName, Object value) {
- if(messageAttributes == null) {
- messageAttributes = new HashMap<String, Object>();
- }
- messageAttributes.put(attributeName,value);
- }
-
- public HashMap<String,Object> getAttributes() {
- return messageAttributes;
- }
-
- public String getMarkerId() {
- return markerId;
- }
-
- public void setMarkerId(String markerId) {
- this.markerId = markerId;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/MessageFilter.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/MessageFilter.java
deleted file mode 100644
index a8e97a3..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/MessageFilter.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-
-/**
- * <p>
- * Encapsulates common message filtering parameters. Message Filters are used when retrieving
- * messages via an IMessageAccess. The filter encapsulates a simple set of typical filter criteria
- * which is used to select a subset of messages to retrieve. If multiple attributes of the message
- * filter are specified, they should be logically AND'd together by the MessageAccess
- * implementation.
- * </p>
- */
-public class MessageFilter {
- public static final int ANY_SEVERITY = -1;
-
- /**
- * <p>
- * Messages matching this severity(s) will be retrieved. One of SeverityEnum XXX_severity
- * constants, or ANY_SEVERITY to specify that messages of any severity will be returned. This
- * field can be combined with other filter attributes to narrow the selection set further.
- * </p>
- */
- private int severity = ANY_SEVERITY;
-
- /**
- * <p>
- * The validator which reported the messages that should be returned. All messages which were
- * reported using validator matching this validator will be returned. This field can be combined
- * with other filter attributes to narrow the selection set further.
- * </p>
- */
- private IValidator validator;
-
- /**
- * <p>
- * The target object of the messages that should be returned, or null to specify to retrieve
- * messages of any target. All messages having a target object matching this object will be
- * returned. This field can be combined with other filter attributes to narrow the selection set
- * further.
- * </p>
- */
- private Object targetObject;
-
- /**
- * @deprecated
- */
- public MessageFilter() {
- super();
- }
-
- /**
- *
- * @param aSeverity
- * Severity of the message
- * @param validator
- * IValidator which reported the message
- * @param aTargetObject
- * Target object of the message
- */
- public MessageFilter(int aSeverity, IValidator validator, Object aTargetObject) {
- super();
- severity = aSeverity;
- this.validator = validator;
- targetObject = aTargetObject;
- }
-
- /**
- * @return the severity filter constraint.
- */
- public int getSeverity() {
- return severity;
- }
-
- /**
- * @return the target object filter constraint.
- */
- public java.lang.Object getTargetObject() {
- return targetObject;
- }
-
- /**
- * @return the validator to filter on.
- */
- public IValidator getValidator() {
- return validator;
- }
-
- /**
- * Set the severity filter constraint.
- *
- * @param newSeverity
- * severity filter constraint
- */
- public void setSeverity(int newSeverity) {
- severity = newSeverity;
- }
-
- /**
- * Set the target object filter constraint.
- *
- * @param newTargetObject
- * target object filter constraint
- */
- public void setTargetObject(java.lang.Object newTargetObject) {
- targetObject = newTargetObject;
- }
-
- /**
- * Set the validator to return messages for.
- *
- * @param validator
- * validator to return messages for
- */
- public void setValidator(IValidator validator) {
- this.validator = validator;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidationException.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidationException.java
deleted file mode 100644
index f8970a7..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidationException.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-
-import java.util.Locale;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * <p>
- * This exception is the only exception which should be thrown by IValidators. The message in this
- * exception must be suitable for showing to the user. All ValidationExceptions will have their
- * message extracted when they're caught, and the message will be shown to the user.
- *
- * @plannedfor 1.0
- * </p>
- */
-public class ValidationException extends Exception {
- private Throwable _lowLevelException;
- private IMessage _message;
- private ClassLoader _loader;
- private final static long serialVersionUID = -3387516993124229949L;
-
-
-
- /**
- * Constructs a new exception with a given message string. <br>
- * <br>
- *
- * @param message
- * IMessage, which is Locale-independent, which contains the message to be shown to
- * be shown to the user.
- */
- public ValidationException(IMessage message) {
- this(message, null);
- }
-
- /**
- * Constructs a new exception with a given message string, and low-level exception. <br>
- * <br>
- *
- * @param message
- * IMessage Locale-independent message to be shown to the user.
- * @param exception
- * relevant low-level exception, or <code>null</code> if none. <br>
- *   For example, when a method fails because of a network
- * communications   problem, this would be the
- * <code>java.io.IOException</code>   describing the exact nature
- * of the problem.
- */
- public ValidationException(IMessage message, Throwable exception) {
- super();
- _message = message;
- _lowLevelException = exception;
- }
-
- /**
- * @return the low-level exception associated with this ValidationException.
- */
- public Throwable getAssociatedException() {
- return _lowLevelException;
- }
-
- /**
- * @return the IMessage to be shown to the user, or null if this exception should be handled
- * internally.
- */
- public IMessage getAssociatedMessage() {
- return _message;
- }
-
- /**
- * @return if the IValidator which threw this exception was loaded by a different ClassLoader than the
- * framework, this method returns the ClassLoader of the IValidator.
- */
- public ClassLoader getClassLoader() {
- return _loader;
- }
-
- /**
- * @return the error message string of this <code>Throwable</code> object if it was
- * {@link java.lang.Throwable#Throwable(String) created}with an error message string;
- * or <code>null</code> if it was {@link java.lang.Throwable#Throwable() created}with
- * no error message.
- *
- */
- public String getMessage() {
- return _message.getText(getClassLoader());
- }
-
- /**
- * @param locale
- * The locale of which to get the message.
- * @return the error message string of this <code>Throwable</code> object if it was
- * {@link java.lang.Throwable#Throwable(String) created}with an error message string;
- * or <code>null</code> if it was {@link java.lang.Throwable#Throwable() created}with
- * no error message.
- */
- public String getMessage(Locale locale) {
- return _message.getText(locale, getClassLoader());
- }
-
- /**
- * <p>
- * If the IValidator which threw this exception was loaded by a different ClassLoader than the
- * framework, this method should set the ClassLoader to be the ClassLoader of the IValidator.
- * </p>
- * @param loader
- * ClassLoader of the validator
- */
- public void setClassLoader(ClassLoader loader) {
- _loader = loader;
- }
-
- /**
- * <p>
- * Returns a short description of this throwable object. If this <code>Throwable</code> object
- * was {@link java.lang.Throwable#Throwable(String) created}with an error message string, then
- * the result is the concatenation of three strings:
- * <ul>
- * <li>The name of the actual class of this object
- * <li>": " (a colon and a space)
- * <li>The result of the {@link #getMessage}method for this object
- * </ul>
- * If this <code>Throwable</code> object was {@link java.lang.Throwable#Throwable() created}
- * with no error message string, then the name of the actual class of this object is returned.
- * </p>
- *
- * @return a string representation of this <code>Throwable</code>.
- */
- public String toString() {
- return toString(Locale.getDefault());
- }
-
- /**
- * <p>
- * Returns a short description of this throwable object. If this <code>Throwable</code> object
- * was {@link java.lang.Throwable#Throwable(String) created}with an error message string, then
- * the result is the concatenation of three strings:
- * <ul>
- * <li>The name of the actual class of this object
- * <li>": " (a colon and a space)
- * <li>The result of the {@link #getMessage}method for this object
- * </ul>
- * If this <code>Throwable</code> object was {@link java.lang.Throwable#Throwable() created}
- * with no error message string, then the name of the actual class of this object is returned.
- * </p>
- *
- * @return a string representation of this <code>Throwable</code>.
- */
- public String toString(Locale locale) {
- String s = getClass().getName();
- String message = getMessage(locale);
- return (message != null) ? (s + ": " + message) : s; //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidatorLauncher.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidatorLauncher.java
deleted file mode 100644
index f053410..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidatorLauncher.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-import org.eclipse.wst.validation.internal.operations.MessageInfo;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * This singleton launches the validation on a single validator. Clients should call this class's
- * <code>start</code> method to begin the validation.
- */
-public class ValidatorLauncher {
- private static ValidatorLauncher _launcher;
-
- private ValidatorLauncher() {
- }
-
- /**
- * @return the singleton launcher.
- */
- public static ValidatorLauncher getLauncher() {
- if (_launcher == null) {
- _launcher = new ValidatorLauncher();
- }
- return _launcher;
- }
-
- /**
- * <p>
- * This method is the launch point of the validation. It runs validation on the validator
- * accessed by the IValidationContext. When the validation is complete, each validator may perform resource
- * cleanup, if necessary.
- * <p>
- * If <code>helper</code>,<code>validator</code>, or <code>reporter</code> are null,
- * validation is not performed. <code>changedFiles</code> may be null, or empty, if a full
- * build should be done.
- * </p>
- *
- * @param helper
- * loads an object.
- * @param validator
- * validator object to launch validation.
- * @param reporter
- * Is an instance of an IReporter interface, which is used for interaction with the user.
- */
- public void start(final IValidationContext helper, final IValidator validator, final IReporter reporter) throws ValidationException {
- if ((helper == null) || (validator == null) || (reporter == null))return;
-
- // Can't force each validator to check if it's cancelled or not,
- // so check for cancellation here. Hopefully the user won't wait too long.
- if (reporter.isCancelled())return;
-
-
- // If the validator is about to perform a full build, remove all of its previous validation
- // messages.
- if ((helper.getURIs() == null) || (helper.getURIs().length == 0)) {
- reporter.removeAllMessages(validator);
- }
- if( validator instanceof IValidatorJob ){
- ((IValidatorJob)validator).validateInJob(helper, reporter);
- }else{
- validator.validate(helper, reporter);
- }
- if( validator instanceof IValidatorJob ){
- //the validators who have implemented IValidatorJob but are running synchronously
- //would log messages now ...
- ValidatorManager mgr = ValidatorManager.getManager();
- final List list = mgr.getMessages((IValidatorJob)validator);
-
- Iterator it = list.iterator();
- while( it.hasNext() ){
- MessageInfo info = (MessageInfo)it.next();
- try {
- TaskListUtility.addTask( info.getMessageOwnerId(), info.getResource(),
- info.getLocation(), info.getMsg().getId(), info.getText(),
- info.getMsg().getSeverity(), info.getMarkerId(),
- info.getTargetObjectName(),
- info.getMsg().getGroupName(), info.getMsg().getOffset(), info.getMsg().getLength());
-
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- mgr.clearMessages( (IValidatorJob)validator );
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMessage.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMessage.java
deleted file mode 100644
index 5550942..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMessage.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.provisional.core;
-
-
-import java.util.HashMap;
-import java.util.Locale;
-
-/**
- * <p>
- * This interface represents a locale-independent validation message.
- * </p>
- * <p>
- * Given these three values as input, this interface can be queried for the final message string.
- * (i.e., the message with the parameters already substituted in.) Either the default Locale can be
- * used, or the caller can specify a Locale.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
-public interface IMessage {
- /*
- *
- * [issue: CS - The 'IMessage' interface would be simpler without the bundle related details. I'd like to understand
- * why we can 'precompute' the translated message. Is there some benefit to perform 'late computation' of these messages?
- * How does this compare to the eclipse Marker (as far as I know the Marker's text() is preLocalized).
- * Here's a list of the methods that are related to 'bundle specific' aspects and could be separate out (or designed away)?
- *
- * - getId()
- * - getBundle(...)
- * - getBundleName()
- * - getParams()
- * - getText(Locale)
- * - getText(ClassLoader)
- * - getText(Locale, ClassLoader)
- * - setId(String)
- * - setBundleName(String)
- * - setParams(String[])
- * ]
- *
- * - void setAttribute(String attributeName, Object value)
- * - Object getAttribute(String attributeName);
- * ]
- */
- int OFFSET_UNSET = -1; // see getLength(), getOffset()
- int LINENO_UNSET = 0;
-
- /**
- * Typically used to specify error messages.
- */
- int HIGH_SEVERITY = 0x0001;
- /**
- * Typically used to specify warning messages.
- */
- int NORMAL_SEVERITY = 0x0002;
- /**
- * Typically used to specify information messages.
- */
- int LOW_SEVERITY = 0x0004;
- /**
- * Specify high (error) and normal (warning) messages. Typically used with a MessageFilter, to
- * filter out information messages.
- */
- int ERROR_AND_WARNING = HIGH_SEVERITY | NORMAL_SEVERITY;
- /**
- * Specify all types of messages. Typically used with a MessageFilter.
- */
- int ALL_MESSAGES = ERROR_AND_WARNING | LOW_SEVERITY;
-
- /**
- * TargetResource - The key to use when associating a resource with a message via an
- * attribute.
- * <p>
- * Normally, the target is stored using the setTargetObject() method, but
- * some of the legacy validators used this field for objects that where not IResources.
- * In order to associate the message with the proper IResource the validator can store
- * the IResource as an attribute and use this string as the key.
- * </p>
- */
- String TargetResource = "TargetResource"; //$NON-NLS-1$
-
- /**
- * @return the name of the bundle which this message is contained in.
- */
- String getBundleName();
-
- /**
- * To support removal of a subset of validation messages, an IValidator may assign group names
- * to IMessages. An IMessage subset will be identified by the name of its group. Default (null)
- * means no group.
- *
- * @return the name of the group to which the message belongs.
- */
- String getGroupName();
-
- /**
- * Returns the id of the message. Message ids are used as the constants in property bundles
- * which localize the description of the message in a locale-independent fashion. The id is the
- * key, in the resource bundle, which identifies the string to be loaded. The id may not be null
- * or the empty string.
- *
- * @return the id of the message
- */
- String getId();
-
- /**
- * @return the length of the problem area, starting from the offset. If unset, value =
- * IMessage.OFFSET_UNSET.
- *
- * @see #getOffset()
- */
- int getLength();
-
- /**
- * If there is a target object associated with this IMessage, and that target object is a file,
- * then an optional line number may be set. The line number identifies the location of the
- * problem identified by this message. If no line number has been set, #LINENO_UNSET will be
- * returned.
- *
- * @return line number of the location of the problem.
- */
- int getLineNumber();
-
- /**
- * Returns the offset of the message. If unset, value = IMessage.OFFSET_UNSET. For example, if
- * the java compiler were a validator, and it reported that a variable name was unknown, offset
- * would identify the position of the first character of the unknown variable. The position is
- * identified by the number of characters from the start of the file.
- *
- * @return offset of the message
- */
- int getOffset();
-
- /**
- * Returns the parameters of the message. Message parameters are the values which are
- * substituted into parameter slots in localized message text descriptions.
- *
- * @return parameters of the message
- */
- String[] getParams();
-
- /**
- * <p>
- * Returns the severity level of the message. One of SeverityEnum constants.
- *
- * @see IMessage#HIGH_SEVERITY
- * @see IMessage#NORMAL_SEVERITY
- * @see IMessage#LOW_SEVERITY
- * </p>
- *
- * @return the severity level of the message
- */
- int getSeverity();
-
- /**
- * Return the object that this IMessage is reporting the problem against, if any. null will be
- * returned if this is a general message which does not apply to a particular object; for
- * example, "internal error".
- *
- * @return the target object for the message
- */
- Object getTargetObject();
-
- /**
- * @return a text representation of this message formatted in the default Locale, with the
- * bundle loaded by the default ClassLoader.
- */
- String getText();
-
- /**
- * @param classLoader
- * The ClassLoader which will be used to load the ResourceBundle.
- *
- * @return a text representation of this message formatted in the default locale, with the
- * bundle loaded by the specified ClassLoader.
- */
- String getText(ClassLoader classLoader);
-
- /**
- * @param locale
- * The locale to translate the message text into.
- *
- * @return a text representation of this message formatted in the specified locale, with the
- * bundle loaded by the default ClassLoader.
- */
- String getText(Locale locale);
-
- /**
- * @param locale
- * The locale to translate the message text into.
- * @param classLoader
- * The ClassLoader which will be used to load the ResourceBundle.
- *
- * @return a text representation of this message formatted in the specified locale, with the
- * bundle loaded by the specified ClassLoader.
- */
- String getText(Locale locale, ClassLoader classLoader);
-
- /**
- * Provides a way to store some additional attributes that a message would like to store
- * that can used by some other parties that are interested in those attribute values.
- *
- * @param attributeName
- * @return an Object basically the value associated with the object name.
- */
-
- Object getAttribute(String attributeName);
-
- /**
- * Set the attributeName and value as key value pair.
- *
- * @see #getAttribute(String attributeName)
- * @param attributeName
- */
-
- void setAttribute(String attributeName, Object value);
-
-
- /**
- * Set the name of the bundle which this message is contained in.
- *
- * @param bundleName
- * Name of the bundle which contains the message.
- */
- void setBundleName(String bundleName);
-
- /**
- * To support removal of a subset of validation messages, an IValidator may assign group names
- * to IMessages. An IMessage subset will be identified by the name of its group. Default (null)
- * means no group.
- *
- * @param name
- * Name of the group.
- */
- void setGroupName(String name);
-
- /**
- * Set the id of the message. Message ids are used as the constants in property bundles which
- * localize the description of the message in a locale-independent fashion. The id is the key,
- * in the resource bundle, which identifies the string to be loaded. The id may not be null or
- * the empty string.
- *
- * @param newId
- * Id of the message.
- */
- void setId(String newId);
-
- /**
- * Sets the length of the problem, starting from the offset. If unset, value =
- * IMessage.OFFSET_UNSET.
- *
- * @see #setOffset(int)
- *
- * @param length
- * Sets the length.
- */
- void setLength(int length);
-
- /**
- * If there is a target object associated with this IMessage, and that target object is a file,
- * then an optional line number may be set. The line number identifies the location of the
- * problem identified by this message. To indicate no line number, use #LINENO_UNSET.
- *
- * @param lineNumber
- * Sets the line number.
- */
- void setLineNo(int lineNumber);
-
- /**
- * Sets the offset of the message. If unset, value = IMessage.OFFSET_UNSET. For example, if the
- * java compiler were a validator, and it reported that a variable name was unknown, offset
- * would identify the position of the first character of the unknown variable. The position is
- * identified by the number of characters from the start of the file.
- *
- * @param offset
- * Sets the offset of the message.
- */
- void setOffset(int offset);
-
- /**
- * Sets the parameters of the message. Message parameters are the values which are substituted
- * into parameter slots in localized message text descriptions.
- * <p>
- * For example, if getId() returns "MY_ID", then the ResourceBundle identified by
- * getBundleName() is searched for the message named "MY_ID", and if found,
- * has it's parameters set.
- * </p>
- *
- * @see java.text.MessageFormat#format(String, Object[]) is invoked on the message, with
- * <code>newParams</code> passed in as the Object[].
- *
- * @param newParams
- * Parameters of the message.
- */
- void setParams(String[] newParams);
-
- /**
- * Sets the severity level of the message. One of SeverityEnum constants.
- *
- * @see IMessage#HIGH_SEVERITY
- * @see IMessage#NORMAL_SEVERITY
- * @see IMessage#LOW_SEVERITY
- *
- * @param newSeverity
- * Severity level of the message.
- */
- void setSeverity(int newSeverity);
-
- /**
- * Associate this IMessage with the object that has the problem. A null value is permitted. If a
- * message is applicable to one object, then this value should be set. Otherwise, the default
- * value (null) should be kept. Given this target object, it should be possible to calculate the
- * exact location of the problem.
- *
- * @param obj
- * The object that has the problem.
- */
- void setTargetObject(Object obj);
-
- /**
- * Return all the attributes of a Message object.
- */
- HashMap getAttributes();
-
- /**
- * Return the marker id if one is set on this object when created.
- */
- String getMarkerId();
-
- /**
- * Set the marker id on a Message object.
- */
- void setMarkerId(String markerId);
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.java
deleted file mode 100644
index 1ffef39..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.provisional.core;
-
-/**
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
-public interface IMetaModelContext extends IValidationContext {
-
- public Object getModel(String URI);
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.java
deleted file mode 100644
index 4210353..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.provisional.core;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * IProjectValidationContext extends IValidationContext to provide access to a
- * reference to the project on which a validator is being invoked.
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
-public interface IProjectValidationContext extends IValidationContext
-{
- /**
- * Provides the project on which the validator is being invoked.
- *
- * @return an IProject reference to the project on which the validator is
- * being invoked.
- */
- IProject getProject();
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IReporter.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IReporter.java
deleted file mode 100644
index 3005139..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IReporter.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.provisional.core;
-
-import java.util.List;
-
-/*
- * CCM - Reporter is now passed locale-independent messages.
- * Messages should only be translated to a locale upon access.
- * Or in special locale-dependent reporter implementations (console logger).
- */
-
-/**
- * The interface used by IValidator's to report messages. The implementation of the IReporter could
- * simply log the messages to stdout, a file, or retain them in a buffer for later access by a user
- * interface.
- * <p>
- * Reporter implementations should keep non-localized versions of their messages.
- * </p>
- * <p>
- * Any messages which need to be displayed to the user are done through this class, and if the user
- * cancels the current function, this class is the one which registers the cancellation.
- * </p>
- * <p>
- * The IReporter instance is created at the time validation begins and ends when validation is complete.
- * There is only one IReporter instance created for all validators that are run on a IResource. The IResource
- * provides a way to get messages put out each validator and add and delete messages for one validator
- * at a time.
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
-public interface IReporter {
- /**
- * <p>
- * Add a locale-independent validation message. It will be displayed later, with all of the
- * other validation messages.
- * </p>
- * <p>
- * The IValidator passed in is needed for incremental validation (when a message needs to be
- * removed, one validator should not remove messages entered by another validator.) The
- * validator is also queried for information about its resource bundle, to enable support for
- * localization of messages in a client-server environment.
- * </p>
- * <p>
- * Both parameters must not be null.
- * </p>
- * @param origin
- * The validator which is the source of the message.
- * @param message
- * A message to be reported.
- */
- void addMessage(IValidator origin, IMessage message);
-
- /**
- * Show a text representation of this message, formatted in the default
- * Locale, to the user immediately. This message indicates which subtask is
- * currently being processed. The message is not stored. The subtask message
- * in this context is the subtask in a IProgressMontior
- * <p>
- * Both parameters must not be null.
- * </p>
- *
- * @param validator
- * The validator issuing the subtask message.
- * @param message
- * The message to be displayed to the user.
- *
- */
- void displaySubtask(IValidator validator, IMessage message);
-
- /**
- * @return the message access interface to this reporter, or null if message access is not
- * supported.
- *
- */
- List getMessages();
-
- /**
- * Return true if the user canceled validation, and false otherwise. This method should be
- * called by IValidators periodically, because no event is fired to notify IValidators that the
- * user canceled validation. If a validator does not check this method, a cancellation request
- * is ignored.
- *
- * @return true if the user canceled validation, and false otherwise.
- *
- */
- boolean isCancelled();
-
- /**
- * Remove all validation messages entered by the identified validator. This method is provided
- * for incremental validation.
- * <p>
- * The IValidator parameter must not be null.
- * </p>
- * @param origin
- * Originator validator of the message.
- */
- void removeAllMessages(IValidator origin);
-
- /**
- * Remove all validation messages, entered by the identified validator,
- * pertaining to the Object provided. This method is provided for
- * incremental validation. <br>
- * <br>
- * If <code>object</code> is null, then this method should remove all
- * messages owned by the validator. (i.e., the same behaviour as the
- * removeAllMessages(IValidator) method.) <br>
- * <br>
- * <p>
- * The IValidator parameter must not be null.
- * </p>
- *
- * @param origin
- * Originator validator of the message.
- * @param object
- * Object to which the message belongs. Object is the target object
- * that was set on the IMessage when adding the message as problem
- * marker.
- *
- */
- void removeAllMessages(IValidator origin, Object object);
-
- /**
- * To support removal of a subset of validation messages, an IValidator may
- * assign group names to IMessages. An IMessage subset will be identified by
- * the name of its group. This method will remove only the IMessage's that
- * are in the group identified by groupName.
- * <p>
- * The IValidator parameter must not be null.
- * </p>
- * <p>
- * If <code>object</code> is null, then this method should remove all
- * messages owned by the validator. (i.e., the same behaviour as the
- * removeAllMessages(IValidator) method.)
- * </p>
- * <p>
- * If groupName is null, that's the same as no group (i.e., the same
- * behaviour as the <code>removeAllMessages(IValidator, Object)</code>
- * method.)
- * </p>
- *
- * @param validator
- * Originator validator of the message.
- * @param obj
- * Object to which the message belongs.
- * @param groupName
- * Name of the group to which the message belongs.
- */
- void removeMessageSubset(IValidator validator, Object obj, String groupName);
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java
deleted file mode 100644
index 54a8ce5..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.provisional.core;
-
-/**
- * This class is used to to separate the IValidator from the model loading. A model
- * is a group of object(s) that must follow some rules.
- * <p>
- * The model is loaded differently depending on whether the validator is running in
- * as-you-type or builder based context. If the <code>loadModel</code> method was a method on the IValidator,
- * then there would need to be two versions of validators, one for as-you-type and one for
- * builder based. Because <code>loadModel</code> is separate from the IValidator, we provide
- * two different IHelpers instead, and ship the one specific to the environment.
- * </p>
- * <p>
- * Each IValidationContext implementation loads a specific model as identified by a String
- * <code>symbolicName</code>. The symbolicName can be any value except null or the
- * empty string. Each validator identifies the symbolic names which it needs, and the
- * type of model which needs to be returned when that symbolic name is loaded via a
- * <code>loadModel</code> method. An IValidationContext can support more than one IValidator;
- * the helper needs to support every model that each validator needs.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
-public interface IValidationContext {
- /**
- * <p>
- * Load the model identified by <code>symbolicName</code>. <code>symbolicName</code>
- * must not be null or the empty string if the validator needs to be run in both
- * as-you-type and builder based validation.
- * </p>
- * <p>
- * The symbolicName is a string name that is registered in the implementation of the
- * IValidatorContext. For an example our internal implementation of the loadModel use
- * method names for symbolicNames to load the model object to be validated. Users can
- * use their own model load mechanism.
- * </p>
- *
- * @see <code>WorkbenchContext</code>
- */
- Object loadModel(String symbolicName);
-
- /*
- *
- * [issue : CS - It's not at all clear how these parameters would get passed into a helper. I'd suggest
- * providing getProperty() and setProperty() methods on the class to allow contextual information to be
- * supplied and queried in a generic manner.]
- */
- /**
- * <p>
- * Load the model identified by <code>symbolicName</code> and <code>parms</code>.
- * <code>symbolicName</code> must not be null or the empty string if the validator
- * needs to be run in both as-you-type and builder based validation.
- * If <code>parms</code> is null then this
- * method behaves the same as
- *
- * @link #loadModel(String).
- *
- * This method differs from
- * @link #loadModel(String) because it takes parameters, from the IValidator, which
- * are available only at runtime. If you need to pass a live object to the IValidationContext,
- * this is the loadModel method to use.
- * </p>
- *
- * @param symbolicName String identifier for model.
- * @param parms List of parameters that the model takes for invocation.
- */
- Object loadModel(String symbolicName, Object[] parms);
-
- /**
- * @return a string array with the list of URI's that need to be validated in the
- * case of Incremental build.
- */
-
- String[] getURIs();
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidator.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidator.java
deleted file mode 100644
index 6fbd55e..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.provisional.core;
-
-import org.eclipse.wst.validation.internal.core.ValidationException;
-
-/**
- * This is the base interface for all Validators. A Validator is a class which verifies that objects
- * follow some rules. For example, in a MOF model which represents an EJB jar, the EJB specification
- * determines the rules.
- * <p>
- * A validator can perform full validation or incremental validation. All validators must implement
- * full validation but incremental validation is optional.
- * </p>
- * <p>
- * Each validator must not be tied to any particular workbench implementation.
- * </p>
- * <p>
- * A validator's verification starts when the ValidatorLauncher singleton calls
- * <code>validate</code>.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
-public interface IValidator{
-
- /*
- * [issue : CS - Perhaps the IValidator should be required to provide a 'name' that can be used describe
- * the running validation 'Job'. Then the framework could automatically say something like 'XYZ validator : cleanup'.
- * Relying on the IValidator to provide subtask information seems error prone.]
- * [issue: LM - Is the cleanup method necessary? Can the framework put a requirement that client validators 'clean up'
- * before returning from the validate method? ]
- */
-
- /**
- * Perform any resource cleanup once validation is complete. If cleanup will take some time, the
- * IValidator should report subtask information to the user through the IReporter parameter. The
- * IReporter parameter will not be null.
- *
- * @param reporter Used for the interaction with the user.
- */
- void cleanup(IReporter reporter);
-
- /*
- * [issue : CS - I'm curious to understand why the validator is not invoked directly on a file. It seems it should be the
- * domain of another API to manage manage incremental file changes and triggering validations accordingly.
- * Do we have a current use case in WTP where the validator does anything more validate a file from the changedFiles list?]
- */
- /**
- * This is the method which performs the validation on the objects.
- * <p>
- * <code>helper</code> and <code>reporter</code> may not be null. <code>changedFiles</code>
- * may be null, if a full build is desired. <br>
- * </p>
- * @param helper
- * Loads an object.
- * @param reporter
- * Is an instance of an IReporter interface, which is used for interaction with the user.
- *
- */
- void validate(IValidationContext helper, IReporter reporter) throws ValidationException;
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.java
deleted file mode 100644
index a25e7bb..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.provisional.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-
-/**
- * This is the Job interface for the validator. Validators implementing this interface are executed as
- * background jobs.
- * Following is a sequence of calls:
- * <ul>
- * <li>validator.getSchedulingRule(helper)
- * <li>validator.validate(reporter)
- * </ul>
- */
-public interface IValidatorJob extends IValidator{
-
- IStatus OK_STATUS = new Status(IStatus.OK, "org.eclipse.wst.validation", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$
-
-
-
- /**
- * This is the method which performs the validation on the objects.
- * <p>
- * <code>reporter</code> may not be null. <code>changedFiles</code>
- * may be null, if a full build is desired. <br>
- * </p>
- *
- * @param reporter
- * Is an instance of an IReporter interface, which is used for interaction with the
- * user.
- * @param helper Will not be null, loads an object.
- */
- IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException;
-
- /**
- * Get the scheduling rule, which the framework applies to the Validator job.
- *
- * @param helper Will not be null, loads an object.
- */
- ISchedulingRule getSchedulingRule(IValidationContext helper);
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.java
deleted file mode 100644
index 3a86bf4..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.provisional.core;
-
-/*
- * [issue: LM - Going along with my comment on the addMessage method in IReporter I
- * think this class should be internal to the validation framework.
- * I don't think there's a need for this class to be exposed to clients. If too many
- * messages are added the framework should handle this without notifying the client
- * validator. ]
- */
-/**
- * This exception is thrown by
- *
- * @see IReporter#addMessage(IValidator, IMessage) method if no more messages can be reported
- * because the maximum number of messages has been reported.
- * @deprecated This class is not longer used by the framework. The framework is
- * not going to limit the number of messages displayed by a validator.
- */
-public class MessageLimitException extends RuntimeException {
- private final static long serialVersionUID = -7034897190745766940L;
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/package.html b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/package.html
deleted file mode 100644
index 70bdb29..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<title>Validation Framework (Version 1)</title>
-</head>
-<body>
-<p>An earlier framework for calling validators that are build based.</p>
-<p>This framework is being replaced by the <code>newer org.eclipse.wst.validation</code> framework.</p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/AbstractValidator.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/AbstractValidator.java
deleted file mode 100644
index 3d884d9..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/AbstractValidator.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.Validator.V2;
-
-/**
- * The class that all Validators that wish to use version two of the validation framework must subclass.
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @author karasiuk
- *
- */
-public abstract class AbstractValidator {
-
- private V2 _parent;
-
- /**
- * Validate the resource. The validator is called from a WorkspaceJob, so
- * the validator itself does not need to establish it's own
- * IWorkspaceRunnable.
- *
- * @param resource
- * The resource to be validated.
- *
- * @param kind
- * The way the resource changed. It uses the same values as the kind
- * parameter in IResourceDelta.
- *
- * @param state
- * A way to pass arbitrary, validator specific, data from one
- * invocation of a validator to the next, during the validation phase.
- * At the end of the validation phase, this object will be cleared,
- * thereby allowing any of this state information to be garbaged
- * collected.
- *
- * @param monitor
- * A monitor that you can use to report your progress. To be a well
- * behaved validator you need to check the isCancelled() method at
- * appropriate times.
- *
- * @return the result of the validation. This may be, but usually isn't, null.
- */
- public abstract ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor);
-
- /**
- * A call back method that lets the validator know that the project is being
- * cleaned. This method gives the validator a chance to do any special
- * cleanup. The default is to do nothing.
- * <p>
- * If the entire workspace is being cleaned, then the first call will have a
- * null project, and then there will be subsequent calls for each open
- * project in the workspace.</p>
- *
- * @param project
- * The project being cleaned. This may be null, which is an indication
- * that the workspace is being cleaned.
- *
- * @param state
- * A way to pass arbitrary, validator specific, data from one
- * invocation of a validator to the next, during the validation phase.
- *
- * @param monitor
- * The monitor that should be used for reporting progress if the clean
- * takes a long time.
- */
- public void clean(IProject project, ValidationState state, IProgressMonitor monitor){
- }
-
- /**
- * This method is called before any validation takes place. It allows
- * validators to perform any initialization that they might need.
- *
- * @param project
- * The project that is being validated. For the very first call in the
- * validation phase, this will be null. A null project is the signal
- * that a top level validation is starting. Subsequently, the project
- * will be set, as each of the individual projects are validated.
- *
- * @param state
- * A way to pass arbitrary, validator specific, data from one
- * invocation of a validator to the next, during the validation phase.
- *
- * @param monitor
- * The monitor that should be used for reporting progress if the initialization
- * takes a long time.
- */
- public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor){
- }
-
- /**
- * This method will be called when validation is complete. It allows
- * validators to perform any cleanup that they might need to do.
- *
- * @param project
- * The project that was validated. The very last call in the validation
- * sets this to null so that the validator knows that all the
- * projects have now been validated.
- *
- * @param state
- * A way to pass arbitrary, validator specific, data from one
- * invocation of a validator to the next, during the validation phase.
- *
- * @param monitor
- * The monitor that should be used for reporting progress if the cleanup
- * takes a long time.
- */
- public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor){
- }
-
- /**
- * Answer the validator that you belong to. The validator controls the
- * filters and various other settings.
- *
- * @nooverride
- */
- public V2 getParent(){
- return _parent;
- }
-
- void setParent(V2 parent){
- _parent = parent;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/DependentResource.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/DependentResource.java
deleted file mode 100644
index 3f1c67d..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/DependentResource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * A resource that is dependent on another resource.
- * <p>
- * This is returned by the IDependencyIndex.
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @noextend
- * @see IDependencyIndex
- * @author karasiuk
- *
- */
-public class DependentResource {
- private IResource _resource;
- private Validator _validator;
-
- /**
- * @noreference
- */
- public DependentResource(IResource resource, Validator validator){
- _resource = resource;
- _validator = validator;
- }
-
- /**
- * Answer the resource that is depended on.
- */
- public IResource getResource() {
- return _resource;
- }
-
- /**
- * Answer the validator that asserted the dependency.
- */
- public Validator getValidator() {
- return _validator;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Friend.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Friend.java
deleted file mode 100644
index 54f84d7..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Friend.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.ContentTypeWrapper;
-import org.eclipse.wst.validation.internal.ValType;
-
-/**
- * This class is only to be called by the validation framework and it's test cases.
- * This class is NOT part of the API.
- * <p>
- * This class provides access to some internal methods.
- * </p>
- * @author karasiuk
- *
- */
-public class Friend {
-
- public static void setMessages(Validator validator, Map<String, MessageSeveritySetting> map) {
- validator.setMessages(map);
- }
-
- /**
- * Has the validator's implementation been loaded yet? This is used by some test cases to ensure that
- * plug-ins are not loaded too early.
- */
- public static boolean isLoaded(Validator validator){
- return validator.isLoaded();
- }
-
- public static boolean shouldValidate(Validator validator, IResource resource, boolean isManual, boolean isBuild,
- ContentTypeWrapper contentTypeWrapper){
- return validator.shouldValidate(resource, isManual, isBuild, contentTypeWrapper);
- }
-
- public static boolean shouldValidate(Validator validator, IResource resource, ValType valType,
- ContentTypeWrapper contentTypeWrapper){
-
- return validator.shouldValidate(resource, valType, contentTypeWrapper);
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IDependencyIndex.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IDependencyIndex.java
deleted file mode 100644
index d9d494b..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IDependencyIndex.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-
-/**
- * This service is used to specify the resources that a particular resource depends on.
- * <p>
- * This is an optional service, validators do not need to use this Interface and can simply supply
- * their dependency information through the ValidationResult return result.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @noimplement
- * @see ValidationResult
- * @author karasiuk
- *
- */
-public interface IDependencyIndex {
-
- /**
- * Assert that one resource depends on another resource as part of it's validity.
- * <p>
- * For example, if an XML file is dependent on an XSD file to be valid, the
- * resource that holds the XML file would be the dependent, and the resource
- * that holds the XSD would be the dependsOn.
- * </p>
- *
- * @param id
- * The validator id that is asserting that the dependency exists.
- * @param dependent
- * The resource that is dependent on the other resource. For example a XML file.
- * @param dependsOn
- * The resource that this being depended on. For example a XSD file.
- */
- void add(String id, IResource dependent, IResource dependsOn);
-
- /**
- * Remove all the dependency assertions for this project.
- *
- * @param project
- * The project that will have it's dependency assertions removed.
- */
- void clear(IProject project);
-
- /**
- * Answer all the resources that depend on this resource. For example, if
- * this resource was a XSD, this could answer all the XML files that
- * depended on it for their validity.
- *
- * @param resource
- * A resource that other resources may depend on.
- *
- * @return the dependent resources.
- */
- List<DependentResource> get(IResource resource);
-
- /**
- * Answer all the resources that depend on this resource. For example, if
- * this resource was a XSD, this could answer all the XML files that
- * depended on it for their validity.
- *
- * @param id
- * The validator id that asserted that the dependency exists.
- * @param resource
- * A resource that other resources may depend on.
- *
- * @return the dependent resources. This method can return null or an empty array, if
- * there are no dependent resources.
- */
- IResource[] get(String id, IResource resource);
-
- /**
- * Answer true if other resources depend on this resource.
- *
- * @param resource
- * The resource being tested.
- *
- * @return true if any of the validators asserted a dependency on this resource.
- */
- boolean isDependedOn(IResource resource);
-
- /**
- * Replace all the resources that the dependent depends on.
- *
- * @param id
- * The validator id that is asserting that the dependency exists.
- * @param dependent
- * The resource that is dependent on the other resource.
- * @param dependsOn
- * All the resources that are depended on. This can be null or a zero
- * length array. Null or a zero length array removes all the dependencies.
- */
- void set(String id, IResource dependent, IResource[] dependsOn);
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IPerformanceMonitor.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IPerformanceMonitor.java
deleted file mode 100644
index fe7c15b..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IPerformanceMonitor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import java.util.List;
-
-/**
- * A service that collects performance information on validation operations.
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @noimplement
- * @author karasiuk
- *
- */
-public interface IPerformanceMonitor {
-
- /**
- * The level of information to collect.
- */
- public enum CollectionLevel {None, Default}
-
- /**
- * Add this performance counter to the monitor. The monitor will decide what to
- * do with the results, it may log them to a file, or it may simply hold on to them.
- *
- * @param counters
- */
- public void add(PerformanceCounters counters);
-
- /**
- * Answer true if the performance monitor is collecting performance events.
- */
- public boolean isCollecting();
-
- /** Answer true if only summary information is requested. */
- public boolean isSummaryOnly();
-
- /**
- * Set the performance event collection level. This controls which
- * performance events are collected, including none of them.
- *
- * @param level
- * The level to collect. The default is to not collect anything.
- */
- public void setCollectionLevel(CollectionLevel level);
-
- /**
- * Answer the level of performance events that are being collected by the validation framework.
- */
- public CollectionLevel getCollectionLevel();
-
- /**
- * Answer the performance counters that have been collected so far. Some
- * monitors do not save counters, and they will always return an empty list.
- *
- * @param asSummary
- * If this parameter is true, only answer a summary of the counters.
- */
- public List<PerformanceCounters> getPerformanceCounters(boolean asSummary);
-
- /**
- * Delete the collected performance counters.
- */
- public void resetPerformanceCounters();
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IValidatorGroupListener.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IValidatorGroupListener.java
deleted file mode 100644
index 5f4feee..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IValidatorGroupListener.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Validators may wish to join validator groups for performance or other
- * reasons. That way expensive operations like creating and releasing models can
- * be done in a common location, and be done only once per resource. Group listeners
- * are declared via the <code>org.eclipse.wst.validation.validatorGroup</code> extension point.
- * <p>
- * As validation proceeds, the validation framework, on a resource by resource
- * bases, determines if any validators that are members of a group are
- * interested in the resource. If they are, before the first validator in the
- * group is called, the <code>validationStarting</code> method is called. If this method was
- * called, then the <code>validationFinishing</code> method will be called once all the
- * validators have processed the resource.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
-public interface IValidatorGroupListener {
- /**
- * This is called before the first validator in the group that is interested
- * in the resource is called. If no validators in the group are interested
- * in the resource, then this method is not called.
- *
- * @param resource
- * The resource that is being validated.
- * @param monitor
- * A progress monitor that the method should use.
- * @param state
- * The validation state for the current operation.
- */
- void validationStarting(IResource resource, IProgressMonitor monitor, ValidationState state);
-
- /**
- * If the validationStarting method was called on the resource, then this
- * method will be called after the last validator has processed the
- * resource.
- *
- * @param resource
- * The resource that is being validated.
- * @param monitor
- * A progress monitor that the method can use.
- * @param state
- * The validation state for the current operation.
- */
- void validationFinishing(IResource resource, IProgressMonitor monitor, ValidationState state);
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MessageSeveritySetting.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MessageSeveritySetting.java
deleted file mode 100644
index 4eaa3b7..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MessageSeveritySetting.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.wst.validation.internal.ValMessages;
-
-/**
- * Associate a message severity with a message category.
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @noextend
- * @author karasiuk
- *
- */
-public class MessageSeveritySetting {
- public enum Severity {
- Error(ValMessages.SevError, IMarker.SEVERITY_ERROR),
- Warning(ValMessages.SevWarning, IMarker.SEVERITY_WARNING),
- Ignore(ValMessages.SevIgnore, IMarker.SEVERITY_INFO);
-
- private String _severityLabel;
- private Severity(String label, int markerSeverity){
- _severityLabel = label;
- _markerSeverity = markerSeverity;
- }
- private int _markerSeverity;
-
- @Override
- public String toString() {
- return _severityLabel;
- }
-
- /**
- * Answer the associated IMarker severity.
- */
- public int getMarkerSeverity() {
- return _markerSeverity;
- }
-
- }
-
- private String _id;
- private String _label;
- private Severity _default;
- private Severity _current;
-
- /**
- * Create an association between a label and a message severity.
- *
- * @param id
- * An id that is used to identify this particular setting. This must be
- * unique within the scope of this particular validator.
- *
- * @param label
- * An end user string, that can describe either an individual message
- * or a message category.
- *
- * @param defaultSeverity
- * The default severity for this label. If the end user doesn't change
- * anything this is what the severity will be.
- */
- public MessageSeveritySetting(String id, String label, Severity defaultSeverity){
- _id = id;
- _label = label;
- _default = defaultSeverity;
- }
-
- @Override
- public int hashCode() {
- int h = 0;
- if (_current != null)h += _current.getMarkerSeverity()*1000;
- if (_id != null)h += _id.hashCode();
- return h;
- }
-
- public String getLabel() {
- return _label;
- }
-
- /** Answer the default severity as defined by the validator owner. */
- public Severity getDefault() {
- return _default;
- }
-
- /**
- * Answer the current severity for the message. The end user may have changed this through a
- * preference dialog.
- */
- public Severity getCurrent() {
- if (_current != null)return _current;
- return _default;
- }
-
- /**
- * The id that the validator owner assigned to the message.
- */
- public String getId() {
- return _id;
- }
-
- /**
- * Set the current message severity.
- *
- * @param severity
- * @return true if the setting changed
- */
- public boolean setCurrent(Severity severity) {
- if (_current == severity)return false;
- _current = severity;
- return true;
- }
-
- @Override
- public String toString() {
- return _id + " " + getCurrent().toString(); //$NON-NLS-1$
- }
-
- /**
- * Answer a copy of this object.
- */
- public MessageSeveritySetting copy() {
- MessageSeveritySetting ms = new MessageSeveritySetting(_id, _label, _default);
- ms._current = _current;
- return ms;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/PerformanceCounters.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/PerformanceCounters.java
deleted file mode 100644
index cf57721..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/PerformanceCounters.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.internal.Misc;
-import org.eclipse.wst.validation.internal.ValMessages;
-
-/**
- * Some performance information for a validation invocation. This object is immutable.
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @noextend
- * @author karasiuk
- *
- */
-public class PerformanceCounters {
-
- private long _when;
- private String _validatorId;
- private String _validatorName;
- private String _resourceName;
- private int _numberInvocations;
- private long _elapsedTime;
- private long _cpuTime;
-
- /**
- * @param validatorId
- * @param validatorName
- * @param resourceName
- * @param numberInvocations number of times the validator was invoked
- * @param elapsedTime elapsed time in milliseconds
- * @param cpuTime CPU time in nanoseconds
- */
- public PerformanceCounters(String validatorId, String validatorName, String resourceName,
- int numberInvocations, long elapsedTime, long cpuTime){
-
- _when = System.currentTimeMillis();
- _validatorId = validatorId;
- _validatorName = validatorName;
- _resourceName = resourceName;
- _numberInvocations = numberInvocations;
- _elapsedTime = elapsedTime;
- _cpuTime = cpuTime;
- }
-
- public String getValidatorId() {
- return _validatorId;
- }
- public int getNumberInvocations() {
- return _numberInvocations;
- }
-
- /**
- * Answer the elapsed time in milliseconds.
- */
- public long getElapsedTime() {
- return _elapsedTime;
- }
-
- /**
- * Answer the amount of CPU time in nanoseconds. If this can not be determined,
- * answer -1.
- */
- public long getCpuTime() {
- return _cpuTime;
- }
-
- @Override
- public String toString() {
- return NLS.bind(ValMessages.LogValEndTime,
- new Object[]{_validatorName, _validatorId, _resourceName, Misc.getTimeMS(_elapsedTime)});
- }
-
- public String toString(boolean asSummary){
- if (asSummary){
- if (_cpuTime != -1)return NLS.bind(ValMessages.LogValSummary2,
- new Object[]{_validatorName, _validatorId, _numberInvocations,
- Misc.getTimeMS(_elapsedTime), Misc.getTimeNano(_cpuTime)});
-
- return NLS.bind(ValMessages.LogValSummary,
- new Object[]{_validatorName, _validatorId, _numberInvocations, Misc.getTimeMS(_elapsedTime)});
- }
- return toString();
- }
-
- public String getValidatorName() {
- return _validatorName;
- }
-
- /**
- * Answer when was the event logged.
- *
- * @see System#currentTimeMillis()
- */
- public long getWhen() {
- return _when;
- }
-
- public String getResourceName() {
- return _resourceName;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ReporterHelper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ReporterHelper.java
deleted file mode 100644
index 20876bf..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ReporterHelper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.internal.MarkerManager;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-
-/**
- * This is a temporary class to ease the transition from the previous validation framework.
- * <p>
- * This is not API.
- * @author karasiuk
- *
- */
-public class ReporterHelper implements IReporter {
- private IProgressMonitor _monitor;
- private List<IMessage> _list = new LinkedList<IMessage>();
-
- public ReporterHelper(IProgressMonitor monitor){
- _monitor = monitor;
- }
-
- public void addMessage(IValidator origin, IMessage message) {
- _list.add(message);
- }
-
- public void displaySubtask(IValidator validator, IMessage message) {
- _monitor.subTask(message.getText(validator.getClass().getClassLoader()));
- }
-
- public List<IMessage> getMessages() {
- return _list;
- }
-
- public boolean isCancelled() {
- return _monitor.isCanceled();
- }
-
- public void removeAllMessages(IValidator origin) {
- _list.clear();
- }
-
- public void removeAllMessages(IValidator origin, Object object) {
- _list.clear();
- }
-
- public void removeMessageSubset(IValidator validator, Object obj, String groupName) {
- _list.clear();
- }
-
- public void makeMarkers(){
- MarkerManager.getDefault().makeMarkers(_list);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationFramework.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationFramework.java
deleted file mode 100644
index fe62b40..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationFramework.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.validation.internal.ContentTypeWrapper;
-import org.eclipse.wst.validation.internal.DebugConstants;
-import org.eclipse.wst.validation.internal.DependencyIndex;
-import org.eclipse.wst.validation.internal.DisabledResourceManager;
-import org.eclipse.wst.validation.internal.DisabledValidatorManager;
-import org.eclipse.wst.validation.internal.MarkerManager;
-import org.eclipse.wst.validation.internal.Misc;
-import org.eclipse.wst.validation.internal.PerformanceMonitor;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValOperation;
-import org.eclipse.wst.validation.internal.ValType;
-import org.eclipse.wst.validation.internal.ValidationRunner;
-import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-
-/**
- * The central class of the Validation Framework.
- * <p>
- * This is a singleton class that is accessed through the getDefault() method.
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @author karasiuk
- *
- */
-public final class ValidationFramework {
-
- private IDependencyIndex _dependencyIndex;
- private IPerformanceMonitor _performanceMonitor;
-
- private Set<IProject> _suspendedProjects;
- private boolean _suspendAllValidation;
-
- private static ValidationFramework _me;
-
- /**
- * Answer the singleton, default instance of this class.
- */
- public static ValidationFramework getDefault(){
- if (_me == null)_me = new ValidationFramework();
- return _me;
- }
-
- private ValidationFramework(){}
-
- /**
- * Clear any validation markers that may have been set by this validator.
- *
- * @param resource
- * The resource that may have it's markers cleared.
- * @param validatorId
- * The id of validator that created the marker.
- */
- public void clearMessages(IResource resource, String validatorId) throws CoreException {
- Validator v = getValidator(validatorId, null);
- if (v != null)MarkerManager.getDefault().clearMarker(resource, v);
- }
-
- /**
- * Disable all validation for the given resource. This method instructs
- * the framework to not run any validators on the given resource or any of
- * it's children. This setting is persistent. Currently this only works with version 2
- * validators.
- * <p>
- * Use the enableValidation method to restore validation.
- * </p>
- *
- * @param resource
- * The resource that is having validation disabled. It must be an IFolder or an IFile.
- *
- * @see #enableValidation(IResource)
- */
- public void disableValidation(IResource resource){
- assert resource != null;
- DisabledResourceManager.getDefault().disableValidation(resource);
- }
-
- /**
- * Enable validation for the given resource. If the resource was not
- * previously disabled this method call has no effect. Currently this only
- * works with version 2 validators.
- *
- * @param resource
- * The resource that is having validation re-enabled.
- *
- * @see #disableValidation(IResource)
- */
- public void enableValidation(IResource resource){
- DisabledResourceManager.getDefault().enableValidation(resource);
- }
-
- /**
- * Answer the dependency index. Validators can use this to determine which resources depend on which
- * other resources.
- */
- public IDependencyIndex getDependencyIndex(){
- if (_dependencyIndex != null)return _dependencyIndex;
- return getDependencyIndex2();
- }
-
- private synchronized IDependencyIndex getDependencyIndex2() {
- if (_dependencyIndex == null)_dependencyIndex = new DependencyIndex();
- return _dependencyIndex;
- }
-
- /**
- * Answer a performance monitor for the validators.
- */
- public synchronized IPerformanceMonitor getPerformanceMonitor(){
- if (_performanceMonitor == null){
- boolean traceTimes = Misc.debugOptionAsBoolean(DebugConstants.TraceTimes);
- String traceFile = Platform.getDebugOption(DebugConstants.TraceTimesFile);
- boolean useDoubles = Misc.debugOptionAsBoolean(DebugConstants.TraceTimesUseDoubles);
-
- _performanceMonitor = PerformanceMonitor.create(traceTimes, traceFile, useDoubles);
- }
- return _performanceMonitor;
- }
-
- /**
- * Answer the preference store that holds the global validation settings.
- */
- public IEclipsePreferences getPreferenceStore(){
- return new InstanceScope().getNode(ValidationPlugin.PLUGIN_ID);
- }
-
- public IReporter getReporter(IProject project, IProgressMonitor monitor){
- return new WorkbenchReporter(project, monitor);
- }
-
- /**
- * Answer all the validators that are applicable for the given resource. A validator is
- * still returned even if it has been turned off by the user.
- * <p>
- * The caller may still need to test if the validator has been turned off by
- * the user, by using the isBuildValidation() and isManualValidation()
- * methods.
- * </p>
- *
- * @param resource
- * The resource that determines which validators are applicable.
- *
- * @param isManual
- * If true then the validator must be turned on for manual validation.
- * If false then the isManualValidation setting isn't used to filter
- * out validators.
- *
- * @param isBuild
- * If true then the validator must be turned on for build based
- * validation. If false then the isBuildValidation setting isn't used
- * to filter out validators.
- *
- * @see Validator#isBuildValidation()
- * @see Validator#isManualValidation()
- */
- public Validator[] getValidatorsFor(IResource resource, boolean isManual, boolean isBuild){
- IProject project = resource.getProject();
- List<Validator> list = new LinkedList<Validator>();
- ContentTypeWrapper ctw = new ContentTypeWrapper();
- for (Validator val : ValManager.getDefault().getValidators(project)){
- if (val.shouldValidate(resource, isManual, isBuild, ctw))list.add(val);
- }
-
- Validator[] result = new Validator[list.size()];
- list.toArray(result);
- return result;
- }
-
- /**
- * Answer all the validators that should not validate the resource, either
- * because their filters don't support the resource, or the validator has
- * been disabled for both build validation and manual validation.
- *
- * @param resource
- * The resource this is being tested.
- */
- public Set<Validator> getDisabledValidatorsFor(IResource resource){
- return DisabledValidatorManager.getDefault().getDisabledValidatorsFor(resource);
- }
-
- /**
- * Answer the global validator with the given id.
- *
- * @deprecated Use getValidator(String id, IProject project) with a null project instead.
- *
- * @param id
- * @return null if the validator is not found
- */
- public Validator getValidator(String id){
- return ValManager.getDefault().getValidatorWithId(id, null);
- }
-
- /**
- * Answer the validator with the given id that is in effect for the given
- * project.
- * <p>
- * Individual projects may override the global validation preference
- * settings. If this is allowed and if the project has it's own settings,
- * then those validators are returned via this method.
- * </p>
- * <p>
- * The following approach is used. For version 1 validators, the validator
- * is only returned if it is defined to operate on this project type. This
- * is the way that the previous version of the framework did it. For version
- * 2 validators, they are all returned.
- * </p>
- *
- * @param id
- * Validator id.
- * @param project
- * This can be null, in which case all the registered validators are
- * checked.
- * @return null if the validator is not found
- */
- public Validator getValidator(String id, IProject project){
- return ValManager.getDefault().getValidatorWithId(id, project);
- }
-
- /**
- * Answer all the validators that are applicable for the given resource.
- *
- * @param resource the resource that determines which validators are applicable.
- */
- public Validator[] getValidatorsFor(IResource resource){
- List<Validator> list = new LinkedList<Validator>();
- for (Validator v : getValidatorsFor(resource, false, false)){
- if (v.isBuildValidation() || v.isManualValidation())list.add(v);
- }
- Validator[] vals = new Validator[list.size()];
- return list.toArray(vals);
- }
-
- /**
- * Answer true if the resource has any enabled validators.
- *
- * @param resource
- * A file, folder or project.
- *
- * @param isManual
- * If true then the validator must be turned on for manual validation.
- * If false then the isManualValidation setting isn't used to filter
- * out validators.
- *
- * @param isBuild
- * If true then the validator must be turned on for build based
- * validation. If false then the isBuildValidation setting isn't used
- * to filter out validators.
- */
- public boolean hasValidators(IResource resource, boolean isManual, boolean isBuild){
- return ValManager.getDefault().hasValidators(resource, isManual, isBuild);
- }
-
- /**
- * Waits until all validation jobs are finished. This method will block the
- * calling thread until all such jobs have finished executing, or until this
- * thread is interrupted. If there are no validation jobs that are
- * currently waiting, running, or sleeping, this method returns immediately.
- * Feedback on how the join is progressing is provided to the progress
- * monitor.
- * <p>
- * If this method is called while the job manager is suspended, only jobs
- * that are currently running will be joined. Once there are no jobs in the
- * family in the {@link Job#RUNNING} state, this method returns.
- * </p>
- * <p>
- * Note that there is a deadlock risk when using join. If the calling thread
- * owns a lock or object monitor that the joined thread is waiting for,
- * deadlock will occur. This method can also result in starvation of the
- * current thread if another thread continues to add jobs of the given
- * family, or if a job in the given family reschedules itself in an infinite
- * loop.
- * </p>
- *
- * @param monitor
- * Progress monitor for reporting progress on how the wait is
- * progressing, or <code>null</code> if no progress monitoring is
- * required.
- * @exception InterruptedException
- * if this thread is interrupted while waiting
- * @exception OperationCanceledException
- * if the progress monitor is canceled while waiting
- */
- public void join(IProgressMonitor monitor) throws InterruptedException, OperationCanceledException {
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, monitor);
- Job.getJobManager().join(ValidationBuilder.FAMILY_VALIDATION_JOB, monitor);
- }
-
- /**
- * Suspends, or undoes the suspension of, validation on the current project.
- * If <b>suspend</b> is true then validation is suspended and if it's false
- * then validation is not suspended on the project. The value of this
- * variable is not persisted.
- * <p>
- * Be <b>very careful</b> when you use this method! Turn validation back on in a
- * finally block because if the code which suspended validation crashes, the
- * user has no way to reset the suspension. The user will have to shut down
- * and restart the workbench to get validation to work again.
- * </p>
- *
- * @param project
- * The project that is to be suspended or unsuspended.
- * @param suspend
- * If true, validation on the project will be suspend. If false it will
- * not be suspended.
- */
- public void suspendValidation(IProject project, boolean suspend) {
- if (project == null)return;
- if (suspend)getSuspendedProjects().add(project);
- else getSuspendedProjects().remove(project);
- }
-
- private synchronized Set<IProject> getSuspendedProjects(){
- if (_suspendedProjects == null)_suspendedProjects = Collections.synchronizedSet(new HashSet<IProject>(20));
- return _suspendedProjects;
- }
-
- /**
- * Suspends, or undoes the suspension of, validation on all projects in the
- * workbench. If "suspend" is true then validation is suspended and if it's
- * "false" then validation is not suspended. The value of this variable is
- * not persisted.
- * <p>
- * Be <b>very careful</b> when you use this method! Turn validation back on in a
- * finally block because if the code which suspended validation crashes, the
- * user has no way to reset the suspension. The user will have to shut down
- * and restart the workbench to get validation to work again.
- * </p>
- */
- public void suspendAllValidation(boolean suspend) {
- _suspendAllValidation = suspend;
- }
-
- /**
- * Return true if "suspend all" is enabled, false otherwise.
- */
- public boolean isSuspended() {
- return _suspendAllValidation;
- }
-
- /**
- * Returns true if validation will not run on the project because it's been suspended. This
- * method checks only the suspension status; if validation cannot run for some other reason (for
- * example, there are no enabled validators), yet the IProject is not suspended, this method
- * will return true even though validation will not run.
- */
- public boolean isSuspended(IProject project) {
- if (_suspendAllValidation)return true;
- if (project == null)return false;
- return getSuspendedProjects().contains(project);
- }
-
- /**
- * This method should be called by any code that is preparing to suspend validation on a
- * project. Rather than calling isSuspended(IProject), which will also return true if all validation
- * has been suspended.
- *
- * @param project the project that is being tested
- * @return boolean true if the project has been suspended
- */
- public boolean isProjectSuspended(IProject project) {
- if (project == null)return false;
- return getSuspendedProjects().contains(project);
- }
-
- /**
- * Validate the projects. Exactly one of isManual or isBuild needs to be true.
- *
- * @param projects
- * The projects to be validated.
- *
- * @param isManual
- * Is this being done as part of a manual validation? i.e. did
- * the user select the Validate menu item?
- *
- * @param isBuild
- * Is this being done as part of a build?
- *
- * @param monitor
- *
- * @return the validation result which is the combined result for all the
- * resources that were validated.
- */
- public ValidationResults validate(IProject[] projects, final boolean isManual, final boolean isBuild,
- IProgressMonitor monitor) throws CoreException{
- ValType type = ValType.Build;
- if (isManual)type = ValType.Manual;
- ValOperation vo = ValidationRunner.validate(createMap(projects), type, monitor, true);
- return vo.getResults();
- }
-
- /**
- * Answer all the resources in the projects as a map.
- * @param projects
- */
- private Map<IProject, Set<IResource>> createMap(IProject[] projects) throws CoreException{
- final HashMap<IProject, Set<IResource>> map = new HashMap<IProject, Set<IResource>>(1000);
-
- for (IProject p : projects){
- Set<IResource> set = new HashSet<IResource>(1000);
- ResourceAdder ra = new ResourceAdder(set);
- p.accept(ra);
- map.put(p, set);
- }
- return map;
- }
-
- public static class ResourceAdder implements IResourceVisitor {
-
- private Set<IResource> _set;
-
- /**
- * A class that knows how to add resources to a set.
- * @param set the set where the resources are added.
- */
- public ResourceAdder(Set<IResource> set){
- _set = set;
- }
-
- public boolean visit(IResource resource) throws CoreException {
- // [225839] the older validators only expect files and folders.
- int type = resource.getType();
- if (type == IResource.FILE || type == IResource.FOLDER)_set.add(resource);
- return true;
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResult.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResult.java
deleted file mode 100644
index 1e54b7c..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResult.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * The result of running a validate operation. Validators create and return this objects as part of
- * performing their validation.
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @author karasiuk
- *
- */
-public final class ValidationResult {
-
- private List<ValidatorMessage> _messages;
-
- private static ValidatorMessage[] _noMessages = new ValidatorMessage[0];
-
- private boolean _canceled;
-
- /**
- * The resources that the validated resource depends on. This can be left null.
- * For example, an XML file may depend on a XSD in order to know if it is valid or not.
- * It would pass back the XSD file.
- */
- private IResource[] _dependsOn;
-
- /**
- * The objects that you validated as a side effect of validating this object. The framework will not
- * call you with any of these objects (in this validation run). This can be left null.
- */
- private IResource[] _validated;
-
- private int _severityError;
- private int _severityWarning;
- private int _severityInfo;
-
- private IProject _suspendValidation;
-
- /** A count of the number of resources that were validated. */
- private int _numberOfValidatedResources = 1;
-
- private ReporterHelper _reporter;
- private ValidationException _validationException;
-
- /**
- * This is an optional method, that a validator can use to return error
- * messages. The validation framework converts these into IMarkers.
- * <p>
- * The scenario that motivated this method, is when a validator is used both
- * for <b>as you type</b> validation and <b>build</b> validation. When
- * called in as you type mode, the validator doesn't want to directly create IMarkers,
- * because the resource hasn't been saved yet. It needs to return something
- * other than an IMarker. But when called in build mode, it does ultimately
- * want IMarkers. By returning ValidatorMessages, it only needs to return
- * one type of message, and those messages can be either be directly used by
- * the caller, or automatically converted into IMarkers by the validation
- * framework.
- * <p>
- * To make matters even more complicated there is a third way to return
- * messages. To make it easier for old validators to port to the new
- * framework, they can continue to use an IReporter. If a validator calls
- * the getReporter() method then it is assumed by the framework that that is
- * the approach that they have chosen.
- *
- * @see #getReporter(IProgressMonitor)
- *
- * @param message
- * A validation message.
- */
- public void add(ValidatorMessage message){
- getMessageList().add(message);
- }
-
- /**
- * Answer an IReporter for handing error messages.
- * <p>
- * This is a transition method, to help old validators port to the new validation framework. If this method
- * is called it is assumed by the framework, that this IReporter will be used as the only way of passing messages
- * back to the framework.
- *
- * @see #add(ValidatorMessage)
- * @param monitor
- */
- public IReporter getReporter(IProgressMonitor monitor){
- if (_reporter == null)_reporter = new ReporterHelper(monitor);
- return _reporter;
- }
-
- ReporterHelper getReporterHelper(){
- return _reporter;
- }
-
- /**
- * Merge the message counts and messages from an individual validator into this result.
- * @param result it can be null, in which case it is ignored.
- */
- public void mergeResults(ValidationResult result){
- if (result == null)return;
-
- ValidatorMessage[] msgs = result.getMessages();
- for (ValidatorMessage m : msgs){
- add(m);
- int severity = m.getAttribute(IMarker.SEVERITY, 0);
- switch (severity){
- case IMarker.SEVERITY_ERROR:
- incrementError(1);
- break;
- case IMarker.SEVERITY_WARNING:
- incrementWarning(1);
- break;
- case IMarker.SEVERITY_INFO:
- incrementInfo(1);
- break;
-
- }
- }
-
- incrementError(result.getSeverityError());
- incrementWarning(result.getSeverityWarning());
- incrementInfo(result.getSeverityInfo());
-
- _numberOfValidatedResources += result.getNumberOfValidatedResources();
-
- }
-
- /**
- * Answer the resources that the validated resource depends on.
- */
- public IResource[] getDependsOn() {
- return _dependsOn;
- }
-
- /**
- * Answer any validation messages that were added by the validator.
- * @return an array is returned even if there are no messages.
- */
- public ValidatorMessage[] getMessages(){
- if (_messages == null)return _noMessages;
- ValidatorMessage[] msgs = new ValidatorMessage[_messages.size()];
- _messages.toArray(msgs);
- return msgs;
- }
-
- /**
- * Update the resources that the validated resource depends on. This can be
- * left null. For example, a XML file may depend on a XSD file in order to
- * know if it is valid or not. It would pass back that XSD file.
- *
- * @param dependsOn
- * If this is null then the dependency information is not updated. To
- * remove the dependency information, an empty array needs to be
- * supplied. A non null parameter, <b>replaces</b> all the dependency
- * information for this resource, for this validator.
- */
- public void setDependsOn(IResource[] dependsOn) {
- _dependsOn = dependsOn;
- }
-
- private List<ValidatorMessage> getMessageList(){
- if (_messages == null)_messages = new LinkedList<ValidatorMessage>();
- return _messages;
- }
-
- /**
- * @return All the resources that were validated as a side-effect of
- * validating the main resource, or null if none were.
- */
- public IResource[] getValidated() {
- return _validated;
- }
-
- /**
- * Indicate that additional resources have been validated as part of this
- * validate operation. Sometimes in the course of performing a validation on
- * one resource it is necessary to validate other resources as well. This
- * method is used to let the framework know about these additional validated
- * resources, to possibly save them being validated redundantly.
- *
- * @param validated
- * Any additional resources that were validated.
- */
- public void setValidated(IResource[] validated) {
- _validated = validated;
- }
-
- /**
- * Answer the number of error messages that were generated as part of this validation operation.
- */
- public int getSeverityError() {
- return _severityError;
- }
-
- /**
- * Set the number of error messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- */
- public void setSeverityError(int severityError) {
- _severityError = severityError;
- }
-
-
- /**
- * Increment the number of error messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- *
- * @return the current number of errors.
- */
- public int incrementError(int errors){
- _severityError += errors;
- return _severityError;
- }
-
- /**
- * Answer the number of warning messages that were generated as part of this validation operation.
- */
- public int getSeverityWarning() {
- return _severityWarning;
- }
-
- /**
- * Set the number of warning messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- */
- public void setSeverityWarning(int severityWarning) {
- _severityWarning = severityWarning;
- }
-
- /**
- * Increment the number of warning messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- *
- * @return the current number of warnings.
- */
- public int incrementWarning(int warnings){
- _severityWarning += warnings;
- return _severityWarning;
- }
-
- /**
- * Answer the number of informational messages that were generated as part of this validation operation.
- */
- public int getSeverityInfo() {
- return _severityInfo;
- }
-
- /**
- * Set the number of informational messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- */
- public void setSeverityInfo(int severityInfo) {
- _severityInfo = severityInfo;
- }
-
- /**
- * Increment the number of informational messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- *
- * @return the current number of informational message.
- */
- public int incrementInfo(int info){
- _severityInfo += info;
- return _severityInfo;
- }
-
- /**
- * Was the operation canceled before it completed? For example if the validation is being run through the
- * user interface, the end user can cancel the operation through the progress monitor.
- *
- * @return true if the operation was canceled
- */
- public boolean isCanceled() {
- return _canceled;
- }
-
- /**
- * Indicate if the operation was canceled.
- *
- * @param canceled
- * Set to true if it was canceled and false if it was not canceled.
- */
- public void setCanceled(boolean canceled) {
- _canceled = canceled;
- }
-
- /**
- * Answer the number of resources that have been validated.
- */
- public int getNumberOfValidatedResources() {
- if (_validated == null)return _numberOfValidatedResources;
- return _numberOfValidatedResources + _validated.length;
- }
-
- /**
- * If the validation ended with an exception, answer it.
- * @return null if the validator did not finish with an exception.
- */
- public ValidationException getValidationException() {
- return _validationException;
- }
-
- /**
- * If the validation failed with an exception, it can be recorded here.
- * <p>
- * This method is provided for old validators to ease their transition to the new framework.
- * </p>
- * @param validationException
- */
- public void setValidationException(ValidationException validationException) {
- _validationException = validationException;
- }
-
- /**
- * Answer the project that the validator would like to have suspended.
- *
- * @return the project to suspend or null. The normal result is null, which means that
- * the validator wishes to receive normal validation requests.
- */
- public IProject getSuspendValidation(){
- return _suspendValidation;
- }
-
- /**
- * Calling this method will inform the framework, that this validator does not wish to be
- * called again for any resources in this project, for the duration of this validation operation.
- * <p>
- * Some validators may have a rich set of triggers, but once they have been invoked once,
- * do not need to be invoked again during the course of the current validation.
- * </p>
- * @param project The project that this validator no longer wants to be notified on.
- */
- public void setSuspendValidation(IProject project) {
- _suspendValidation = project;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResults.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResults.java
deleted file mode 100644
index f614121..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResults.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-/**
- * The combined results of validating multiple resources.
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @author karasiuk
- *
- */
-public class ValidationResults {
- private ValidationResult _result;
-
- public ValidationResults(ValidationResult result){
- _result = result;
- }
-
- /**
- * Answer any validation messages that were added by the validation operation.
- * @return an array is returned even if there are no messages.
- */
- public ValidatorMessage[] getMessages(){
- if (_result == null)return new ValidatorMessage[0];
- return _result.getMessages();
- }
-
- /**
- * Answer the number of error messages that were generated as part of this validation operation.
- */
- public int getSeverityError() {
- if (_result == null)return 0;
- return _result.getSeverityError();
- }
-
- /**
- * Answer the number of informational messages that were generated as part of this validation operation.
- */
- public int getSeverityInfo() {
- if (_result == null)return 0;
- return _result.getSeverityInfo();
- }
-
- /**
- * Answer the number of warning messages that were generated as part of this validation operation.
- */
- public int getSeverityWarning() {
- if (_result == null)return 0;
- return _result.getSeverityWarning();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationState.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationState.java
deleted file mode 100644
index 3c194ac..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationState.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Keep track of arbitrary validation data, during the course of a validation.
- * <p>
- * To enable more efficient caching, the validation framework, allows individual validators to cache
- * arbitrary data during the validation process. Use of this object is completely optional.
- * <p>
- * Since some validators wish to share data with other validators, any validator can see the state data for
- * any other validator, since the id is simply the validator's extension id.
- * <p>
- * This object is freed at the end of the validation process.
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @noextend
- * @author karasiuk
- *
- */
-public class ValidationState {
-
- /**
- * This is a special id.
- * <p>
- * If a resource that is depended on by others is changed, then the
- * dependent resources are validated. The depended on resource, which is the
- * resource that actually changed, is placed into the ValidationState using
- * this id.
- * </p>
- */
- public static final String TriggerResource = ValidationPlugin.PLUGIN_ID + ".Trigger"; //$NON-NLS-1$
-
- private Map<String, Object> _map = new HashMap<String, Object>(50);
-
- /**
- * Save some state information.
- *
- * @param id
- * By convention this is the fully qualified validator extension id.
- * For example: org.eclipse.wst.html.ui.HTMLValidator
- *
- * @param value
- * Any arbitrary data that the validator might find useful. The
- * validation framework doesn't do anything with this object except
- * pass it along during the validation process.
- */
- public void put(String id, Object value){
- _map.put(id, value);
- }
-
- /**
- * Answer the state data for the given validator.
- *
- * @param id
- * By convention this is the fully qualified validator extension point
- * id. For example org.eclipse.wst.html.ui.HTMLValidator
- *
- * @return any arbitrary data that the validator might find useful,
- * including null.
- */
- public Object get(String id){
- return _map.get(id);
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Validator.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Validator.java
deleted file mode 100644
index 124f8a5..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Validator.java
+++ /dev/null
@@ -1,1271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.internal.ConfigurationConstants;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.ContentTypeWrapper;
-import org.eclipse.wst.validation.internal.ExtensionConstants;
-import org.eclipse.wst.validation.internal.MarkerManager;
-import org.eclipse.wst.validation.internal.Misc;
-import org.eclipse.wst.validation.internal.NullValidator;
-import org.eclipse.wst.validation.internal.SummaryReporter;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValMessages;
-import org.eclipse.wst.validation.internal.ValOperation;
-import org.eclipse.wst.validation.internal.ValOperationManager;
-import org.eclipse.wst.validation.internal.ValPrefManagerGlobal;
-import org.eclipse.wst.validation.internal.ValPrefManagerProject;
-import org.eclipse.wst.validation.internal.ValType;
-import org.eclipse.wst.validation.internal.ValidationConfiguration;
-import org.eclipse.wst.validation.internal.ValidatorExtensionReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.core.ValidatorLauncher;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.internal.model.FilterGroup;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * Represents a validator. This gets instantiated through one of the validator extension points.
- * <p>
- * <b>This class is not API</b>.
- * </p>
- *
- * @author karasiuk
- *
- */
-public abstract class Validator implements Comparable<Validator> {
- // Remember if you add a new instance variable, make sure that you update the copy and become methods
-
- /**
- * The level of configuration for the validator.
- * <ul>
- * <li>Extension - Defined by an extension point.</li>
- * <li>Global - Defined by a global preference.</li>
- * <li>Project - Defined by a project property.</li>
- * </ul>
- */
- public enum Level {Extension, Global, Project};
-
- protected boolean _buildValidation = true;
-
- /** If this is a delegating validator, then this field holds the validator that will be delegated to. */
- private String _delegatingId;
-
- /**
- * If this validator is also used to control an ISource validator, the id of the ISource validator is
- * registered here.
- */
- private String _sourceId;
-
- protected boolean _manualValidation = true;
-
- /** An optional customized marker id for this validator. */
- private String _markerId;
-
- /**
- * Version of the filter definition. By increasing this number the framework can know that a plug-in has
- * changed it's filters.
- */
- private int _version = 1;
-
- /** Map simple message id's to message settings. */
- private Map<String, MessageSeveritySetting> _messageSettings;
-
- /** The project that you are defined in. This can be null which means that you are a global validator. */
- protected IProject _project;
-
- /** How many times has a global field in this validator been changed since it was created (or copied)? */
- protected transient int _changeCountGlobal;
-
- /** How many times has a message field in this validator been changed since it was created (or copied)? */
- protected transient int _changeCountMessages;
-
- /**
- * Create a new validator based on a abstract validator.
- *
- * @param validator
- * The validator that is being wrapped.
- *
- * @param project
- * The project that you are defined in. This can be null which
- * means that you are a global validator.
- */
- public static Validator create(IConfigurationElement validator, IProject project) {
- V2 v2 = new V2(validator, project);
- return v2;
- }
-
- /**
- * Create a new validator based on validator meta data.
- *
- * @param project
- * The project that you are defined in. This can be null which
- * means that you are a global validator.
- */
- public static Validator create(ValidatorMetaData vmd, ValidationConfiguration config, IProject project){
- V1 v1 = new V1(vmd, config);
- v1._project = project;
- return v1;
- }
-
- /**
- * If you are a version 1 validator, answer yourself as one, otherwise answer null.
- */
- public V1 asV1Validator(){
- return null;
- }
-
- /**
- * If you are a version 2 validator, answer yourself as one, otherwise answer null.
- */
- public V2 asV2Validator() {
- return null;
- }
-
- /**
- * The project is being cleaned, this method gives the validator a chance to do any special cleanup.
- * The default is to do nothing.
- *
- * @param project the project being built.
- * @param monitor the monitor that should be used for reporting progress if the clean takes a long time.
- */
- public void clean(IProject project, IProgressMonitor monitor){
- }
-
- /**
- * Compare yourself based on Validator name.
- */
- public int compareTo(Validator validator) {
- return getName().compareTo(validator.getName());
- }
-
- /** Answer a deep copy of yourself. */
- public Validator copy(){
- return copy(false);
- }
-
- public abstract Validator copy(boolean includeChangeCounts);
-
- /**
- * Update your direct, non transient fields from the fields in v.
- */
- protected void copyLocal(Validator v, boolean includeChangeCounts){
- _buildValidation = v._buildValidation;
- _delegatingId = v._delegatingId;
- _manualValidation = v._manualValidation;
- _markerId = v._markerId;
- _messageSettings = v._messageSettings;
- _project = v._project;
- _sourceId = v._sourceId;
- _version = v._version;
-
- if (includeChangeCounts){
- _changeCountGlobal = v._changeCountGlobal;
- _changeCountMessages = v._changeCountMessages;
- }
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate
- * this resource. This method does not check to see if global validation or
- * project validation has been suspended or not.
- *
- * @param resource
- * The resource to be checked.
- * @param isManual
- * If true then this validator must also be enabled for manual
- * validation.
- * @param isBuild
- * If true then this validator must also be enabled for builder
- * based validation.
- *
- * @return true if the resource should be validated.
- */
- public boolean shouldValidate(IResource resource, boolean isManual, boolean isBuild){
- return shouldValidate(resource, isManual, isBuild, new ContentTypeWrapper());
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate
- * this resource. This method does not check to see if global validation or
- * project validation has been suspended or not.
- *
- * @param resource
- * The resource to be checked.
- * @param isManual
- * If true then this validator must also be enabled for manual
- * validation.
- * @param isBuild
- * If true then this validator must also be enabled for builder
- * based validation.
- * @param contentTypeWrapper
- * For repeated calls on the same resource, it is more efficient
- * to remember the content type.
- * @return true if the resource should be validated.
- * @see Friend#shouldValidate(Validator, IResource, boolean, boolean, ContentTypeWrapper)
- */
- boolean shouldValidate(IResource resource, boolean isManual, boolean isBuild,
- ContentTypeWrapper contentTypeWrapper){
-
- if (isManual && !_manualValidation)return false;
- if (isBuild && !_buildValidation)return false;
-
- return shouldValidate(resource, contentTypeWrapper);
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate
- * this resource. This method does not check to see if global validation or
- * project validation has been suspended or not.
- *
- * @param resource
- * The resource to be checked.
- * @param valType
- * The context to use when performing the check.
- *
- * @return true if the resource should be validated.
- */
- public boolean shouldValidate(IResource resource, ValType valType){
- return shouldValidate(resource, valType, new ContentTypeWrapper());
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate
- * this resource. This method does not check to see if global validation or
- * project validation has been suspended or not.
- *
- * @param resource
- * The resource to be checked.
- * @param valType
- * The context to use when performing the check.
- * @param contentTypeWrapper
- * For repeated calls on the same resource, it is more efficient
- * to remember the content type.
- *
- * @return true if the resource should be validated.
- *
- * @see Friend#shouldValidate(Validator, IResource, ValType, ContentTypeWrapper)
- */
- boolean shouldValidate(IResource resource, ValType valType, ContentTypeWrapper contentTypeWrapper){
- if (Tracing.matchesExtraDetail(getId())){
- Tracing.log("Validator-01: checking if " + getId() + " should validate " + resource); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (valType == ValType.Manual && !_manualValidation)return false;
- if (valType == ValType.Build && !_buildValidation)return false;
-
- boolean result = shouldValidate(resource, contentTypeWrapper);
- if (Tracing.matchesExtraDetail(getId())){
- Tracing.log("Validator-02: result = " + result); //$NON-NLS-1$
- }
-
- return result;
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate this project. This method
- * does not check to see if global validation or project validation has been suspended or not.
- *
- * @param project the project to be checked
- * @param type The type of validation request
- *
- * @return true if the project should be validated.
- */
- public boolean shouldValidateProject(IProject project, ValType type){
- return shouldValidateProject(project, type == ValType.Manual, type == ValType.Build);
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate this project. This method
- * does not check to see if global validation or project validation has been suspended or not.
- *
- * @param project the project to be checked
- * @param isManual if true then this validator must also be enabled for manual validation.
- * @param isBuild if true then this validator must also be enabled for builder based validation.
- *
- * @return true if the project should be validated.
- */
- public boolean shouldValidateProject(IProject project, boolean isManual, boolean isBuild){
- if (Tracing.matchesExtraDetail(getId())){
- Tracing.log("Validator-03: checking if " + getId() + " should validate " + project); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (isManual && !_manualValidation)return false;
- if (isBuild && !_buildValidation)return false;
- if (project == null || !project.isOpen())return false;
- boolean result = shouldValidateProject(project);
- if (Tracing.matchesExtraDetail(getId())){
- Tracing.log("Validator-04: result " + result); //$NON-NLS-1$
- }
- return result;
- }
- /**
- * Validate the resource.
- *
- * @param resource the resource to be validated
- * @param kind the kind of resource change, see IResourceDelta for values.
- * @param operation the operation that this validation is running under. This can be null.
- * @param monitor a way to report progress. This can be null.
- *
- * @return the result of doing the validation, it can be, but usually isn't null.
- */
- public abstract ValidationResult validate(IResource resource, int kind, ValOperation operation, IProgressMonitor monitor);
-
- /**
- * This method will be called before any validation takes place. It allows validators to perform any
- * initialization that they might need.
- *
- * @param project the project that is being validated. For the very first call in the validation phase,
- * this will be null. That is the signal to the validator that a top level validation is starting.
- * Subsequently, the project will be set, as each of the individual projects are validated.
- *
- * @param state a way to pass arbitrary, validator specific, data from one invocation of a validator to
- * the next, during the validation phase.
- *
- * @param monitor the monitor that should be used for reporting progress if the clean takes a long time.
- */
- public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor){
- // subclasses need to override this, if they wish to let their validators know about this event
- }
-
- /**
- * This method will be called when validation is complete. It allows validators to perform any
- * cleanup that they might need to do.
- *
- * @param project the project that was validated. The very last call in the validation will set this to
- * null so that the validator knows that all the projects have now been validated.
- *
- * @param state a way to pass arbitrary, validator specific, data from one invocation of a validator to
- * the next, during the validation phase.
- *
- * @param monitor the monitor that should be used for reporting progress if the clean takes a long time.
- */
- public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor){
- // subclasses need to override this, if they wish to let their validators know about this event
- }
-
- void add(MessageSeveritySetting message){
- // I can't use getMessageSettings() here, as that will put us into an infinite loop
- if (_messageSettings == null){
- _messageSettings = new HashMap<String, MessageSeveritySetting>(10);
- }
- _messageSettings.put(message.getId(), message);
- bumpChangeCountMessages();
- }
-
- public IValidator asIValidator(){
- return null;
- }
-
- protected abstract boolean shouldValidate(IResource resource, ContentTypeWrapper contentTypeWrapper);
- protected abstract boolean shouldValidateProject(IProject project);
-
- public abstract String getId();
-
- public MessageSeveritySetting getMessage(String id){
- return getMessageSettings().get(id);
- }
-
- /**
- * Answer all the message settings that this validator has defined.
- *
- * @return an empty map if the validator did not define any message settings.
- */
- public Map<String, MessageSeveritySetting> getMessageSettings(){
- Map<String, MessageSeveritySetting> settings = _messageSettings;
- if (settings == null){
- settings = new HashMap<String, MessageSeveritySetting>(10);
- init(settings);
- if (ValManager.getDefault().mustUseGlobalValidators(getProject())){
- ValPrefManagerGlobal gp = ValPrefManagerGlobal.getDefault();
- gp.loadMessages(this, settings);
- }
- else {
- ValPrefManagerProject vp = new ValPrefManagerProject(getProject());
- vp.loadMessages(this, settings);
- }
- _messageSettings = settings;
- }
- return settings;
- }
-
- /**
- * Answer a hash code for the configurable fields so that we can quickly determine if two
- * validators are the same.
- */
- public int hashCodeForConfig(){
- int h = 0;
- if (_buildValidation)h += 101;
- if (_delegatingId != null)h += _delegatingId.hashCode();
- if (_manualValidation)h += 201;
- if (_messageSettings != null){
- for (MessageSeveritySetting ms : _messageSettings.values())h += ms.hashCode();
- }
- if (_sourceId != null)h += _sourceId.hashCode();
- h += _version;
- return h;
- }
-
- private void init(Map<String, MessageSeveritySetting> settings) {
- for (MessageSeveritySetting ms : ValidatorExtensionReader.getDefault().addMessages(this)){
- settings.put(ms.getId(), ms);
- }
- }
-
- public abstract String getName();
-
- /**
- * Answer the project that you were enabled on.
- *
- * @return null if you are a global (i.e. workspace level) validator.
- */
- public IProject getProject(){
- return _project;
- }
-
- /**
- * Answer the name of the class that implements the validator.
- */
- public abstract String getValidatorClassname();
-
- /**
- * Is this validator currently enabled for validations that are triggered manually?
- */
- public boolean isManualValidation() {
- return _manualValidation;
- }
-
- /**
- * Set whether this validator should be triggered as part of a manual validation.
- *
- * @param manualValidation
- */
- public void setManualValidation(boolean manualValidation) {
- setManualValidation2(manualValidation);
- }
-
- protected final void setManualValidation2(boolean manualValidation) {
- if (_manualValidation != manualValidation){
- bumpChangeCountGlobal();
- _manualValidation = manualValidation;
- }
- }
-
- /**
- * Is this validator currently enabled for validations that are triggered by builds?
- */
- public boolean isBuildValidation() {
- return _buildValidation;
- }
-
- /**
- * Has the validator changed since it was last created or copied?
- */
- public boolean isChanged(){
- if (_changeCountGlobal > 0 || _changeCountMessages > 0)return true;
- return false;
- }
-
- /**
- * Has the validator's implementation been loaded yet? This is used by some test cases to ensure that
- * plug-ins are not loaded too early.
- */
- abstract boolean isLoaded();
-
-
- /**
- * Set whether this validator should be triggered by the build process.
- *
- * @param buildValidation
- */
- public void setBuildValidation(boolean buildValidation) {
- setBuildValidation2(buildValidation);
- }
-
- protected final void setBuildValidation2(boolean buildValidation) {
- if (_buildValidation != buildValidation){
- bumpChangeCountGlobal();
- _buildValidation = buildValidation;
- }
- }
-
- /**
- * Get the id of the "real" validator, that is the validator that will be called when this delegating
- * validator is asked to validate something. If this isn't a delegating validator answer null.
- */
- public String getDelegatingId() {
- return _delegatingId;
- }
-
- /**
- * Set the id of the "real" validator, that is the validator that will be called when this delegating
- * validator is asked to validate something.
- *
- * @param delegating the id of the validator that is actually going to perform the validation.
- */
- public void setDelegatingId(String delegating) {
- if (!Misc.same(_delegatingId, delegating)){
- _delegatingId = delegating;
- bumpChangeCountGlobal();
- }
- }
-
- public int getVersion() {
- return _version;
- }
-
- public void setVersion(int version) {
- if (_version != version){
- _version = version;
- bumpChangeCountGlobal();
- }
- }
-
- @Override
- public String toString() {
- return getName();
- }
-
-/**
- * A validator that uses version 1 of the validation framework.
- * @author karasiuk
- *
- */
-public static class V1 extends Validator {
- private ValidatorMetaData _vmd;
-
- /**
- * Create a new version 1 validator.
- * @param vmd
- * @param config this is used to set the global enablement options. In some case this can be null.
- */
- public V1(ValidatorMetaData vmd, ValidationConfiguration config){
- _vmd = vmd;
- if (config != null){
- setBuildValidation(config.isBuildEnabled(vmd));
- setManualValidation(config.isManualEnabled(vmd));
- }
- setDelegatingId(ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(_vmd.getValidatorUniqueName()));
- if (_vmd.getMarkerIds() != null && _vmd.getMarkerIds().length > 0)setMarkerId(_vmd.getMarkerIds()[0]);
- resetChangeCounters();
- }
-
- @Override
- public IValidator asIValidator() {
- IValidator v = null;
- try {
- v = _vmd.getValidator();
- }
- catch (InstantiationException e){
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- return v;
- }
-
- public V1 asV1Validator() {
- return this;
- }
-
- @Override
- public void become(Validator val) {
- super.become(val);
- V1 v1 = val.asV1Validator();
- if (v1 == null)throw new IllegalArgumentException("Internal error, the incoming validator must be a v1 validator"); //$NON-NLS-1$
- _vmd = v1._vmd;
- }
-
- public Validator copy(boolean includeChangeCounts) {
- V1 v = new V1Copy(_vmd, null);
- v.copyLocal(this, includeChangeCounts);
-
- return v;
- }
-
- public String getName() {
- return _vmd.getValidatorDisplayName();
- }
-
- public ValidatorMetaData getVmd(){
- return _vmd;
- }
-
- public String getValidatorClassname(){
- String name = ""; //$NON-NLS-1$
- try {
- name = _vmd.getValidator().getClass().getName();
- }
- catch (Exception e){
- // eat it
- }
- return name;
- }
- public String getId() {
- return _vmd.getValidatorUniqueName();
- }
-
- @Override
- boolean isLoaded() {
- return _vmd.isActive();
- }
-
- @Override
- public void setBuildValidation(boolean buildValidation) {
- super.setBuildValidation(buildValidation);
- _vmd.setBuildValidation(buildValidation);
- }
-
- @Override
- public void setManualValidation(boolean manualValidation) {
- super.setManualValidation(manualValidation);
- _vmd.setManualValidation(manualValidation);
- }
-
- @Override
- protected boolean shouldValidate(IResource resource, ContentTypeWrapper contentTypeWrapper) {
- return _vmd.isApplicableTo(resource);
- }
-
- @Override
- protected boolean shouldValidateProject(IProject project) {
- // TODO determine if this can be optimized
- return true;
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValOperation operation,
- IProgressMonitor monitor) {
-
- if (monitor == null)monitor = new NullProgressMonitor();
-
- ValidationResult vr = new ValidationResult();
- IValidator v = asIValidator();
- if (v == null)return null;
-
- try {
- IProject project = resource.getProject();
- SummaryReporter reporter = new SummaryReporter(project, monitor);
- IWorkbenchContext helper = _vmd.getHelper(project);
- if (helper instanceof WorkbenchContext){
- WorkbenchContext wc = (WorkbenchContext)helper;
- List<String> files = new LinkedList<String>();
- // [213631] The JSP validator expects full paths not relative paths, but the XML validator
- // expects relative paths.
- files.add(wc.getPortableName(resource));
- wc.setValidationFileURIs(files);
- }
- ValidatorLauncher.getLauncher().start(helper, v, reporter);
-
- vr.incrementError(reporter.getSeverityHigh());
- vr.incrementWarning(reporter.getSeverityNormal());
- vr.incrementInfo(reporter.getSeverityLow());
-
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- return vr;
- }
-
- /*
- * GRK - Because I didn't want to try to make a true copy of the V1 validator, (because I didn't
- * want to copy the vmd object), I came up with this approach to only copy the fields that
- * the preference page was worried about.
- */
- public static class V1Copy extends V1 {
- public V1Copy(ValidatorMetaData vmd, ValidationConfiguration vc){
- super(vmd, vc);
- }
-
- @Override
- public void setManualValidation(boolean bool) {
- setManualValidation2(bool);
- }
-
- @Override
- public void setBuildValidation(boolean bool) {
- setBuildValidation2(bool);
- }
-
- @Override
- public void become(Validator val) {
- super.become(val);
- super.setBuildValidation(val.isBuildValidation());
- super.setManualValidation(val.isManualValidation());
- }
-
- }
-
-}
-
-/**
- * A validator that uses version 2 of the validation framework.
- * @author karasiuk
- *
- */
-public final static class V2 extends Validator implements IAdaptable {
- private AbstractValidator _validator;
-
- private List<FilterGroup> _groups = new LinkedList<FilterGroup>();
- private FilterGroup[] _groupsArray;
-
- /** The full id of the extension. */
- private String _id;
-
- /** Name of the validator. */
- private String _name;
-
- /**
- * We don't want to create the validator too early, as it may trigger new plug-ins to be loaded.
- * We delay that as long as possible, by starting with just the config element.
- */
- private IConfigurationElement _validatorConfigElement;
-
- private String _validatorClassName;
-
- /**
- * An array containing the validator group IDs for which this validator is a member.
- */
- private String[] _validatorGroupIds;
-
- /**
- * If this validator is a delegating validator, then this is the "real" validator (i.e. the one that
- * does the work).
- */
- private AbstractValidator _delegated;
-
- /** How many times has a group field in this validator been changed since it was created (or copied)? */
- protected transient int _changeCountGroups;
-
- private Level _level;
-
- V2(IConfigurationElement configElement, IProject project){
- assert configElement != null;
- _validatorConfigElement = configElement;
- _validatorClassName = configElement.getAttribute(ExtensionConstants.AttribClass);
- _project = project;
-
- IConfigurationElement[] groupReferenceElements = configElement.getChildren(ExtensionConstants.Group.elementGroup);
- List<String> validatorGroupIDs = new ArrayList<String>();
- for (IConfigurationElement groupElement : groupReferenceElements) {
- String id = groupElement.getAttribute(ExtensionConstants.Group.attId);
- if (id != null)validatorGroupIDs.add(id);
- }
- _validatorGroupIds = validatorGroupIDs.toArray(new String[validatorGroupIDs.size()]);
-
- init();
- }
-
- private V2(IProject project, String validatorClassName, AbstractValidator validator){
- assert validator != null;
-
- _project = project;
- _validatorClassName = validatorClassName;
- _validator = validator;
- init();
- }
-
- private void init(){
- try {
- String id = ConfigurationManager.getManager().getConfiguration(_project).getDelegateForTarget(_validatorClassName);
- if (id == null) id = ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(_validatorClassName);
- setDelegatingId(id);
- }
- catch (InvocationTargetException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- resetChangeCounters();
- }
-
- public synchronized void add(FilterGroup fg) {
- assert fg != null;
- _groupsArray = null;
- _groups.add(fg);
- bumpChangeCountGroups();
- }
-
- @Override
- public IValidator asIValidator() {
- AbstractValidator av = getDelegatedValidator();
- if (av instanceof IValidator)return (IValidator)av;
- return super.asIValidator();
- }
-
- public V2 asV2Validator() {
- return this;
- }
-
- /**
- * Let the validator know that a clean is about to happen.
- *
- * @param project the project that is being cleaned. This can be null which means that the workspace
- * is being cleaned (in which case a separate call will be made for each open project).
- */
- public void clean(IProject project, IProgressMonitor monitor) {
- getDelegatedValidator().clean(project, ValOperationManager.getDefault().getOperation().getState(), monitor);
- }
-
- public Validator copy(boolean includeChangeCounts) {
- V2 v = null;
- if (_validatorConfigElement != null)v = new V2(_validatorConfigElement, _project);
- else v = new V2(_project, _validatorClassName, _validator);
- v.copyLocal(this, includeChangeCounts);
-
- if (includeChangeCounts)v._changeCountGroups = _changeCountGroups;
-
- FilterGroup[] groups = getGroups();
- v._groupsArray = new FilterGroup[groups.length];
- for (int i=0; i<groups.length; i++){
- v._groupsArray[i] = groups[i].copy();
- v._groups.add(v._groupsArray[i]);
- }
-
- v._id = _id;
- v._name = _name;
- v._validatorGroupIds = _validatorGroupIds;
-
- return v;
- }
-
- public int getChangeCountGroups(){
- return _changeCountGroups;
- }
-
- public void bumpChangeCountGroups(){
- _changeCountGroups++;
- }
-
- public Level getLevel() {
- return _level;
- }
-
- public void setLevel(Level level) {
- assert _level == null;
- _level = level;
- }
-
- /**
- * Answer the actual validator that is going to perform the validation. If this is a normal validator this
- * method will simply answer itself. However if this is a delegating validator, then this will answer the
- * "real" validator.
- */
- public AbstractValidator getDelegatedValidator(){
- AbstractValidator delegated = _delegated;
- if (delegated != null)return delegated;
- else if (getDelegatingId() == null)return getValidator();
- try {
- ValidatorDelegateDescriptor vdd = ValidatorDelegatesRegistry.getInstance()
- .getDescriptor(getValidatorClassname(), getDelegatingId());
- if (vdd == null)return getValidator();
- delegated = vdd.getValidator2();
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- delegated = new NullValidator();
- }
- delegated.setParent(this);
- _delegated = delegated;
- return delegated;
- }
-
- public String getId() {
- return _id;
- }
-
- /**
- * Answer the validator's filter groups.
- * @return an empty array if the validator does not have any filter groups.
- */
- public synchronized FilterGroup[] getGroups(){
- FilterGroup[] groups = _groupsArray;
- if (groups == null){
- groups = new FilterGroup[_groups.size()];
- _groups.toArray(groups);
- _groupsArray = groups;
- }
- return groups;
- }
-
- public String getName() {
- return _name;
- }
-
- public AbstractValidator getValidator() {
- if (_validator == null){
- try {
- _validator = (AbstractValidator)_validatorConfigElement.createExecutableExtension(ExtensionConstants.AttribClass);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- IContributor contrib = _validatorConfigElement.getContributor();
- String message = NLS.bind(ValMessages.ErrConfig, contrib.getName());
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
- _validator = new NullValidator();
- }
- _validator.setParent(this);
- _validatorConfigElement = null;
-
- }
- return _validator;
- }
-
- public String getValidatorClassname(){
- return _validatorClassName;
- }
-
- public String[] getValidatorGroups(){
- return _validatorGroupIds;
- }
-
- @Override
- public int hashCodeForConfig() {
- int h = super.hashCodeForConfig();
- if (_id != null)h += _id.hashCode();
- if (_groups != null){
- for (FilterGroup fg : _groups)h += fg.hashCodeForConfig();
- }
- return h;
- }
-
- @Override
- public boolean isChanged() {
- if (_changeCountGroups > 0)return true;
- return super.isChanged();
- }
-
- @Override
- boolean isLoaded() {
- return _validator != null;
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate this resource.
- *
- * @return true if the resource should be validated.
- */
- protected boolean shouldValidate(IResource resource, ContentTypeWrapper contentTypeWrapper) {
- FilterGroup[] groups = getGroups();
- IProject project = resource.getProject();
- for (FilterGroup group : groups){
- if (!group.shouldValidate(project, resource, contentTypeWrapper))return false;
- }
- return true;
- }
-
-
- @Override
- public void setDelegatingId(String delegating) {
- super.setDelegatingId(delegating);
- _delegated = null;
- }
-
- public synchronized void setGroups(List<FilterGroup> groups){
- _groups = groups;
- _groupsArray = null;
- bumpChangeCountGroups();
- }
-
- public void setId(String id) {
- if (!Misc.same(_id, id)){
- _id = id;
- bumpChangeCountGlobal();
- }
- }
-
- public void setName(String name) {
- if (!Misc.same(_name, name)){
- _name = name;
- bumpChangeCountGlobal();
- }
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValOperation operation, IProgressMonitor monitor) {
- ValidationResult vr = null;
- if (operation == null)operation = new ValOperation();
- if (monitor == null)monitor = new NullProgressMonitor();
- try {
- vr = getDelegatedValidator().validate(resource, kind, operation.getState(), monitor);
- }
- catch (Exception e){
- try {
- String msg = NLS.bind(ValMessages.LogValEnd, getName(), resource.getLocationURI());
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, msg);
- }
- catch (Exception e2 ){
- // ignore it
- }
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- if (vr != null){
- if (vr.getValidationException() != null){
- ValidationPlugin.getPlugin().handleException(vr.getValidationException());
- }
- updateResults(vr);
- if (vr.getDependsOn() != null){
- ValidationFramework.getDefault().getDependencyIndex().set(getId(), resource, vr.getDependsOn());
- }
- IResource[] validated = vr.getValidated();
- if (validated != null){
- for (int i=0; i<validated.length; i++){
- operation.addValidated(getId(), validated[i]);
- }
- }
-
- ValidatorMessage[] msgs = vr.getMessages();
-// if (sanityTest(msgs.length, resource)){
- MarkerManager mm = MarkerManager.getDefault();
- for (ValidatorMessage m : msgs){
- mm.createMarker(m, getId());
- }
-// }
-// else {
-// setBuildValidation(false);
-// setManualValidation(false);
-// }
- }
- return vr;
- }
-
- /**
- * Perform a simple sanity test to ensure that the validator is configured correctly.
- * @param numberofMessages number of messages that the validator produced.
- * @return true if the test passed
- */
-// private boolean sanityTest(int numberofMessages, IResource resource) {
-// //FIXME make this more general and configurable
-// if (numberofMessages < 201)return true;
-//
-// String resName = ""; //$NON-NLS-1$
-// if (resource != null)resName = resource.getName();
-// String message = NLS.bind(ValMessages.ConfigError, new Object[]{
-// getName(), getId(), String.valueOf(numberofMessages), resName});
-// ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
-//
-// return false;
-// }
-
- /**
- * If the validator is using a report helper then update it with any of the messages that were
- * added directly to the validation result.
- * @param vr
- */
- private void updateResults(ValidationResult vr) {
- ReporterHelper rh = vr.getReporterHelper();
- if (rh == null)return;
- ClassLoader classloader = getDelegatedValidator().getClass().getClassLoader();
- for (IMessage message : rh.getMessages()){
- Object target = message.getTargetObject();
- if (target != null){
- IResource res = null;
- if (target instanceof IResource)res = (IResource)target;
- if (res == null){
- target = message.getAttribute(IMessage.TargetResource);
- if (target != null && target instanceof IResource)res = (IResource)target;
- }
- if (res != null){
-
- ValidatorMessage vm = ValidatorMessage.create(message.getText(classloader), res);
- if (getMarkerId() != null)vm.setType(getMarkerId());
- vr.add(vm);
- int markerSeverity = IMarker.SEVERITY_INFO;
- int sev = message.getSeverity();
- if ((sev & IMessage.HIGH_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_ERROR;
- else if ((sev & IMessage.NORMAL_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_WARNING;
- vm.setAttribute(IMarker.SEVERITY, markerSeverity);
- vm.setAttribute(IMarker.LINE_NUMBER, message.getLineNumber());
- int offset = message.getOffset();
- if (offset != IMessage.OFFSET_UNSET){
- vm.setAttribute(IMarker.CHAR_START, offset);
- int len = message.getLength();
- if (len != IMessage.OFFSET_UNSET){
- vm.setAttribute(IMarker.CHAR_START, offset);
- vm.setAttribute(IMarker.CHAR_END, offset+len);
- }
- }
- String groupName = message.getGroupName();
- if (groupName != null){
- vm.setAttribute(ConfigurationConstants.VALIDATION_MARKER_GROUP, groupName);
- }
-
- copyAttributes(message, vm);
- }
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- private void copyAttributes(IMessage message, ValidatorMessage vm) {
- // I made this a separate method, so that I could localize the suppression of unchecked warnings.
- Map attributes = message.getAttributes();
- if (attributes != null){
- for (Iterator it = attributes.entrySet().iterator(); it.hasNext();){
- Map.Entry me = (Map.Entry)it.next();
- String key = (String)me.getKey();
- vm.setAttribute(key, me.getValue());
- }
- }
- }
-
- @Override
- public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor) {
- getDelegatedValidator().validationStarting(project, state, monitor);
- }
-
- @Override
- public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor) {
- getDelegatedValidator().validationFinishing(project, state, monitor);
- }
-
- @SuppressWarnings("unchecked")
- public Object getAdapter(Class adapter) {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
- public synchronized void remove(FilterGroup group) {
- _groups.remove(group);
- _groupsArray = null;
- bumpChangeCountGroups();
- }
-
- @Override
- public void resetChangeCounters() {
- super.resetChangeCounters();
- _changeCountGroups = 0;
- }
-
- @Override
- protected boolean shouldValidateProject(IProject project) {
- FilterGroup[] groups = getGroups();
- ContentTypeWrapper ctw = new ContentTypeWrapper();
- for (FilterGroup group : groups){
- if (!group.shouldValidate(project, null, ctw))return false;
- }
- return true;
- }
-
- @Override
- public void become(Validator val) {
- super.become(val);
- V2 v2 = val.asV2Validator();
- if (v2 == null)throw new IllegalArgumentException(ValMessages.Error20);
- _changeCountGroups = v2._changeCountGroups;
- _delegated = v2._delegated;
- _groups = v2._groups;
- _groupsArray = v2._groupsArray;
- _id = v2._id;
- _name = v2._name;
- _validator = v2._validator;
- _validatorConfigElement = v2._validatorConfigElement;
- _validatorClassName = v2._validatorClassName;
- _validatorGroupIds = v2._validatorGroupIds;
- }
-
-}
-
-public String getSourceId() {
- return _sourceId;
-}
-
-public void setSourceId(String sourceId) {
- if (!Misc.same(_sourceId, sourceId)){
- _sourceId = sourceId;
- bumpChangeCountGlobal();
- }
-}
-
-/**
- * Take the instance variables from the incoming validator and set them to yourself.
- * @param validator
- */
-public void become(Validator validator) {
- _buildValidation = validator._buildValidation;
- _delegatingId = validator._delegatingId;
- _manualValidation = validator._manualValidation;
- _markerId = validator._markerId;
- _messageSettings = validator._messageSettings;
- _project = validator._project;
- _sourceId = validator._sourceId;
- _version = validator._version;
- _changeCountGlobal = validator._changeCountGlobal;
- _changeCountMessages = validator._changeCountMessages;
-}
-
-void setMessages(Map<String, MessageSeveritySetting> map) {
- _messageSettings = map;
- bumpChangeCountMessages();
-}
-
-public int getChangeCountGlobal() {
- return _changeCountGlobal;
-}
-
-public int getChangeCountMessages() {
- return _changeCountMessages;
-}
-
-public void bumpChangeCountMessages(){
- _changeCountMessages++;
-}
-
-public void resetChangeCounters() {
- _changeCountGlobal = 0;
- _changeCountMessages = 0;
-}
-
-public void bumpChangeCountGlobal(){
- _changeCountGlobal++;
-}
-
-/**
- * Answer true if you have the same configuration settings as validator.
- * @param validator this can be null.
- */
-public boolean sameConfig(Validator validator) {
- if (validator == null)return false;
- return hashCodeForConfig() == validator.hashCodeForConfig();
-}
-
-public String getMarkerId() {
- return _markerId;
-}
-
-public void setMarkerId(String markerId) {
- _markerId = markerId;
- if (markerId != null)MarkerManager.getDefault().getMarkers().add(markerId);
-}
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidatorMessage.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidatorMessage.java
deleted file mode 100644
index 70bdd90..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidatorMessage.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValConstants;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * This class provides a way for a validator to return messages, that are easily
- * converted into IMarkers.
- * <p>
- * This class is completely optional for validators. A validator can choose to
- * directly manage IMarkers. However, some validators want to be used in
- * multiple contexts, for example as-you-type validation and build based
- * validation. For these types of validators it is not possible for them to use
- * only IMarkers, because often the Resource has not been saved yet.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that
- * is still under development and expected to change significantly before
- * reaching stability. It is being made available at this early stage to solicit
- * feedback from pioneering adopters on the understanding that any code that
- * uses this API will almost certainly be broken (repeatedly) as the API
- * evolves.
- * </p>
- */
-public class ValidatorMessage {
-
- public static final String ValidationId = "ValidationId"; //$NON-NLS-1$
-
- /** Associate some arbitrary attributes with a message. */
- private Map<String, Object> _map = new HashMap<String, Object>(5);
-
- private IResource _resource;
-
- /** The type of marker. */
- private String _type;
-
- /**
- * Create a new validation message.
- *
- * @param message
- * The localized message that will be displayed to the user.
- *
- * @param resource
- * The resource that the message is associated with.
- */
- public static ValidatorMessage create(String message, IResource resource){
- ValidatorMessage msg = new ValidatorMessage();
- msg._type = ValConstants.ProblemMarker;
- msg._resource = resource;
- msg.setAttribute(IMarker.MESSAGE, ValidationPlugin.getPlugin().isDebugging() ?
- Tracing.timestampIt(message): message);
- return msg;
- }
-
- private ValidatorMessage(){}
-
- /**
- * Returns the attribute with the given name. The result is an instance of
- * one of the following classes: <code>String</code>, <code>Integer</code>,
- * or <code>Boolean</code>. Returns <code>null</code> if the attribute is
- * undefined.
- *
- * @param attributeName
- * The name of the attribute.
- * @return the value, or <code>null</code> if the attribute is undefined.
- */
- public Object getAttribute(String attributeName){
- return _map.get(attributeName);
- }
-
- /**
- * Returns the integer valued attribute with the given name. Returns the
- * given default value if the attribute is undefined or the marker does not
- * exist or is not an integer value.
- *
- * @param attributeName
- * The name of the attribute.
- * @param defaultValue
- * The value to use if no integer value is found.
- * @return the value or the default value if no integer value was found.
- */
- public int getAttribute(String attributeName, int defaultValue){
- Integer value = null;
- try {
- value = (Integer)_map.get(attributeName);
- }
- catch (Exception e){
- // eat it
- }
- if (value == null)return defaultValue;
- return value.intValue();
- }
-
- /**
- * Returns the string valued attribute with the given name. Returns the
- * given default value if the attribute is undefined or the marker does not
- * exist or is not a string value.
- *
- * @param attributeName
- * The name of the attribute.
- * @param defaultValue
- * The value to use if no value is found.
- * @return the value or the default value if no value was found.
- */
- public String getAttribute(String attributeName, String defaultValue){
- String value = null;
- try {
- value = (String)_map.get(attributeName);
- }
- catch (Exception e){
- // eat it
- }
- if (value == null)return defaultValue;
- return value;
-
- }
-
- /**
- * Returns the boolean valued attribute with the given name. Returns the
- * given default value if the attribute is undefined or the marker does not
- * exist or is not a boolean value.
- *
- * @param attributeName
- * The name of the attribute.
- * @param defaultValue
- * The value to use if no value is found.
- * @return the value or the default value if no value was found.
- */
- public boolean getAttribute(String attributeName, boolean defaultValue){
- Boolean value = null;
- try {
- value = (Boolean)_map.get(attributeName);
- }
- catch (Exception e){
- // eat it
- }
- if (value == null)return defaultValue;
- return value.booleanValue();
-
- }
-
- /**
- * Returns a map with all the attributes for the marker. If the marker has
- * no attributes then <code>null</code> is returned.
- *
- * @return a map of attribute keys and values (key type :
- * <code>String</code> value type : <code>String</code>,
- * <code>Integer</code>, or <code>Boolean</code>) or <code>null</code>.
- */
- @SuppressWarnings("unchecked")
- public Map getAttributes() {
- return _map;
- }
-
- /**
- * Returns the resource with which this marker is associated.
- *
- * @return the resource with which this marker is associated
- */
- public IResource getResource(){
- return _resource;
- }
-
- /**
- * Returns the type of this marker. The returned marker type will not be
- * <code>null</code>.
- *
- * @return the type of this marker
- */
- public String getType() {
- return _type;
- }
-
- /**
- * Sets the marker type.
- *
- * @param type The marker id to use when creating new markers.
- */
- public void setType(String type){
- assert type != null;
- _type = type;
- }
-
- /**
- * Sets the integer valued attribute with the given name.
- * <p>
- * This method changes resources; these changes will be reported in a
- * subsequent resource change event, including an indication that this
- * marker has been modified.
- * </p>
- *
- * @param attributeName
- * The name of the attribute.
- * @param value
- * The value.
- */
- public void setAttribute(String attributeName, int value){
- _map.put(attributeName, new Integer(value));
-
- }
-
- /**
- * Sets the attribute with the given name. The value must be
- * <code>null</code> or an instance of one of the following classes:
- * <code>String</code>, <code>Integer</code>, or <code>Boolean</code>.
- *
- * @param attributeName
- * The name of the attribute.
- * @param value
- * The value, or <code>null</code> if the attribute is to be undefined.
- */
- public void setAttribute(String attributeName, Object value){
- _map.put(attributeName, value);
- }
-
- /**
- * Sets the boolean valued attribute with the given name.
- *
- * @param attributeName
- * The name of the attribute.
- * @param value
- * The value.
- */
- public void setAttribute(String attributeName, boolean value){
- _map.put(attributeName, value ? Boolean.TRUE : Boolean.FALSE);
- }
-
- /**
- * Sets the given attribute key-value pairs on this marker. The values must
- * be <code>null</code> or an instance of one of the following classes:
- * <code>String</code>, <code>Integer</code>, or <code>Boolean</code>. If a
- * value is <code>null</code>, the new value of the attribute is considered
- * to be undefined.
- *
- * @param attributeNames
- * An array of attribute names.
- * @param values
- * An array of attribute values.
- */
- public void setAttributes(String[] attributeNames, Object[] values){
- Assert.isTrue(attributeNames.length == values.length);
- for (int i=0; i<attributeNames.length; i++){
- setAttribute(attributeNames[i], values[i]);
- }
- }
-
- /**
- * Sets the attributes for this marker to be the ones contained in the given
- * table. The values must be an instance of one of the following classes:
- * <code>String</code>, <code>Integer</code>, or <code>Boolean</code>.
- * Attributes previously set on the marker but not included in the given map
- * are considered to be removals. Setting the given map to be
- * <code>null</code> is equivalent to removing all marker attributes.
- *
- * @param attributes
- * A map of attribute names to attribute values (key type :
- * <code>String</code> value type : <code>String</code>,
- * <code>Integer</code>, or <code>Boolean</code>) or <code>null</code>.
- */
- public void setAttributes(Map<String, Object> attributes) {
- _map.clear();
- _map.putAll(attributes);
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ContentTypeWrapper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ContentTypeWrapper.java
deleted file mode 100644
index 2436c84..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ContentTypeWrapper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Since it can be expense to determine a content type, we provide a wrapper so that we only
- * need to get it once, as we validate a resource.
- * @author karasiuk
- *
- */
-public class ContentTypeWrapper {
-
- private IContentType _type;
- private boolean _initialized;
-
- public IContentType getContentType(IFile file){
- if (_initialized)return _type;
-
- IContentDescription cd = null;
- try {
- cd = file.getContentDescription();
- }
- catch (CoreException e){
- try {
- file.refreshLocal(IResource.DEPTH_ZERO, null);
- cd = file.getContentDescription();
- }
- catch (CoreException e2){
- if (Tracing.isLogging())ValidationPlugin.getPlugin().handleException(e2);
- }
- }
- if (cd == null)return null;
- _type = cd.getContentType();
- _initialized = true;
- return _type;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DebugConstants.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DebugConstants.java
deleted file mode 100644
index 53a020d..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DebugConstants.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-public interface DebugConstants {
-
- /** matches - trace filter matches. */
- String TraceMatches = ValidationPlugin.PLUGIN_ID+"/matches"; //$NON-NLS-1$
-
- /** timings - trace the times of the validators. */
- String TraceTimes = ValidationPlugin.PLUGIN_ID+"/timings"; //$NON-NLS-1$
-
- /** v1 - trace the v1 validators. */
- String TraceV1 = ValidationPlugin.PLUGIN_ID+"/v1"; //$NON-NLS-1$
-
- /** timings/tracefile - file that stores the trace events */
- String TraceTimesFile = ValidationPlugin.PLUGIN_ID+"/timings/tracefile"; //$NON-NLS-1$
-
- /**
- * timings/useDoubles - By default times that are written to the trace file are
- * in milliseconds for elapsed time and nanoseconds for cpu time.
- * If you find these times easier to read as seconds as expressed by a double,
- * the following flag can be turned on.
- */
- String TraceTimesUseDoubles = ValidationPlugin.PLUGIN_ID+"/timings/useDoubles"; //$NON-NLS-1$
-
- /**
- * extraValDetail - If extra detail is needed for a particular validator it's id can be specified here.
- * For example, if you wanted more detail on the XML validator you would use org.eclipse.wst.xml.core.xml
- */
- String ExtraValDetail = ValidationPlugin.PLUGIN_ID+"/extraValDetail"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DependencyIndex.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DependencyIndex.java
deleted file mode 100644
index 6e4026e..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DependencyIndex.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ISaveContext;
-import org.eclipse.core.resources.ISaveParticipant;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.DependentResource;
-import org.eclipse.wst.validation.IDependencyIndex;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * A simple implementation of the IDependencyIndex. This will probably be
- * replaced with a higher performance, more robust index, at some point in the
- * future.
- * <p>
- * The format of the index is:
- *
- * <pre>
- * Version number
- * Number of depends on entries
- * depends on file name
- * number of dependent entries
- * dependent file name
- * number of validators
- * validator id
- * </pre>
- *
- * @author karasiuk
- */
-public class DependencyIndex implements IDependencyIndex, ISaveParticipant {
-
- /**
- * An index so that we can determine which things depend on this resource.
- */
- private Map<IResource,Set<Depends>> _dependsOn;
-
- /**
- * An index so that we can determine who the resource depends on.
- */
- private Map<IResource,Set<Depends>> _dependents;
- private boolean _dirty;
-
- private static IResource[] EmptyResources = new IResource[0];
-
- /** Version of the persistent index. */
- private static final int CurrentVersion = 1;
-
- public synchronized void add(String id, IResource dependent, IResource dependsOn) {
- init();
- Depends d = getOrCreateDepends(dependent, dependsOn);
- if (d.getValidators().add(id))_dirty = true;
- }
-
- private Depends getOrCreateDepends(IResource dependent, IResource dependsOn) {
- Set<Depends> set = getSet(_dependents, dependent);
- for (Depends d : set){
- if (d.getDependsOn() == dependsOn)return d;
- }
- Depends d = new Depends(dependent, dependsOn);
- _dirty = true;
- set.add(d);
-
- getSet(_dependsOn, dependsOn).add(d);
- return d;
- }
-
- /**
- * Answer the set for the resource, creating it if you need to.
- */
- private Set<Depends> getSet(Map<IResource, Set<Depends>> map, IResource resource) {
- Set<Depends> set = map.get(resource);
- if (set == null){
- set = new HashSet<Depends>(5);
- map.put(resource, set);
- }
- return set;
- }
-
- /**
- * Restore the dependency index. See the class comment for the structure.
- */
- private void init() {
- if (_dependsOn != null)return;
-
- boolean error = false;
- File f = getIndexLocation();
- if (!f.exists()){
- _dependsOn = new HashMap<IResource,Set<Depends>>(100);
- _dependents = new HashMap<IResource,Set<Depends>>(100);
- }
- else {
- String errorMessage = "The following dependency could not be restored " + //$NON-NLS-1$
- "because the following resource {0} could no longer be found."; //$NON-NLS-1$
- DataInputStream in = null;
- try {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- in = new DataInputStream(new FileInputStream(f));
-
- int version = in.readInt();
- if (version != CurrentVersion){
- error = true;
- String msg = NLS.bind(ValMessages.ErrDependencyVersion, CurrentVersion);
- throw new IllegalStateException(msg);
- }
- int numDependsOn = in.readInt();
- _dependsOn = new HashMap<IResource,Set<Depends>>(numDependsOn+100);
- _dependents = new HashMap<IResource,Set<Depends>>(numDependsOn+100);
- for (int i=0; i<numDependsOn; i++){
- String v = in.readUTF();
- IResource dependsOn = root.findMember(v);
- if (v == null){
- Tracing.log(NLS.bind(errorMessage, v));
- continue;
- }
- int numDependents = in.readInt();
- for (int j=0; j<numDependents; j++){
- v = in.readUTF();
- IResource dependent = root.findMember(v);
- if (dependent == null){
- Tracing.log(NLS.bind(errorMessage, v));
- continue;
- }
- int numVal = in.readInt();
- for (int k=0; k<numVal; k++){
- String id = in.readUTF();
- add(id, dependent, dependsOn);
- }
- }
- }
- }
- catch (IOException e){
- error = true;
- ValidationPlugin.getPlugin().handleException(e);
- }
- finally {
- Misc.close(in);
- if (error){
- _dependsOn = new HashMap<IResource,Set<Depends>>(100);
- _dependents = new HashMap<IResource,Set<Depends>>(100);
- f.delete();
- }
- }
- }
- }
-
- public synchronized void clear(IProject project) {
- init();
- for (Map.Entry<IResource,Set<Depends>> me : _dependents.entrySet()){
- if (me.getKey().getProject() == project){
- for (Depends d : me.getValue()){
- if (d.delete())_dirty = true;
- }
- }
- }
- }
-
- public synchronized IResource[] get(String validatorId, IResource dependsOn) {
- init();
- List<IResource> list = new LinkedList<IResource>();
- Set<Depends> set = getSet(_dependsOn, dependsOn);
- for (Depends d : set){
- for (String id : d.getValidators()){
- if (validatorId.equals(id))list.add(d.getDependent());
- }
- }
-
- if (list.size() == 0)return EmptyResources;
- IResource[] resources = new IResource[list.size()];
- list.toArray(resources);
- return resources;
- }
-
-
- public synchronized List<DependentResource> get(IResource dependsOn) {
- init();
- List<DependentResource> list = new LinkedList<DependentResource>();
- Set<Depends> set = getSet(_dependsOn, dependsOn);
- ValManager vm = ValManager.getDefault();
- for (Depends d : set){
- for (String id : d.getValidators()){
- Validator v = vm.getValidator(id, d.getDependent().getProject());
- if (v != null)list.add(new DependentResource(d.getDependent(), v));
- }
- }
- return list;
- }
-
-
- public synchronized void set(String id, IResource dependent, IResource[] dependsOn) {
- init();
- Set<Depends> set = getSet(_dependents, dependent);
- for (Depends d : set){
- if (d.delete(id))_dirty = true;
- }
- if (dependsOn != null){
- for (IResource d : dependsOn)add(id, dependent, d);
- }
- }
-
- public boolean isDependedOn(IResource resource) {
- init();
- Set<Depends> set = _dependsOn.get(resource);
- if (set == null || set.size() == 0)return false;
- return true;
- }
-
- public void doneSaving(ISaveContext context) {
- }
-
- public void prepareToSave(ISaveContext context) throws CoreException {
- }
-
- public void rollback(ISaveContext context) {
- }
-
- /**
- * Persist the dependency index. See the class comment for the structure.
- */
- public synchronized void saving(ISaveContext context) throws CoreException {
- if (!_dirty)return;
- _dirty = false;
-
- DataOutputStream out = null;
- try {
- File f = getIndexLocation();
- out = new DataOutputStream(new FileOutputStream(f));
- out.writeInt(CurrentVersion);
- Map<String, Set<DependsResolved>> map = compress(_dependsOn);
- out.writeInt(map.size());
- for (Map.Entry<String, Set<DependsResolved>> me : map.entrySet()){
- out.writeUTF(me.getKey());
- Set<DependsResolved> set = me.getValue();
- out.writeInt(set.size());
- for (DependsResolved d : set){
- out.writeUTF(d.resource);
- out.writeInt(d.validators.size());
- for (String id : d.validators){
- out.writeUTF(id);
- }
- }
- }
- }
- catch (IOException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- finally {
- Misc.close(out);
- }
- }
-
- private Map<String, Set<DependsResolved>> compress(Map<IResource, Set<Depends>> dependsOn) {
- Map<String, Set<DependsResolved>> map = new HashMap<String, Set<DependsResolved>>(dependsOn.size());
- for (Map.Entry<IResource, Set<Depends>> me : dependsOn.entrySet()){
- Set<DependsResolved> set = new HashSet<DependsResolved>(me.getValue().size());
- for (Depends d : me.getValue()){
- IPath path = d.getDependent().getFullPath();
- if (path != null){
- DependsResolved dr = new DependsResolved();
- dr.resource = path.toPortableString();
- if (d.getValidators().size() > 0){
- dr.validators = d.getValidators();
- set.add(dr);
- }
- }
- }
- if (set.size() > 0){
- IResource res = me.getKey();
- if (res != null){
- IPath path = res.getFullPath();
- if (path != null)map.put(path.toPortableString(), set);
- }
- }
- }
- return map;
- }
-
- private File getIndexLocation() {
- IPath path = ValidationPlugin.getPlugin().getStateLocation().append("dep.index"); //$NON-NLS-1$
- return path.toFile();
- }
-
- /**
- * Keep track of a relationship between a dependent and the thing that it
- * depends on.
- *
- * @author karasiuk
- *
- */
- private static class Depends {
-
- /** The resource that is being depended on, for example a.xsd */
- private IResource _dependsOn;
-
- /** The resource that is dependent, for example a.xml */
- private IResource _dependent;
-
- /** The id's of the validators that have asserted the dependency. */
- private Set<String> _validators;
-
- public Depends(IResource dependent, IResource dependsOn) {
- _dependent = dependent;
- _dependsOn = dependsOn;
- _validators = new HashSet<String>(5);
- }
-
- /**
- * Answer true if the id was deleted.
- */
- public boolean delete(String id) {
- return _validators.remove(id);
- }
-
- /**
- * Delete all the dependency assertions for all of your validators.
- * @return false if there was nothing to delete
- */
- public boolean delete() {
- boolean deleted = _validators.size() > 0;
- if (deleted)_validators.clear();
- return deleted;
- }
-
- public IResource getDependsOn() {
- return _dependsOn;
- }
-
- public IResource getDependent() {
- return _dependent;
- }
-
- public Set<String> getValidators() {
- return _validators;
- }
-}
-
- private static class DependsResolved {
- String resource;
- Set<String> validators;
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Deserializer.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Deserializer.java
deleted file mode 100644
index b1af963..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Deserializer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-/**
- * A simple deserializer that knows how to retrieve booleans, integers and strings, from a string
- * that was encoded by the Serializer class.
- *
- * @see Serializer
- * @author karasiuk
- *
- */
-public class Deserializer {
- private char[] _buffer;
- private int _posn;
-
- public Deserializer(String value){
- _buffer = value.toCharArray();
- }
-
- public boolean getBoolean(){
- boolean result = false;
- if (_buffer[_posn] == 'T')result = true;
- else if (_buffer[_posn] == 'F')result = false;
- else throw new IllegalStateException(ValMessages.DecodeError1);
-
- _posn++;
- return result;
- }
-
- public String getString(){
- int len = getInt();
- String result = new String(_buffer, _posn, len);
- _posn += len;
- return result;
- }
-
- public int getInt(){
- Integer len = new Integer(String.valueOf(_buffer[_posn]));
- _posn++;
-
- String s = String.valueOf(_buffer, _posn, len+1);
- _posn += len+1;
- return Integer.parseInt(s);
- }
-
- /**
- * Are there any more items?
- * @return
- */
- public boolean hasNext() {
- if (_posn >= _buffer.length)return false;
- return true;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledResourceManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledResourceManager.java
deleted file mode 100644
index 1b522fa..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledResourceManager.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * Validators can assert that certain resources (usually folders) are not validated. This class keeps track of those
- * assertions.
- * @author karasiuk
- *
- */
-public class DisabledResourceManager implements IProjectChangeListener {
-
- private static DisabledResourceManager _me;
-
- public static DisabledResourceManager getDefault(){
- if (_me == null)_me = new DisabledResourceManager();
- return _me;
- }
-
- private Set<IResource> _disabled = new HashSet<IResource>(100);
- private Set<IProject> _loadedProjects = new HashSet<IProject>(40);
-
- private DisabledResourceManager(){
- EventManager.getManager().addProjectChangeListener(this);
- }
-
- public void disableValidation(IResource resource){
- // We check for two reasons, 1) we may save some work, 2) we force the project to be loaded
- if (isDisabled(resource))return;
-
- Set<IResource> copy = new HashSet<IResource>(_disabled.size()+2);
- copy.addAll(_disabled);
- copy.add(resource);
- save(copy, resource.getProject());
- _disabled = copy;
- }
-
- public void enableValidation(IResource resource){
- // We check for two reasons, 1) we may save some work, 2) we force the project to be loaded
- if (!isDisabled(resource))return;
-
- Set<IResource> copy = new HashSet<IResource>(_disabled.size()+2);
- copy.addAll(_disabled);
- copy.remove(resource);
- save(copy, resource.getProject());
- _disabled = copy;
- }
-
- private IEclipsePreferences getPreferences(IProject project){
- IScopeContext projectContext = new ProjectScope(project);
- return projectContext.getNode(ValidationPlugin.PLUGIN_ID);
- }
-
- private void save(Set<IResource> disabled, IProject project) {
- Serializer ser = new Serializer(200);
- for (IResource resource : disabled){
- if (project == resource.getProject()){
- ser.put(resource.getProjectRelativePath().toPortableString());
- }
- }
- IEclipsePreferences prefs = getPreferences(project);
- prefs.put(PrefConstants.disabled, ser.toString());
- try {
- prefs.flush();
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- private void load(IProject project){
- Set<IResource> copy = new HashSet<IResource>(_disabled.size()+10);
- copy.addAll(_disabled);
- IEclipsePreferences prefs = getPreferences(project);
- String disabled = prefs.get(PrefConstants.disabled, ""); //$NON-NLS-1$
- if (disabled.length() > 0){
- Deserializer des = new Deserializer(disabled);
- while(des.hasNext()){
- String pathString = des.getString();
- IPath path = Path.fromPortableString(pathString);
- IResource resource = project.findMember(path);
- copy.add(resource);
- }
- }
- _disabled = copy;
- }
-
- public void dispose(){
- EventManager.getManager().removeProjectChangeListener(this);
- }
-
- /**
- * Answer true if this resource should not be validated.
- *
- * @param resource the resource that is being tested.
- * @return true if the resource should not be validated.
- */
- public boolean isDisabled(IResource resource){
- IProject project = resource.getProject();
- if (_loadedProjects.contains(project))return _disabled.contains(resource);
- return isDisabled(resource, project);
- }
-
- private synchronized boolean isDisabled(IResource resource, IProject project){
- if (!_loadedProjects.contains(project)){
- load(project);
- _loadedProjects.add(project);
- }
- return _disabled.contains(resource);
- }
-
- public void addDisabled(IResource resource){
- _disabled.add(resource);
- }
-
- public void projectChanged(IProject project, int type) {
- switch (type) {
- case IProjectChangeListener.ProjectDeleted:
- case IProjectChangeListener.ProjectClosed:
- projectRemoved(project);
- break;
-
- }
-
- }
-
- private synchronized void projectRemoved(IProject project) {
- _loadedProjects.remove(project);
- Set<IResource> copy = new HashSet<IResource>(100);
- for (IResource resource : _disabled){
- if (resource.getProject() != project)copy.add(resource);
- }
- _disabled = copy;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java
deleted file mode 100644
index 4afe15e..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.wst.validation.internal;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
-
-/**
- * Keep track of the disabled validators.
- * @author karasiuk
- *
- */
-public class DisabledValidatorManager implements IValChangedListener {
-
- private static DisabledValidatorManager _me;
- private static int _counter;
- private static final int CacheSize = 5;
-
- private Map<IResource, LRUSet> _map = Collections.synchronizedMap(new HashMap<IResource, LRUSet>(5));
-
- public static DisabledValidatorManager getDefault(){
- DisabledValidatorManager me = _me;
- if (me != null)return me;
- me = new DisabledValidatorManager();
- _me = me;
- return me;
- }
-
- private DisabledValidatorManager(){
- ValPrefManagerProject.addListener(this);
- }
-
- /*
- * Although this is currently not called, it should be if this ever stops being a singleton.
- */
- public void dispose(){
- ValPrefManagerProject.removeListener(this);
- }
-
- public Set<Validator> getDisabledValidatorsFor(IResource resource) {
- LRUSet set = _map.get(resource);
- if (set != null){
- set.counter = _counter++;
- return set.validators;
- }
-
- DisabledValidationFinder dvf = new DisabledValidationFinder();
- Set<Validator> vset = dvf.findDisabledValidatorsFor(resource);
- insert(resource, vset);
- return vset;
- }
-
- private synchronized void insert(IResource resource, Set<Validator> vset) {
- if (_map.size() >= CacheSize ){
- IResource oldest = null;
- int current = Integer.MAX_VALUE;
- for (Map.Entry<IResource, LRUSet> me : _map.entrySet()){
- if (me.getValue().counter < current){
- oldest = me.getKey();
- current = me.getValue().counter;
- }
- }
- _map.remove(oldest);
- }
- LRUSet set = new LRUSet();
- set.counter = _counter++;
- set.validators = vset;
- _map.put(resource, set);
- }
-
-
- private static class LRUSet {
- int counter;
- Set<Validator> validators;
- }
-
- private static class DisabledValidationFinder implements IValidatorVisitor {
-
- private Map<String, Validator> _validators;
-
- public void visit(Validator validator, IProject project, ValType valType, ValOperation operation,
- IProgressMonitor monitor) {
-
- _validators.remove(validator.getId());
-
- }
-
- public Set<Validator> findDisabledValidatorsFor(IResource resource) {
- ValManager vm = ValManager.getDefault();
- Validator[] vals = vm.getValidatorsCopy();
- _validators = new HashMap<String, Validator>(100);
- for (Validator v : vals)_validators.put(v.getId(), v);
-
- IProject project = resource.getProject();
- vm.accept(this, project, resource, ValType.Build, new ValOperation(), new NullProgressMonitor());
- Set<Validator> set = new HashSet<Validator>(_validators.size());
- set.addAll(_validators.values());
- return set;
- }
-
-
- }
-
- public void validatorsForProjectChanged(IProject project, boolean configSettingChanged) {
- _map.clear();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionConstants.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionConstants.java
deleted file mode 100644
index 9073cdb..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionConstants.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-/**
- * Constants used in the extension points.
- * @author karasiuk
- *
- */
-public interface ExtensionConstants {
-
- /** validatorV2 - extension point for registering validators that use version 2 of the validation framework. */
- String validator = "validatorV2"; //$NON-NLS-1$
-
- /** exclude - extension point for adding extra exclusion filters to a validator. */
- String excludeExtension = "exclude"; //$NON-NLS-1$
-
- /** build - is the validator enabled by default for build based validations? true or false */
- String build = "build"; //$NON-NLS-1$
-
- /** class - name of the attribute that holds the validator class. */
- String AttribClass = "class"; //$NON-NLS-1$
-
- /** manual - is the validator enabled by default for manual based validations? true or false */
- String manual = "manual"; //$NON-NLS-1$
-
- /**
- * markerId - the marker id that the framework should use when creating customized markers for this validator.
- * This is an optional attribute. If it is not supplied than the standard validation marker type will be used.
- */
- String markerId = "markerId"; //$NON-NLS-1$
-
- /**
- * sourceid - If this validator also serves as an as-you-type validator (also know as an ISourceValidator)
- * then it's source id is specified here, so that the two validators can be associated with one
- * another. By source id, we mean the id that is used in the org.eclipse.wst.sse.ui.sourceValidation
- * extension point.
- */
- String sourceId = "sourceid"; //$NON-NLS-1$
-
- /**
- * version - the version of this definition. The attribute is a simple integer, and if not specified it
- * is assumed to be 1. This allows the filter settings to be changed in the future.
- */
- String version = "version"; //$NON-NLS-1$
-
- /**
- * include - a group of inclusion rules. At least one rule in this group needs to match in order for the resource
- * to to considered to be validated.
- */
- String include = "include"; //$NON-NLS-1$
-
- /** exclude - a group of exclusion rules. If any of these rules match the resource is not validated. */
- String exclude = "exclude"; //$NON-NLS-1$
-
- /** rules - a group of inclusion or exclusion rules. */
- String rules = "rules"; //$NON-NLS-1$
-
- /** rules - extension point to declare a validator group */
- String group = "validatorGroup"; //$NON-NLS-1$
-
- interface Group {
- /*
- * The group sub-element for either the validatorGroup or validator
- * extension points.
- */
- String elementGroup = "group"; //$NON-NLS-1$
- // a validator group identifier
- String attId = "id"; //$NON-NLS-1$
- // the listener sub-element
- String elementListener = "listener"; //$NON-NLS-1$
- // the group listener class name
- String attClass = "class"; //$NON-NLS-1$
- }
-
- /** Different types of rules for filtering validation. */
- interface Rule {
-
- /** projectNature - filter by project nature. */
- String projectNature = "projectNature"; //$NON-NLS-1$
-
- /** fileext - filter by file extension. */
- String fileext = "fileext"; //$NON-NLS-1$
-
- /** file - a file name, it can include path information as well. */
- String file = "file"; //$NON-NLS-1$
-
- /** facet - filter by facet id. */
- String facet = "facet"; //$NON-NLS-1$
-
- /** contentType - filter by content type. */
- String contentType = "contentType"; //$NON-NLS-1$
- }
-
- /** Rule attributes */
- interface RuleAttrib {
-
- /** caseSensitive - true or false. */
- String caseSensitive = "caseSensitive"; //$NON-NLS-1$
-
- /**
- * exactMatch - true or false, default is true. It is used to decide whether content types need to match
- * exactly, or whether sub types should also be considered.
- */
- String exactMatch = "exactMatch"; //$NON-NLS-1$
-
- /** ext - a file extension, for example "html". */
- String ext = "ext"; //$NON-NLS-1$
-
- /** id - an identifier. */
- String id = "id"; //$NON-NLS-1$
-
- /** name - a file name. */
- String name = "name"; //$NON-NLS-1$
-
- /**
- * type - the type of file to be matched:
- * <ul>
- * <li>folder - project relative folder name
- * <li>file - simple file name
- * <li>full - fully qualified, project relative file name
- * </ul>
- */
- String fileType = "type"; //$NON-NLS-1$
- }
-
- interface FileType {
- /** folder - project relative folder name */
- String folder = "folder"; //$NON-NLS-1$
-
- /** file - simple file name */
- String file = "file"; //$NON-NLS-1$
-
- /** full - fully qualified, project relative file name */
- String full = "full"; //$NON-NLS-1$
- }
-
- interface MessageCategory {
- /** messageCategory - name of the message category element. */
- String name = "messageCategory"; //$NON-NLS-1$
-
- /** id - simple id of the message. */
- String id = "id"; //$NON-NLS-1$
-
- /** label = human readable label of the message category. */
- String label = "label"; //$NON-NLS-1$
-
- /** severity - message severity, it must be one of error, warning or ignore. */
- String severity = "severity"; //$NON-NLS-1$
-
- String sevError = "error"; //$NON-NLS-1$
- String sevWarning = "warning"; //$NON-NLS-1$
- String sevIgnore = "ignore"; //$NON-NLS-1$
- }
-
- interface Exclude {
- /** id - fully qualified id of the validator that is being extended. */
- String id = "id"; //$NON-NLS-1$
- }
-
- /** true */
- String True = "true"; //$NON-NLS-1$
-
- /** false */
- String False = "false"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionValidators.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionValidators.java
deleted file mode 100644
index 5b74568..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionValidators.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * The validators that have been defined by the validator extension points.
- * @author karasiuk
- *
- */
-public class ExtensionValidators {
- private static ExtensionValidators _me;
-
- /** All the registered validators. The key is the validator id and the value is the validator. */
- private Map<String, Validator> _map;
-
- public synchronized static ExtensionValidators instance(){
- if (_me == null){
- _me = new ExtensionValidators();
- _me.load();
- }
- return _me;
- }
-
- private ExtensionValidators(){};
-
- private void load() {
- _map = new HashMap<String, Validator>(100);
- for (Validator v : ValidatorExtensionReader.getDefault().process()){
- _map.put(v.getId(), v);
- }
- }
-
- /**
- * Answer all the v2 validators that have been defined by the extension point. This is the real
- * map (not a copy).
- *
- * @return The key is the validator id and the value is the validator.
- */
- public Map<String, Validator> getMapV2() {
- return _map;
- }
-
- /**
- * Answer all the v2 validators that have been defined by the extension point. This is a copy of
- * the map, but not a copy of the validators.
- *
- * @return The key is the validator id and the value is the validator.
- */
- public Map<String, Validator> getMapV2Copy() {
- HashMap<String, Validator> map = new HashMap<String, Validator>(_map.size());
- map.putAll(_map);
- return map;
- }
-
-
- /**
- * Answer all the validators that have been defined by extension points. This includes all
- * the v2 validators, and all of the v1 validators that have been defined just on this project.
- *
- * @return The key is the validator id and the value is the validator.
- */
- public Map<String, Validator> getMap(IProject project) {
- //TODO I may want to consider caching this, but then again if the v1 validators are going away
- // it may not be worth it.
- Map<String, Validator> map = new HashMap<String, Validator>();
- map.putAll(_map);
-
- try {
- ProjectConfiguration pc = new ProjectConfiguration(project);
- pc.resetToDefault();
- for (ValidatorMetaData vmd : pc.getValidators()){
- Validator v = Validator.create(vmd, pc, project);
- map.put(v.getId(), v);
- }
- }
- catch (InvocationTargetException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- return map;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/FullBuildJob.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/FullBuildJob.java
deleted file mode 100644
index 332a2c7..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/FullBuildJob.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-public class FullBuildJob extends WorkspaceJob {
-
- public FullBuildJob(){
- super(ValMessages.JobName);
- }
-
- @Override
- public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
- try {
- ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, monitor);
- }
- catch (Exception e){
- return new Status(IStatus.ERROR,ValidationPlugin.PLUGIN_ID, e.toString(), e);
- }
- return Status.OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IProjectChangeListener.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IProjectChangeListener.java
deleted file mode 100644
index 6788534..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IProjectChangeListener.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * A call back for listeners that are interested when a project changes.
- * @author karasiuk
- *
- */
-public interface IProjectChangeListener {
-
- int ProjectOpened = 1;
- int ProjectClosed = 2;
- int ProjectDeleted = 4;
-
- /** 8 - Something in the project description has changed. For example, a Nature was added. */
- int ProjectChanged = 8;
-
- /** 16 - The project has been added. */
- int ProjectAdded = 16;
-
- /**
- * The project has changed in some way.
- *
- * @param project The project that has changed.
- * @param type The type of change. This will be one of the Project constants;
- */
- void projectChanged(IProject project, int type);
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IValChangedListener.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IValChangedListener.java
deleted file mode 100644
index a2d26d8..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IValChangedListener.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-/**
- * A class that wants to be notified when the validator preferences change.
- * @author karasiuk
- *
- */
-public interface IValChangedListener {
-
- /**
- * The validators for the project have changed.
- *
- * @param project the project can be null, which means that the global validation preferences have
- * changed.
- *
- * @param configSettingChanged If true a setting that could effect what gets validated has changed.
- * If false, then only other types of settings (like whether to show a results dialog or not) have
- * changed.
- */
- public void validatorsForProjectChanged(org.eclipse.core.resources.IProject project, boolean configSettingChanged);
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/MarkerManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/MarkerManager.java
deleted file mode 100644
index 03722be..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/MarkerManager.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.ValidatorMessage;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * A central place to manage all of the V2 validation markers.
- * @author karasiuk
- *
- */
-public class MarkerManager {
-
- private static MarkerManager _me;
-
- private Set<String> _markers = new HashSet<String>(50);
-
- public static MarkerManager getDefault(){
- if (_me == null)_me = new MarkerManager();
- return _me;
- }
-
- private MarkerManager(){
- _markers.add(ValConstants.ProblemMarker);
- _markers.add(ConfigurationConstants.VALIDATION_MARKER);
- }
-
- /**
- * Clear any validation markers that may have been set by this validator.
- *
- * @param resource
- * The resource that may have it's markers cleared. It can be
- * null, in which case the operation is a no-op.
- * @param validator
- * The validator that created the marker.
- */
- public void clearMarker(IResource resource, Validator validator) throws CoreException {
- if (resource == null)return;
- hook(resource);
-
- String id = validator.getMarkerId();
- if (id != null){
- resource.deleteMarkers(id, true, IResource.DEPTH_ZERO);
- return;
- }
-
- IMarker[] markers = resource.findMarkers(ValConstants.ProblemMarker, true, IResource.DEPTH_ZERO);
- String valId = validator.getId();
- for (IMarker marker : markers){
- id = marker.getAttribute(ValidatorMessage.ValidationId, null);
- if (valId.equals(id))marker.delete();
- }
- }
-
- @SuppressWarnings("unchecked")
- public void createMarker(ValidatorMessage m, String id){
- try {
- IResource resource = m.getResource();
- hook(resource);
- IMarker marker = resource.createMarker(m.getType());
- Map map = m.getAttributes();
- if (map.get(ValidatorMessage.ValidationId) == null)
- map.put(ValidatorMessage.ValidationId, id);
- marker.setAttributes(map);
- }
- catch (CoreException e){
- if (!m.getResource().exists())throw new ResourceUnavailableError(m.getResource());
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- }
-
- /**
- * Delete all the markers on this resource that were created before the
- * operation start time.
- *
- * @param resource
- * The resource that is having it's markers deleted.
- * @param operationStartTime
- * The time as returned by System.currentTimeMillis().
- * @param depth
- * The depth of the markers to clear. It is one of the
- * IResource.DEPTH_XXX constants.
- */
- public void deleteMarkers(IResource resource, long operationStartTime, int depth){
- try {
- hook(resource);
- IMarker[] markers = resource.findMarkers(null, true, depth);
- for (IMarker marker : markers){
- if (_markers.contains(marker.getType())){
- long createTime = marker.getCreationTime();
-// long diff = createTime - operationStartTime;
- if (createTime < operationStartTime)marker.delete();
- }
- }
- }
- catch (CoreException e){
- IProject project = resource.getProject();
- if (!project.exists() || !project.isOpen())throw new ProjectUnavailableError(project);
- if (!resource.exists())throw new ResourceUnavailableError(resource);
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public void makeMarkers(List<IMessage> list){
- for (IMessage message : list){
- IResource res = null;
- Object target = message.getTargetObject();
- if (target != null && target instanceof IResource)res = (IResource)target;
- if (res == null){
- target = message.getAttribute(IMessage.TargetResource);
- if (target != null && target instanceof IResource)res = (IResource)target;
- }
- if (res != null){
- try {
- hook(res);
- String id = message.getMarkerId();
- if (id == null)id = ConfigurationConstants.VALIDATION_MARKER;
- IMarker marker = res.createMarker(id);
- marker.setAttributes(message.getAttributes());
- marker.setAttribute(IMarker.MESSAGE, message.getText());
- int markerSeverity = IMarker.SEVERITY_INFO;
- int sev = message.getSeverity();
- if ((sev & IMessage.HIGH_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_ERROR;
- else if ((sev & IMessage.NORMAL_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_WARNING;
- marker.setAttribute(IMarker.SEVERITY, markerSeverity);
- marker.setAttribute(IMarker.LINE_NUMBER, message.getLineNumber());
- }
- catch (CoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
- }
-
- /**
- * A debugging method. A place to put break points, so that you can figure out what sort of marker
- * changes are happening.
- *
- * @param resource
- */
- public void hook(IResource resource){
-// String name = "first.test2x";
-// if (resource.getName().equals(name)){
-// String markers = Misc.listMarkers(resource);
-// Tracing.log("MarkerManager has hooked: ", name); //$NON-NLS-1$
-// RuntimeException rt = new RuntimeException("hooking " + name);
-// rt.printStackTrace();
-// }
- }
-
- public Set<String> getMarkers() {
- return _markers;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Misc.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Misc.java
deleted file mode 100644
index bf9beeb..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Misc.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.management.ManagementFactory;
-import java.lang.management.ThreadMXBean;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Some miscellaneous helper methods.
- * @author karasiuk
- *
- */
-public class Misc {
-
- public static void close(InputStream in){
- if (in == null)return;
- try {
- in.close();
- }
- catch (IOException e){
- // eat it
- }
- }
-
- public static void close(OutputStream out) {
- if (out == null)return;
- try {
- out.close();
- }
- catch (IOException e){
- // eat it
- }
- }
-
- public static boolean debugOptionAsBoolean(String option){
- String opt = Platform.getDebugOption(option);
- if (opt == null)return false;
- opt = opt.toLowerCase();
- if ("true".equals(opt))return true; //$NON-NLS-1$
- if ("yes".equals(opt))return true; //$NON-NLS-1$
- return false;
- }
-
-
- /**
- * Answer a units appropriate string for the time.
- * @param time time in nano seconds
- */
- public static String getTimeNano(long time){
- if (time <= 1000)return NLS.bind(ValMessages.TimeNano, time);
- if (time <= 1000000)return NLS.bind(ValMessages.TimeMicro, time/1000);
- return getTimeMS(time/1000000);
- }
-
- /**
- * Answer the CPU time consumed by this thread in nano seconds.
- * @return -1 if the time can not be determined.
- */
- public static long getCPUTime(){
- long cpuTime = -1;
- ThreadMXBean tb = ManagementFactory.getThreadMXBean();
- if (tb.isCurrentThreadCpuTimeSupported()){
- cpuTime = tb.getCurrentThreadCpuTime();
- }
- return cpuTime;
- }
-
- /**
- * Answer a units appropriate string for the time.
- * @param time time in milliseconds
- */
- public static String getTimeMS(long time) {
- if (time <= 1000)return ValMessages.TimeUnder;
- if (time <= 60000)return NLS.bind(ValMessages.TimeSec, time/1000);
- return NLS.bind(ValMessages.TimeMin, time/60000);
- }
-
- /**
- * Used in debugging so we can see what types of markers there are.
- * @param resource
- */
- public static String listMarkers(IResource resource){
- StringBuffer b = new StringBuffer(2000);
- try {
- IMarker[] markers = resource.findMarkers(null, true, IResource.DEPTH_ZERO);
- for (IMarker m : markers){
- Object o = m.getAttribute(IMarker.MESSAGE);
- if (o != null){
- b.append(o);
- }
- o = m.getAttribute(IMarker.SEVERITY);
- if (o != null){
- b.append(", Severity="); //$NON-NLS-1$
- b.append(o);
- }
- b.append("; "); //$NON-NLS-1$
- }
- }
- catch (CoreException e){
-
- }
- return b.toString();
- }
-
- /**
- * Answer true if they are the same. If they are both null then they are the same.
- * @param s1 the string to compare. It can be null.
- * @param s2 the string to compare. It can be null.
- */
- public static boolean same(String s1, String s2){
- if (s1 == null && s2 == null)return true;
- if (s1 == null)return false;
- return s1.equals(s2);
- }
-
- public static void niy(String msg){
- if (msg == null)msg = "Sorry, this function is not implemented yet"; //$NON-NLS-1$
- throw new RuntimeException(msg);
- }
-
- /**
- * Answer the type as a human readable string. This is only used for debugging.
- * @param type
- * @return
- */
- public static String resourceChangeEventType(int type){
- StringBuffer b = new StringBuffer(200);
- if ((type & IResourceChangeEvent.POST_BUILD) != 0)b.append("post_build "); //$NON-NLS-1$
- if ((type & IResourceChangeEvent.POST_CHANGE) != 0)b.append("post_change "); //$NON-NLS-1$
- if ((type & IResourceChangeEvent.PRE_BUILD) != 0)b.append("pre_build "); //$NON-NLS-1$
- if ((type & IResourceChangeEvent.PRE_CLOSE) != 0)b.append("pre_close "); //$NON-NLS-1$
- if ((type & IResourceChangeEvent.PRE_DELETE) != 0)b.append("pre_delete "); //$NON-NLS-1$
- return b.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/NullValidator.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/NullValidator.java
deleted file mode 100644
index 9f057aa..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/NullValidator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-
-/**
- * A null validator that is used in error cases. It simply no-ops.
- * @author karasiuk
- *
- */
-public class NullValidator extends AbstractValidator {
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PerformanceMonitor.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PerformanceMonitor.java
deleted file mode 100644
index f00e93d..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PerformanceMonitor.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.IPerformanceMonitor;
-import org.eclipse.wst.validation.PerformanceCounters;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-public class PerformanceMonitor implements IPerformanceMonitor {
-
- private CollectionLevel _level = CollectionLevel.None;
- private boolean _summaryOnly;
-
- /**
- * Create a performance monitor.
- *
- * @param traceTimes
- * Should the monitor be turned on?
- * @param file
- * Should the events be logged to a file. If this is null or the
- * empty string the events will be written to stderr. Otherwise
- * the events are appended to a file with this name.
- *
- * @param logInSeconds
- * Set this to true if you want the times that are logged in the
- * trace file normalized to seconds. Otherwise the default units are used,
- * milliseconds for elapsed time and nanoseconds for cpu time.
- */
- public static PerformanceMonitor create(boolean traceTimes, String file, boolean logInSeconds){
- PerformanceMonitor pm = null;
- if (file == null || file.length() == 0)pm = new PerformanceMonitor();
- else pm = new ToFile(file, logInSeconds);
-
- if (traceTimes)pm.setCollectionLevel(CollectionLevel.Default);
-
- return pm;
- }
-
- private PerformanceMonitor(){};
-
- public CollectionLevel getCollectionLevel() {
- return _level;
- }
-
- public void setCollectionLevel(CollectionLevel level) {
- _level = level;
- }
-
- public List<PerformanceCounters> getPerformanceCounters(boolean asSummary) {
- return new LinkedList<PerformanceCounters>();
- }
-
-
- public void resetPerformanceCounters() {
- }
-
- public boolean isCollecting() {
- return _level != CollectionLevel.None;
- }
-
- public boolean isSummaryOnly() {
- return _summaryOnly;
- }
-
- public void add(PerformanceCounters counters){
- Tracing.write(counters.toString());
- }
-
- public static class Counters{
- String name;
- int numberInvocations;
-
- /** Elapsed time in milliseconds. */
- long elapsedTime;
-
- /** CPU time in nanoseconds, or -1 if unknown. */
- long cpuTime;
- }
-
- public static class ToFile extends PerformanceMonitor {
-
- private String _fileName;
- private boolean _logInSeconds;
-
- private PrintWriter _pw;
- private static final String Comma=","; //$NON-NLS-1$
- private static DateFormat _df = new SimpleDateFormat("HH:mm:ss.SSSS"); //$NON-NLS-1$
-
- private ToFile(String fileName, boolean logInSeconds){
- _fileName = fileName;
- _logInSeconds = logInSeconds;
- }
-
- @Override
- public synchronized void add(PerformanceCounters pc) {
- try {
- PrintWriter pw = getWriter();
- pw.print(_df.format(pc.getWhen()) + Comma +
- pc.getValidatorId() + Comma + pc.getNumberInvocations() + Comma);
- if (_logInSeconds){
- double sec = ((double)pc.getElapsedTime()) / 1000.0;
- pw.print(sec);
- pw.print(Comma);
- sec = ((double)pc.getCpuTime()) / 1000000000.0;
- pw.print(sec);
- }
- else {
- pw.print(pc.getElapsedTime()+Comma+pc.getCpuTime());
- }
- pw.println(Comma + pc.getResourceName());
- pw.flush();
- }
- catch (IOException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- private PrintWriter getWriter() throws IOException {
- if (_pw == null){
- _pw = new PrintWriter(new FileOutputStream(_fileName, true));
- DateFormat df = DateFormat.getDateTimeInstance();
- _pw.println("# " + NLS.bind(ValMessages.LogSession, //$NON-NLS-1$
- df.format(new Date(System.currentTimeMillis()))));
- if (_logInSeconds)
- _pw.println("# when, id, invocation count, elapsed time (seconds), cpu time (seconds), resource"); //$NON-NLS-1$
- else
- _pw.println("# when, id, invocation count, elapsed time (ms), cpu time (ns), resource"); //$NON-NLS-1$
- }
- return _pw;
-
- }
- }
-
- public static class Collecting extends PerformanceMonitor {
- private List<PerformanceCounters> _counters = new LinkedList<PerformanceCounters>();
-
- public void add(PerformanceCounters counters){
- _counters.add(counters);
- }
-
- public List<PerformanceCounters> getPerformanceCounters(boolean asSummary) {
- if (asSummary){
- Map<String, Counters> map = new HashMap<String, Counters>(40);
- for (PerformanceCounters pc : _counters){
- Counters c = map.get(pc.getValidatorId());
- if (c == null){
- c = new Counters();
- c.name = pc.getValidatorName();
- map.put(pc.getValidatorId(), c);
- }
- c.numberInvocations += pc.getNumberInvocations();
- c.elapsedTime += pc.getElapsedTime();
- if (pc.getCpuTime() != -1)c.cpuTime += pc.getCpuTime();
- else c.cpuTime = -1;
- }
- List<PerformanceCounters> list = new LinkedList<PerformanceCounters>();
- for (Map.Entry<String, Counters> me : map.entrySet()){
- Counters c = me.getValue();
- list.add(new PerformanceCounters(me.getKey(), c.name, null, c.numberInvocations, c.elapsedTime, c.cpuTime));
- }
- return list;
- }
- return _counters;
- }
-
- public void resetPerformanceCounters() {
- _counters.clear();
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PrefConstants.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PrefConstants.java
deleted file mode 100644
index 3bac075..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PrefConstants.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-/**
- * The constants that are used in the preference store so save the validator configurations.
- * <p>
- * The entries in the preference hierarchy are organized something like this:
- * <pre>
- * /instance/frame-work-id/saveAuto=true|false
- * /instance/frame-work-id/suspend=true|false
- * /instance/frame-work-id/vf.version=2
- * /instance/frame-work-id/filters/val-id/build=true|false
- * /instance/frame-work-id/filters/val-id/manual=true|false
- * /instance/frame-work-id/filters/val-id/version=someNumber
- * /instance/frame-work-id/filters/val-id/groups/0/type=include|exclude
- * /instance/frame-work-id/filters/val-id/groups/0/rules/0/type=file|fileext|projectNature|...
- * /instance/frame-work-id/filters/val-id/groups/0/rules/0/pattern=...
- * /instance/frame-work-id/filters/val-id/groups/0/rules/1/type=file|fileext|projectNature|...
- * /instance/frame-work-id/filters/val-id/groups/0/rules/1/pattern=...
- * </pre>
- * <p>
- * New approach
- * <pre>
- * vals/val-id/global=TF[version][len]delegate-id
- * vals/val-id/groups=[groups]
- * </pre>
- *
- *
- * @author karasiuk
- *
- */
-public interface PrefConstants {
-
- /** filters - node where all the filters are saved. */
- String filters = "filters"; //$NON-NLS-1$
-
- /** build - is the validator enabled for builds? */
- String build = "build"; //$NON-NLS-1$
-
- /** delegate - the delegating implementation to use */
- String delegate = "delegate"; //$NON-NLS-1$
-
- /** disabled - the list of disabled resources in the project. */
- String disabled = "disabled"; //$NON-NLS-1$
-
- /** exactMatch - must the content type match exactly? */
- String exactMatch = "exactMatch"; //$NON-NLS-1$
-
- /** manual - is the validator enabled for manual validation? */
- String manual = "manual"; //$NON-NLS-1$
-
- /** msgs - node where all the message severity mappings are stored. */
- String msgs = "msgs"; //$NON-NLS-1$
-
- /**
- * version - version of the filter definition. This is something that a client can use to keep track
- * of changes that they might make to their validation extension.
- */
- String version = "version"; //$NON-NLS-1$
-
- /** vf.version - version of the validation framework. */
- String frameworkVersion = "vf.version"; //$NON-NLS-1$
-
- /** groups - filter group. */
- String groups = "groups"; //$NON-NLS-1$
-
- /** type - type of group, either include or exclude. */
- String type = "type"; //$NON-NLS-1$
-
- /** type - the type of rule. */
- String ruleType = "type"; //$NON-NLS-1$
-
- /** rules - a filter rule. */
- String rules = "rules"; //$NON-NLS-1$
-
- /** pattern - the pattern part of the rule. */
- String pattern = "pattern"; //$NON-NLS-1$
-
- /** saveAuto - can we save all the resources automatically? true/false */
- String saveAuto = "saveAuto"; //$NON-NLS-1$
-
- /** stateTS - plug-in state time stamp */
- String stateTS = "stateTS"; //$NON-NLS-1$
-
- /** suspend - suspend all validation? true/false */
- String suspend = "suspend"; //$NON-NLS-1$
-
- /** case - is this case sensitive? */
- String caseSensitive = "case"; //$NON-NLS-1$
-
- /** fileType - the type of file, see FilterRule.File */
- String fileType = "fileType"; //$NON-NLS-1$
-
- /** confirmDialog - should we show a confirmation dialog when doing a manual validation? */
- String confirmDialog = "confirmDialog"; //$NON-NLS-1$
-
- /** override - should we show projects to override the global preferences? */
- String override = "override"; //$NON-NLS-1$
-
- /** vals - the validators are grouped under this node. */
- String vals = "vals"; //$NON-NLS-1$
-
- /** global - some global validation settings. */
- String global = "global"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ProjectUnavailableError.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ProjectUnavailableError.java
deleted file mode 100644
index 03e2b65..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ProjectUnavailableError.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * This internal error is used to signal that a project is now unavailable.
- * <p>
- * We could be in the middle of validating a large project, and the project could be closed.
- * This error is used to "exit" the validation framework.
- * <p>
- * This is an error rather than a runtime exception, because some parts of Eclipse like to
- * trap RuntimeExceptions and log them.
- * @author karasiuk
- *
- */
-public class ProjectUnavailableError extends Error {
-
- private IProject _project;
-
- private static final long serialVersionUID = 200801281118L;
-
- public ProjectUnavailableError(IProject project){
- super();
- _project = project;
- }
-
- public IProject getProject() {
- return _project;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ResourceUnavailableError.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ResourceUnavailableError.java
deleted file mode 100644
index 9543670..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ResourceUnavailableError.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * This internal error is used to signal that a resource is now unavailable.
- * <p>
- * This error is used to "exit" the validation framework.
- * <p>
- * This is an error rather than a runtime exception, because some parts of Eclipse like to
- * trap RuntimeExceptions and log them.
- * @author karasiuk
- *
- */
-public class ResourceUnavailableError extends Error {
-
- private static final long serialVersionUID = 200801290853L;
-
- private IResource _resource;
-
- public ResourceUnavailableError(IResource resource){
- super();
- _resource = resource;
- }
-
- public IResource getResource() {
- return _resource;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Serializer.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Serializer.java
deleted file mode 100644
index 22da768..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Serializer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-/**
- * A simple encoder that knows how to convert booleans, integers and strings, into a single string.
- *
- * @see Deserializer
- * @author karasiuk
- *
- */
-public class Serializer {
- private StringBuffer _buffer;
-
- public Serializer(int size){
- _buffer = new StringBuffer(size);
- }
-
- public void put(boolean bool){
- _buffer.append(bool ? 'T' : 'F');
- }
-
- public void put(String string){
- put(string.length());
- _buffer.append(string);
- }
-
- public void put(int anInt){
- String s = String.valueOf(anInt);
- int len = s.length();
- _buffer.append(len-1);
- _buffer.append(s);
- }
-
- @Override
- public String toString() {
- return _buffer.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/SummaryReporter.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/SummaryReporter.java
deleted file mode 100644
index 5a19332..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/SummaryReporter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * This class extends the workbench reporter by capturing some summary information about any added
- * messages.
- * @author karasiuk
- *
- */
-public class SummaryReporter extends WorkbenchReporter {
-
- private int _severityHigh;
- private int _severityNormal;
- private int _severityLow;
-
- public SummaryReporter(IProject project, IProgressMonitor monitor) {
- super(project, monitor);
- }
-
- @Override
- public void addMessage(IValidator validator, IMessage message) {
- super.addMessage(validator, message);
- switch (message.getSeverity()){
- case IMessage.HIGH_SEVERITY:
- _severityHigh++;
- break;
- case IMessage.NORMAL_SEVERITY:
- _severityNormal++;
- break;
- case IMessage.LOW_SEVERITY:
- _severityLow++;
- break;
- }
- }
-
- public int getSeverityHigh() {
- return _severityHigh;
- }
-
- public int getSeverityNormal() {
- return _severityNormal;
- }
-
- public int getSeverityLow() {
- return _severityLow;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Tracing.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Tracing.java
deleted file mode 100644
index cb7dded..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Tracing.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Control the tracing that this plug-in performs. This is used for service.
- * @author karasiuk
- *
- */
-public class Tracing {
-
- private static DateFormat _df = new SimpleDateFormat("HH:mm:ss.SSSS"); //$NON-NLS-1$
- private static boolean _forceLogging;
- private static Boolean _traceMatches;
- private static Boolean _traceV1;
- private static String _extraValDetail;
-
- /**
- * Are we in logging/debugging mode?
- */
- public static boolean isLogging(){
- return _forceLogging || ValidationPlugin.getPlugin().isDebugging();
- }
-
- public static boolean isTraceMatches(){
- if (_traceMatches == null){
- _traceMatches = Misc.debugOptionAsBoolean(DebugConstants.TraceMatches);
- }
- return _traceMatches;
- }
-
- public static boolean isTraceV1(){
- if (_traceV1 == null){
- _traceV1 = Misc.debugOptionAsBoolean(DebugConstants.TraceV1);
- }
- return _traceV1;
- }
-
- public static boolean matchesExtraDetail(String validatorId){
- if (_extraValDetail == null){
- _extraValDetail = Platform.getDebugOption(DebugConstants.ExtraValDetail);
- if (_extraValDetail == null)_extraValDetail = ""; //$NON-NLS-1$
- }
- if (_extraValDetail.length() == 0)return false;
- return _extraValDetail.equals(validatorId);
- }
-
- /**
- * Write a line to the console for debugging, if in debugging mode.
- * @param line
- */
- public static void log(String line){
- if (isLogging())write(line);
- }
-
- public static void log(Object... parts){
- if (isLogging()){
- StringBuffer b = new StringBuffer(200);
- for (Object p : parts)b.append(p);
- write(b.toString());
- }
- }
-
- /**
- * Write a line to the log. Include a time stamp with the line.
- * @param line
- */
- public static void write(String line){
- System.err.println(timestampIt(line));
- }
-
- public static String timestampIt(String line){
- Date date = new Date();
- long thread = Thread.currentThread().getId();
- return _df.format(date) + " " + thread + " " + line; //$NON-NLS-1$//$NON-NLS-2$
- }
-
- /**
- * If we are in logging mode, log the item, and then reset the string buffer.
- */
- public static void log(StringBuffer b){
- log(b.toString());
- b.setLength(0);
- }
-
- /**
- * Force the logging to be turned on. Normally logging is turned on via -debug options. However
- * the logging can be forced to be on by setting this to true. (Setting this to false doesn't force
- * the logging to be turned off).
- *
- * @param forceLogging
- */
- public static void setForceLogging(boolean forceLogging) {
- _forceLogging = forceLogging;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValBuilderJob.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValBuilderJob.java
deleted file mode 100644
index b8be3ac..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValBuilderJob.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.LinkedList;
-import java.util.Queue;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.wst.validation.DependentResource;
-import org.eclipse.wst.validation.Friend;
-import org.eclipse.wst.validation.IDependencyIndex;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * Run all the v2 validators through this job.
- * <p>
- * This is the main class for supporting build based validation. When triggered it looks at all of the
- * resource changes and determines what needs to be validated.
- * @author karasiuk
- *
- */
-public class ValBuilderJob extends WorkspaceJob implements IResourceDeltaVisitor, IResourceVisitor {
-
- private static ValBuilderJob _job;
- private static Queue<ValidationRequest> _work = new LinkedList<ValidationRequest>();
-
- /** The monitor to use while running the build. */
- private IProgressMonitor _monitor;
-
- private SubMonitor _subMonitor;
-
- private ValidationRequest _request;
-
- /** The types of changes we are interested in. */
- private final static int InterestedFlags = IResourceDelta.CONTENT | IResourceDelta.ENCODING |
- IResourceDelta.MOVED_FROM | IResourceDelta.MOVED_TO;
-
- public static synchronized void validateProject(IProject project, IResourceDelta delta, int buildKind, ValOperation operation){
- ValidationRequest request = new ValidationRequest(project, delta, buildKind, operation);
- if (_job == null){
- _job = new ValBuilderJob();
- _job.add(request);
- _job.schedule();
- }
- else {
- _job.add(request);
- }
- }
-
- private static synchronized ValidationRequest getRequest(){
- ValidationRequest request = _work.poll();
- if (request == null){
- _job = null;
- }
- return request;
- }
-
- /**
- * Each validation run is done in it's own job.
- *
- * @param project the project that is being validated
- * @param delta the delta that is being validated. This may be null, in which case we do a
- * full validation of the project.
- *
- * @param buildKind the kind of build.
- * @see org.eclipse.core.resources.IncrementalProjectBuilder#AUTO_BUILD
- * @see org.eclipse.core.resources.IncrementalProjectBuilder#CLEAN_BUILD
- * @see org.eclipse.core.resources.IncrementalProjectBuilder#FULL_BUILD
- * @see org.eclipse.core.resources.IncrementalProjectBuilder#INCREMENTAL_BUILD
- *
- * @param operation some global context for the validation operation
- *
- */
- private ValBuilderJob(){
- super(ValMessages.JobName);
- }
-
- private void add(ValidationRequest request){
- _work.add(request);
- }
-
- public boolean belongsTo(Object family) {
- if (family == ResourcesPlugin.FAMILY_MANUAL_BUILD)return true;
- if (family == ValidationBuilder.FAMILY_VALIDATION_JOB){
- return true;
- }
-
- return super.belongsTo(family);
- }
-
- public IStatus runInWorkspace(IProgressMonitor monitor) {
- Tracing.log("ValBuilderJob-01: Starting"); //$NON-NLS-1$
- _monitor = monitor;
-
- ValidationRequest request = getRequest();
- while(request != null){
- _request = request;
- run();
- request = getRequest();
- }
-
- Tracing.log("ValBuilderJob-02: Finished"); //$NON-NLS-1$
- return Status.OK_STATUS;
- }
-
- private void run(){
- setName(ValMessages.JobName + " " + _request.getProject().getName()); //$NON-NLS-1$
- try {
- if (_request.getDelta() == null)fullBuild();
- else deltaBuild();
-
- }
- catch (ProjectUnavailableError e){
- ValidationPlugin.getPlugin().handleProjectUnavailableError(e);
- }
- catch (ResourceUnavailableError e){
- ValidationPlugin.getPlugin().handleResourceUnavailableError(e);
- }
- catch (CoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- }
-
- private void deltaBuild() throws CoreException {
- ResourceCounter counter = new ResourceCounter();
- _request.getDelta().accept(counter);
- _subMonitor = SubMonitor.convert(_monitor, counter.getCount());
- _request.getDelta().accept(this);
- }
-
- private void fullBuild() throws CoreException {
- ResourceCounter counter = new ResourceCounter();
- _request.getProject().accept(counter, 0);
- _subMonitor = SubMonitor.convert(_monitor, counter.getCount());
- _request.getProject().accept(this);
-
- }
-
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResource resource = delta.getResource();
- if (DisabledResourceManager.getDefault().isDisabled(resource)){
- MarkerManager.getDefault().deleteMarkers(resource, _request.getOperation().getStarted(), IResource.DEPTH_INFINITE);
- return false;
- }
- int kind = delta.getKind();
- boolean isChanged = (kind & IResourceDelta.CHANGED) != 0;
- if (isChanged && (delta.getFlags() & InterestedFlags) == 0)return true;
-
- if ((kind & (IResourceDelta.ADDED | IResourceDelta.CHANGED)) != 0){
- ValManager.getDefault().validate(_request.getProject(), resource, delta.getKind(), ValType.Build,
- _request.getBuildKind(), _request.getOperation(), _subMonitor.newChild(1));
- }
-
- IDependencyIndex index = ValidationFramework.getDefault().getDependencyIndex();
- if (index.isDependedOn(resource)){
- MarkerManager mm = MarkerManager.getDefault();
- for (DependentResource dr : index.get(resource)){
- if (Friend.shouldValidate(dr.getValidator(), dr.getResource(), ValType.Build, new ContentTypeWrapper())){
- mm.clearMarker(dr.getResource(), dr.getValidator());
- _request.getOperation().getState().put(ValidationState.TriggerResource, resource);
- ValManager.getDefault().validate(dr.getValidator(), _request.getOperation(), dr.getResource(),
- IResourceDelta.NO_CHANGE, _monitor);
- }
- }
- }
-
- return true;
- }
-
- public boolean visit(IResource resource) throws CoreException {
- try {
- if (DisabledResourceManager.getDefault().isDisabled(resource)){
- MarkerManager.getDefault().deleteMarkers(resource, _request.getOperation().getStarted(), IResource.DEPTH_INFINITE);
- return false;
- }
- ValManager.getDefault().validate(_request.getProject(), resource, IResourceDelta.NO_CHANGE, ValType.Build,
- _request.getBuildKind(), _request.getOperation(), _subMonitor.newChild(1));
- }
- catch (ResourceUnavailableError e){
- if (Tracing.isLogging())Tracing.log("ValBuilderJob-02: " + e.toString()); //$NON-NLS-1$
- return false;
- }
- return true;
- }
-
- static class ResourceCounter implements IResourceProxyVisitor, IResourceDeltaVisitor {
-
- private int _count;
-
- public int getCount() {
- return _count;
- }
-
- public boolean visit(IResourceProxy proxy) throws CoreException {
- _count++;
- return true;
- }
-
- public boolean visit(IResourceDelta delta) throws CoreException {
- _count++;
- return true;
- }
- }
-
- static class ValidationRequest {
- /** The project that is being built. */
- private IProject _project;
-
- /** The resource delta that triggered the build, it will be null for a full build. */
- private IResourceDelta _delta;
-
- private ValOperation _operation;
-
- /**
- * The kind of build.
- *
- * @see org.eclipse.core.resources.IncrementalProjectBuilder
- */
- private int _buildKind;
-
- public ValidationRequest(IProject project, IResourceDelta delta, int buildKind, ValOperation operation){
- _project = project;
- _delta = delta;
- _buildKind = buildKind;
- _operation = operation;
- }
-
- public IProject getProject() {
- return _project;
- }
-
- public IResourceDelta getDelta() {
- return _delta;
- }
-
- public ValOperation getOperation() {
- return _operation;
- }
-
- public int getBuildKind() {
- return _buildKind;
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValConstants.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValConstants.java
deleted file mode 100644
index ab2aebf..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValConstants.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-public interface ValConstants {
- /** problem marker for version 2 of the validation framework. */
- String ProblemMarker = ValidationPlugin.PLUGIN_ID +".problemmarker2"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValManager.java
deleted file mode 100644
index 92c0bae..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValManager.java
+++ /dev/null
@@ -1,1064 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import 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.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
-import org.eclipse.wst.validation.Friend;
-import org.eclipse.wst.validation.IPerformanceMonitor;
-import org.eclipse.wst.validation.IValidatorGroupListener;
-import org.eclipse.wst.validation.PerformanceCounters;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.model.GlobalPreferences;
-import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
-import org.eclipse.wst.validation.internal.model.ProjectPreferences;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * A central place to keep track of all the validators.
- * @author karasiuk
- *
- */
-public class ValManager implements IValChangedListener, IFacetedProjectListener, IProjectChangeListener {
-
- private static ValManager _me;
-
- /**
- * Projects may be allowed to override the global validation settings. If that is the case then those
- * project specific settings are saved here. If the key exists, but the value is null, then that
- * means that the project has been checked and it does not have any specific settings.
- */
- private Map<IProject, ProjectPreferences> _projectPreferences =
- Collections.synchronizedMap(new HashMap<IProject, ProjectPreferences>(50));
-
- private GlobalPreferences _globalPreferences;
-
- /**
- * This number increases each time any of the validation configurations change. It is used to determine
- * if information that we have cached in the ValProperty is stale or not. This starts off at zero, each time
- * the workbench is started.
- */
- private int _configNumber;
- private ValidatorIdManager _idManager = new ValidatorIdManager();
-
- private ValidatorProjectManager _projectManager = new ValidatorProjectManager();
-
- private static final QualifiedName StatusBuild = new QualifiedName(ValidationPlugin.PLUGIN_ID, "sb"); //$NON-NLS-1$
- private static final QualifiedName StatusManual = new QualifiedName(ValidationPlugin.PLUGIN_ID, "sm"); //$NON-NLS-1$
-
- public static synchronized ValManager getDefault(){
- if (_me == null)_me = new ValManager();
- return _me;
- }
-
- private ValManager(){
- ValPrefManagerGlobal.getDefault().addListener(this);
- ValPrefManagerProject.addListener(this);
- FacetedProjectFramework.addListener(this, IFacetedProjectEvent.Type.PROJECT_MODIFIED);
- EventManager.getManager().addProjectChangeListener(this);
- }
-
- /**
- * This needs to be called if the ValManager is ever deleted.
- */
- public void dispose(){
- // currently nobody calls this method, because this instance is never removed, but the method is
- // here for completeness none the less.
- ValPrefManagerGlobal.getDefault().removeListener(this);
- ValPrefManagerProject.removeListener(this);
- FacetedProjectFramework.removeListener(this);
- EventManager.getManager().removeProjectChangeListener(this);
- }
-
- /**
- * Answer all the registered validators. If you are planning on making changes to the validators,
- * and then saving them in a preference store then you probably want the getValidatorsCopy method.
- * Because if you make changes to the original validators, and since we only save differences,
- * there won't be any differences.
- *
- * @return Answer an empty array if there are no validators.
- *
- * @see #getValidatorsCopy()
- */
- public Validator[] getValidators(){
- return getValidators(null);
- }
-
- /**
- * Answer copies of all the registered validators. If you are going to be making changes to the validators
- * and then saving them backing into the preference store, then this is the method to use.
- *
- * @return Answer an empty array if there are no validators.
- */
- public Validator[] getValidatorsCopy(){
- Validator[] orig = getValidators();
- Validator[] copy = new Validator[orig.length];
- for (int i=0; i<orig.length; i++)copy[i] = orig[i].copy();
- return copy;
- }
-
- /**
- * Answer all the validators that are in effect for the given project.
- * <p>
- * Individual projects may override the global validation preference settings. If this is allowed and if
- * the project has it's own settings, then those validators are returned via this method.
- * </p>
- * <p>
- * The following approach is used. For version 1 validators, the validator is only returned if it
- * is defined to operate on this project type. This is the way that the previous version of the framework
- * did it. For version 2 validators, they are all returned.
- * </p>
- * @param project this may be null, in which case the global preferences are returned.
- */
- public Validator[] getValidators(IProject project) throws ProjectUnavailableError {
- return getValidators(project, true);
- }
-
- /**
- * Answer all the validators for the given project.
- * <p>
- * Individual projects may override the global validation preference
- * settings. If the project has it's own settings, then those validators are
- * returned via this method.
- * </p>
- * <p>
- * The following approach is used. For version 1 validators, the validator
- * is only returned if it is defined to operate on this project type. This
- * is the way that the previous version of the framework did it. For version
- * 2 validators, they are all returned.
- * </p>
- *
- * @param project
- * this may be null, in which case the global preferences are
- * returned.
- * @param respectOverrideSettings
- * if this is true then the validators that get returned are
- * based on the override settings. So for example, if the global
- * preferences do not allow project overrides then none of the
- * project settings are used. Normal validation would set this to true.
- * The properties page would set this to false.
- */
- public synchronized Validator[] getValidators(IProject project, boolean respectOverrideSettings) throws ProjectUnavailableError {
- Map<String,Validator> v2Vals = getV2Validators(project);
- TreeSet<Validator> sorted = new TreeSet<Validator>();
- for (Validator v : v2Vals.values())sorted.add(v);
-
- try {
- ValidationConfiguration vc = ConfigurationManager.getManager().getConfiguration(project);
- for (ValidatorMetaData vmd : vc.getValidators()){
- Validator v = Validator.create(vmd, vc, project);
- sorted.add(v);
- }
- }
- catch (InvocationTargetException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- Validator[] vals = new Validator[sorted.size()];
- sorted.toArray(vals);
- return vals;
- }
-
- /**
- * Answer the V2 validators that are in effect for this project. The following approach is used:
- * <ol>
- * <li>The validators that are defined by the extension point are loaded.</li>
- * <li>They are customized by any global preferences.</li>
- * <li>If project customizations are allowed, they are customized by the project preferences.
- * </ol>
- *
- * @param project
- * This may be null, in which case only the global preferences are used.
- * @return
- */
- private Map<String,Validator> getV2Validators(IProject project){
- Map<String,Validator> extVals = ExtensionValidators.instance().getMapV2Copy();
- try {
- List<Validator> vals = ValPrefManagerGlobal.getDefault().getValidators();
- for (Validator v : vals)extVals.put(v.getId(), v);
-
- if (!mustUseGlobalValidators(project)){
- //TODO should probably cache this vpm
- ValPrefManagerProject vpm = new ValPrefManagerProject(project);
- vals = vpm.getValidators(extVals);
- for (Validator v : vals)extVals.put(v.getId(), v);
- }
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- return extVals;
- }
-
-
- /**
- * Answer true if we must use the global settings for this project. If the global preferences do not
- * allow overrides, or if this project does not allow overrides then the global preferences must be used.
- *
- * @param project project that is being tested. It can be null, in which case the global preferences must be used.
- * @return true if the global preferences must be used.
- */
- public boolean mustUseGlobalValidators(IProject project){
- if (project == null)return true;
- if (!getGlobalPreferences().getOverride())return true;
- ProjectPreferences pp = getProjectPreferences2(project);
- if (pp == null){
- ValPrefManagerProject vpm = new ValPrefManagerProject(project);
- pp = new ProjectPreferences(project);
- vpm.loadProjectPreferencesShallow(pp);
- }
-
- return !pp.getOverride();
- }
-
- /**
- * Answer the validator with the given id that is in effect for the given project.
- *
- * @param id The validator id.
- * @param project
- * @return null if the validator is not found
- */
- public Validator getValidator(String id, IProject project){
- Validator[] vals = getValidators(project);
- for (Validator v : vals){
- if (v.getId().equals(id))return v;
- }
- return null;
- }
-
- /**
- * @see ValidationFramework#getValidator(String, IProject)
- */
- public Validator getValidatorWithId(String id, IProject project){
- Validator[] vals = getValidators(project);
- for (Validator v : vals){
- if (v.getId().equals(id))return v;
- }
- return null;
- }
-
- /**
- * Answer true if the resource has any enabled validators.
- *
- * @param resource a file, folder or project.
- *
- * @param isManual if true then the validator must be turned on for manual validation.
- * If false then the isManualValidation setting isn't used to filter out validators.
- *
- * @param isBuild if true then the validator must be turned on for build based validation.
- * If false then the isBuildValidation setting isn't used to filter out validators.
- */
- public boolean hasValidators(IResource resource, boolean isManual, boolean isBuild){
- if (resource instanceof IProject){
- IProject project = (IProject)resource;
- return ValManager.getDefault().getValidators(project).length > 0;
- }
- else if (resource instanceof IFolder){
- IFolder folder = (IFolder)resource;
- HasValidatorVisitor v = new HasValidatorVisitor(isManual, isBuild);
- return v.hasValidator(folder);
- }
- else {
- ContentTypeWrapper ctw = new ContentTypeWrapper();
- for (Validator val : ValManager.getDefault().getValidators(resource.getProject())){
- if (Friend.shouldValidate(val, resource, isManual, isBuild, ctw))return true;
- }
- }
- return false;
- }
-
- /**
- * Answer true if the project has disabled all of it's validators, or if project overrides are not
- * allowed if global validation has been disabled.
- *
- * @param project the project that is being consulted, or null if only the global settings are to be
- * checked.
- */
- public boolean isDisabled(IProject project){
- GlobalPreferences gp = getGlobalPreferences();
- if (!gp.getOverride() || project == null)return gp.getDisableAllValidation();
-
- ProjectPreferences pp = getProjectPreferences2(project);
- if (pp == null)return gp.getDisableAllValidation();
- return pp.getSuspend();
- }
-
- /**
- * Answer all the registered validators as they were defined by the extension points. That is
- * answer the validators as if the user has never applied any customizations.
- *
- * @return Answer an empty array if there are no validators.
- */
- public static Validator[] getDefaultValidators() throws InvocationTargetException {
- Map<String,Validator> extVals = ExtensionValidators.instance().getMapV2();
- TreeSet<Validator> sorted = new TreeSet<Validator>();
- for (Validator v : extVals.values())sorted.add(v);
-
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- GlobalConfiguration gc = new GlobalConfiguration(root);
- gc.resetToDefault();
- for (ValidatorMetaData vmd : gc.getValidators()){
- Validator v = Validator.create(vmd, gc, null);
- v.setBuildValidation(vmd.isBuildValidation());
- v.setManualValidation(vmd.isManualValidation());
- sorted.add(v);
- }
-
- Validator[] val = new Validator[sorted.size()];
- sorted.toArray(val);
- return val;
- }
-
- public static Validator[] getDefaultValidators(IProject project) throws InvocationTargetException {
- Map<String,Validator> extVals = ExtensionValidators.instance().getMap(project);
- Validator[] val = new Validator[extVals.size()];
- extVals.values().toArray(val);
- return val;
- }
-
- /**
- * Answer all the registered validators.
- *
- * @param project the project to use for getting the version 1 validator settings. This can
- * be null in which case the global preferences are used.
- *
- * @return Answer an empty array if there are no validators.
- */
-// Validator[] getValidators2(IProject project) throws ProjectUnavailableError {
-// // If I use a local variable I don't need to synchronize the method.
-//
-// Validator[] validators = _validators;
-// if (project == null && validators != null)return validators;
-//
-// Validator[] val = loadExtensions(false, project);
-// ValPrefManagerGlobal vpm = ValPrefManagerGlobal.getDefault();
-// if (!vpm.loadPreferences(val)){
-// val = restoreDefaults2(project);
-// saveStateTimestamp();
-// }
-// else {
-// if (getGlobalPreferences().getStateTimeStamp() != Platform.getStateStamp())
-// val = migrateSettings(val, project);
-// }
-//
-// TreeSet<Validator> set = new TreeSet<Validator>();
-// for (Validator v : val)set.add(v);
-//
-// List<Validator> list = new LinkedList<Validator>();
-// try {
-// ValidationConfiguration vc = ConfigurationManager.getManager().getConfiguration(project);
-// for (ValidatorMetaData vmd : vc.getValidators()){
-// list.add(Validator.create(vmd, vc, project));
-// }
-//
-// }
-// catch (InvocationTargetException e){
-// if (project != null && (!project.exists() || !project.isOpen()))
-// throw new ProjectUnavailableError(project);
-// ValidationPlugin.getPlugin().handleException(e);
-// }
-//
-// set.addAll(list);
-// val = new Validator[set.size()];
-// set.toArray(val);
-// if (project == null)_validators = val;
-// return val;
-// }
-
- /**
- * This method needs to be called whenever the validation configuration has changed.
- */
- private void configHasChanged(){
- _configNumber++;
- _projectManager.reset();
- }
-
- /**
- * Answer the global validation preferences.
- */
- public synchronized GlobalPreferences getGlobalPreferences(){
- GlobalPreferences gp = _globalPreferences;
- if (gp == null){
- ValPrefManagerGlobal vpm = ValPrefManagerGlobal.getDefault();
- gp = new GlobalPreferences();
- vpm.loadGlobalPreferences(gp);
- _globalPreferences = gp;
- }
- return gp;
- }
-
- public ProjectPreferences getProjectPreferences(IProject project) {
- ProjectPreferences pp = getProjectPreferences2(project);
- if (pp != null)return pp;
-
- /* hopefully we rarely get this far */
-
- Map<String,Validator> extVals = ExtensionValidators.instance().getMapV2Copy();
- try {
- List<Validator> vals = ValPrefManagerGlobal.getDefault().getValidators();
- for (Validator v : vals)extVals.put(v.getId(), v);
-
- pp = getProjectPreferences(project, extVals);
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- return pp;
- }
-
-
- private ProjectPreferences getProjectPreferences(IProject project, Map<String, Validator> baseValidators)
- throws BackingStoreException {
- if (_projectPreferences.containsKey(project)){
- return _projectPreferences.get(project);
- }
-
- ValPrefManagerProject vpm = new ValPrefManagerProject(project);
- ProjectPreferences pp = new ProjectPreferences(project);
- vpm.loadProjectPreferences(pp, baseValidators);
- _projectPreferences.put(project, pp);
- return pp;
- }
-
- /**
- * Answer the project specific validation preferences from the cache
- *
- * @param project
- *
- * @return null if the project is not in the cache.
- */
- private ProjectPreferences getProjectPreferences2(IProject project){
- if (_projectPreferences.containsKey(project)){
- return _projectPreferences.get(project);
- }
- return null;
- }
-
- /**
- * Restore all the validation defaults, as defined by the individual validators via the
- * validation extension point.
- */
-// public synchronized void restoreDefaults() {
-// getGlobalPreferences().resetToDefault();
-// _validators = null;
-// getValidators(true);
-// }
-
-
- /**
- * Run all the validators that are applicable to this resource.
- * <p>
- * If this is a manual validation both the version 1 and version 2 validators are run. If it
- * is a build validation, then only the version 2 validators are run, because the old framework handles
- * the running of the old validators.
- * </p>
- *
- * @param project project that is being validated
- *
- * @param resource the resource that is being validated
- *
- * @param kind the kind of resource delta. It will be one of the IResourceDelta constants, like
- * IResourceDelta.CHANGED for example.
- *
- * @param valType The type of validation request.
- * @param buildKind the kind of build that triggered this validation. See IncrementalProjectBuilder for values.
- * @param operation the operation that this validation is running under
- * @param monitor the monitor to use to report progress
- */
- public void validate(IProject project, final IResource resource, final int kind, ValType valType,
- int buildKind, ValOperation operation, final IProgressMonitor monitor) {
-
- MarkerManager.getDefault().deleteMarkers(resource, operation.getStarted(), IResource.DEPTH_ZERO);
-
- IValidatorVisitor visitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType vt,
- ValOperation operation, IProgressMonitor monitor) {
-
- Validator.V1 v1 = validator.asV1Validator();
- if (vt == ValType.Build && v1 != null)return;
-
- SubMonitor subMonitor = SubMonitor.convert(monitor);
- String task = NLS.bind(ValMessages.LogValStart, validator.getName(), resource.getName());
- subMonitor.beginTask(task, 1);
- validate(validator, operation, resource, kind, subMonitor.newChild(1));
- }
- };
- SubMonitor sm = SubMonitor.convert(monitor, getValidators(project).length);
- accept(visitor, project, resource, valType, operation, sm);
-
- }
-
- /**
- * Validate a single resource with a single validator. This will call the validator whether the validator
- * is enabled or not.
- * <p>
- * Callers of this method should ensure that the shouldValidate was tested before making this call.
- *
- * @param validator the validator
- * @param operation the operation that the validation is running in.
- * @param resource the resource to validate
- * @param kind the kind of resource change. See IResourceDelta.
- * @param monitor
- */
- public void validate(Validator validator, ValOperation operation, IResource resource, int kind,
- IProgressMonitor monitor){
- if (operation.isValidated(validator.getId(), resource))return;
- long time = 0;
- long cpuTime = -1;
- String msg1 = NLS.bind(ValMessages.LogValStart, validator.getName(), resource.getName());
- monitor.subTask(msg1);
- IPerformanceMonitor pm = ValidationFramework.getDefault().getPerformanceMonitor();
- if (pm.isCollecting()){
- time = System.currentTimeMillis();
- cpuTime = Misc.getCPUTime();
- }
-
- if (Tracing.matchesExtraDetail(validator.getId())){
- Tracing.log("ValManager-03: validating ", resource); //$NON-NLS-1$
- }
- ValidationResult vr = validator.validate(resource, kind, operation, monitor);
- if (pm.isCollecting()){
- if (cpuTime != -1){
- cpuTime = Misc.getCPUTime() - cpuTime;
- }
- int num = 0;
- if (vr != null)num = vr.getNumberOfValidatedResources();
- PerformanceCounters pc = new PerformanceCounters(validator.getId(),
- validator.getName(), resource.getName(),
- num, System.currentTimeMillis()-time, cpuTime);
- pm.add(pc);
- }
- if (ValidationPlugin.getPlugin().isDebugging() && !pm.isCollecting()){
- String msg = time != 0 ?
- NLS.bind(ValMessages.LogValEndTime, new Object[]{validator.getName(),
- validator.getId(), resource, Misc.getTimeMS(System.currentTimeMillis()-time)}) :
- NLS.bind(ValMessages.LogValEnd, validator.getName(), resource);
- Tracing.log("ValManager-01: " + msg); //$NON-NLS-1$
- }
- if (vr != null){
- operation.getResult().mergeResults(vr);
- if (vr.getSuspendValidation() != null)operation.suspendValidation(vr.getSuspendValidation(), validator);
- }
- }
-
- /**
- * Accept a visitor for all the validators that are enabled for the given project.
- *
- * @param visitor
- * @param project
- * @param valType the type of validation
- * @param operation
- * @param monitor
- */
- public void accept(IValidatorVisitor visitor, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor){
-
- if (isDisabled(project))return;
-
- for (Validator val : getValidators(project)){
- if (monitor.isCanceled())return;
- if (!_projectManager.shouldValidate(val, project, valType))continue;
- if (operation.isSuspended(val, project))continue;
- try {
- visitor.visit(val, project, valType, operation, monitor);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- /**
- * Accept a visitor for all the validators that are enabled for the given project, resource,
- * and validation mode.
- *
- * @param valType the type of validation request
- */
- public void accept(IValidatorVisitor visitor, IProject project, IResource resource,
- ValType valType, ValOperation operation, IProgressMonitor monitor){
-
- if (isDisabled(project))return;
-
- Map<String,IValidatorGroupListener[]> groupListeners = new HashMap<String,IValidatorGroupListener[]>();
-
- ValProperty vp = getValProperty(resource, valType, _configNumber);
- if (vp != null){
- BitSet bs = vp.getConfigSet();
- for (Validator val : getValidators(project)){
- if (!monitor.isCanceled()) {
- if (!bs.get(_idManager.getIndex(val.getId())))continue;
- Validator.V2 v2 = val.asV2Validator();
- if (v2 != null) {
- notifyGroupListenersStarting(resource, operation.getState(), monitor, groupListeners, v2);
- }
- try {
- visitor.visit(val, project, valType, operation, monitor);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
- notifyGroupFinishing(resource, operation.getState(), monitor, groupListeners);
- return;
- }
-
- vp = new ValProperty();
- vp.setConfigNumber(_configNumber);
- ContentTypeWrapper ctw = new ContentTypeWrapper();
- for (Validator val : getValidators(project)){
- if (!monitor.isCanceled()) {
- if (!_projectManager.shouldValidate(val, project, valType))continue;
- if (Friend.shouldValidate(val, resource, valType, ctw)){
- vp.getConfigSet().set(_idManager.getIndex(val.getId()));
- // we do the suspend check after figuring out if it needs to be validated, because we save
- // this information for the session.
- if (operation.isSuspended(val, project))continue;
- Validator.V2 v2 = val.asV2Validator();
- if (v2 != null) {
- notifyGroupListenersStarting(resource, operation.getState(), monitor, groupListeners, v2);
- }
- try {
- visitor.visit(val, project, valType, operation, monitor);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
- }
- notifyGroupFinishing(resource, operation.getState(), monitor, groupListeners);
- putValProperty(vp, resource, valType);
- }
-
- /**
- * Let the group listeners know that validation might be starting for the group of validators.
- */
- private void notifyGroupListenersStarting(final IResource resource,
- final ValidationState state, final IProgressMonitor monitor,
- Map<String, IValidatorGroupListener[]> groupListeners, Validator.V2 v2) {
-
- String[] groups = v2.getValidatorGroups();
- for (String group : groups) {
- if (!groupListeners.containsKey(group)) {
- IValidatorGroupListener[] createdListeners = null;
- try {
- createdListeners = ValidatorGroupExtensionReader.getDefault().createListeners(group);
- }
- catch (CoreException e){
- String msg = NLS.bind(ValMessages.ErrConfig, v2.getId());
- Status status = new Status(IStatus.ERROR, ValidationPlugin.PLUGIN_ID, msg);
- CoreException core = new CoreException(status);
- ValidationPlugin.getPlugin().handleException(core);
- ValidationPlugin.getPlugin().handleException(e);
-
- // we create this to ensure that we don't signal the same exception over and over.
- createdListeners = new IValidatorGroupListener[0];
- }
-
- // create and notify just this once
- final IValidatorGroupListener[] listeners = createdListeners;
-
- groupListeners.put(group, listeners);
- for (final IValidatorGroupListener listener : listeners) {
- SafeRunner.run(new ISafeRunnable() {
- public void run() throws Exception {
- listener.validationStarting(resource, monitor, state);
- }
-
- public void handleException(Throwable exception) {
- ValidationPlugin.getPlugin().handleException(exception);
- }
- });
- }
- }
- }
- }
-
- /**
- * Let the group listeners know that validation is finished for the group of validators.
- */
- private void notifyGroupFinishing(final IResource resource,
- final ValidationState state, final IProgressMonitor monitor,
- Map<String, IValidatorGroupListener[]> groupListeners) {
- for (final IValidatorGroupListener[] listeners : groupListeners.values()) {
- for (final IValidatorGroupListener listener : listeners) {
- SafeRunner.run(new ISafeRunnable() {
- public void run() throws Exception {
- listener.validationFinishing(resource, monitor, state);
- }
-
- public void handleException(Throwable exception) {
- ValidationPlugin.getPlugin().handleException(exception);
- }
- });
- }
- }
- }
-
- private ValProperty getValProperty(IResource resource, ValType valType, int configNumber) {
- ValProperty vp = null;
- try {
- if (valType == ValType.Build)vp = (ValProperty)resource.getSessionProperty(StatusBuild);
- else if (valType == ValType.Manual)vp = (ValProperty)resource.getSessionProperty(StatusManual);
- }
- catch (CoreException e){
- // don't care about this one
- }
- if (vp == null)return null;
- if (vp.getConfigNumber() != _configNumber)return null;
- return vp;
- }
-
- /**
- * Let the validation manager know that a project has been changed.
- *
- * @param project The project that has been opened, created, or had it's description change.
- */
- public void projectChanged(IProject project){
- _projectManager.change(project);
- }
-
- /**
- * Let the validation manager know that a project has been removed.
- *
- * @param project The project that has been closed or deleted.
- *
- */
- public void projectRemoved(IProject project){
- _projectManager.remove(project);
- }
-
- private void putValProperty(ValProperty vp, IResource resource, ValType valType) {
- try {
- if (valType == ValType.Build)resource.setSessionProperty(StatusBuild, vp);
- else if (valType == ValType.Manual)resource.setSessionProperty(StatusManual, vp);
- }
- catch (CoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Let each of the enabled validators know that a clean has been requested.
- *
- * @param project the project that is being cleaned, or null if the entire workspace is being cleaned.
- * @param monitor
- */
- void clean(final IProject project, final ValOperation operation, final IProgressMonitor monitor) {
- IValidatorVisitor visitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
- validator.clean(project, monitor);
- }
-
- };
- accept(visitor, project, ValType.Build, operation, monitor);
- }
-
- /**
- * Let each of the enabled validators know that a clean has been requested.
- *
- * @param project the project that is being cleaned, or null if the entire workspace is being cleaned.
- * @param monitor
- */
- public void clean(IProject project, IProgressMonitor monitor){
- IValidatorVisitor visitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
- validator.clean(project, monitor);
- }
-
- };
- ValidationFramework.getDefault().getDependencyIndex().clear(project);
- ValOperation operation = new ValOperation();
- accept(visitor, project, ValType.Build, operation, monitor);
- }
-
- public void validatorsForProjectChanged(IProject project, boolean validationSettingChanged) {
- if (validationSettingChanged){
- if (project != null)_projectPreferences.remove(project);
- configHasChanged();
- }
- }
-
- private class HasValidatorVisitor implements IResourceVisitor {
-
- private boolean _hasValidator;
- private boolean _isManual;
- private boolean _isBuild;
-
- public HasValidatorVisitor(boolean isManual, boolean isBuild){
- _isManual = isManual;
- _isBuild = isBuild;
- }
-
- public boolean hasValidator(IFolder folder){
- try {
- folder.accept(this);
- }
- catch (CoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- return _hasValidator;
- }
-
- public boolean visit(IResource resource) throws CoreException {
- if (resource instanceof IFolder)return true;
- if (hasValidators(resource, _isManual, _isBuild)){
- _hasValidator = true;
- return false;
- }
- return true;
- }
- }
-
- /**
- * Map validator id's to an index number on a bit set, so that we can quickly determine if a
- * particular validator needs to validate a particular resource.
- * @author karasiuk
- *
- */
- private static class ValidatorIdManager {
-
- /**
- * Map validator id's to Integers. The integers correspond to bits in the ValProperty instances.
- */
- private HashMap<String, Integer> _map = new HashMap<String, Integer>(100);
- private HashMap<Integer, String> _reverseMap = new HashMap<Integer, String>(100);
-
- /** Next available bit. */
- private int _next;
-
- /**
- * Answer the index number for this validator. If we haven't seen it yet allocate a new index number.
- * @param id validator id.
- * @return index into the validator bit mask.
- */
- public int getIndex(String id){
- Integer i = _map.get(id);
- if (i != null)return i;
-
- i = _next++;
- _map.put(id, i);
- _reverseMap.put(i, id);
-
- return i;
- }
-
- /**
- * Answer the validator id for the index.
- * @param index
- * @return null if the index number has not been set.
- */
- public String getId(Integer index){
- return _reverseMap.get(index);
- }
-
- public void reset(){
- _map.clear();
- _reverseMap.clear();
- _next = 0;
- }
-
- /**
- * Answer the ids for the bit in the bitset. This is used for debugging.
- * @param bs
- */
- public String[] getIds(BitSet bs){
- List<String> list = new LinkedList<String>();
- for(int i=bs.nextSetBit(0); i>=0; i=bs.nextSetBit(i+1)) {
- String id = getId(i);
- if (id != null)list.add(id);
- }
- String[] s = new String[list.size()];
- return list.toArray(s);
- }
- }
-
- /**
- * This is used to keep track of which validators are enabled with which projects. We want to ensure
- * that we don't activate a validator (and it's plug-in) if it has nothing to validate in the workspace.
- * The ValManager keeps a single instance of this class.
- * @author karasiuk
- *
- */
- private static class ValidatorProjectManager {
-
- private ValProjectMap _manual = new ValProjectMap(ValType.Manual);
- private ValProjectMap _build = new ValProjectMap(ValType.Build);
-
- /**
- * Should this validator attempt to validate any resources in this project?
- *
- * @param validator
- * The validator that is being tested.
- * @param project
- * The project that is being tested. This can be null, which
- * means that all projects will be tested.
- * @param type
- * The type of validation operation.
- * @return true if the validator should attempt to validate.
- */
- public synchronized boolean shouldValidate(Validator validator, IProject project, ValType type){
- if (type == ValType.Build)return _build.shouldValidate(validator, project);
- if (type == ValType.Manual)return _manual.shouldValidate(validator, project);
-
- return false;
- }
-
- /**
- * A project has been created, opened, or had it's description changed.
- * @param project
- */
- public void change(IProject project) {
- reset();
- }
-
- public void remove(IProject project) {
- reset();
- }
-
-
- public synchronized void reset(){
- _build.reset();
- _manual.reset();
- }
-
- /**
- * This is used to keep track of which validators are enabled for which projects. We want to ensure
- * that we don't activate a validator (and it's plug-in) if it has nothing to validate in the workspace.
- * @author karasiuk
- *
- */
- private static class ValProjectMap {
- /**
- * Map a validator to the projects that it validates.
- * <p>
- * I've gone back and forth on whether the key should
- * be a Validator or the validator id. I'm back to it being the id because I was
- * running into cases where because of copying I wasn't getting the matches that I expected. If I run into
- * false matches, it is probably because reset isn't being called when it should be.
- */
- private Map<String, Set<IProject>> _map = new HashMap<String, Set<IProject>>(50);
-
- private ValType _type;
-
- /** Have we been initialized yet? */
- private boolean _initialized;
-
- public ValProjectMap(ValType type){
- _type = type;
- }
-
- /**
- * Should this validator attempt to validate any resources in this project?
- *
- * @param validator
- * The validator that is being tested.
- * @param project
- * The project that is being tested. This can be null, which
- * means that all projects will be tested, and if any of them return true,
- * then true is answered for this method.
- *
- * @return true if the validator should attempt to validate.
- */
- public synchronized boolean shouldValidate(Validator validator, IProject project){
- if (!_initialized)load();
- String vid = validator.getId();
- Set<IProject> projects = _map.get(vid);
- if (projects == null)return false;
- if (project == null)return projects.size() > 0;
- return projects.contains(project);
- }
-
- private void load() {
- ValManager vm = ValManager.getDefault();
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- Tracing.log("ValManager-02: loading " + projects.length + " projects"); //$NON-NLS-1$//$NON-NLS-2$
- for (IProject project : projects){
- if (!project.isOpen())continue;
- Validator[] vals = vm.getValidators(project);
- for (Validator v : vals){
- String vid = v.getId();
- Set<IProject> set = _map.get(vid);
- if (set == null){
- set = new HashSet<IProject>(50);
- _map.put(vid, set);
- }
-
- if (v.shouldValidateProject(project, _type))set.add(project);
- }
- }
- _initialized = true;
- }
-
- public synchronized void reset(){
- _initialized = false;
- _map.clear();
- }
- }
-
- }
-
- public void handleEvent(IFacetedProjectEvent event) {
- projectChanged(event.getProject().getProject());
- }
-
- public void projectChanged(IProject project, int type) {
- switch (type){
- case IProjectChangeListener.ProjectClosed:
- case IProjectChangeListener.ProjectDeleted:
- projectRemoved(project);
- break;
- case IProjectChangeListener.ProjectOpened:
- case IProjectChangeListener.ProjectChanged:
- case IProjectChangeListener.ProjectAdded:
- projectChanged(project);
- break;
- }
-
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValMessages.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValMessages.java
deleted file mode 100644
index 02aabe1..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValMessages.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ValMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.wst.validation.internal.messages"; //$NON-NLS-1$
-
- public static String ConfigError;
-
- public static String DecodeError1;
- public static String Error20;
-
- public static String ErrConfig;
- public static String ErrFilterRule;
- public static String ErrGroupName;
- public static String ErrDependencyVersion;
-
- public static String ErrGroupNoType;
- public static String ErrGroupInvalidType;
-
- public static String ErrPatternAttrib;
- public static String ErrTypeReq;
- public static String ErrType;
-
- public static String VbfExcSyntaxNoValClass;
- public static String VbfExcSyntaxNoValRun;
- public static String VbfExcSyntaxNoValNull;
-
- public static String GroupInclude;
-
- public static String GroupExclude;
-
- public static String JobName;
- public static String JobNameMonitor;
-
- public static String JobIndexSave;
-
- public static String LogValStart;
- public static String LogValEnd;
- public static String LogValEndTime;
- public static String LogValSummary;
- public static String LogValSummary2;
- public static String LogSession;
-
- public static String MigrationJobName;
-
- public static String RuleProjectNature;
- public static String RuleFileExt;
- public static String RuleFile;
- public static String RuleFolder;
- public static String RuleFull;
- public static String RuleContentType;
- public static String RuleFacet;
-
- public static String ContentTypeExact;
- public static String ContentTypeNotExact;
-
- public static String FileExtWithCase;
- public static String FileExtWithoutCase;
-
- public static String SevError;
- public static String SevWarning;
- public static String SevIgnore;
-
- public static String TimeUnder;
- public static String TimeNano;
- public static String TimeMicro;
- public static String TimeSec;
- public static String TimeMin;
-
- public static String TypeInclude;
- public static String TypeExclude;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ValMessages.class);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperation.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperation.java
deleted file mode 100644
index e5d8696..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperation.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationResults;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.Validator;
-
-/**
- * This represents a validation operation, i.e. the running of a set of validators in response to some change.
- * It may be a large operation, as would happen on a clean build, or it may be the validation of just a single
- * resource.
- * <p>
- * The operation can, but doesn't need to, span multiple projects.
- * </p>
- * <p>
- * Once the operation has finished, this object goes away.
- * </p>
- * @author karasiuk
- *
- */
-public class ValOperation {
-
- private ValidationState _state = new ValidationState();
- private ValidationResult _result = new ValidationResult();
- private Map<IProject, Set<Validator>> _suspended =
- Collections.synchronizedMap(new HashMap<IProject, Set<Validator>>(40));
-
- /** The time that the operation started. */
- private long _started = System.currentTimeMillis();
-
- /**
- * Are we in a multi project validation? This can be triggered by either clean all or
- * if auto build is turned off, a build all.
- */
- private boolean _multiProject;
-
- /**
- * Holds all the resources that have been validated as a side-effect of running other validations.
- * The key is the validator id and the value is a Set of IResources.
- */
- private Map<String, Set<IResource>> _validated = new HashMap<String, Set<IResource>>(20);
-
- public ValOperation(){
- }
-
- public ValidationState getState() {
- return _state;
- }
- public void setState(ValidationState state) {
- _state = state;
- }
- public ValidationResult getResult() {
- return _result;
- }
-
- public void setResult(ValidationResult result) {
- _result = result;
- }
-
- public ValidationResults getResults(){
- return new ValidationResults(_result);
- }
-
- /**
- * Remember that this resource has already been validated as a side-effect.
- *
- * @param id id of the validator
- * @param resource resource that has been validated.
- */
- public void addValidated(String id, IResource resource){
- Set<IResource> set = _validated.get(id);
- if (set == null){
- set = new HashSet<IResource>(20);
- _validated.put(id, set);
- }
- set.add(resource);
- }
-
- /**
- * Answer if this resource has already been validated as a side-effect of some other validation by the
- * given validator.
- *
- * @param id
- * @param resource
- */
- public boolean isValidated(String id, IResource resource){
- Set<IResource> set = _validated.get(id);
- if (set == null)return false;
-
- return set.contains(resource);
- }
-
- /**
- * Has this validator been suspended for the duration of this operation?
- *
- * @param val
- * @param project can be null, in which case we return false
- *
- * @return true if we already know that this validator should not run on this project.
- */
- public boolean isSuspended(Validator val, IProject project) {
- if (project == null)return false;
- Set<Validator> set = getSuspended(project);
- return set.contains(val);
- }
-
- private Set<Validator> getSuspended(IProject project){
- Set<Validator> set = _suspended.get(project);
- if (set == null){
- set = new HashSet<Validator>(5);
- _suspended.put(project, set);
- }
- return set;
- }
-
- void suspendValidation(IProject project, Validator validator) {
- if (project == null)return;
- getSuspended(project).add(validator);
- }
-
- public long getStarted() {
- return _started;
- }
-
- public boolean isMultiProject() {
- return _multiProject;
- }
-
- /**
- * Are we in a multi project validation? That is, could we be validating several
- * projects at the same time? This can be triggered by either clean all or
- * if auto build is turned off, a build all.
- */
- public void setMultiProject(boolean multiProject) {
- _multiProject = multiProject;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperationJob.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperationJob.java
deleted file mode 100644
index 9414c02..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperationJob.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IProject;
-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.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
-
-/**
- * This is used to signal when the entire validation operation is complete. This needs to be done in a job
- * because the operation isn't done, until all the validation jobs have finished.
- * @author karasiuk
- *
- */
-public class ValOperationJob extends Job {
-
- private ValOperation _operation;
-
- public ValOperationJob(ValOperation operation){
- super(ValMessages.JobNameMonitor);
- _operation = operation;
- }
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- boolean ok = true;
- try {
- ValidationFramework.getDefault().join(monitor);
- }
- catch (InterruptedException e){
- ok = false;
- }
- finished(monitor);
- return ok ? Status.OK_STATUS : Status.CANCEL_STATUS;
- }
-
- private void finished(IProgressMonitor monitor){
- IValidatorVisitor visitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
-
- validator.validationFinishing(project, operation.getState(), monitor);
- }
-
- };
- ValManager.getDefault().accept(visitor, null, ValType.Build, _operation, monitor);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperationManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperationManager.java
deleted file mode 100644
index 1877a33..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperationManager.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
-
-/**
- * Keep track of a validation operation when it is triggered as part of a build.
- * @author karasiuk
- *
- */
-public class ValOperationManager implements IResourceChangeListener {
-
- /*
- * I tried various tests to see what sort of change events I would get. This is what I
- * observed using Eclipse 3.4:
- *
- * Auto Build On
- *
- * Clean All
- * - workspace, clean, pre
- * - workspace, clean post
- * - workspace, auto, post
- *
- * Clean Some
- * - project1, clean, pre
- * - project1, clean, post
- * - project2, clean, pre
- * - project2, clean, post
- * - workspace, Auto, post
- *
- * Build Working Set - NA
- * Build Project - NA
- * Build All - NA
- *
- * Ctrl-S
- * - workspace, auto, pre
- * - workspace, auto, post
- *
- * Auto build Off
- *
- * Clean All
- * - same as (auto build on), but no workspace,auto,post event
- *
- * Clean Some
- * - same as (auto build on), but no workspace,auto,post event
- *
- * Build Working Set
- * - project1, incremental, pre
- * - project1, incremental, post
- * - project2, incremental, pre
- * - project2, incremental, post
- *
- * Build Project
- * - same as above
- *
- * Build All
- * - workspace, incremental, pre
- * - workspace, incremental, post
- *
- * Ctrl-S - NA
- *
- * For the case where a subset of the projects are built there is no way to guess whether they are part of the
- * same operation or not. Eclipse threats them as independent events, and so will the validation framework.
- *
- * So for example, if the user selected two projects (p1 and p2) and built them, the framework would call the
- * validators like this:
- *
- * validation starting on null
- * validation starting on P1
- * - individual events per resource
- * validation finished on P1
- * validation finished on null
- *
- * validation starting on null
- * validation starting on P2
- * - individual events per resource
- * validation finished on P2
- * validation finished on null
- */
-
- private static ValOperationManager _me;
-
- /**
- * This operation is in affect for a build cycle. At the end of the build it is reinitialized.
- */
- private ValOperation _operation;
-
-
- /**
- * In the very common case of doing a clean all (with auto build turned on), Eclipse signals two
- * workspace, auto build, post events. One at the end of the clean and one at the end of the
- * real build.
- *
- * If we are doing a clean all, with auto build turned on, we increment this by one,
- * so that we know to throw away the first workspace, auto build, post event.
- */
- private int _discardAutoPost;
-
- public static synchronized ValOperationManager getDefault(){
- if (_me == null)_me = new ValOperationManager();
- return _me;
- }
-
- private ValOperationManager(){}
-
- public void resourceChanged(IResourceChangeEvent event) {
- int type = event.getType();
- int kind = event.getBuildKind();
-
- if (kind == IncrementalProjectBuilder.CLEAN_BUILD && ((type & IResourceChangeEvent.PRE_BUILD) != 0)){
- processClean(event);
- }
-
- if (isBuildStarting(event)){
- _operation = new ValOperation();
- _operation.setMultiProject(true);
- IValidatorVisitor visitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
-
- validator.validationStarting(project, operation.getState(), monitor);
- }
- };
- ValManager.getDefault().accept(visitor, null, ValType.Build, _operation, new NullProgressMonitor());
-
- }
-
- if (isBuildFinished(event)){
- ValOperationJob finished = new ValOperationJob(getOperation());
- finished.schedule();
- _operation = null;
- }
-
-
- if (Tracing.isLogging()){
- String kindName = null;
- if (kind == IncrementalProjectBuilder.AUTO_BUILD)kindName = "Auto"; //$NON-NLS-1$
- else if (kind == IncrementalProjectBuilder.CLEAN_BUILD)kindName = "Clean"; //$NON-NLS-1$
- else if (kind == IncrementalProjectBuilder.FULL_BUILD)kindName = "Full"; //$NON-NLS-1$
- else if (kind == IncrementalProjectBuilder.INCREMENTAL_BUILD)kindName = "Incremental"; //$NON-NLS-1$
- else kindName = String.valueOf(kind);
-
- StringBuffer b = new StringBuffer(100);
-
- String sourceName = "unknown"; //$NON-NLS-1$
- if (event.getSource() instanceof IResource) {
- IResource res = (IResource) event.getSource();
- sourceName = res.getName();
- }
- else if (event.getSource() instanceof IWorkspace) {
- sourceName = "Workspace"; //$NON-NLS-1$
- }
- b.append("ValOperationManager-01: A resource has changed, source="+sourceName+", kind="+kindName+", event type=("+type); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- if ((type & IResourceChangeEvent.POST_BUILD) != 0)b.append(", post build"); //$NON-NLS-1$
- if ((type & IResourceChangeEvent.PRE_BUILD) != 0){
- b.append(", pre build"); //$NON-NLS-1$
- }
- b.append(')');
- IResourceDelta rd = event.getDelta();
- if (rd == null)b.append(", there was no resource delta"); //$NON-NLS-1$
-
- Tracing.log(b);
- }
-
- }
-
- /**
- * Determine if we are starting a new build cycle.
- * @param event
- * @return
- */
- private boolean isBuildStarting(IResourceChangeEvent event) {
- int type = event.getType();
- int kind = event.getBuildKind();
- boolean isWorkspace = event.getSource() instanceof IWorkspace;
- boolean preBuild = (type & IResourceChangeEvent.PRE_BUILD) != 0;
-
- if (ResourcesPlugin.getWorkspace().isAutoBuilding()){
- if (isWorkspace && preBuild && kind == IncrementalProjectBuilder.CLEAN_BUILD){
- _discardAutoPost = 1;
- return true;
- }
-
- if (isWorkspace && preBuild && kind == IncrementalProjectBuilder.AUTO_BUILD)return true;
- }
- else {
- if (isWorkspace && preBuild && kind == IncrementalProjectBuilder.INCREMENTAL_BUILD)return true;
- }
- return false;
- }
-
- /**
- * Determine if we are at the end of a build cycle. This will give callers the ability to
- * clear caches etc.
- *
- * @param event
- * @return return true if we are just finishing a build.
- */
- private boolean isBuildFinished(IResourceChangeEvent event) {
-
- if (_operation == null)return false;
-
- int type = event.getType();
- int kind = event.getBuildKind();
- boolean isWorkspace = event.getSource() instanceof IWorkspace;
- boolean postBuild = (type & IResourceChangeEvent.POST_BUILD) != 0;
-
-
- if (ResourcesPlugin.getWorkspace().isAutoBuilding()){
- if (isWorkspace && postBuild && kind == IncrementalProjectBuilder.AUTO_BUILD){
- if (_discardAutoPost == 1)_discardAutoPost = 0;
- else return true;
- }
- }
- else {
- if (isWorkspace && postBuild && kind == IncrementalProjectBuilder.INCREMENTAL_BUILD)return true;
- }
-
- return false;
- }
-
- private void processClean(IResourceChangeEvent event){
- // Originally I was using this to monitor IProject build requests as well, but that is not not needed
- // since these will be handled by the IncrementalProjectBuilder.clean() method.
- IProgressMonitor monitor = new NullProgressMonitor();
- Object source = event.getSource();
- if (source instanceof IWorkspace) {
- ValManager.getDefault().clean(null, getOperation(), monitor);
- }
-
- }
-
- /**
- * Answer the current validation operation. If we are not in a multiple project validation
- * we will return a new one.
- */
- public ValOperation getOperation() {
- /*
- * If we don't have a current operation, we create a new one. The only time we save
- * the operation is when we are sure that we are in a multi project validation.
- */
- if (_operation == null)return new ValOperation();
- return _operation;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerGlobal.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerGlobal.java
deleted file mode 100644
index a187cfa..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerGlobal.java
+++ /dev/null
@@ -1,523 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.validation.MessageSeveritySetting;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.Validator.V2;
-import org.eclipse.wst.validation.internal.model.FilterGroup;
-import org.eclipse.wst.validation.internal.model.GlobalPreferences;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * A class that knows how to manage the global persisted validation settings.
- * @author karasiuk
- */
-public class ValPrefManagerGlobal {
-
- /**
- * Version of the framework properties.
- * <ul>
- * <li>Version 2 - used the filter approach
- * <li>Version 3 - switched to a difference based approach. (See Bugzilla 224179)
- * </ul>
- *
- */
- public final static int frameworkVersion = 3;
-
- private List<IValChangedListener> _listeners = new LinkedList<IValChangedListener>();
- private static ValPrefManagerGlobal _me;
-
- private List<Validator> _validators;
-
- private ValPrefManagerGlobal(){}
-
- public static ValPrefManagerGlobal getDefault(){
- if (_me == null)_me = new ValPrefManagerGlobal();
- return _me;
- }
-
- public void addListener(IValChangedListener listener){
- if (_listeners.contains(listener))return;
- _listeners.add(listener);
- }
-
- public void removeListener(IValChangedListener listener){
- _listeners.remove(listener);
- }
-
- private void updateListeners(boolean validationSettingChanged){
- for (IValChangedListener cl : _listeners)cl.validatorsForProjectChanged(null, validationSettingChanged);
- }
-
- /**
- * Update the validator filters from the preference store.
- *
- * @param val
- *
- * @return false if there are no preferences, that means that the user has never changed any
- * of the default settings. Also answer false if there was some sort of error, which essentially
- * means that the preferences aren't valid for whatever reason.
- *
- * @deprecated
- */
-// public boolean loadPreferences(Validator[] val) {
-//
-// try {
-// IEclipsePreferences pref = ValidationFramework.getDefault().getPreferenceStore();
-// if (!pref.nodeExists(PrefConstants.filters))return false;
-//
-// Preferences filters = pref.node(PrefConstants.filters);
-// for (Validator v : val){
-// String id = v.getId();
-// if (filters.nodeExists(id)){
-// Preferences vp = filters.node(id);
-// loadPreferences(v, vp);
-// }
-// }
-// }
-// catch (Exception e){
-// ValidationPlugin.getPlugin().handleException(e);
-// return false;
-// }
-//
-// return true;
-// }
-
- /**
- * Answer the v2 validators that have been overridden by the global preferences.
- */
- public List<Validator> getValidators() throws BackingStoreException {
- List<Validator> vals = _validators;
- if (vals == null){
- vals = loadValidators();
- _validators = vals;
- }
- return vals;
- }
-
- /**
- * Load the validators from the preference store.
- * @return the validators that have been overridden by the global references.
- */
- private List<Validator> loadValidators() throws BackingStoreException {
- LinkedList<Validator> list = new LinkedList<Validator>();
- IEclipsePreferences pref = ValidationFramework.getDefault().getPreferenceStore();
- if (pref.nodeExists(PrefConstants.vals)){
- Preferences vals = pref.node(PrefConstants.vals);
- for (String id : vals.childrenNames()){
- Validator base = ExtensionValidators.instance().getMapV2().get(id);
- Validator v = loadValidator(id, vals, base);
- if (v != null){
- V2 v2 = v.asV2Validator();
- if (v2 != null)v2.setLevel(Validator.Level.Global);
- list.add(v);
- }
- }
- }
- return list;
- }
-
- /**
- * Answer a copy of the validator that has been updated with the given preferences.
- *
- * @param id
- * Validator id.
- * @param valsNode
- * The /vals node in the preference store.
- * @param base
- * The base validator that is being customized. This can be null,
- * in which case null will be returned.
- *
- * @return A new validator that is a copy of the extension point validator
- * with the updates from the preference store.
- */
- static Validator loadValidator(String id, Preferences valsNode, Validator base) {
- if (base == null)return null;
-
- Preferences vp = valsNode.node(id);
- base = base.copy();
- V2 v2 = base.asV2Validator();
-
- String global = vp.get(PrefConstants.global, ""); //$NON-NLS-1$
- if (global.length() > 0){
- Global g = new Global(global);
- base.setBuildValidation(g.isBuild());
- base.setManualValidation(g.isManual());
- base.setDelegatingId(g.getDelegating());
- }
-
- if (v2 != null){
- String groups = vp.get(PrefConstants.groups, ""); //$NON-NLS-1$
- if (groups.length() > 0){
- List<FilterGroup> list = new LinkedList<FilterGroup>();
- Deserializer des = new Deserializer(groups);
- while(des.hasNext())list.add(FilterGroup.create(des));
- v2.setGroups(list);
- }
- }
- return base;
- }
-
- /**
- * The only valid way to get the global preferences is through the ValManager.
- *
- * @see ValManager#getGlobalPreferences()
- */
- public void loadGlobalPreferences(GlobalPreferences gp) {
- IEclipsePreferences pref = ValidationFramework.getDefault().getPreferenceStore();
- gp.setSaveAutomatically(pref.getBoolean(PrefConstants.saveAuto, GlobalPreferences.DefaultAutoSave));
- gp.setDisableAllValidation(pref.getBoolean(PrefConstants.suspend, GlobalPreferences.DefaultSuspend));
- gp.setConfirmDialog(pref.getBoolean(PrefConstants.confirmDialog, GlobalPreferences.DefaultConfirm));
- gp.setOverride(pref.getBoolean(PrefConstants.override, GlobalPreferences.DefaultOverride));
- gp.setVersion(pref.getInt(PrefConstants.frameworkVersion, GlobalPreferences.DefaultFrameworkVersion));
- gp.setStateTimeStamp(pref.getLong(PrefConstants.stateTS, 0));
-
- if (gp.getVersion() != frameworkVersion)migrate(gp.getVersion(), pref);
- }
-
- /**
- * If necessary migrate the preferences.
- * @param version The incoming version of the preferences.
- * @param pref the root of the preference store
- */
- static void migrate(int version, IEclipsePreferences pref) {
- try {
- boolean update = false;
- if (version == 2){
- if (pref.nodeExists(PrefConstants.filters)){
- pref.node(PrefConstants.filters).removeNode();
- update = true;
- }
- if (pref.nodeExists(PrefConstants.msgs)){
- pref.node(PrefConstants.msgs).removeNode();
- update = true;
- }
- }
- if (update){
- pref.putInt(PrefConstants.frameworkVersion, frameworkVersion);
- pref.flush();
- }
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Load the preferences for a validator.
- *
- * @param v the validator that is being built up
- * @param p the node in the preference tree for the validator,
- * e.g. /instance/validator-framework-id/filters/validator-id
- *
- * @deprecated
- */
-// static void loadPreferences(Validator v, Preferences p) throws BackingStoreException {
-// v.setBuildValidation(p.getBoolean(PrefConstants.build, true));
-// v.setManualValidation(p.getBoolean(PrefConstants.manual, true));
-// v.setVersion(p.getInt(PrefConstants.version, 1));
-// v.setDelegatingId(p.get(PrefConstants.delegate, null));
-//
-// Validator.V2 v2 = v.asV2Validator();
-// if (v2 == null)return;
-// if (!p.nodeExists(PrefConstants.groups))return;
-//
-// Preferences groupNode = p.node(PrefConstants.groups);
-// for (String groupName : groupNode.childrenNames()){
-// Preferences group = groupNode.node(groupName);
-// String type = group.get(PrefConstants.type, null);
-// if (type == null)throw new IllegalStateException(ValMessages.ErrGroupNoType);
-// FilterGroup fg = FilterGroup.create(type);
-// if (fg == null)throw new IllegalStateException(NLS.bind(ValMessages.ErrGroupInvalidType, type));
-// v2.add(fg);
-//
-// if (group.nodeExists(PrefConstants.rules)){
-// Preferences ruleNode = group.node(PrefConstants.rules);
-// for (String ruleName : ruleNode.childrenNames()){
-// Preferences rule = ruleNode.node(ruleName);
-// FilterRule fr = FilterRule.create(rule.get(PrefConstants.ruleType, null));
-// if (fr != null){
-// fr.load(rule);
-// fg.add(fr);
-// }
-// }
-// }
-// }
-// }
-
- /**
- * Save the validator into the preference store.
- *
- * @param validator
- * The validator being saved.
- *
- * @param root
- * The top of the preference tree for validators, i.e.
- * /instance/validator-framework-id/vals for workspace validators
- * and /vals for project validators.
- *
- * @param baseValidators
- * A map of the validators that are one level higher in the
- * storage hierarchy. So if we are updating the preference page
- * validators, then this map would be the extension point
- * validators. If we are updating a project's validators, then
- * this map would be the preference page validators.
- */
- static void save(Validator validator, Preferences root, Map<String, Validator> baseValidators) throws BackingStoreException {
- Validator.V2 v2 = validator.asV2Validator();
- if (v2 == null)return;
-
- Preferences vp = root.node(validator.getId());
- if (validator.sameConfig(baseValidators.get(validator.getId()))){
- vp.removeNode();
- return;
- }
- if (!validator.isChanged())return;
- if (validator.getChangeCountGlobal() > 0){
- Global g = new Global(validator.isManualValidation(), validator.isBuildValidation(), validator.getVersion(),
- validator.getDelegatingId());
- vp.put(PrefConstants.global, g.serialize());
- }
-
- if (validator.getChangeCountMessages() > 0){
- Collection<MessageSeveritySetting> msgs = validator.getMessageSettings().values();
- if (msgs.size() > 0){
- vp.put(PrefConstants.msgs, Msgs.serialize(msgs));
- }
- }
-
- if (v2.getChangeCountGroups() > 0){
- FilterGroup[] groups = v2.getGroups();
- if (groups.length > 0){
- Serializer ser = new Serializer(500);
- for (FilterGroup group : groups)group.save(ser);
- vp.put(PrefConstants.groups, ser.toString());
- }
- }
- }
-
- public void saveAsPrefs(Validator[] val) {
- try {
- IEclipsePreferences pref = ValidationFramework.getDefault().getPreferenceStore();
- Preferences vals = pref.node(PrefConstants.vals);
- Map<String, Validator> base = ExtensionValidators.instance().getMapV2();
- for (Validator v : val)save(v, vals, base);
- pref.flush();
- _validators = null;
- updateListeners(true);
- }
- catch (BackingStoreException e){
- throw new RuntimeException(e);
- }
- }
-
-
- /**
- * Save the global preferences and the validators.
- */
- public synchronized void savePreferences(GlobalPreferences gp, Validator[] validators){
- try {
- IEclipsePreferences prefs = ValidationFramework.getDefault().getPreferenceStore();
- savePreferences(prefs, gp);
- Preferences vals = prefs.node(PrefConstants.vals);
-
- Map<String, Validator> base = ExtensionValidators.instance().getMapV2();
- for (Validator v : validators)save(v, vals, base);
- prefs.flush();
- _validators = null;
- updateListeners(true);
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Save the global preferences and the validators.
- */
- public synchronized void savePreferences(GlobalPreferences gp){
- try {
- IEclipsePreferences prefs = ValidationFramework.getDefault().getPreferenceStore();
- boolean isConfigChange = gp.isConfigChange();
- savePreferences(prefs, gp);
- prefs.flush();
- updateListeners(isConfigChange);
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Save the global preferences and the validators.
- */
- private void savePreferences(IEclipsePreferences prefs, GlobalPreferences gp){
- prefs.putBoolean(PrefConstants.saveAuto, gp.getSaveAutomatically());
- prefs.putBoolean(PrefConstants.suspend, gp.getDisableAllValidation());
- prefs.putLong(PrefConstants.stateTS, gp.getStateTimeStamp());
- prefs.putBoolean(PrefConstants.confirmDialog, gp.getConfirmDialog());
- prefs.putBoolean(PrefConstants.override, gp.getOverride());
- prefs.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
- }
-
- /**
- * Update any message preferences in the map.
- * @param validator
- * @param settings
- */
- public void loadMessages(Validator validator, Map<String, MessageSeveritySetting> settings) {
- IEclipsePreferences pref = ValidationFramework.getDefault().getPreferenceStore();
- try {
- loadMessageSettings(validator, settings, pref);
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Load the message preferences for the validator into the map.
- *
- * @param val
- * @param settings
- * @param root the root of the preference store
- */
- static void loadMessageSettings(Validator val, Map<String, MessageSeveritySetting> settings, Preferences root)
- throws BackingStoreException {
- if (!root.nodeExists(PrefConstants.vals))return;
-
- Preferences vals = root.node(PrefConstants.vals);
- if (!vals.nodeExists(val.getId()))return;
-
- Preferences valPrefs = vals.node(val.getId());
- String msgs = valPrefs.get(PrefConstants.msgs, ""); //$NON-NLS-1$
- if (msgs.length() == 0)return;
-
- Map<String, MessageSeveritySetting.Severity> map = Msgs.deserialize(msgs);
-
- for (Map.Entry<String, MessageSeveritySetting.Severity> me : map.entrySet()){
- MessageSeveritySetting ms = settings.get(me.getKey());
- if (ms != null)ms.setCurrent(me.getValue());
- }
- }
-
- /**
- * Save whether the validator is enabled or not.
- * @param validator
- * @param prefs up to the filter part of the preference tree
- */
-// private void saveShallowPreference(Validator validator, Preferences prefs) {
-// if (validator.asV2Validator() == null)return;
-// Preferences val = prefs.node(validator.getId());
-// val.putBoolean(PrefConstants.build, validator.isBuildValidation());
-// val.putBoolean(PrefConstants.manual, validator.isManualValidation());
-// val.putInt(PrefConstants.version, validator.getVersion());
-// }
-
-// /**
-// * Load the customized message settings from the preference store.
-// * @param messageSettings
-// */
-// public void loadMessageSettings(Validator val, MessageCategory[] messageSettings) {
-// try {
-// loadMessageSettings(val, messageSettings, ValidationFramework.getDefault().getPreferenceStore());
-// }
-// catch (Exception e){
-// ValidationPlugin.getPlugin().handleException(e);
-// }
-// }
-
- private static class Global {
- private boolean _manual;
- private boolean _build;
- private int _version;
- private String _delegating;
-
- public Global(String value){
- Deserializer d = new Deserializer(value);
- _manual = d.getBoolean();
- _build = d.getBoolean();
- _version = d.getInt();
- if (d.hasNext())_delegating = d.getString();
- }
-
- public Global(boolean manual, boolean build, int version, String delegating){
- _manual = manual;
- _build = build;
- _version = version;
- _delegating = delegating;
- }
-
- public String serialize(){
- Serializer s = new Serializer(50);
- s.put(_manual);
- s.put(_build);
- s.put(_version);
- if (_delegating != null)s.put(_delegating);
- return s.toString();
- }
-
- public boolean isManual() {
- return _manual;
- }
-
- public boolean isBuild() {
- return _build;
- }
-
- public int getVersion() {
- return _version;
- }
-
- public String getDelegating() {
- return _delegating;
- }
- }
-
- private static class Msgs {
- public static String serialize(Collection<MessageSeveritySetting> messages){
- Serializer s = new Serializer(100);
- for (MessageSeveritySetting ms : messages){
- s.put(ms.getId());
- s.put(ms.getCurrent().ordinal());
- }
- return s.toString();
- }
-
- /**
- * Answer a map for all the messages.
- * The key is the message id and the value is the current setting for that message
- * @param v
- * @return
- */
- public static Map<String, MessageSeveritySetting.Severity> deserialize(String v){
- Map<String, MessageSeveritySetting.Severity> map = new HashMap<String, MessageSeveritySetting.Severity>(10);
- Deserializer d = new Deserializer(v);
- while(d.hasNext()){
- String id = d.getString();
- int sev = d.getInt();
- map.put(id, MessageSeveritySetting.Severity.values()[sev]);
- }
- return map;
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerProject.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerProject.java
deleted file mode 100644
index 706f595..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerProject.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.wst.validation.MessageSeveritySetting;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.Validator.V2;
-import org.eclipse.wst.validation.internal.model.ProjectPreferences;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * A class that knows how to manage the project level persisted validation settings.
- * @author karasiuk
- *
- */
-public class ValPrefManagerProject {
-
- private IProject _project;
- private static List<IValChangedListener> _listeners = new LinkedList<IValChangedListener>();
-
- private List<Validator> _validators;
-
- public ValPrefManagerProject(IProject project){
- assert project != null;
- _project = project;
- }
-
- public static void addListener(IValChangedListener listener){
- if (_listeners.contains(listener))return;
- _listeners.add(listener);
- }
-
- public static void removeListener(IValChangedListener listener){
- _listeners.remove(listener);
- }
-
- private static void updateListeners(IProject project){
- for (IValChangedListener cl : _listeners)cl.validatorsForProjectChanged(project, true);
- }
-
-
- /**
- * Answer whether or not this project has validation settings.
- *
- * @return true if it has settings. This does not mean that the settings are enabled, only that it
- * has settings.
- *
- * @see ValManager#hasEnabledProjectPreferences(IProject)
- */
- public boolean hasProjectSpecificSettings(){
- IEclipsePreferences pref = getPreferences();
-
- if (pref == null)return false;
- int version = pref.getInt(PrefConstants.frameworkVersion, 0);
- if (version == 0)return false;
-
- return true;
- }
-
- /**
- * Answer the v2 validators that have been overridden by the global preferences.
- */
- public List<Validator> getValidators(Map<String, Validator> baseValidators) throws BackingStoreException {
- List<Validator> vals = _validators;
- if (vals == null){
- vals = loadValidators(baseValidators);
- _validators = vals;
- }
- return vals;
- }
-
- /**
- * Load the validators from the preference store.
- * @return the validators that have been overridden by the global references.
- */
- private List<Validator> loadValidators(Map<String, Validator> baseValidators) throws BackingStoreException {
- LinkedList<Validator> list = new LinkedList<Validator>();
- IEclipsePreferences pref = getPreferences();
- if (pref.nodeExists(PrefConstants.vals)){
- Preferences vals = pref.node(PrefConstants.vals);
- for (String id : vals.childrenNames()){
- Validator base = baseValidators.get(id);
- Validator v = ValPrefManagerGlobal.loadValidator(id, vals, base);
- if (v != null){
- V2 v2 = v.asV2Validator();
- if (v2 != null)v2.setLevel(Validator.Level.Project);
- list.add(v);
- }
- }
- }
- return list;
- }
-
- /**
- * Update the project preferences from the preference store.
- * @return false if the project does not have any specific preferences.
- */
- public boolean loadProjectPreferencesShallow(ProjectPreferences pp) {
- IEclipsePreferences pref = getPreferences();
-
- if (pref == null)return false;
- int version = pref.getInt(PrefConstants.frameworkVersion, 0);
- if (version == 0)return false;
-
- if (version != ValPrefManagerGlobal.frameworkVersion)ValPrefManagerGlobal.migrate(version, pref);
-
- pp.setOverride(pref.getBoolean(PrefConstants.override, ProjectPreferences.DefaultOverride));
- pp.setSuspend(pref.getBoolean(PrefConstants.suspend, ProjectPreferences.DefaultSuspend));
- return true;
- }
-
-
- //FIXME I suspect that this method should be removed
- /**
- * Update the project preferences from the preference store.
- * @return false if the project does not have any specific preferences.
- */
- public boolean loadProjectPreferences(ProjectPreferences pp, Map<String, Validator> baseValidators)
- throws BackingStoreException {
-
- if (!loadProjectPreferencesShallow(pp))return false;
-
- IEclipsePreferences pref = getPreferences();
- if (!pref.nodeExists(PrefConstants.vals))return true;
-
- Preferences vp = pref.node(PrefConstants.vals);
- List<Validator> list = new LinkedList<Validator>();
- for (String id : vp.childrenNames()){
- Validator base = baseValidators.get(id);
- Validator v = ValPrefManagerGlobal.loadValidator(id, vp, base);
- if (v != null){
- V2 v2 = v.asV2Validator();
- if (v2 != null)v2.setLevel(Validator.Level.Project);
- list.add(v);
- }
- }
- Validator[] vals = new Validator[list.size()];
- list.toArray(vals);
- pp.setValidators(vals);
- return true;
- }
-
- private IEclipsePreferences getPreferences() {
- IScopeContext projectContext = new ProjectScope(_project);
- IEclipsePreferences pref = projectContext.getNode(ValidationPlugin.PLUGIN_ID);
- return pref;
- }
-
- public void savePreferences(ProjectPreferences projectPreferences, Validator[] validators) {
- IEclipsePreferences pref = getPreferences();
- pref.putBoolean(PrefConstants.suspend, projectPreferences.getSuspend());
- pref.putBoolean(PrefConstants.override, projectPreferences.getOverride());
- pref.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
- Preferences vals = pref.node(PrefConstants.vals);
- try {
- Validator[] workspaceVals = ValManager.getDefault().getValidators();
- Map<String, Validator> base = new HashMap<String, Validator>(workspaceVals.length);
- for (Validator v : validators)ValPrefManagerGlobal.save(v, vals, base);
- pref.flush();
- ProjectConfiguration pc = ConfigurationManager.getManager()
- .getProjectConfiguration(projectPreferences.getProject());
- pc.setEnabledBuildValidators(getEnabledBuildValidators(validators));
- pc.setEnabledManualValidators(getEnabledManualValidators(validators));
- pc.passivate();
- pc.store();
- updateListeners(_project);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Answer all the V1 validators that are enabled for build.
- * @return
- */
- private Set<ValidatorMetaData> getEnabledBuildValidators(Validator[] validators) {
- Set<ValidatorMetaData> set = new HashSet<ValidatorMetaData>(50);
- for (Validator v : validators){
- if (v.isBuildValidation()){
- Validator.V1 v1 = v.asV1Validator();
- if (v1 != null)set.add(v1.getVmd());
- }
- }
- return set;
- }
-
- /**
- * Answer all the V1 validators that are enabled for manual validation.
- * @return
- */
- private Set<ValidatorMetaData> getEnabledManualValidators(Validator[] validators) {
- Set<ValidatorMetaData> set = new HashSet<ValidatorMetaData>(50);
- for (Validator v : validators){
- if (v.isManualValidation()){
- Validator.V1 v1 = v.asV1Validator();
- if (v1 != null)set.add(v1.getVmd());
- }
- }
- return set;
- }
-
- public void loadMessages(Validator validator, Map<String, MessageSeveritySetting> settings) {
- try {
- ValPrefManagerGlobal.loadMessageSettings(validator, settings, getPreferences());
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValProperty.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValProperty.java
deleted file mode 100644
index fd001dc..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValProperty.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.BitSet;
-
-/**
- * A resource session property, that is used to improve the performance of the validation framework. This is placed
- * on each resource and it enables the framework to quickly determine if the resource needs to be processed.
- * @author karasiuk
- *
- */
-public class ValProperty {
-/*
- * I did some performance measurements on the IResource#setSessionProperty() and IResource#getSessionProperty()
- * methods, and they were very fast. I used a very large workspace (over 17,000) resources, and you could set (or get)
- * a property on all the resources in under 100ms.
- */
-
- private int _configNumber;
- private BitSet _configSet = new BitSet(100);
-
- private int _validationNumber;
- private BitSet _validationSet = new BitSet(100);
-
- public int getConfigNumber() {
- return _configNumber;
- }
- public void setConfigNumber(int configNumber) {
- _configNumber = configNumber;
- }
- public BitSet getConfigSet() {
- return _configSet;
- }
- public int getValidationNumber() {
- return _validationNumber;
- }
- public void setValidationNumber(int validationNumber) {
- _validationNumber = validationNumber;
- }
- public BitSet getValidationSet() {
- return _validationSet;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValType.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValType.java
deleted file mode 100644
index 8a97136..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValType.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-/**
- * Type of validation. Build or Manual?
- * @author karasiuk
- *
- */
-public enum ValType {
- /** The validation is triggered via a resource change and the build process. */
- Build,
-
- /** The user manually requested the validation. */
- Manual,
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationRunner.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationRunner.java
deleted file mode 100644
index dd33d82..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationRunner.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
-
-/**
- * Run the validators on a selected set of resources.
- * @author karasiuk
- *
- */
-public class ValidationRunner implements IWorkspaceRunnable {
-
- private Map<IProject, Set<IResource>> _projects;
- private ValType _valType;
- private ValOperation _valOperation;
-
- /**
- * Validate the selected projects and/or resources.
- *
- * @param projects
- * The selected projects. The key is an IProject and the value is
- * the Set of IResources that were selected. Often this will be
- * every resource in the project.
- *
- * @param valType
- * The type of validation that has been requested.
- *
- * @param monitor
- * Progress monitor.
- *
- * @param atomic
- * Run as an atomic workspace operation?
- */
- public static ValOperation validate(Map<IProject, Set<IResource>> projects, ValType valType,
- IProgressMonitor monitor, boolean atomic) throws CoreException{
- ValidationRunner me = new ValidationRunner(projects, valType);
- if (atomic)ResourcesPlugin.getWorkspace().run(me, null, IWorkspace.AVOID_UPDATE, monitor);
- else me.execute(monitor);
- return me._valOperation;
- }
-
- private ValidationRunner(Map<IProject, Set<IResource>> projects, ValType valType){
- _projects = projects;
- _valType = valType;
-
- }
-
- private ValOperation execute(IProgressMonitor monitor){
- _valOperation = new ValOperation();
- ValManager manager = ValManager.getDefault();
-
- IValidatorVisitor startingVisitor = new IValidatorVisitor(){
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
- validator.validationStarting(project, operation.getState(), monitor);
- }
- };
-
- IValidatorVisitor finishedVisitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
-
- validator.validationFinishing(project, operation.getState(), monitor);
- }
- };
-
- manager.accept(startingVisitor, null, _valType, _valOperation, monitor);
-
- for (Map.Entry<IProject, Set<IResource>> me : _projects.entrySet()){
- if (monitor.isCanceled()){
- _valOperation.getResult().setCanceled(true);
- return _valOperation;
- }
- IProject project = me.getKey();
- manager.accept(startingVisitor, project, _valType, _valOperation, monitor);
- for (IResource resource : me.getValue()){
- manager.validate(project, resource, IResourceDelta.NO_CHANGE, _valType,
- IncrementalProjectBuilder.AUTO_BUILD, _valOperation, monitor);
- }
- manager.accept(finishedVisitor, project, _valType, _valOperation, monitor);
- }
- manager.accept(finishedVisitor, null, _valType, _valOperation, monitor);
- return _valOperation;
- }
-
- public void run(IProgressMonitor monitor) throws CoreException {
- execute(monitor);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorExtensionReader.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorExtensionReader.java
deleted file mode 100644
index 3a4975e..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorExtensionReader.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.MessageSeveritySetting;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.Validator.V2;
-import org.eclipse.wst.validation.internal.model.FilterGroup;
-import org.eclipse.wst.validation.internal.model.FilterRule;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Process the validator (version 2) extension point.
- *
- * @author karasiuk
- *
- */
-public class ValidatorExtensionReader {
-
- private static ValidatorExtensionReader _me;
-
- public static ValidatorExtensionReader getDefault(){
- if (_me == null)_me = new ValidatorExtensionReader();
- return _me;
- }
-
- private ValidatorExtensionReader(){}
-
- /**
- * Read the extensions.
- */
- Collection<Validator> process() {
- Map<String,Validator> map = new HashMap<String, Validator>(100);
- IExtensionPoint extensionPoint = getExtensionPoint();
- if (extensionPoint == null)return map.values();
-
- for (IExtension ext : extensionPoint.getExtensions()){
- for (IConfigurationElement validator : ext.getConfigurationElements()){
- Validator v = processValidator(validator, ext.getUniqueIdentifier(), ext.getLabel(), null);
- if (v != null)map.put(v.getId(),v);
- }
- }
-
- extensionPoint = getExtensionPointExclude();
- if (extensionPoint != null){
- for (IExtension ext : extensionPoint.getExtensions()){
- for (IConfigurationElement validator : ext.getConfigurationElements()){
- String id = validator.getAttribute(ExtensionConstants.Exclude.id);
- Validator v = map.get(id);
- V2 v2 = null;
- if (v != null)v2 = v.asV2Validator();
-
- if (v2 == null){
- String msg = NLS.bind("Plug-in configuration error, extension {0} references validator id {1} but this id does not exist.", //$NON-NLS-1$
- extensionPoint.getUniqueIdentifier(), id);
- CoreException ex = new CoreException(new Status(IStatus.ERROR, ValidationPlugin.PLUGIN_ID, msg));
- ValidationPlugin.getPlugin().handleException(ex);
- }
- else {
- for (IConfigurationElement exclude : validator.getChildren()){
- FilterGroup fg = createFilterGroup(exclude);
- if (fg != null && fg.isExclude()){
- mergeExcludeGroup(v2, fg);
- }
- }
- }
- }
- }
-
- }
- return map.values();
-
- }
-
- /**
- * Merge the rules from the filter group into the current exclude group, creating a current exclude
- * group if need be.
- * @param v2
- * @param fg
- */
- private void mergeExcludeGroup(V2 v2, FilterGroup fg){
- FilterGroup existing = null;
- for (FilterGroup group : v2.getGroups()){
- if (group.isExclude()){
- existing = group;
- break;
- }
- }
- if (existing == null)v2.add(fg);
- else {
- for (FilterRule rule : fg.getRules()){
- existing.add(rule);
- }
- v2.bumpChangeCountGroups();
- }
- }
-
- /**
- * Process the validator element in a validator extension.
- *
- * @param validator
- * The validator element.
- *
- * @param deep
- * If true load all the configuration elements for each
- * validator, if false do a shallow load, where only the
- * validator class, id and name's are loaded.
- *
- * @param project
- * The project that you are defined in. This can be null which
- * means that you are a global validator.
- *
- * @return a configured validator or null if there was an error.
- */
- private Validator processValidator(IConfigurationElement validator, String id, String label, IProject project) {
- Validator.V2 v = null;
- try {
- v = Validator.create(validator, project).asV2Validator();
- v.setLevel(Validator.Level.Extension);
- v.setId(id);
- v.setName(label);
- v.setBuildValidation(getAttribute(validator, ExtensionConstants.build, true));
- v.setManualValidation(getAttribute(validator, ExtensionConstants.manual, true));
- v.setMarkerId(validator.getAttribute(ExtensionConstants.markerId));
- v.setVersion(getAttribute(validator, ExtensionConstants.version, 1));
- v.setSourceId(validator.getAttribute(ExtensionConstants.sourceId));
- IConfigurationElement[] children = validator.getChildren();
- for (IConfigurationElement child : children)processIncludeAndExcludeElement(v, child);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- IContributor contrib = validator.getContributor();
- String message = NLS.bind(ValMessages.ErrConfig, contrib.getName());
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
- }
- return v;
- }
-
- /**
- * Answer all the messages that this validator has defined.
- * @param v
- * @return an empty list if the validator did not define any messages.
- */
- public List<MessageSeveritySetting> addMessages(Validator v){
- List<MessageSeveritySetting> list = new LinkedList<MessageSeveritySetting>();
- IExtensionPoint extensionPoint = getExtensionPoint();
- if (extensionPoint == null)return list;
- IExtension ext = extensionPoint.getExtension(v.getId());
- if (ext == null)return list;
-
- for (IConfigurationElement elem : ext.getConfigurationElements()){
- for (IConfigurationElement ce : elem.getChildren(ExtensionConstants.MessageCategory.name)){
- list.add(processMessage(ce));
- }
- }
-
- return list;
- }
-
- /**
- * Answer the extension point for the validators.
- *
- * @return null if there is a problem or no extensions.
- */
- private IExtensionPoint getExtensionPoint() {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- return registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, ExtensionConstants.validator);
- }
-
- /**
- * Answer the extension point for adding exclusion filters.
- *
- * @return null if there is a problem or no extensions.
- */
- private IExtensionPoint getExtensionPointExclude() {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- return registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, ExtensionConstants.excludeExtension);
- }
-
-
-
-
- /**
- * Process a message element for the validator, by creating a MessageCategory for it.
- *
- * @param ce a MessageCategory element.
- */
- private MessageSeveritySetting processMessage(IConfigurationElement ce) {
- String s = ce.getAttribute(ExtensionConstants.MessageCategory.severity);
- MessageSeveritySetting.Severity sev = null;
- if (ExtensionConstants.MessageCategory.sevError.equals(s))sev = MessageSeveritySetting.Severity.Error;
- else if (ExtensionConstants.MessageCategory.sevWarning.equals(s))sev = MessageSeveritySetting.Severity.Warning;
- else if (ExtensionConstants.MessageCategory.sevIgnore.equals(s))sev = MessageSeveritySetting.Severity.Ignore;
-
- return new MessageSeveritySetting(ce.getAttribute(ExtensionConstants.MessageCategory.id),
- ce.getAttribute(ExtensionConstants.MessageCategory.label), sev);
- }
-
- /**
- * Process the include and exclude elements.
- *
- * @param v The validator that we are building up.
- * @param group The children of the validator tag. This may included include and exclude elements.
- * Other elements are ignored.
- */
- private void processIncludeAndExcludeElement(Validator.V2 v, IConfigurationElement group) {
- FilterGroup fg = createFilterGroup(group);
- if (fg != null)v.add(fg);
- }
-
- /**
- * Process an include or exclude element, returning a filter group for it.
- *
- * @param group
- * An include, exclude or some other element. Only include and
- * exclude elements are processed, other types are ignored.
- *
- * @return a filter group that corresponds to the include or exclude
- * element, or null if the element was not an include or exclude
- * element.
- */
- private FilterGroup createFilterGroup(IConfigurationElement group){
- FilterGroup fg = FilterGroup.create(group.getName());
- if (fg == null)return null;
-
- IConfigurationElement[] rules = group.getChildren(ExtensionConstants.rules);
- // there should only be one
- for (int i=0; i<rules.length; i++){
- IConfigurationElement[] r = rules[i].getChildren();
- for(int j=0; j<r.length; j++){
- processRule(fg, r[j]);
- }
- }
- return fg;
- }
-
- /**
- * Process a rule in one of the rule groups.
- *
- * @param fg the filter group that we are building up
- * @param rule a rule in the group, like fileext.
- */
- private void processRule(FilterGroup fg, IConfigurationElement rule) {
- FilterRule fr = FilterRule.create(rule.getName());
- if (fr == null)throw new IllegalStateException(ValMessages.ErrFilterRule);
- fr.setData(rule);
- fg.add(fr);
- }
-
- /**
- * Determine if any of the validators need to be migrated, and if so answer a new
- * Validator array.
- *
- * @param validators the existing validators (from the preferences).
- *
- * @return null if no validators needed to be migrated.
- */
- Validator[] migrate(Validator[] validators, IProject project) {
- int count = 0;
- Map<String, Validator> map = new HashMap<String, Validator>(validators.length);
- for (Validator v : validators)map.put(v.getId(), v);
-
- IExtensionPoint extensionPoint = getExtensionPoint();
- if (extensionPoint == null)return null;
-
- for (IExtension ext : extensionPoint.getExtensions()){
- for (IConfigurationElement validator : ext.getConfigurationElements()){
- Validator v = processValidator(validator, ext.getUniqueIdentifier(), ext.getLabel(), project);
- if (v == null)continue;
- Validator old = map.get(v.getId());
- if (old == null || old.getVersion() < v.getVersion()){
- //TODO we may be replacing user preferences, at some point we may want to do a real migration.
- map.put(v.getId(), v);
- count++;
- }
- }
- }
-
- if (count > 0){
- Validator[] vals = new Validator[map.size()];
- map.values().toArray(vals);
- return vals;
- }
- return null;
- }
-
- private boolean getAttribute(IConfigurationElement element, String name, boolean dft){
- String v = element.getAttribute(name);
- if (v == null)return dft;
- if ("true".equalsIgnoreCase(v))return true; //$NON-NLS-1$
- if ("false".equalsIgnoreCase(v))return false; //$NON-NLS-1$
- return dft;
- }
-
- private int getAttribute(IConfigurationElement element, String name, int dft){
- String v = element.getAttribute(name);
- if (v == null)return dft;
- try {
- return Integer.parseInt(v);
- }
- catch (Exception e){
- // eat it.
- }
- return dft;
- }
-
-// /**
-// * This method is only used for debugging.
-// * @param elem
-// */
-// private static void dump(IConfigurationElement elem){
-// String name = elem.getName();
-// String[] attribs = elem.getAttributeNames();
-// String[] vals = new String[attribs.length];
-// for (int i=0; i<vals.length; i++)vals[i] = elem.getAttribute(attribs[i]);
-// String v = elem.getValue();
-// IConfigurationElement[] children = elem.getChildren();
-// for (int i=0; i<children.length; i++)dump(children[i]);
-// }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorGroupExtensionReader.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorGroupExtensionReader.java
deleted file mode 100644
index 62543f7..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorGroupExtensionReader.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.IValidatorGroupListener;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Process the validator group (for use with validator version 2 only) extension point.
- *
- * @author nitin
- *
- */
-public class ValidatorGroupExtensionReader {
-
- private static final String DOT = "."; //$NON-NLS-1$
- private static ValidatorGroupExtensionReader _instance;
-
- public static ValidatorGroupExtensionReader getDefault() {
- if (_instance == null)_instance = new ValidatorGroupExtensionReader();
- return _instance;
- }
-
- /**
- * Map of group IDs to configuration elements
- */
- private Map<String, List<IConfigurationElement>> _map;
-
- /**
- * Map of group ID's to resolved configuration elements.
- */
- private Map<String, IValidatorGroupListener[]> _resolved;
-
- private ValidatorGroupExtensionReader() {
- init();
- }
-
- /**
- * Answer the listeners with this group id.
- * @param groupID
- * @return an empty array there are no listeners for this group id.
- */
- IValidatorGroupListener[] createListeners(String groupID) throws CoreException {
- IValidatorGroupListener[] result = _resolved.get(groupID);
- if (result != null)return result;
-
- List<IConfigurationElement> elements = _map.get(groupID);
- if (elements == null){
- _resolved.put(groupID, new IValidatorGroupListener[0]);
- String msg = NLS.bind("Configuration error, there is no validation listener group with id: {0}", groupID); //$NON-NLS-1$
- Status status = new Status(IStatus.ERROR, ValidationPlugin.PLUGIN_ID, msg);
- throw new CoreException(status);
- }
-
- List<IValidatorGroupListener> listeners = new ArrayList<IValidatorGroupListener>(elements.size());
- for (IConfigurationElement element : elements) {
- IValidatorGroupListener listener;
- try {
- listener = (IValidatorGroupListener) element.createExecutableExtension(ExtensionConstants.Group.attClass);
- listeners.add(listener);
- }
- catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- listeners = new ArrayList<IValidatorGroupListener>();
- }
- }
-
- result = listeners.toArray(new IValidatorGroupListener[listeners.size()]);
- _resolved.put(groupID, result);
- return result;
- }
-
- /**
- * Answer the extension point for the validatorGroups.
- *
- * @return null if there is a problem or no extensions.
- */
- private IExtensionPoint getExtensionPoint() {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- return registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, ExtensionConstants.group);
- }
-
- private void init() {
- _map = new HashMap<String, List<IConfigurationElement>>(4);
- _resolved = new HashMap<String, IValidatorGroupListener[]>(4);
-
- IExtensionPoint extensionPoint = getExtensionPoint();
- if (extensionPoint != null) {
- for (IExtension ext : extensionPoint.getExtensions()) {
- for (IConfigurationElement group : ext.getConfigurationElements()) {
- processGroupElement(group);
- }
- }
- }
- }
-
- private void processGroupElement(IConfigurationElement element) {
- if (!ExtensionConstants.Group.elementGroup.equals(element.getName()))return;
-
- String id = element.getAttribute(ExtensionConstants.Group.attId);
- if (id == null)throw new IllegalStateException("Configuration error, the " + //$NON-NLS-1$
- ExtensionConstants.Group.attId + " is required"); //$NON-NLS-1$
- // force the use of a qualified ID
- if (id.indexOf(DOT) < 0) {
- id = element.getContributor().getName() + DOT + id;
- }
- IConfigurationElement[] newElements = element.getChildren(ExtensionConstants.Group.elementListener);
- if (newElements.length > 0) {
- List<IConfigurationElement> elements = _map.get(id);
- if (elements == null) {
- elements = new ArrayList<IConfigurationElement>();
- _map.put(id, elements);
- }
- elements.addAll(Arrays.asList(newElements));
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterGroup.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterGroup.java
deleted file mode 100644
index f544156..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterGroup.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.model;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.internal.ContentTypeWrapper;
-import org.eclipse.wst.validation.internal.Deserializer;
-import org.eclipse.wst.validation.internal.ExtensionConstants;
-import org.eclipse.wst.validation.internal.Serializer;
-import org.eclipse.wst.validation.internal.ValMessages;
-
-public abstract class FilterGroup implements IAdaptable {
-
- /** A list of FilterRule's for this group. */
- List<FilterRule> _rules = new LinkedList<FilterRule>();
- FilterRule[] _rulesArray;
-
- /** The version number of the serialization (in case we ever need to change this) */
- private static final int SerializationVersion = 1;
-
- /**
- * Answer a filter group based on the type of the group.
- *
- * @param name either "include" or "exclude"
- *
- * @return null if the name parameter isn't correct.
- */
- public static FilterGroup create(String name) {
- if (ExtensionConstants.include.equals(name))return new FilterIncludeGroup();
- if (ExtensionConstants.exclude.equals(name))return new FilterExcludeGroup();
- return null;
- }
-
- /**
- * Answer a filter group from a deserializer.
- * @param des
- *
- * @see FilterGroup#save(Serializer)
- */
- public static FilterGroup create(Deserializer des){
- des.getInt(); // get the version
- String type = des.getString();
- FilterGroup fg = create(type);
- if (fg != null)fg.load(des);
- return fg;
- }
-
- /**
- * Answer a new filter group.
- *
- * @param exclude if true an exclusion group is returned, otherwise an inclusion group is returned.
- */
- public static FilterGroup create(boolean exclude){
- if (exclude) return new FilterExcludeGroup();
- return new FilterIncludeGroup();
- }
-
- public void add(FilterRule fr) {
- _rulesArray = null;
- _rules.add(fr);
- }
-
- /**
- * If you can, remove this rule from yourself.
- *
- * @param fr the rule that is being removed
- *
- * @return true if the rule was removed, and false if it was not. If you didn't include the rule in the
- * first place, false would be returned.
- */
- public synchronized boolean remove(FilterRule fr){
- if (_rules.remove(fr)){
- _rulesArray = null;
- return true;
- }
- return false;
- }
-
- public FilterRule[] getRules(){
- FilterRule[] rules = _rulesArray;
- if (rules == null){
- rules = new FilterRule[_rules.size()];
- _rules.toArray(rules);
- _rulesArray = rules;
- }
- return rules;
- }
-
- /**
- * Answer the internal type of group, e.g. "include" or "exclude".
- */
- public abstract String getType();
-
- /** Answer the type as a type that can be displayed to a user, that is it has been localized. */
- public abstract String getDisplayableType();
-
- @SuppressWarnings("unchecked")
- public Object getAdapter(Class adapter) {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
- public static class FilterIncludeGroup extends FilterGroup {
-
- public String getType() {
- return ExtensionConstants.include;
- }
-
- public String getDisplayableType() {
- return ValMessages.GroupInclude;
- }
-
- public boolean isInclude() {
- return true;
- }
-
- protected FilterGroup create() {
- return new FilterIncludeGroup();
- }
-
- }
-
-
- public static class FilterExcludeGroup extends FilterGroup {
- public String getType() {
- return ExtensionConstants.exclude;
- }
-
- protected FilterGroup create() {
- return new FilterExcludeGroup();
- }
-
- public String getDisplayableType() {
- return ValMessages.GroupExclude;
- }
-
- public boolean isExclude() {
- return true;
- }
- }
-
- protected void load(Deserializer des) {
- int rules = des.getInt();
- for (int i=0; i<rules; i++)_rules.add(FilterRule.create(des));
- }
-
- /**
- * Save your settings into the serializer.
- * @param ser
- */
- public void save(Serializer ser){
- ser.put(SerializationVersion);
- ser.put(getType());
- ser.put(_rules.size());
- for (FilterRule rule : _rules)rule.save(ser);
- }
-
- /**
- * Answer whether or not we should validate the resource based on the filters in this group.
- *
- * @param project the project that is being validated.
- * @param resource the resource that is being validated. This can be null, in which case
- * only the project level checks are performed.
- */
- public boolean shouldValidate(IProject project, IResource resource, ContentTypeWrapper contentTypeWrapper) {
- FilterRule[] rules = getRules();
- boolean exclude = isExclude();
- boolean include = isInclude();
- int count = 0;
- for (FilterRule rule : rules){
- if (resource != null){
- Boolean match = rule.matchesResource(resource, contentTypeWrapper);
- if (match != null)count++;
- if (exclude && match != null && match)return false;
- if (include && match != null && match)return true;
- }
-
- Boolean match = rule.matchesProject(project);
- if (match != null)count++;
- if (exclude && match != null && match)return false;
- if (include && match != null && match)return true;
- }
- if (exclude)return true;
- if (count == 0)return true;
- return false;
- }
-
- /**
- * Answer true if this is an inclusion filter, that is at least one of the rules must
- * match in order to validate the resource.
- */
- public boolean isInclude() {
- return false;
- }
-
- /**
- * Answer true if this is an exclusion filter, that is if any of the rules match the
- * resource is not validated.
- */
- public boolean isExclude() {
- return false;
- }
-
- protected abstract FilterGroup create();
-
- /** Answer a deep copy of yourself. */
- public FilterGroup copy() {
- FilterGroup fg = create();
- FilterRule[] rules = getRules();
- fg._rulesArray = new FilterRule[rules.length];
- for (int i=0; i<rules.length; i++){
- fg._rulesArray[i] = rules[i].copy();
- fg._rules.add(fg._rulesArray[i]);
- }
- return fg;
- }
-
- public int hashCodeForConfig() {
- int h = 0;
- if (isExclude())h += 13;
- if (_rules != null){
- for (FilterRule fr : _rules)h += fr.hashCodeForConfig();
- }
- return h;
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java
deleted file mode 100644
index 0097cd5..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java
+++ /dev/null
@@ -1,580 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.model;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.eclipse.wst.validation.internal.ContentTypeWrapper;
-import org.eclipse.wst.validation.internal.Deserializer;
-import org.eclipse.wst.validation.internal.ExtensionConstants;
-import org.eclipse.wst.validation.internal.PrefConstants;
-import org.eclipse.wst.validation.internal.Serializer;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValMessages;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * A rule that is used to filter out (or in) validation on a resource.
- * @author karasiuk
- *
- */
-public abstract class FilterRule implements IAdaptable {
-
- protected String _pattern;
-
- /**
- * Create a rule based on an extension element.
- * @param name the extension element, it can be one of projectNature, facet, fileext, file or contentType
- * @return null if there is a problem.
- */
- public static FilterRule create(String name){
- if (ExtensionConstants.Rule.fileext.equals(name))return new FileExt();
- if (ExtensionConstants.Rule.projectNature.equals(name))return new ProjectNature();
- if (ExtensionConstants.Rule.file.equals(name))return new File();
- if (ExtensionConstants.Rule.contentType.equals(name))return new ContentType();
- if (ExtensionConstants.Rule.facet.equals(name))return new Facet();
- return null;
- }
-
- public static FilterRule create(Deserializer des) {
- String type = des.getString();
- FilterRule fr = create(type);
- if (fr != null)fr.load(des);
- return fr;
- }
-
-
- public static FilterRule createFile(String pattern, boolean caseSensitive, int type){
- File ext = new File();
- ext.setData(pattern);
- ext.setCaseSensitive(caseSensitive);
- ext.setType(type);
- return ext;
- }
-
- public static FilterRule createFileExt(String pattern, boolean caseSensitive){
- FileExt ext = new FileExt();
- ext.setData(pattern);
- ext.setCaseSensitive(caseSensitive);
- return ext;
- }
-
- public static FilterRule createFacet(String facetId){
- Facet facet = new Facet();
- facet.setData(facetId);
- return facet;
- }
-
- public static FilterRule createProject(String projectNature){
- ProjectNature pn = new ProjectNature();
- pn.setData(projectNature);
- return pn;
- }
-
- public static FilterRule createContentType(String contentType, boolean exactMatch){
- ContentType ct = new ContentType();
- ct.setData(contentType);
- ct.setExactMatch(exactMatch);
- return ct;
- }
-
- public abstract void setData(IConfigurationElement rule);
-
- /**
- * Answer true if the rule matches the resource, false if it doesn't, and
- * null if the rule does not apply to resources.
- *
- * @param resource the resource that is being validated.
- */
- public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper){
- return null;
- }
-
- /**
- * Answer true if the rule matches the project, false if it doesn't, and null if the
- * rule does not apply.
- *
- * @param project the project that is being validated.
- */
- public Boolean matchesProject(IProject project){
- return null;
- }
-
- public void setData(String data){
- _pattern = data;
- }
-
- public String toString() {
- return getDisplayableType() + ": " + _pattern; //$NON-NLS-1$
- }
-
- /** Answer a name of the rule, that can be displayed to a user. */
- public String getName(){
- return toString();
- }
-
- public String getPattern(){
- return _pattern;
- }
-
- /** Answer the type of rule. */
- public abstract String getType();
-
- /** Answer a type that can be displayed to an end user. */
- public abstract String getDisplayableType();
-
- public boolean asBoolean(String value, boolean aDefault){
- if (value == null)return aDefault;
- if (value.equals(ExtensionConstants.True))return true;
- if (value.equals(ExtensionConstants.False))return false;
- return aDefault;
- }
-
- @SuppressWarnings("unchecked")
- public Object getAdapter(Class adapter) {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
- public static class ProjectNature extends FilterRule {
-
-
- public FilterRule copy() {
- ProjectNature rule = new ProjectNature();
- rule._pattern = _pattern;
- return rule;
- }
-
- public void setData(IConfigurationElement rule) {
- _pattern = rule.getAttribute(ExtensionConstants.RuleAttrib.id);
-
- }
-
- public String getDisplayableType() {
- return ValMessages.RuleProjectNature;
- }
-
- public String getType() {
- return ExtensionConstants.Rule.projectNature;
- }
-
- public Boolean matchesProject(IProject project) {
- try {
- return project.hasNature(_pattern);
- }
- catch (CoreException e){
- }
- return Boolean.FALSE;
- }
-
- }
-
- public static class FileExt extends FilterRule {
-
- private boolean _caseSensitive;
-
- public FilterRule copy() {
- FileExt rule = new FileExt();
- rule._pattern = _pattern;
- rule._caseSensitive = _caseSensitive;
- return rule;
- }
-
- public String getType() {
- return ExtensionConstants.Rule.fileext;
- }
-
- @Override
- public int hashCodeForConfig() {
- int h = super.hashCodeForConfig();
- if (_caseSensitive)h += 601;
- return h;
- }
-
- public String getDisplayableType() {
- return ValMessages.RuleFileExt;
- }
-
- public String getName() {
- return toString();
- }
-
- public void setData(IConfigurationElement rule) {
- _pattern = rule.getAttribute(ExtensionConstants.RuleAttrib.ext);
- _caseSensitive = asBoolean(rule.getAttribute(ExtensionConstants.RuleAttrib.caseSensitive), false);
- }
-
- public String toString() {
- if (_caseSensitive)return NLS.bind(ValMessages.FileExtWithCase, getDisplayableType(), _pattern);
- return NLS.bind(ValMessages.FileExtWithoutCase, getDisplayableType(), _pattern);
- }
-
- public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper) {
- String ext = resource.getFileExtension();
- if (_caseSensitive)return _pattern.equals(ext);
- return _pattern.equalsIgnoreCase(ext);
- }
-
- public boolean isCaseSensitive() {
- return _caseSensitive;
- }
-
- @Override
- public void load(Preferences rid) {
- _caseSensitive = rid.getBoolean(PrefConstants.caseSensitive, false);
- super.load(rid);
- }
-
- @Override
- public void save(Preferences rid) {
- rid.putBoolean(PrefConstants.caseSensitive, _caseSensitive);
- super.save(rid);
- }
-
- @Override
- protected void load(Deserializer des) {
- super.load(des);
- _caseSensitive = des.getBoolean();
- }
- @Override
- public void save(Serializer ser) {
- super.save(ser);
- ser.put(_caseSensitive);
- }
-
- public void setCaseSensitive(boolean caseSensitive) {
- _caseSensitive = caseSensitive;
- }
- }
-
- /**
- * A rule that is used to filter based on file or folder names.
- * @author karasiuk
- *
- */
- public static class File extends FilterRule {
-
- private boolean _caseSensitive;
- private String _patternAsLowercase;
-
- /** One of the FileTypeXX constants. */
- private int _type;
-
- public static final int FileTypeFile = 1;
- public static final int FileTypeFolder = 2;
- public static final int FileTypeFull = 3;
-
- private static final String PortableFileDelim = "/"; //$NON-NLS-1$
-
- public File(){
- }
-
- public FilterRule copy() {
- File rule = new File();
- rule._pattern = _pattern;
- rule._patternAsLowercase = _patternAsLowercase;
- rule._caseSensitive = _caseSensitive;
- rule._type = _type;
- return rule;
- }
-
- public String getType() {
- return ExtensionConstants.Rule.file;
- }
-
- @Override
- public int hashCodeForConfig() {
- int h = super.hashCodeForConfig();
- if (_caseSensitive)h += 401;
- return h;
- }
-
- public String getDisplayableType() {
- if (_type == FileTypeFolder)return ValMessages.RuleFolder;
- if (_type == FileTypeFull)return ValMessages.RuleFull;
- return ValMessages.RuleFile;
- }
-
- @Override
- public void setData(String pattern) {
- if (pattern != null)_patternAsLowercase = pattern.toLowerCase();
- else _patternAsLowercase = null;
-
- _pattern = pattern;
- }
-
- public void setData(IConfigurationElement rule) {
- setData(rule.getAttribute(ExtensionConstants.RuleAttrib.name));
- if (_pattern == null)throw new IllegalStateException(ValMessages.ErrPatternAttrib);
- _caseSensitive = asBoolean(rule.getAttribute(ExtensionConstants.RuleAttrib.caseSensitive), false);
- String type = rule.getAttribute(ExtensionConstants.RuleAttrib.fileType);
- if (type == null)throw new IllegalStateException(ValMessages.ErrTypeReq);
- if (ExtensionConstants.FileType.file.equals(type))_type = FileTypeFile;
- else if (ExtensionConstants.FileType.folder.equals(type)){
- _type = FileTypeFolder;
- if (!_pattern.endsWith(PortableFileDelim))setData(_pattern + PortableFileDelim);
- }
- else if (ExtensionConstants.FileType.full.equals(type))_type = FileTypeFull;
- else {
- Object[] parms = {type, ExtensionConstants.FileType.file, ExtensionConstants.FileType.folder,
- ExtensionConstants.FileType.full};
- throw new IllegalStateException(NLS.bind(ValMessages.ErrType, parms));
- }
- }
-
- public String toString() {
- if (_caseSensitive)return NLS.bind(ValMessages.FileExtWithCase, getDisplayableType(), _pattern);
- return NLS.bind(ValMessages.FileExtWithoutCase, getDisplayableType(), _pattern);
- }
-
- public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper) {
- String name = null;
- switch (_type){
- case FileTypeFile:
- name = resource.getName();
- break;
-
- case FileTypeFolder:
- name = resource.getProjectRelativePath().removeLastSegments(1).toString() + PortableFileDelim;
- break;
-
- case FileTypeFull:
- name = resource.getProjectRelativePath().toPortableString();
- break;
- }
-
- if (name == null)return Boolean.FALSE;
- if (_caseSensitive)return name.startsWith(_pattern);
- return name.toLowerCase().startsWith(_patternAsLowercase);
- }
-
- @Override
- public void load(Preferences rid) {
- _caseSensitive = rid.getBoolean(PrefConstants.caseSensitive, false);
- _type = rid.getInt(PrefConstants.fileType, -1);
- super.load(rid);
- }
-
- @Override
- public void save(Preferences rid) {
- rid.putBoolean(PrefConstants.caseSensitive, _caseSensitive);
- rid.putInt(PrefConstants.fileType, _type);
- super.save(rid);
- }
-
- @Override
- protected void load(Deserializer des) {
- super.load(des);
- _caseSensitive = des.getBoolean();
- _type = des.getInt();
- }
-
- @Override
- public void save(Serializer ser) {
- super.save(ser);
- ser.put(_caseSensitive);
- ser.put(_type);
- }
-
- public void setCaseSensitive(boolean caseSensitive) {
- _caseSensitive = caseSensitive;
- }
-
- public void setType(int type) {
- _type = type;
- }
-
- }
-
- public static class Facet extends FilterRule {
-
- public FilterRule copy() {
- Facet rule = new Facet();
- rule._pattern = _pattern;
- return rule;
- }
-
- public String getType() {
- return ExtensionConstants.Rule.facet;
- }
-
- public String getDisplayableType() {
- return ValMessages.RuleFacet;
- }
-
- public void setData(IConfigurationElement rule) {
- _pattern = rule.getAttribute(ExtensionConstants.RuleAttrib.id);
- }
-
- @Override
- public Boolean matchesProject(IProject project) {
- try {
- return FacetedProjectFramework.hasProjectFacet(project, _pattern);
- }
- catch (CoreException e){
- if (Tracing.isLogging())ValidationPlugin.getPlugin().handleException(e);
- }
- return Boolean.FALSE;
- }
-
- }
-
- public static class ContentType extends FilterRule {
-
- private transient IContentType _type;
- private boolean _exactMatch = true;
-
- public FilterRule copy() {
- ContentType rule = new ContentType();
- rule._pattern = _pattern;
- rule._type = _type;
- rule._exactMatch = _exactMatch;
- return rule;
- }
-
- public String getType() {
- return ExtensionConstants.Rule.contentType;
- }
-
- @Override
- public int hashCodeForConfig() {
- int h = super.hashCodeForConfig();
- if (_exactMatch)h += 301;
- return h;
- }
-
- public String getDisplayableType() {
- return ValMessages.RuleContentType;
- }
-
- @Override
- public void load(Preferences rid) {
- _exactMatch = rid.getBoolean(PrefConstants.exactMatch, true);
- super.load(rid);
- }
-
- @Override
- public void save(Preferences rid) {
- rid.putBoolean(PrefConstants.exactMatch, _exactMatch);
- super.save(rid);
- }
-
- @Override
- protected void load(Deserializer des) {
- super.load(des);
- _exactMatch = des.getBoolean();
- }
-
- @Override
- public void save(Serializer ser) {
- super.save(ser);
- ser.put(_exactMatch);
- }
-
- public void setData(IConfigurationElement rule) {
- setData(rule.getAttribute(ExtensionConstants.RuleAttrib.id));
- boolean exactMatch = true;
- String exact = rule.getAttribute(ExtensionConstants.RuleAttrib.exactMatch);
- if (ExtensionConstants.False.equals(exact)) exactMatch = false;
- setExactMatch(exactMatch);
- }
-
- @Override
- public void setData(String pattern) {
- _pattern = pattern;
- _type = Platform.getContentTypeManager().getContentType(pattern);
- }
-
- public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper) {
- if (_type == null)return Boolean.FALSE;
- if (resource instanceof IFile) {
- IFile file = (IFile) resource;
- IContentType ct = contentTypeWrapper.getContentType(file);
- if (ct == null)return Boolean.FALSE;
- boolean match = false;
- if (_exactMatch)match = ct.getId().equals(_type.getId());
- else match = ct.isKindOf(_type);
-
- if (match && Tracing.isTraceMatches())
- Tracing.log("FilterRule-01: ", toString() + " has matched " + resource); //$NON-NLS-1$ //$NON-NLS-2$
- return match;
- }
- return Boolean.FALSE;
- }
-
- /**
- * Should the content type match exactly, or should sub types be
- * included as well?
- *
- * @param exactMatch
- * If true this rule will only match this specific content
- * type. If false this rule will match this content type and
- * any of it's sub types.
- */
- public void setExactMatch(boolean exactMatch) {
- _exactMatch = exactMatch;
- }
-
- @Override
- public String toString() {
- if (_exactMatch)return NLS.bind(ValMessages.ContentTypeExact, getDisplayableType(), _pattern);
- return NLS.bind(ValMessages.ContentTypeNotExact, getDisplayableType(), _pattern);
- }
-
- }
-
- /** Answer a deep copy of yourself. */
- public abstract FilterRule copy();
-
- /**
- * Save yourself in the preference file.
- * @param rid
- */
- public void save(Preferences rid) {
- rid.put(PrefConstants.ruleType, getType());
- rid.put(PrefConstants.pattern, getPattern());
- }
-
- /**
- * @param rule
- */
- public void load(Preferences rule) {
- setData(rule.get(PrefConstants.pattern, null));
- }
-
- protected void load(Deserializer des){
- setData(des.getString());
- }
-
- /**
- * Save your settings into the serializer.
- * @param ser
- */
- public void save(Serializer ser) {
- ser.put(getType());
- ser.put(getPattern());
- }
-
- public int hashCodeForConfig() {
- int h = getType().hashCode();
- if (_pattern != null)h += _pattern.hashCode();
- return h;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferences.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferences.java
deleted file mode 100644
index 274fa20..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferences.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.model;
-
-/**
- * This class represents the global Preferences as set on the Validation Preferences page. It doesn't
- * hold any of the individual validator settings, just the global check boxes.
- */
-public class GlobalPreferences {
-
- /** false - Default setting for the should all the validation be suspended setting. */
- public static final boolean DefaultSuspend = false;
-
- /** false - Default setting for the auto save setting. */
- public static final boolean DefaultAutoSave = false;
-
- /** false - Default setting for the confirm dialog setting. */
- public static final boolean DefaultConfirm = true;
-
- /** false - Default setting for letting projects override the global settings. */
- public static final boolean DefaultOverride = true;
-
- /** 2 - The version of the framework meta data, if an explicit version isn't found. */
- public static final int DefaultFrameworkVersion = 2;
-
- private boolean _disableAllValidation = DefaultSuspend;
- private boolean _saveAutomatically = DefaultAutoSave;
- private boolean _confirmDialog = DefaultConfirm;
- private boolean _override = DefaultOverride;
-
- /** The plug-in state time stamp. */
- private long _stateTimeStamp;
-
- /** The incoming version of the framework. This is used to determine if a migration is needed.*/
- private int _version;
-
- /** Has a setting changed that could effect which validators get called? */
- private boolean _configChange;
-
- /**
- * The only valid way to get the global preferences is through the ValManager.
- *
- * @see org.eclipse.wst.validation.internal.ValManager#getGlobalPreferences()
- */
- public GlobalPreferences(){ }
-
- public boolean getSaveAutomatically() {
- return _saveAutomatically;
- }
-
- public void setSaveAutomatically(boolean saveAutomatically) {
- _saveAutomatically = saveAutomatically;
- }
-
- /**
- * Answer if all validation has been disabled.
- */
- public boolean getDisableAllValidation() {
- return _disableAllValidation;
- }
-
- public void setDisableAllValidation(boolean disableAllValidation) {
- if (_disableAllValidation != disableAllValidation){
- _configChange = true;
- _disableAllValidation = disableAllValidation;
- }
- }
-
- /**
- * Reset all the global preferences to their default settings. This doesn't reset
- * the individual validators.
- */
- public void resetToDefault() {
- setDisableAllValidation(DefaultSuspend);
- _saveAutomatically = DefaultAutoSave;
- _confirmDialog = DefaultConfirm;
- setOverride(DefaultOverride);
- }
-
- public boolean getConfirmDialog() {
- return _confirmDialog;
- }
-
- public void setConfirmDialog(boolean confirmDialog) {
- _confirmDialog = confirmDialog;
- }
-
- public long getStateTimeStamp() {
- return _stateTimeStamp;
- }
-
- public void setStateTimeStamp(long stateTimeStamp) {
- _stateTimeStamp = stateTimeStamp;
- }
-
- /** Answer whether or not projects are allowed to override the global preferences. */
- public boolean getOverride() {
- return _override;
- }
-
- public void setOverride(boolean override) {
- if (_override != override){
- _configChange = true;
- _override = override;
- }
- }
-
- public int getVersion() {
- return _version;
- }
-
- public void setVersion(int version) {
- _version = version;
- }
-
- public boolean isConfigChange() {
- return _configChange;
- }
-
- public void setConfigChange(boolean configChange) {
- _configChange = configChange;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/IValidatorVisitor.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/IValidatorVisitor.java
deleted file mode 100644
index 8c74736..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/IValidatorVisitor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.model;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.ValOperation;
-import org.eclipse.wst.validation.internal.ValType;
-
-/**
- * This interface is implemented by objects that visit enabled validators.
- * <p>
- * Usage:
- * <pre>
- * class Visitor implements IValidatorVisitor {
- * public void visit(Validator validator, IProgressMonitor monitor) {
- * // your code here
- * }
- * }
- * ValidatorManager vm = ValidatorManager.getDefault();
- * vm.accept(new Visitor(), ...);
- * </pre>
- * </p>
- * <p>
- * Clients may implement this interface.
- * </p>
- */
-public interface IValidatorVisitor {
-
- /**
- * Visits the given validator.
- * @param validator
- */
- void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor);
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ProjectPreferences.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ProjectPreferences.java
deleted file mode 100644
index a571dc6..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ProjectPreferences.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.model;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.Validator;
-
-/**
- * Validation preferences for a particular project.
- * @author karasiuk
- *
- */
-public class ProjectPreferences {
- /** false - Default setting for the "should all the validation be suspended" setting. */
- public static final boolean DefaultSuspend = false;
-
- /** false - Default setting for letting projects override the global settings. */
- public static final boolean DefaultOverride = false;
-
- private IProject _project;
-
- private boolean _override = DefaultOverride;
- private boolean _suspend = DefaultSuspend;
-
- private Validator[] _validators = new Validator[0];
-
- public ProjectPreferences(IProject project){
- _project = project;
- }
-
- public boolean getOverride() {
- return _override;
- }
- public void setOverride(boolean override) {
- _override = override;
- }
- public boolean getSuspend() {
- return _suspend;
- }
- public void setSuspend(boolean suspend) {
- _suspend = suspend;
- }
-
- /**
- * Answer the validators that have been registered for this project.
- * @return an empty array if there are no validators.
- */
- public Validator[] getValidators() {
- return _validators;
- }
-
- public void setValidators(Validator[] validators){
- _validators = validators;
- }
-
- public IProject getProject() {
- return _project;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java
deleted file mode 100644
index c3152b4..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java
+++ /dev/null
@@ -1,37 +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.model;
-
-import org.eclipse.wst.validation.Validator;
-
-/**
- * Implement some common validator methods, that don't need to be part of the API.
- *
- * @author karasiuk
- *
- */
-public class ValidatorHelper {
-
- /**
- * Answer true if this validator already has an exclude filter.
- *
- * @param v
- * @return
- */
- public static boolean hasExcludeGroup(Validator.V2 v){
- FilterGroup[] groups = v.getGroups();
- for (int i=0; i<groups.length; i++){
- if (groups[i].isExclude())return true;
- }
- return false;
-
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/package.html b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/package.html
deleted file mode 100644
index 4b88f6b..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<body>
-<h1>Validation Framework</h1>
-<h3>Build Based Validation</h3>
-The main class for build based validation is the
-<a href="ValBuilderJob.html">ValBuilderJob</a>. This gets triggered as part of the
-build mechanism. It reacts to resource change events, and from that determines what needs to be
-validated.
-</body>
-</html>
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/package.html b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/package.html
deleted file mode 100644
index 87823d6..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/package.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-<head>
-<title>Validation Framework</title>
-</head>
-<body>
-<p>A framework for calling validators that are build based.</p>
-<p>
-There are two main types of validation, <b>build based</b> and
-<b>as you type</b>. This framework supports build based
-validation. If auto build is turned on then the validators are called
-when the user saves their file. If auto build is not turned on then
-the validators are called when the user starts a build.</p>
-<p>This framework was added to WTP in version 3.4.</p>
-<h3>Dependency Support</h3>
-<p>Sometimes resources depend on other resources, to determine whether they are
-valid or not. An example would be that an XML resource could depend on a DTD. If at some
-point in the future the DTD changes, then the dependent XML resource should be
-revalidated to ensure that it still meets the requirements of the changed DTD
-file. In order to do this efficiently, there needs to be an association between
-the DTD and all the resources that depend on it.<p>To be as efficient as possible, the validation framework allows
-this dependency information to be returned as part of a
-<a href="AbstractValidator.html#validate(org.eclipse.core.resources.IResource, int, ValidationState, org.eclipse.core.runtime.IProgressMonitor)">
-validate operation</a>. Since the validator needed to figure this out anyways,
-why not pass this information back to the framework, so that it can be saved.
-This saves the cost of having to parse the file at some later point in time
-(when the file is probably sitting cold on disk). The fewer times that we need
-to open, read and/or parse the same file, will improve the performance of the
-product.
-<p>In particular when the validate method returns, a
-<a href="ValidationResult.html">ValidationResult</a> must be returned, inside of
-this result, all your dependencies need to be specified with the
-<a href="ValidationResult.html#setDependsOn(org.eclipse.core.resources.IResource[])">
-setDependsOn</a> method.<p>In addition to keeping the dependency information
-up-to-date through the normal course of validation, direct access is also
-provided to the dependency support through the
-<a href="ValidationFramework.html#getDependencyIndex()">getDependencyIndex</a>
-method. The <a href="IDependencyIndex.html">IDependencyIndex</a> allows you to
-directly manipulate the dependency information for a validator.
-</body>
-</html>
diff --git a/plugins/org.eclipse.wst.validation/xsds/exclude.exsd b/plugins/org.eclipse.wst.validation/xsds/exclude.exsd
deleted file mode 100644
index 3ed9a96..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/exclude.exsd
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="exclude" name="Validator Exclusion"/>
- </appinfo>
- <documentation>
- A way to add additional exclusion filters to a V2 validator.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="validator" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- A short id that is unique within the plug-in, so that this set of extra exclusion filters can be identified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- The short user friendly name for the exclusion.
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="validator">
- <annotation>
- <documentation>
- Identifies the validator that is being extended.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="exclude"/>
- </sequence>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualifed validator id that is being extended.
- </documentation>
- <appinfo>
- <meta.attribute kind="identifier"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="exclude">
- <annotation>
- <documentation>
- This contains a set of exclusion rules, used in filtering which resources get validated. If any of these rules are matched, then the validator is not called on this resource.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="rules"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="fileext">
- <annotation>
- <documentation>
- A file extension, for example html.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="ext" type="string" use="required">
- <annotation>
- <documentation>
- The file extension, for example html.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="caseSensitive" type="boolean">
- <annotation>
- <documentation>
- If the file extension is case sensitive, then this needs to be set to true.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="projectNature">
- <annotation>
- <documentation>
- Used to filter on project natures.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualified project nature id, for example "org.eclipse.jdt.core.javanature".
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="file">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The file or folder name. The file name can be fully qualified, that is it starts with a leading slash ("/"), or it can be a relative name. Folder names are separated with the forward slash ("/") character.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="caseSensitive" type="boolean">
- <annotation>
- <documentation>
- If the file name is not case senstitive, then this needs to be set to false.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="type" use="required">
- <annotation>
- <documentation>
- Type of name, there are three choices. <ul><li>folder - specifies a project relative folder name.</li><li>file - a simple file name (i.e. no path information).</li><li>full - a fully qualified (project relative) file name.</li></ul>
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="folder">
- </enumeration>
- <enumeration value="file">
- </enumeration>
- <enumeration value="full">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <element name="rules">
- <annotation>
- <documentation>
- A set of rules for determining if a resource is passed to this validator or not. The rules are OR'ed together.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="fileext" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="file" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="projectNature" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="facet" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="contentType" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="facet">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The facet id.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="contentType">
- <annotation>
- <documentation>
- Used to filter based on content types.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The content type id.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="exactMatch" type="boolean">
- <annotation>
- <documentation>
- Set to true if the content type needs to match exactly. Set to false if sub types are considered matches as well.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- WebTools 3.0
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- <!-- A plug-in is turning off the T1A validator for projects that have the ModuleCoreNature -->
- <extension
- id="exclude1"
- point="org.eclipse.wst.validation.exclude">
- <validator
- id="org.eclipse.wst.common.tests.validation.T1A">
- <exclude>
- <rules>
- <projectNature
- id="org.eclipse.jst.j2ee.ModuleCoreNature">
- </projectNature>
- </rules>
- </exclude>
- </validator>
- </extension>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiInfo"/>
- </appinfo>
- <documentation>
- Provisional API.
- </documentation>
- </annotation>
-
-
-
-
-</schema>
diff --git a/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd b/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
deleted file mode 100644
index fcfe873..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="referencialFileValidator" name="Referencial File Validator"/>
- </appInfo>
- <documentation>
- This extension point is used for referential file validation. This extension point should be extended if you have files that reference other files and would like the validation on referenced files to run when the validation on the referencing file is run. The Post Validator operation that is used by this extension point expects a flat list of files to run validation on referenced files.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="referencialFileValidator"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="referencialFileValidator">
- <complexType>
- <sequence>
- <element ref="run"/>
- </sequence>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="run">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- This class must implement org.eclipse.wst.validation.internal.operations.ReferencialFileValidator.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd b/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
deleted file mode 100644
index fd854dc..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="validationHelper" name="Validation Helper"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="validationHelper"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="validationHelper">
- <complexType>
- <attribute name="helperClass" type="string" use="required">
- <annotation>
- <documentation>
- The class must implement org.eclipse.wst.validation.internal.IProjectValidationHelper.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.validation/xsds/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/validator.exsd b/plugins/org.eclipse.wst.validation/xsds/validator.exsd
deleted file mode 100644
index 7699671..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/validator.exsd
+++ /dev/null
@@ -1,387 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="validator-v2" name="Validator V2"/>
- </appinfo>
- <documentation>
- This is used to register a validator to the validation framework (version 2). In addition to specifying the validator to invoke, it registers a set of default filter rules, to control which resources are passsed to the validator.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="validator"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- A short id that is unique within the plug-in, so that this validator can be identified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The short user friendly name of the validator.
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="validator">
- <annotation>
- <documentation>
- Defines a validator to the validation framework.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="include" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="exclude" minOccurs="0" maxOccurs="1"/>
- <element ref="messageCategory" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="group" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- The class that implements the validator.
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.wst.validation.AbstractValidator"/>
- </appinfo>
- </annotation>
- </attribute>
- <attribute name="build" type="boolean">
- <annotation>
- <documentation>
- Is this validator enabled by default for build based validations? The default is true.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="manual" type="boolean">
- <annotation>
- <documentation>
- Is this validator enabled by default for manual based validations? The default is true.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="version" type="string">
- <annotation>
- <documentation>
- The version of the definition. It is a simple integer. If not specified the version is assumed to be 1.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="sourceid" type="string">
- <annotation>
- <documentation>
- If this validator also serves as an as-you-type validator (also know as an ISourceValidator) then it's source id is specified here, so that the two validators can be associated with one another.
-By source id, we mean the id that is used in the org.eclipse.wst.sse.ui.sourceValidation extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="markerId" type="string">
- <annotation>
- <documentation>
- If your validator wishes to use it's own marker, it can do so by supplying that marker id here.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="include">
- <annotation>
- <documentation>
- This contains a set of inclusion rules, which are used in filtering which resources get validated. At least one of these rules must be satisfied in order for the validator to be called on the particular resource.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="rules"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="exclude">
- <annotation>
- <documentation>
- This contains a set of exclusion rules, used in filtering which resources get validated. If any of these rules are matched, then the validator is not called on this resource.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="rules"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="fileext">
- <annotation>
- <documentation>
- A file extension, for example html.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="ext" type="string" use="required">
- <annotation>
- <documentation>
- The file extension, for example html.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="caseSensitive" type="boolean">
- <annotation>
- <documentation>
- If the file extension is case sensitive, then this needs to be set to true.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="projectNature">
- <annotation>
- <documentation>
- Used to filter on project natures.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualified project nature id, for example "org.eclipse.jdt.core.javanature".
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="file">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The file or folder name. The file name can be fully qualified, that is it starts with a leading slash ("/"), or it can be a relative name. Folder names are separated with the forward slash ("/") character.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="caseSensitive" type="boolean">
- <annotation>
- <documentation>
- If the file name is not case senstitive, then this needs to be set to false.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="type" use="required">
- <annotation>
- <documentation>
- Type of name, there are three choices. <ul><li>folder - specifies a project relative folder name.</li><li>file - a simple file name (i.e. no path information).</li><li>full - a fully qualified (project relative) file name.</li></ul>
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="folder">
- </enumeration>
- <enumeration value="file">
- </enumeration>
- <enumeration value="full">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <element name="rules">
- <annotation>
- <documentation>
- A set of rules for determining if a resource is passed to this validator or not. The rules are OR'ed together.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="fileext" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="file" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="projectNature" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="facet" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="contentType" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="facet">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The facet id.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="group">
- <annotation>
- <documentation>
- Declares that this validator belongs to this validation group.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualified ID of the validation group to which this validator belongs.
- </documentation>
- <appinfo>
- <meta.attribute kind="identifier"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="contentType">
- <annotation>
- <documentation>
- Used to filter based on content types.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The content type id.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="exactMatch" type="boolean">
- <annotation>
- <documentation>
- Set to true if the content type needs to match exactly. Set to false if sub types are considered matches as well.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="messageCategory">
- <annotation>
- <documentation>
- Used to group together a set of messages, where the user can change the message severity of all the messages in the group. This is similar to the support in the JDT, where for example a user can specify whether used methods should be errors, warnings or ignored.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- A simple id that is unique within the scope of this validator.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- A short, one line label that is displayed to the end user, that describes the message category.
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- <attribute name="severity">
- <annotation>
- <documentation>
- The default severity for this category.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="error">
- </enumeration>
- <enumeration value="warning">
- </enumeration>
- <enumeration value="ignore">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- WebTools 3.4.
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- An example of a validator that will be called on resources that have html or htm file extensions.
-<pre>
- <extension
- point="org.eclipse.wst.validation.validator"
- id="Test" name="%Validator.Name">
- <validator class="org.eclipse.wst.validation.test.TestValidator">
- <include>
- <rules>
- <fileext ext="html"/>
- <fileext ext="htm"/>
- </rules>
- </include>
- </validator>
- </extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiInfo"/>
- </appinfo>
- <documentation>
- Provisional API.
- </documentation>
- </annotation>
-
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright (c) 2007,2008 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
deleted file mode 100644
index 4a5f850..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="validatorDelegates" name="Validator Delegates"/>
- </appInfo>
- <documentation>
- This extension point allows validator providers to contribute alternate implementations for a delegating validator.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="delegate"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="delegate">
- <annotation>
- <documentation>
- Defines a validator delegate. Delegating validators can have one or more delegates registered, only one of which can be active (selected) at once.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- Specifies the class name of the delegate validator. The class must implement IValidatorJob.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.wst.validation.internal.provisional.core.IValidatorJob"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="target" type="string" use="required">
- <annotation>
- <documentation>
- Specifies the id of the validator extension for which this delegate is being registered.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <extension point="org.eclipse.wst.validation.validatorDelegates">
- <delegate
- class="com.acme.fast.SuperFastValidator"
- name="Super fast validator"
- target="org.acme.core.ACMEDelegatingValidator"/>
- </extension>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- A delegate validator will have to implement the IValidatorJob interface.
-The target validator, the one who will delegate its implementation to a delegate validator will have to extend org.eclipse.wst.validation.delegates.BaseDelegatingValidator.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2006 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
deleted file mode 100644
index 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>
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
deleted file mode 100644
index ca2fb6f..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="validatorGroup" name="Validator Group"/>
- </appinfo>
- <documentation>
- Defines a grouping for validators with listeners notified of group members' activites. Useful for pre-caching common information used by multiple validators and disposing of that information when they're all done.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="group" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="identifier">
- <annotation>
- <documentation>
- A unique identifier for this extension
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- A name for this extension
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="listener">
- <annotation>
- <documentation>
- A listener for activities in this group.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- The listener's class.
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.wst.validation.IValidatorGroupListener"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="group">
- <annotation>
- <documentation>
- Declares a validator group. A group may have multiple listeners.
- </documentation>
- </annotation>
- <complexType>
- <choice>
- <element ref="listener" minOccurs="1" maxOccurs="unbounded"/>
- </choice>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute kind="identifier"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- WebTools 3.4
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- Define a listener that simply prints that it has been called.
-<pre>
-<extension point="org.eclipse.wst.validation.validatorGroup">
- <group id="validatorGroup">
- <listener class="org.eclipse.wst.validation.example.ValidatorGroupListener"/>
- </group>
-</extension>
-
-public class org.eclipse.wst.validation.example.ValidatorGroupListener implements IValidatorGroupListener {
-
- public ValidatorGroupListener() {
- }
-
- public void validationFinishing(IResource resource, IProgressMonitor monitor, ValType valType, ValOperation operation) {
- System.out.println("Finishing:" + resource.getFullPath());
- }
-
- public void validationStarting(IResource resource, IProgressMonitor monitor, ValType valType, ValOperation operation) {
- System.out.println("Starting:" + resource.getFullPath());
- }
-}
-
-<extension id="id" name="name" point="org.eclipse.wst.validation.validatorV2">
- <validator class="org.eclipse.wst.validation.example.Validator">
- <group id="org.eclipse.wst.validation.example.validatorGroup"/>
- </validator>
-</extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiinfo"/>
- </appinfo>
- <documentation>
- Provisional API.
- </documentation>
- </annotation>
-
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright (c) 2008 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
