1 files changed, 0 insertions, 36 deletions
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample778.wsdl b/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample778.wsdl
deleted file mode 100644
index b689b9736..000000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample778.wsdl
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="sample" targetNamespace="http://www.example.org/sample778" xmlns:tns="http://www.example.org/sample778" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/sample778">
-<xsd:element name="NewOperationResponse" type="xsd:string"/><xsd:element name="NewOperationRequest" type="xsd:string"/></xsd:schema>
-</wsdl:types>
-<wsdl:message name="NewOperationResponse">
-<wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-</wsdl:message>
-<wsdl:message name="NewOperationRequest">
-<wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-</wsdl:message>
-<wsdl:portType name="sample">
-<wsdl:operation name="NewOperation">
-<wsdl:input message="tns:NewOperationRequest"/>
-<wsdl:output message="tns:NewOperationResponse"/>
-</wsdl:operation>
-</wsdl:portType>
-<wsdl:binding name="sampleSOAP" type="tns:sample">
-<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-<wsdl:operation name="NewOperation">
-<soap:operation soapAction="http://www.example.org/sample/NewOperation"/>
-<wsdl:input>
-<soap:body use="literal" parts=" NewOperationRequest"/>
-</wsdl:input>
-<wsdl:output>
-<soap:body use="literal" parts=" NewOperationResponse"/>
-</wsdl:output>
-</wsdl:operation>
-</wsdl:binding>
-<wsdl:service name="sample">
-<wsdl:port name="sampleSOAP" binding="tns:sampleSOAP">
-<soap:address location="http://www.example.org/"/>
-</wsdl:port>
-</wsdl:service>
-</wsdl:definitions>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/.cvsignore b/docs/org.eclipse.jst.j2ee.doc.user/.cvsignore
deleted file mode 100644
index 6e60185a7..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-org.eclipse.jst.j2ee.doc.user_1.0.0.jar
-temp
-DitaLink.cat
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/.project b/docs/org.eclipse.jst.j2ee.doc.user/.project
deleted file mode 100644
index 86d94083c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Copy of org.eclipse.jst.j2ee.doc.user</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.jst.j2ee.doc.user/DocBuild.xml b/docs/org.eclipse.jst.j2ee.doc.user/DocBuild.xml
deleted file mode 100644
index f88d63e4c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	This script build the Help plug-in by transforming the DITA source files into HTML.
-	
-	To use this script, you must install DITA-OT on your machine in the directory
-	defined by the dita.ot.dir property.
-	
-	Run the default target after you edit the DITA source files to regenerate the HTML.
-	
-	To customize this script for other Help plug-ins, modify the value of the args.input property
-	to be the DITA map file for the plug-in.
-	
-	NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
-	output directory structure will be shifted incorrectly.
-	
-	NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
-	will be copied over the generated plugin.xml which is currently not being generated correctly
-	by DITA-OT.
-	
-	ChangeLog:
-	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
-	- Created.
-	2008-01-09 Kate Price <katep@ca.ibm.com>
-	- modified for new DITA-OT version
-	2008-05-05 Kate Price <katep@ca.ibm.com>
-	- modified to add generation of pre-built help index. 
-	- Must delete /index folder before running build
--->
-<project name="eclipsehelp" default="all">
-
-	<property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
-	<path id="dost.class.path">
-		<pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
-	</path>
-
-	<taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
-		<classpath refid="dost.class.path" />
-	</taskdef>
-	<target name="all" depends="integrate, eclipsehelp">
-	</target>
-	<target name="integrate">
-		<integrate ditadir="${dita.ot.dir}" />
-	</target>
-
-	<!-- revise below here -->
-	<target name="eclipsehelp">
-		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
-			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="../org.eclipse.wst.doc.user" />
-			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="3.6.0" />
-			<property name="args.input" location="jst_j2ee_relsmap.ditamap" /> 
-			<property name="clean.temp" value="true" />
-			<property name="dita.extname" value=".dita" />
-			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location="" />
-			<property name="transtype" value="eclipsehelp" />
-		</ant>
-		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
-	</target>
-	<target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-		     <help.buildHelpIndex manifest="plugin.xml" destination="."/>
-		</target>
-</project>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.j2ee.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index b8e0c059b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.doc.user; singleton:=true
-Bundle-Version: 1.1.400.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/about.html b/docs/org.eclipse.jst.j2ee.doc.user/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/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.jst.j2ee.doc.user/build.properties b/docs/org.eclipse.jst.j2ee.doc.user/build.properties
deleted file mode 100644
index bf935183e..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = images/,\
-               jst_j2ee_toc.xml,\
-               jst_j2ee_relsmap.xml,\
-               topics/*.htm*,\
-               plugin.xml,\
-               plugin.properties,\
-               index/,\
-               META-INF/,\
-               about.html,\
-               org.eclipse.jst.j2ee.doc.userindex.xml
-src.includes = *.maplist,\
-               *.ditamap,\
-               topics/*.dita
-bin.excludes = DocBuild.xml,\
-               myPlugin*.xml
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/AddRelationship.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/AddRelationship.gif
deleted file mode 100644
index a56a758a4..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/AddRelationship.gif
+++ /dev/null
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/ProjectExplorer.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/ProjectExplorer.gif
deleted file mode 100644
index d5c72901b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/ProjectExplorer.gif
+++ /dev/null
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/Relationships.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/Relationships.gif
deleted file mode 100644
index a9f52eb04..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/Relationships.gif
+++ /dev/null
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/n5rpdcst.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/n5rpdcst.gif
deleted file mode 100644
index 68be18cb6..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/n5rpdcst.gif
+++ /dev/null
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/validatefilters.jpg b/docs/org.eclipse.jst.j2ee.doc.user/images/validatefilters.jpg
deleted file mode 100644
index 64810913a..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/validatefilters.jpg
+++ /dev/null
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/webfrag.jpg b/docs/org.eclipse.jst.j2ee.doc.user/images/webfrag.jpg
deleted file mode 100644
index f01bd79b7..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/webfrag.jpg
+++ /dev/null
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/ycwin.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/ycwin.gif
deleted file mode 100644
index 895f9ca06..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/ycwin.gif
+++ /dev/null
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/_18.cfs b/docs/org.eclipse.jst.j2ee.doc.user/index/_18.cfs
deleted file mode 100644
index 3402414e8..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/_18.cfs
+++ /dev/null
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/deletable b/docs/org.eclipse.jst.j2ee.doc.user/index/deletable
deleted file mode 100644
index 593f4708d..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/deletable
+++ /dev/null
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_contributions b/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_contributions
deleted file mode 100644
index 4b6436b91..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 27 10:47:44 EDT 2008
-org.eclipse.jst.j2ee.doc.user=org.eclipse.jst.j2ee.doc.user\n1.1.0.qualifier
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_dependencies b/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_dependencies
deleted file mode 100644
index 943e5fe77..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 27 10:47:44 EDT 2008
-lucene=1.9.1.v200706111724
-analyzer=org.eclipse.help.base\#3.3.1.v20070813_33x?locale\=en
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_docs b/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_docs
deleted file mode 100644
index 8289a250b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,42 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 27 10:47:44 EDT 2008
-/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjview.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjear.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjval.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html=0
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/segments b/docs/org.eclipse.jst.j2ee.doc.user/index/segments
deleted file mode 100644
index cbc649a94..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/segments
+++ /dev/null
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.ditamap b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.ditamap
deleted file mode 100644
index 62fc0d76e..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.ditamap
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map title="J2EE WTP relational table" xml:lang="en-us">
-<reltable>
-<relheader>
-<relcolspec type="concept"></relcolspec>
-<relcolspec type="task"></relcolspec>
-<relcolspec type="reference"></relcolspec>
-</relheader>
-<relrow>
-<relcell linking="targetonly">
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture">
-</topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjtargetserver.dita"
-navtitle="Specifying target servers for J2EE projects"></topicref>
-</relcell>
-<relcell></relcell>
-<relcell>
-<topicref format="html"
-href="../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html"
-linking="targetonly" locktitle="yes"
-navtitle="Defining the installed server runtime environments"
-scope="peer"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell></relcell>
-<relcell>
-<topicref href="topics/tjval.dita"
-navtitle="Validating code in enterprise applications"></topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/rvalerr.dita"
-navtitle="Common validation errors and solutions"></topicref>
-<topicref href="topics/rvalidators.dita" navtitle="J2EE Validators">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell></relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjvaldisable.dita" navtitle="Disabling validation">
-</topicref>
-<topicref href="topics/tjvalglobalpref.dita"
-navtitle="Overriding global validation preferences"></topicref>
-<topicref href="topics/tjvalmanual.dita"
-navtitle="Manually validating code"></topicref>
-<topicref href="topics/tjvalselect.dita"
-navtitle="Selecting code validators"></topicref>
-</relcell>
-<relcell>
-<topicref href="topics/rtunevalidat.dita" navtitle="Tuning validators">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell collection-type="family">
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture">
-</topicref>
-<topicref href="topics/cjearproj.dita"
-navtitle="Enterprise application projects"></topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjear.dita"
-navtitle="Creating an enterprise application project"></topicref>
-<topicref href="topics/tjimpear.dita"
-navtitle="Importing an enterprise application EAR file"></topicref>
-<topicref href="topics/tjexpear.dita"
-navtitle="Exporting an enterprise application into an EAR file">
-</topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell collection-type="family">
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture">
-</topicref>
-<topicref href="topics/cjappcliproj.dita"
-navtitle="Application client projects"></topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjappproj.dita"
-navtitle="Creating an application client project"></topicref>
-<topicref href="topics/tjexpapp.dita"
-navtitle="Exporting an application client project"></topicref>
-<topicref href="topics/tjimpapp.dita"
-navtitle="Importing an application client JAR file"></topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cjcircle.dita"
-navtitle="Cyclical dependencies between J2EE modules"></topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjimpear.dita"
-navtitle="Importing an enterprise application EAR file"></topicref>
-<topicref href="topics/tjcircleb.dita"
-navtitle="Correcting cyclical dependencies after an EAR is imported">
-</topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell collection-type="family">
-<topicref href="topics/cjview.dita"
-navtitle="Project Explorer view in the J2EE perspective"></topicref>
-</relcell>
-<relcell>
-<topicref href="topics/tjviewfilters.dita"
-navtitle="Filtering in the Project Explorer view"></topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cjearproj.dita"
-navtitle="Enterprise application projects"></topicref>
-</relcell>
-<relcell>
-<topicref href="topics/tjear.dita"
-navtitle="Creating an enterprise application project"></topicref>
-<topicref href="topics/tjappproj.dita"
-navtitle="Creating an application client project"></topicref>
-<topicref href="topics/tjrar.dita"
-navtitle="Creating a connector project"></topicref>
-</relcell>
-<relcell></relcell>
-<relcell>
-<topicref href="topics/cfacets.dita" navtitle="Project facets">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cjpers.dita" navtitle="J2EE perspective">
-</topicref>
-<topicref href="topics/cjview.dita"
-navtitle="Project Explorer view in the J2EE perspective"></topicref>
-</relcell>
-<relcell></relcell>
-<relcell></relcell>
-<relcell>
-<topicref format="html"
-href="../org.eclipse.platform.doc.user/concepts/cworkset.htm"
-locktitle="yes" navtitle="Working sets" scope="peer"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cfacets.dita" navtitle="Project facets">
-</topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/taddingfacet.dita"
-navtitle="Adding a facet to a J2EE project"></topicref>
-<topicref href="topics/tchangejavalevel.dita"
-navtitle="Changing the Java compiler version for a J2EE
-project"></topicref>
-<topicref href="topics/tchangefacet.dita"
-navtitle="Changing the version of a facet"></topicref>
-</relcell>
-<relcell></relcell>
-<relcell></relcell>
-</relrow>
-</reltable>
-</map>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.xml b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.xml
deleted file mode 100644
index a0c990b2e..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="J2EE WTP relational table"/>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.ditamap b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.ditamap
deleted file mode 100644
index 8369a58c5..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.ditamap
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<?Pub Sty _display FontColor="red"?>
-<map id="jstj2eetoc" title="J2EE applications - WTP" xml:lang="en-us">
-<anchor id="map_top"/>
-<topicref href="topics/ph-j2eeapp.dita" navtitle="Java EE applications">
-<anchor id="before_intro_topics"/>
-<topicref href="topics/cjavaee5.dita"
-navtitle="Developing Java EE 5 Applications">
-<topicref href="topics/cjee5overview.dita" navtitle="Java EE 5: Overview">
-</topicref>
-<topicref href="topics/cannotations.dita"
-navtitle="Java EE 5 support for annotations">
-<topicref href="topics/tdefiningannotations.dita"
-navtitle="Defining and using Annotations">
-<topicref href="topics/ctypesofanno.dita" navtitle="Types of annotations">
-</topicref>
-</topicref>
-</topicref>
-</topicref>
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture">
-</topicref>
-<topicref href="topics/cjpers.dita" navtitle="Java EE perspective">
-</topicref>
-<topicref href="topics/cjview.dita"
-navtitle="Project Explorer view in the Java EE perspective"></topicref>
-<anchor id="after_intro_topics"/>
-<anchor id="before_filters"/>
-<topicref href="topics/tjviewfilters.dita"
-navtitle="Filtering in the Project Explorer view"></topicref>
-<anchor id="after_filters"/>
-<anchor id="before_projects"/>
-<topicref href="topics/ph-projects.dita" navtitle="Working with projects">
-<topicref href="topics/cjearproj.dita"
-navtitle="Enterprise application projects"></topicref>
-<topicref href="topics/cjappcliproj.dita"
-navtitle="Application client projects"></topicref>
-<anchor id="project_types"/>
-<topicref href="topics/tjear.dita"
-navtitle="Creating an enterprise application project"></topicref>
-<topicref href="topics/tjappproj.dita"
-navtitle="Creating an application client project"></topicref>
-<topicref href="topics/tjrar.dita"
-navtitle="Creating a connector project"></topicref>
-<topicref href="topics/tcreatingawebproject.dita"
-navtitle="Creating Web projects"></topicref>
-<topicref href="topics/twebfragproj.dita"
-navtitle="Creating Web fragment projects"></topicref><?Pub Caret -2?>
-<anchor id="creating_projects"/>
-<topicref href="topics/tjtargetserver.dita"
-navtitle="Specifying target servers for J2EE projects"></topicref>
-<anchor id="target_servers"/>
-<topicref href="topics/cfacets.dita" navtitle="Project facets">
-<topicref href="topics/taddingfacet.dita"
-navtitle="Adding a facet to a Java EE project"></topicref>
-<topicref href="topics/tchangefacet.dita"
-navtitle="Changing the version of a facet"></topicref>
-<topicref href="topics/tchangejavalevel.dita"
-navtitle="Changing the Java compiler version for a Java EE project">
-</topicref>
-<anchor id="childof_J2EEProjectFacets"/></topicref>
-<anchor id="J2EEProjectFacets"/>
-<anchor id="before_importexport"/>
-<topicref href="topics/ph-importexport.dita"
-navtitle="Importing and exporting projects and files">
-<anchor id="importexport_top"/>
-<topicref href="topics/tjexpapp.dita"
-navtitle="Exporting an application client project"></topicref>
-<topicref href="topics/tjexpear.dita"
-navtitle="Exporting an enterprise application into an EAR file">
-</topicref>
-<topicref href="topics/tjexprar.dita"
-navtitle="Exporting connector projects to RAR files"></topicref>
-<anchor id="export_types"/>
-<topicref href="topics/tjimpear.dita"
-navtitle="Importing an enterprise application EAR file"></topicref>
-<topicref href="topics/tjimpapp.dita"
-navtitle="Importing an application client JAR file"></topicref>
-<topicref href="topics/tjimprar.dita"
-navtitle="Importing a connector project RAR file"></topicref>
-<topicref format="html"
-href="../org.eclipse.wst.webtools.doc.user/topics/twimpwar.html"
-linking="targetonly" locktitle="yes"
-navtitle="Importing Web archive (WAR) files" scope="peer" toc="no">
-</topicref>
-<topicref format="html"
-href="../org.eclipse.wst.webtools.doc.user/topics/twcrewar.html"
-linking="targetonly" locktitle="yes"
-navtitle="Exporting Web Archive (WAR) files" scope="peer" toc="no">
-</topicref>
-<topicref format="html"
-href="../org.eclipse.jst.ejb.doc.user/topics/teimp.html"
-linking="targetonly" locktitle="yes" navtitle="Importing EJB JAR files"
-scope="peer" toc="no"></topicref>
-<topicref format="html"
-href="../org.eclipse.jst.ejb.doc.user/topics/teexp.html"
-linking="targetonly" locktitle="yes"
-navtitle="Exporting EJB projects to EJB JAR files" scope="peer" toc="no">
-</topicref>
-<anchor id="import_types"/>
-<anchor id="before_dependencies"/>
-<topicref href="topics/cjcircle.dita"
-navtitle="Cyclical dependencies between Java EE modules"></topicref>
-<topicref href="topics/tjcircleb.dita"
-navtitle="Correcting cyclical dependencies after an EAR
-is imported"></topicref>
-<anchor id="after_dependencies"/>
-<anchor id="importexport_bottom"/></topicref>
-<anchor id="after_importexport"/></topicref>
-<anchor id="after_projects"/>
-<anchor id="before_validation"/>
-<topicref href="topics/tjval.dita"
-navtitle="Validating code in enterprise applications">
-<anchor id="validation_top"/>
-<topicref href="topics/rtunevalidat.dita" navtitle="Tuning validators">
-</topicref>
-<topicref href="topics/rvalerr.dita"
-navtitle="Common validation errors and solutions"></topicref>
-<topicref href="topics/rvalidators.dita" navtitle="J2EE Validators">
-<anchor id="childof_validators"/></topicref>
-<topicref href="topics/tjvaldisable.dita" navtitle="Disabling validation">
-</topicref>
-<topicref href="topics/tjvalselect.dita"
-navtitle="Selecting code validators"></topicref>
-<topicref href="topics/tjvalglobalpref.dita"
-navtitle="Overriding global validation preferences"></topicref>
-<topicref href="topics/tjvalmanual.dita"
-navtitle="Manually validating code"></topicref>
-<anchor id="validation_bottom"/></topicref>
-<anchor id="after_validation"/>
-<anchor id="before_reference"/>
-<topicref href="topics/ph-ref.dita" navtitle="Reference">
-<anchor id="reference_top"/>
-<topicref href="topics/rvalidators.dita" navtitle="J2EE Validators">
-</topicref>
-<topicref href="topics/rvalerr.dita"
-navtitle="Common validation errors and solutions">
-<anchor id="validation_errors"/></topicref>
-<topicref href="topics/rjlimitcurrent.dita"
-navtitle="Limitations of J2EE development tools">
-<anchor id="limitations"/></topicref>
-<anchor id="reference_bottom"/></topicref>
-<anchor id="after_reference"/></topicref>
-<anchor id="map_bottom"/></map>
-<?Pub *0000006359?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml
deleted file mode 100644
index 2221a1f0a..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="J2EE applications - WTP" topic="topics/ph-j2eeapp.html">
-<anchor id="map_top"/>
-<topic label="Java EE applications" href="topics/ph-j2eeapp.html">
-<anchor id="before_intro_topics"/>
-<topic label="Developing Java EE Applications" href="topics/cjavaee5.html">
-<topic label="Java EE 5: Overview" href="topics/cjee5overview.html"/>
-<topic label="Java EE 5 and Java EE 6 support for annotations" href="topics/cannotations.html">
-<topic label="Defining and using annotations" href="topics/tdefiningannotations.html">
-<topic label="Types of annotations" href="topics/ctypesofanno.html"/>
-</topic>
-</topic>
-</topic>
-<topic label="J2EE architecture" href="topics/cjarch.html"/>
-<topic label="Java EE perspective" href="topics/cjpers.html"/>
-<topic label="Project Explorer view in the Java EE perspective" href="topics/cjview.html"/>
-<anchor id="after_intro_topics"/>
-<anchor id="before_filters"/>
-<topic label="Filtering in the Project Explorer view" href="topics/tjviewfilters.html"/>
-<anchor id="after_filters"/>
-<anchor id="before_projects"/>
-<topic label="Working with projects" href="topics/ph-projects.html">
-<topic label="Enterprise application projects" href="topics/cjearproj.html"/>
-<topic label="Application client projects" href="topics/cjappcliproj.html"/>
-<anchor id="project_types"/>
-<topic label="Creating an enterprise application project" href="topics/tjear.html"/>
-<topic label="Creating an application client project" href="topics/tjappproj.html"/>
-<topic label="Creating a connector project" href="topics/tjrar.html"/>
-<topic label="Creating Web projects" href="topics/tcreatingawebproject.html"/>
-<topic label="Creating Web fragment projects" href="topics/twebfragproj.html"/>
-<anchor id="creating_projects"/>
-<topic label="Specifying target servers for J2EE projects" href="topics/tjtargetserver.html"/>
-<anchor id="target_servers"/>
-<topic label="Project facets" href="topics/cfacets.html">
-<topic label="Adding a facet to a Java EE project" href="topics/taddingfacet.html"/>
-<topic label="Changing the version of a facet" href="topics/tchangefacet.html"/>
-<topic label="Changing the Java compiler version for a Java EE project" href="topics/tchangejavalevel.html"/>
-<anchor id="childof_J2EEProjectFacets"/>
-</topic>
-<anchor id="J2EEProjectFacets"/>
-<anchor id="before_importexport"/>
-<topic label="Importing and exporting projects and files" href="topics/ph-importexport.html">
-<anchor id="importexport_top"/>
-<topic label="Exporting an application client project" href="topics/tjexpapp.html"/>
-<topic label="Exporting an enterprise application into an EAR file" href="topics/tjexpear.html"/>
-<topic label="Exporting connector projects to RAR files" href="topics/tjexprar.html"/>
-<anchor id="export_types"/>
-<topic label="Importing an enterprise application EAR file" href="topics/tjimpear.html"/>
-<topic label="Importing an application client JAR file" href="topics/tjimpapp.html"/>
-<topic label="Importing a connector project RAR file" href="topics/tjimprar.html"/>
-<anchor id="import_types"/>
-<anchor id="before_dependencies"/>
-<topic label="Cyclical dependencies between Java EE modules" href="topics/cjcircle.html"/>
-<topic label="Correcting cyclical dependencies after an EAR is imported" href="topics/tjcircleb.html"/>
-<anchor id="after_dependencies"/>
-<anchor id="importexport_bottom"/>
-</topic>
-<anchor id="after_importexport"/>
-</topic>
-<anchor id="after_projects"/>
-<anchor id="before_validation"/>
-<topic label="Validating code in enterprise applications" href="topics/tjval.html">
-<anchor id="validation_top"/>
-<topic label="Tuning validators" href="topics/rtunevalidat.html"/>
-<topic label="Common validation errors and solutions" href="topics/rvalerr.html"/>
-<topic label="J2EE Validators" href="topics/rvalidators.html">
-<anchor id="childof_validators"/>
-</topic>
-<topic label="Disabling validation" href="topics/tjvaldisable.html"/>
-<topic label="Selecting code validators" href="topics/tjvalselect.html"/>
-<topic label="Overriding global validation preferences" href="topics/tjvalglobalpref.html"/>
-<topic label="Manually validating code" href="topics/tjvalmanual.html"/>
-<anchor id="validation_bottom"/>
-</topic>
-<anchor id="after_validation"/>
-<anchor id="before_reference"/>
-<topic label="Reference" href="topics/ph-ref.html">
-<anchor id="reference_top"/>
-<topic label="J2EE Validators" href="topics/rvalidators.html"/>
-<topic label="Common validation errors and solutions" href="topics/rvalerr.html">
-<anchor id="validation_errors"/>
-</topic>
-<topic label="Limitations of J2EE development tools" href="topics/rjlimitcurrent.html">
-<anchor id="limitations"/>
-</topic>
-<anchor id="reference_bottom"/>
-</topic>
-<anchor id="after_reference"/>
-</topic>
-<anchor id="map_bottom"/>
-</toc>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/myplugin.xml b/docs/org.eclipse.jst.j2ee.doc.user/myplugin.xml
deleted file mode 100644
index 3010c835e..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/myplugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.6"?>
-<?NLS TYPE="org.eclipse.help.toc"?> 
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-  
-  <extension point="org.eclipse.help.toc">
-       <toc file="jst_j2ee_toc.xml" />
-       <index path="index/"/>
-   </extension>
-   	<extension point="org.eclipse.help.index">
-      <index file="org.eclipse.jst.j2ee.doc.userindex.xml"/>
-    </extension>
-</plugin>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.user.maplist b/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.user.maplist
deleted file mode 100644
index ab8c2ad9f..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.user.maplist
+++ /dev/null
@@ -1,9 +0,0 @@
-<maplist version="3.6.2">
-  <nav>
-    <map file="jst_j2ee_toc.ditamap"/>
-  </nav>
-  <link>
-    <map file="jst_j2ee_toc.ditamap"/>
-    <map file="jst_j2ee_relsmap.ditamap"/>
-  </link>
-</maplist>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.xml b/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.xml
deleted file mode 100644
index 3755b1645..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="Java Enterprise Edition 5">
-    <entry keyword="Overview">
-      <topic href="topics/cjavaee5.html#cjavaee5" title="Developing Java EE 5 Applications"/>
-    </entry>
-  </entry>
-  <entry keyword="Java EE 5">
-    <topic href="topics/cjee5overview.html#cjavaee5" title="Java EE 5: Overview"/>
-    <entry keyword="annotations">
-      <topic href="topics/cannotations.html#cjavaee5" title="Java EE 5 support for annotations"/>
-      <topic href="topics/tdefiningannotations.html#tjimpear" title="Defining and using annotations"/>
-      <entry keyword="types">
-        <topic href="topics/ctypesofanno.html#cjavaee5" title="Types of annotations"/>
-      </entry>
-    </entry>
-    <entry keyword="defining">
-      <topic href="topics/tdefiningannotations.html#tjimpear" title="Defining and using annotations"/>
-    </entry>
-  </entry>
-  <entry keyword="Oerview">
-    <topic href="topics/cjee5overview.html#cjavaee5" title="Java EE 5: Overview"/>
-  </entry>
-  <entry keyword="J2EE">
-    <entry keyword="architecture">
-      <topic href="topics/cjarch.html#cjarch" title="J2EE architecture"/>
-    </entry>
-    <entry keyword="enterprise application projects">
-      <entry keyword="overview">
-        <topic href="topics/cjearproj.html#cjearproj" title="Enterprise application projects"/>
-      </entry>
-      <entry keyword="creating">
-        <topic href="topics/tjear.html#tjear" title="Creating an enterprise application project"/>
-      </entry>
-    </entry>
-    <entry keyword="target servers">
-      <topic href="topics/tjtargetserver.html#tjtargetserver" title="Specifying target servers for J2EE projects"/>
-    </entry>
-    <entry keyword="tool limitations">
-      <topic href="topics/rjlimitcurrent.html#rjlimitcurrent" title="Limitations of J2EE development tools"/>
-    </entry>
-  </entry>
-  <entry keyword="Java EE">
-    <topic href="topics/cjarch.html#cjarch" title="J2EE architecture"/>
-    <entry keyword="workbench perspectives">
-      <topic href="topics/cjpers.html#cjpers" title="Java EE perspective"/>
-    </entry>
-    <entry keyword="application client projects">
-      <topic href="topics/cjappcliproj.html#cjappcliproj" title="Application client projects"/>
-    </entry>
-    <entry keyword="project facets">
-      <topic href="topics/cfacets.html#cfacets" title="Project facets"/>
-    </entry>
-    <entry keyword="adding project facets">
-      <topic href="topics/taddingfacet.html#taddingfacet" title="Adding a facet to a Java EE project"/>
-    </entry>
-    <entry keyword="changing facet versions">
-      <topic href="topics/tchangefacet.html#tchangefacet" title="Changing the version of a facet"/>
-    </entry>
-    <entry keyword="project compiler level">
-      <topic href="topics/tchangejavalevel.html#tchangejavalevel" title="Changing the Java compiler version for a Java EE project"/>
-    </entry>
-    <entry keyword="cyclical dependencies between modules">
-      <topic href="topics/cjcircle.html#cjcircle" title="Cyclical dependencies between Java EE modules"/>
-    </entry>
-  </entry>
-  <entry keyword="enterprise applications">
-    <entry keyword="Java EE perspective">
-      <topic href="topics/cjpers.html#cjpers" title="Java EE perspective"/>
-    </entry>
-    <entry keyword="projects">
-      <entry keyword="artifacts">
-        <topic href="topics/cjearproj.html#cjearproj" title="Enterprise application projects"/>
-      </entry>
-      <entry keyword="creating">
-        <topic href="topics/tjear.html#tjear" title="Creating an enterprise application project"/>
-      </entry>
-      <entry keyword="exporting">
-        <topic href="topics/tjexpear.html#tjexpear" title="Exporting an enterprise application into an EAR file"/>
-      </entry>
-      <entry keyword="importing">
-        <topic href="topics/tjimpear.html#tjimpear" title="Importing an enterprise application EAR file"/>
-      </entry>
-    </entry>
-  </entry>
-  <entry keyword="views">
-    <entry keyword="Project Explorer">
-      <topic href="topics/cjview.html#cjview" title="Project Explorer view in the Java EE perspective"/>
-    </entry>
-    <entry keyword="Project Explorer filters">
-      <topic href="topics/tjviewfilters.html#cjviewfiltersCait" title="Filtering in the Project Explorer view"/>
-    </entry>
-  </entry>
-  <entry keyword="filters">
-    <entry keyword="Project Explorer view">
-      <topic href="topics/tjviewfilters.html#cjviewfiltersCait" title="Filtering in the Project Explorer view"/>
-    </entry>
-  </entry>
-  <entry keyword="projects">
-    <entry keyword="filtering">
-      <topic href="topics/tjviewfilters.html#cjviewfiltersCait" title="Filtering in the Project Explorer view"/>
-    </entry>
-    <entry keyword="enterprise applications">
-      <topic href="topics/cjearproj.html#cjearproj" title="Enterprise application projects"/>
-    </entry>
-    <entry keyword="target servers">
-      <topic href="topics/tjtargetserver.html#tjtargetserver" title="Specifying target servers for J2EE projects"/>
-    </entry>
-    <entry keyword="facets">
-      <entry keyword="overview">
-        <topic href="topics/cfacets.html#cfacets" title="Project facets"/>
-      </entry>
-      <entry keyword="adding">
-        <topic href="topics/taddingfacet.html#taddingfacet" title="Adding a facet to a Java EE project"/>
-      </entry>
-    </entry>
-    <entry keyword="changing facet versions">
-      <topic href="topics/tchangefacet.html#tchangefacet" title="Changing the version of a facet"/>
-    </entry>
-    <entry keyword="Java compiler level">
-      <topic href="topics/tchangejavalevel.html#tchangejavalevel" title="Changing the Java compiler version for a Java EE project"/>
-    </entry>
-    <entry keyword="cyclical dependencies">
-      <topic href="topics/cjcircle.html#cjcircle" title="Cyclical dependencies between Java EE modules"/>
-    </entry>
-    <entry keyword="correcting cyclical dependencies">
-      <topic href="topics/tjcircleb.html#tjcircleb" title="Correcting cyclical dependencies after an EAR is imported"/>
-    </entry>
-  </entry>
-  <entry keyword="application client projects">
-    <entry keyword="overview">
-      <topic href="topics/cjappcliproj.html#cjappcliproj" title="Application client projects"/>
-    </entry>
-    <entry keyword="creating">
-      <topic href="topics/tjappproj.html#tjappproj" title="Creating an application client project"/>
-    </entry>
-    <entry keyword="exporting">
-      <topic href="topics/tjexpapp.html#tjexpapp" title="Exporting an application client project"/>
-    </entry>
-    <entry keyword="importing">
-      <topic href="topics/tjimpapp.html#tjimpapp" title="Importing an application client JAR file"/>
-    </entry>
-  </entry>
-  <entry keyword="connector projects">
-    <entry keyword="creating">
-      <topic href="topics/tjrar.html#tjrar" title="Creating a connector project"/>
-    </entry>
-    <entry keyword="exporting">
-      <topic href="topics/tjexprar.html#tjexprar" title="Exporting connector projects to RAR files"/>
-    </entry>
-    <entry keyword="importing">
-      <topic href="topics/tjimprar.html#tjimprar" title="Importing a connector project RAR file"/>
-    </entry>
-  </entry>
-  <entry keyword="target servers">
-    <entry keyword="J2EE applications">
-      <topic href="topics/tjtargetserver.html#tjtargetserver" title="Specifying target servers for J2EE projects"/>
-    </entry>
-  </entry>
-  <entry keyword="JavaServer Faces (JSF)">
-    <entry keyword="project facets">
-      <topic href="topics/cfacets.html#cfacets" title="Project facets"/>
-    </entry>
-  </entry>
-  <entry keyword="facets">
-    <entry keyword="changing versions">
-      <topic href="topics/tchangefacet.html#tchangefacet" title="Changing the version of a facet"/>
-    </entry>
-  </entry>
-  <entry keyword="EAR">
-    <entry keyword="files">
-      <entry keyword="exporting">
-        <topic href="topics/tjexpear.html#tjexpear" title="Exporting an enterprise application into an EAR file"/>
-      </entry>
-      <entry keyword="importing">
-        <topic href="topics/tjimpear.html#tjimpear" title="Importing an enterprise application EAR file"/>
-      </entry>
-    </entry>
-  </entry>
-  <entry keyword="RAR files">
-    <entry keyword="exporting">
-      <topic href="topics/tjexprar.html#tjexprar" title="Exporting connector projects to RAR files"/>
-    </entry>
-    <entry keyword="importing">
-      <topic href="topics/tjimprar.html#tjimprar" title="Importing a connector project RAR file"/>
-    </entry>
-  </entry>
-  <entry keyword="dependencies">
-    <entry keyword="cycles between modules">
-      <topic href="topics/cjcircle.html#cjcircle" title="Cyclical dependencies between Java EE modules"/>
-    </entry>
-    <entry keyword="correcting cyclical">
-      <topic href="topics/tjcircleb.html#tjcircleb" title="Correcting cyclical dependencies after an EAR is imported"/>
-    </entry>
-  </entry>
-  <entry keyword="EAR files">
-    <entry keyword="correcting cyclical dependencies">
-      <topic href="topics/tjcircleb.html#tjcircleb" title="Correcting cyclical dependencies after an EAR is imported"/>
-    </entry>
-  </entry>
-  <entry keyword="build validation">
-    <entry keyword="enabling">
-      <topic href="topics/tjval.html#tjval" title="Validating code in enterprise applications"/>
-    </entry>
-  </entry>
-  <entry keyword="code validation">
-    <entry keyword="overview">
-      <topic href="topics/tjval.html#tjval" title="Validating code in enterprise applications"/>
-    </entry>
-    <entry keyword="error solutions">
-      <topic href="topics/rvalerr.html#rvalerr" title="Common validation errors and solutions"/>
-    </entry>
-    <entry keyword="J2EE validators">
-      <topic href="topics/rvalidators.html#rvalidators" title="J2EE Validators"/>
-    </entry>
-    <entry keyword="disabling">
-      <topic href="topics/tjvaldisable.html#tjvaldisable" title="Disabling validation"/>
-    </entry>
-    <entry keyword="selecting validators">
-      <topic href="topics/tjvalselect.html#tjvalselect" title="Selecting code validators"/>
-    </entry>
-    <entry keyword="overriding global preferences">
-      <topic href="topics/tjvalglobalpref.html#tjvalglobalpref" title="Overriding global validation preferences"/>
-    </entry>
-    <entry keyword="manual">
-      <topic href="topics/tjvalmanual.html#tjvalmanual" title="Manually validating code"/>
-    </entry>
-  </entry>
-  <entry keyword="validation">
-    <entry keyword="overview">
-      <topic href="topics/tjval.html#tjval" title="Validating code in enterprise applications"/>
-    </entry>
-    <entry keyword="error solutions">
-      <topic href="topics/rvalerr.html#rvalerr" title="Common validation errors and solutions"/>
-    </entry>
-    <entry keyword="J2EE validators">
-      <topic href="topics/rvalidators.html#rvalidators" title="J2EE Validators"/>
-    </entry>
-    <entry keyword="disabling">
-      <topic href="topics/tjvaldisable.html#tjvaldisable" title="Disabling validation"/>
-    </entry>
-    <entry keyword="selecting validators">
-      <topic href="topics/tjvalselect.html#tjvalselect" title="Selecting code validators"/>
-    </entry>
-    <entry keyword="overriding global preferences">
-      <topic href="topics/tjvalglobalpref.html#tjvalglobalpref" title="Overriding global validation preferences"/>
-    </entry>
-    <entry keyword="manual">
-      <topic href="topics/tjvalmanual.html#tjvalmanual" title="Manually validating code"/>
-    </entry>
-  </entry>
-</index>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/plugin.properties b/docs/org.eclipse.jst.j2ee.doc.user/plugin.properties
deleted file mode 100644
index 15a495037..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/plugin.properties
+++ /dev/null
@@ -1,14 +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
-###############################################################################
-# NLS_MESSAGEFORMAT_VAR 
-# NLS_ENCODING=UTF-8 
-pluginName = J2EE tools documentation
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/plugin.xml b/docs/org.eclipse.jst.j2ee.doc.user/plugin.xml
deleted file mode 100644
index 3010c835e..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.6"?>
-<?NLS TYPE="org.eclipse.help.toc"?> 
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-  
-  <extension point="org.eclipse.help.toc">
-       <toc file="jst_j2ee_toc.xml" />
-       <index path="index/"/>
-   </extension>
-   	<extension point="org.eclipse.help.index">
-      <index file="org.eclipse.jst.j2ee.doc.userindex.xml"/>
-    </extension>
-</plugin>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita
deleted file mode 100644
index b93f875cc..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<?Pub Sty _display FontColor="red"?>
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title"><tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 6 support for annotations</title>
-<shortdesc outputclass="id_shortdesc">The goal of <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 6 platform development is to minimize
-the number of artifacts that you have to create and maintain, thereby
-simplifying the development process. <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 6 support the injection of annotations
-into your source code, so that you can embed resources, dependencies,
-services, and life-cycle notifications in your source code, without
-having to maintain these artifacts elsewhere.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5<indexterm>annotations</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p>An annotation is a modifier or Metadata tag that provides additional
-data to <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> classes, interfaces, constructors,
-methods, fields, parameters, and local variables. Annotations replace
-boilerplate code, common code that is required by certain applications.
-For example, an annotation can replace the paired interface and implementation
-required for a Web service. Annotations can also replace additional
-files that programs require, which are maintained separately. By using
-an annotation, this separate file is no longer required. For example,
-annotations can replace the need for a separately maintained deployment
-descriptor for <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="JavaBeans">JavaBeans</tm>. </p>
-<p>Annotations<ul>
-<li>Replace descriptors for most purposes</li>
-<li>Remove the need for marker interfaces (like java.rmi.Remote)</li>
-<li>Allow application settings to be visible in the component they
-affect</li>
-</ul></p>
-<p>Java EE 5 provides annotations for the following tasks, among others:<ul>
-<li>Developing Enterprise JavaBean applications</li>
-<li>Defining and using Web services</li>
-<li>Mapping Java technology classes to XML</li>
-<li>Mapping Java technology classes to databases</li>
-<li>Mapping methods to operations</li>
-<li>Specifying external dependencies</li>
-<li>Specirying deployment information, including security attributes</li>
-</ul></p>
-<p><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 5 defines a number of annotations that
-can be injected into your source code. To declare an annotation, you
-simply precede the keyword with an "at" sign (@). <codeblock>
-package com.ibm.counter;
-
-import javax.ejb.Stateless;
-
-@Stateless
-
-public class CounterBean {
-
-}</codeblock></p>
-<p>For more information about the categories of annotations that <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 5 and  <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-6 support, see <xref href="ctypesofanno.dita">Types of annotations</xref>.</p><?Pub
-Caret 85?>
-</conbody>
-</concept>
-<?Pub *0000003751?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html
deleted file mode 100644
index 3d9fea29c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Java EE 5 and Java EE 6 support for annotations" />
-<meta name="abstract" content="The goal of Java EE 5 and Java EE 6 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 and Java EE 6 support the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere." />
-<meta name="description" content="The goal of Java EE 5 and Java EE 6 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 and Java EE 6 support the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere." />
-<meta content="Java EE 5, annotations" name="DC.subject" />
-<meta content="Java EE 5, annotations" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tdefiningannotations.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE
-5 and Java EE 6 support for annotations</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Java EE
-5 and Java EE 6 support for annotations</h1>
-
-
-
-<div><p class="id_shortdesc">The goal of Java™ EE
-5 and Java EE 6 platform development is to minimize
-the number of artifacts that you have to create and maintain, thereby
-simplifying the development process. Java EE
-5 and Java EE 6 support the injection of annotations
-into your source code, so that you can embed resources, dependencies,
-services, and life-cycle notifications in your source code, without
-having to maintain these artifacts elsewhere.</p>
-
-<p>An annotation is a modifier or Metadata tag that provides additional
-data to Java classes, interfaces, constructors,
-methods, fields, parameters, and local variables. Annotations replace
-boilerplate code, common code that is required by certain applications.
-For example, an annotation can replace the paired interface and implementation
-required for a Web service. Annotations can also replace additional
-files that programs require, which are maintained separately. By using
-an annotation, this separate file is no longer required. For example,
-annotations can replace the need for a separately maintained deployment
-descriptor for JavaBeans™. </p>
-
-<div class="p">Annotations<ul>
-<li>Replace descriptors for most purposes</li>
-
-<li>Remove the need for marker interfaces (like java.rmi.Remote)</li>
-
-<li>Allow application settings to be visible in the component they
-affect</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides annotations for the following tasks, among others:<ul>
-<li>Developing Enterprise JavaBean applications</li>
-
-<li>Defining and using Web services</li>
-
-<li>Mapping Java technology classes to XML</li>
-
-<li>Mapping Java technology classes to databases</li>
-
-<li>Mapping methods to operations</li>
-
-<li>Specifying external dependencies</li>
-
-<li>Specirying deployment information, including security attributes</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 defines a number of annotations that
-can be injected into your source code. To declare an annotation, you
-simply precede the keyword with an "at" sign (@). <pre>
-package com.ibm.counter;
-
-import javax.ejb.Stateless;
-
-@Stateless
-
-public class CounterBean {
-
-}</pre>
-</div>
-
-<p>For more information about the categories of annotations that Java EE 5 and  Java EE
-6 support, see <a href="ctypesofanno.html">Types of annotations</a>.</p>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tdefiningannotations.html">Defining and using annotations</a></strong><br />
-You can use the @Interface annotation to define your own annotation definition.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cjavaee5.html" title="The Java EE 5 programming model simplifies the process of creating Java applications.">Developing Java EE Applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita
deleted file mode 100644
index 11b05780d..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cfacets" xml:lang="en-us">
-<title outputclass="id_title">Project facets</title>
-<shortdesc outputclass="id_shortdesc">Facets define characteristics and requirements
-for Java EE projects and are used as part of the runtime configuration. </shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE<indexterm>project facets</indexterm></indexterm>
-<indexterm>JavaServer Faces (JSF)<indexterm>project facets</indexterm></indexterm>
-<indexterm>projects<indexterm>facets<indexterm>overview</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p id="aboutfacet">When you add a facet to a project, that project is configured
-to perform a certain task, fulfill certain requirements, or have certain characteristics.
-For example, the EAR facet sets up a project to function as an enterprise
-application by adding a deployment descriptor and setting up the project's
-classpath.</p>
-<p>You can add facets only to Java EE projects and other types of projects
-that are based on J2EE projects, such as enterprise application projects,
-dynamic Web projects, and EJB projects. You cannot add facets to a <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> project
-or plug-in project, for example. Typically, a facet-enabled project has at
-least one facet when it is created, allowing you to add more facets if necessary.
-For example, a new EJB project has the EJB Module facet. You can then add
-other facets to this project like the EJBDoclet (XDoclet) facet. To add a
-facet to a project, see <xref href="taddingfacet.dita"></xref>.</p>
-<p>Some facets require other facets as prerequisites. Other facets cannot
-be in the same project together. For example, you cannot add the Dynamic Web
-Module facet to an EJB project because the EJB project already has the EJB
-Module facet. Some facets can be removed from a project and others cannot.</p>
-<p>Facets also have version numbers. You can change the version numbers of
-facets as long as you stay within the requirements for the facets. To change
-the version number of a facet, see <xref href="tchangefacet.dita"></xref>.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html
deleted file mode 100644
index 81e6b1bc5..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Project facets" />
-<meta name="abstract" content="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration." />
-<meta name="description" content="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration." />
-<meta content="Java EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="DC.subject" />
-<meta content="Java EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjrar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cfacets" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Project facets</title>
-</head>
-<body id="cfacets"><a name="cfacets"><!-- --></a>
-
-
-<h1 class="id_title">Project facets</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">Facets define characteristics and requirements
-for Java EE projects and are used as part of the runtime configuration. </p>
-
-<p class="anchor_topictop" />
-
-<p id="cfacets__aboutfacet"><a name="cfacets__aboutfacet"><!-- --></a>When you add a facet to a project, that project is configured
-to perform a certain task, fulfill certain requirements, or have certain characteristics.
-For example, the EAR facet sets up a project to function as an enterprise
-application by adding a deployment descriptor and setting up the project's
-classpath.</p>
-
-<p>You can add facets only to Java EE projects and other types of projects
-that are based on J2EE projects, such as enterprise application projects,
-dynamic Web projects, and EJB projects. You cannot add facets to a Java™ project
-or plug-in project, for example. Typically, a facet-enabled project has at
-least one facet when it is created, allowing you to add more facets if necessary.
-For example, a new EJB project has the EJB Module facet. You can then add
-other facets to this project like the EJBDoclet (XDoclet) facet. To add a
-facet to a project, see <a href="taddingfacet.html" title="This topic explains how to add a facet&#10;to an existing project in your workspace.">Adding a facet to a Java EE project</a>.</p>
-
-<p>Some facets require other facets as prerequisites. Other facets cannot
-be in the same project together. For example, you cannot add the Dynamic Web
-Module facet to an EJB project because the EJB project already has the EJB
-Module facet. Some facets can be removed from a project and others cannot.</p>
-
-<p>Facets also have version numbers. You can change the version numbers of
-facets as long as you stay within the requirements for the facets. To change
-the version number of a facet, see <a href="tchangefacet.html" title="You can change the version of a facet&#10;in a Java EE project by editing the facets for the project.">Changing the version of a facet</a>.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjrar.html" title="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs).">Creating a connector project</a></div>
-<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a Java EE project</a></div>
-<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
-<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita
deleted file mode 100644
index 92d44a010..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjappcliproj" xml:lang="en-us">
-<title outputclass="id_title">Application client projects</title>
-<shortdesc outputclass="id_shortdesc">Application client projects contain
-programs that run on networked client systems so the project can benefit from
-a server's tools.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>overview</indexterm></indexterm>
-<indexterm>Java EE<indexterm>application client projects</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p> Application client projects contain the resources needed for application
-client modules. An application client module is used to contain a full-function
-client <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> application (non Web-based) that connects to and
-uses the Java EE resources defined in your server. When you place the client
-code in an application client module instead of a simple JAR file, the application
-client benefits from the server's resources (it does not need to re-specify
-the class path to Java EE and server JAR files) as well as from easier JNDI
-lookup (the client container fills in the initial context and other parameters).
-The application client project allows you to work as if you are creating a
-standalone <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> application in a <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> project.</p>
-<p>An application client project enables you to do the following things:</p>
-<ul>
-<li>Develop the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> classes that implement the client module</li>
-<li>Set the application client deployment descriptor</li>
-<li>Test the application client</li>
-</ul>
-<p>Like <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> projects, application client projects contain the
-resources needed for application clients, including <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> class
-files. When you create a new application client project, the environment is
-set up for <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> development. A <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> builder is associated with the project
-so the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> source can be incrementally compiled as it is updated.
-The application client project contains information about the type hierarchy
-and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> elements.
-This information is kept current as changes are made, and the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> builder
-will incrementally compile the resources within these projects as the resources
-are updated.</p>
-<p>In the workbench, application client projects are always referenced by
-enterprise application (EAR) projects. When you create an application client
-project, you specify the enterprise application project to which the application
-client project belongs. A module element is automatically added to the <codeph>application.xml</codeph> deployment
-descriptor for the EAR project.</p>
-<p>An application client project is deployed as a JAR file. This application
-client JAR file contains the necessary resources for the application, including <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> class
-files, and deployment descriptor information and any meta-data extensions
-and bindings files.</p>
-<p>Application client projects are typically run on networked client systems
-connected to Java EE (EJB) servers. The point of entry for the application
-client is a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> main-class, which is simply a <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> class
-that contains a static main method. The class is declared in the manifest
-file of the client module. </p>
-<p>A Java EE application client container provides access to the Java EE service
-(JNDI naming services, deployment services, transaction services, and security
-services) and communications APIs (internet protocols, Remote Method Invocation
-protocols, Object Management Group protocols, Messaging protocols, and data
-formats).</p>
-<p>By default, application client projects contain one folder named <uicontrol>appClientModule</uicontrol>,
-which contains both <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> source code and compiled <codeph>.class</codeph> files,
-along with all the meta-data files in the <uicontrol>META-INF</uicontrol> subfolder.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html
deleted file mode 100644
index 3977b0a16..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Application client projects" />
-<meta name="abstract" content="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools." />
-<meta name="description" content="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools." />
-<meta content="application client projects, overview, Java EE" name="DC.subject" />
-<meta content="application client projects, overview, Java EE" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjappcliproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Application client projects</title>
-</head>
-<body id="cjappcliproj"><a name="cjappcliproj"><!-- --></a>
-
-
-<h1 class="id_title">Application client projects</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">Application client projects contain
-programs that run on networked client systems so the project can benefit from
-a server's tools.</p>
-
-<p class="anchor_topictop" />
-
-<p> Application client projects contain the resources needed for application
-client modules. An application client module is used to contain a full-function
-client Java™ application (non Web-based) that connects to and
-uses the Java EE resources defined in your server. When you place the client
-code in an application client module instead of a simple JAR file, the application
-client benefits from the server's resources (it does not need to re-specify
-the class path to Java EE and server JAR files) as well as from easier JNDI
-lookup (the client container fills in the initial context and other parameters).
-The application client project allows you to work as if you are creating a
-standalone Java application in a Java project.</p>
-
-<p>An application client project enables you to do the following things:</p>
-
-<ul>
-<li>Develop the Java classes that implement the client module</li>
-
-<li>Set the application client deployment descriptor</li>
-
-<li>Test the application client</li>
-
-</ul>
-
-<p>Like Java projects, application client projects contain the
-resources needed for application clients, including Java class
-files. When you create a new application client project, the environment is
-set up for Java development. A Java builder is associated with the project
-so the Java source can be incrementally compiled as it is updated.
-The application client project contains information about the type hierarchy
-and Java elements.
-This information is kept current as changes are made, and the Java builder
-will incrementally compile the resources within these projects as the resources
-are updated.</p>
-
-<p>In the workbench, application client projects are always referenced by
-enterprise application (EAR) projects. When you create an application client
-project, you specify the enterprise application project to which the application
-client project belongs. A module element is automatically added to the <samp class="codeph">application.xml</samp> deployment
-descriptor for the EAR project.</p>
-
-<p>An application client project is deployed as a JAR file. This application
-client JAR file contains the necessary resources for the application, including Java class
-files, and deployment descriptor information and any meta-data extensions
-and bindings files.</p>
-
-<p>Application client projects are typically run on networked client systems
-connected to Java EE (EJB) servers. The point of entry for the application
-client is a Java main-class, which is simply a Java class
-that contains a static main method. The class is declared in the manifest
-file of the client module. </p>
-
-<p>A Java EE application client container provides access to the Java EE service
-(JNDI naming services, deployment services, transaction services, and security
-services) and communications APIs (internet protocols, Remote Method Invocation
-protocols, Object Management Group protocols, Messaging protocols, and data
-formats).</p>
-
-<p>By default, application client projects contain one folder named <span class="uicontrol">appClientModule</span>,
-which contains both Java source code and compiled <samp class="codeph">.class</samp> files,
-along with all the meta-data files in the <span class="uicontrol">META-INF</span> subfolder.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.dita
deleted file mode 100644
index f715cd4c3..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjarch" xml:lang="en-us">
-<title outputclass="id_title">J2EE architecture</title>
-<shortdesc outputclass="id_shortdesc">The <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Platform, Enterprise Edition (J2EE)
-provides a standard for developing multitier, enterprise applications.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>J2EE<indexterm>architecture</indexterm></indexterm><indexterm>Java
-EE</indexterm></keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>The economy and technology of today have intensified the need for faster,
-more efficient, and larger-scale information management solutions. The J2EE
-specification satisfies these challenges by providing a programming model
-that improves development productivity, standardizes the platform for hosting
-enterprise applications, and ensures portability of developed applications
-with an extensive test suite.</p>
-<p>J2EE architecture supports component-based development of multi-tier enterprise
-applications. A J2EE application system typically includes the following tiers:</p>
-<dl><dlentry outputclass="id_projectfiles_top">
-<dt>Client tier</dt>
-<dd>In the client tier, Web components, such as Servlets and JavaServer Pages
-(JSPs), or standalone <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> applications provide a dynamic interface
-to the middle tier.</dd>
-</dlentry><dlentry>
-<dt>Middle tier</dt>
-<dd>In the server tier, or middle tier, enterprise beans and Web Services
-encapsulate reusable, distributable business logic for the application. These
-server-tier components are contained on a J2EE Application Server, which provides
-the platform for these components to perform actions and store data.</dd>
-</dlentry><dlentry>
-<dt>Enterprise data tier</dt>
-<dd>In the data tier, the enterprise's data is stored and persisted, typically
-in a relational database.</dd>
-</dlentry></dl>
-<p>J2EE applications are comprised of components, containers, and services.
-Components are application-level components. Web components, such as Servlets
-and JSPs, provide dynamic responses to requests from a Web page. EJB components
-contain server-side business logic for enterprise applications. Web and EJB
-component containers host services that support Web and EJB modules.</p>
-<p>For more information on J2EE architecture and its implicit technologies,
-download and read the <xref format="html" href="http://java.sun.com/j2ee/download.html#platformspec"
-scope="external">J2EE 1.4 Specification<desc></desc></xref>.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html
deleted file mode 100644
index 172f4fe00..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="J2EE architecture" />
-<meta name="abstract" content="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications." />
-<meta name="description" content="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications." />
-<meta content="J2EE, architecture, Java EE" name="DC.subject" />
-<meta content="J2EE, architecture, Java EE" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjarch" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>J2EE architecture</title>
-</head>
-<body id="cjarch"><a name="cjarch"><!-- --></a>
-
-
-<h1 class="id_title">J2EE architecture</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">The Java™ 2 Platform, Enterprise Edition (J2EE)
-provides a standard for developing multitier, enterprise applications.</p>
-
-<p class="anchor_topictop" />
-
-<p>The economy and technology of today have intensified the need for faster,
-more efficient, and larger-scale information management solutions. The J2EE
-specification satisfies these challenges by providing a programming model
-that improves development productivity, standardizes the platform for hosting
-enterprise applications, and ensures portability of developed applications
-with an extensive test suite.</p>
-
-<p>J2EE architecture supports component-based development of multi-tier enterprise
-applications. A J2EE application system typically includes the following tiers:</p>
-
-<dl>
-<dt class="dlterm">Client tier</dt>
-
-<dd>In the client tier, Web components, such as Servlets and JavaServer Pages
-(JSPs), or standalone Java applications provide a dynamic interface
-to the middle tier.</dd>
-
-
-<dt class="dlterm">Middle tier</dt>
-
-<dd>In the server tier, or middle tier, enterprise beans and Web Services
-encapsulate reusable, distributable business logic for the application. These
-server-tier components are contained on a J2EE Application Server, which provides
-the platform for these components to perform actions and store data.</dd>
-
-
-<dt class="dlterm">Enterprise data tier</dt>
-
-<dd>In the data tier, the enterprise's data is stored and persisted, typically
-in a relational database.</dd>
-
-</dl>
-
-<p>J2EE applications are comprised of components, containers, and services.
-Components are application-level components. Web components, such as Servlets
-and JSPs, provide dynamic responses to requests from a Web page. EJB components
-contain server-side business logic for enterprise applications. Web and EJB
-component containers host services that support Web and EJB modules.</p>
-
-<p>For more information on J2EE architecture and its implicit technologies,
-download and read the <a href="http://java.sun.com/j2ee/download.html#platformspec" target="_blank" title="">J2EE 1.4 Specification</a>.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.dita
deleted file mode 100644
index 909dbac5f..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<?Pub Sty _display FontColor="red"?>
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title">Developing <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-Applications</title>
-<shortdesc outputclass="id_shortdesc">The <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 programming model simplifies the process of creating <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> applications.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java Enterprise Edition 5<indexterm>Overview</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p id="aboutfacet">In the Java EE specifications, programming requirements
-have been streamlined, and XML deployment descriptors are optional.
-Instead, you can specify many details of assembly and deployment with
-Java annotations. Java EE will provide default values in many situations
-so explicitly specification of these values are not required.</p>
-<p>Code validation, content assistance, Quick Fixes, and refactoring
-simplify working with your code. Code validators check your projects
-for errors. When an error is found, you can double-click on it in
-the Problems view in the product workbench to go to the error location.
-For some error types, you can use a Quick Fix to correct the error
-automatically. For both <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> source
-and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> annotations, you can rely on content assistance
-to simplify your programming task. When you refactor source code,
-the tools automatically update the associated metadata.</p>
-<p>For additional information about <tm tmtype="tm" trademark="Java">Java</tm> EE,
-see the official specification: <ul>
-<li><b><tm tmtype="tm" trademark="Java">Java</tm> EE 5</b>: <xref
-href="http://jcp.org/en/jsr/detail?id=244" scope="external">JSR 244: <tm
-tmtype="tm" trademark="Java">Java</tm> Platform, Enterprise Edition
-5 (<tm tmtype="tm" trademark="Java">Java</tm> EE 5) Specification</xref></li>
-<li><b><tm tmtype="tm" trademark="Java">Java</tm> EE 6</b>: <xref
-href="http://jcp.org/en/jsr/detail?id=316" scope="external">JSR 316:
-JavaTM Platform, Enterprise Edition 6 (<tm tmtype="tm" trademark="Java">Java</tm> EE
-6) Specification</xref></li>
-</ul></p>
-<p outputclass="anchor_topicbottom"></p><?Pub Caret -2?>
-</conbody>
-</concept>
-<?Pub *0000002776?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html
deleted file mode 100644
index feecee8e4..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Developing Java EE Applications" />
-<meta name="abstract" content="The Java EE 5 programming model simplifies the process of creating Java applications." />
-<meta name="description" content="The Java EE 5 programming model simplifies the process of creating Java applications." />
-<meta content="Java Enterprise Edition 5, Overview" name="DC.subject" />
-<meta content="Java Enterprise Edition 5, Overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjee5overview.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cannotations.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Developing Java EE
-Applications</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Developing Java EE
-Applications</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">The Java™ EE
-5 programming model simplifies the process of creating Java applications.</p>
-
-<p class="anchor_topictop" />
-
-<p id="cjavaee5__aboutfacet"><a name="cjavaee5__aboutfacet"><!-- --></a>In the Java EE specifications, programming requirements
-have been streamlined, and XML deployment descriptors are optional.
-Instead, you can specify many details of assembly and deployment with
-Java annotations. Java EE will provide default values in many situations
-so explicitly specification of these values are not required.</p>
-
-<p>Code validation, content assistance, Quick Fixes, and refactoring
-simplify working with your code. Code validators check your projects
-for errors. When an error is found, you can double-click on it in
-the Problems view in the product workbench to go to the error location.
-For some error types, you can use a Quick Fix to correct the error
-automatically. For both Java source
-and Java annotations, you can rely on content assistance
-to simplify your programming task. When you refactor source code,
-the tools automatically update the associated metadata.</p>
-
-<div class="p">For additional information about Java EE,
-see the official specification: <ul>
-<li><strong>Java EE 5</strong>: <a href="http://jcp.org/en/jsr/detail?id=244" target="_blank">JSR 244: Java Platform, Enterprise Edition 5 (Java EE 5) Specification</a></li>
-
-<li><strong>Java EE 6</strong>: <a href="http://jcp.org/en/jsr/detail?id=316" target="_blank">JSR 316: JavaTM Platform, Enterprise Edition 6 (Java EE 6) Specification</a></li>
-
-</ul>
-</div>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjee5overview.html">Java EE 5: Overview</a></strong><br />
-Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues.</li>
-<li class="ulchildlink"><strong><a href="../topics/cannotations.html">Java EE 5 and Java EE 6 support for annotations</a></strong><br />
-The goal of Java EE 5 and Java EE 6 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 and Java EE 6 support the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java Enterprise Edition (Java EE).">Java EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita
deleted file mode 100644
index 3f4ab564f..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjcircle" xml:lang="en-us">
-<title outputclass="id_title">Cyclical dependencies between Java EE modules</title>
-<shortdesc outputclass="id_shortdesc">A cyclical dependency between two or
-more modules in an enterprise application most commonly occurs when projects
-are imported from outside the Workbench.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>dependencies<indexterm>cycles between modules</indexterm></indexterm>
-<indexterm>Java EE<indexterm>cyclical dependencies between modules</indexterm></indexterm>
-<indexterm>projects<indexterm>cyclical dependencies</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>When a cycle exists between two or more modules in an enterprise application,
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> builder
-cannot accurately compute the build order of the projects. Full builds fail
-under these conditions, or require several invocations.</p>
-<p>Therefore, the best practice is to componentize your projects or modules.
-This allows you to have your module dependencies function as a tree instead
-of a cycle diagram. This practice has the added benefit of producing a better
-factored and layered application.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html
deleted file mode 100644
index 4b215fd99..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Cyclical dependencies between Java EE modules" />
-<meta name="abstract" content="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench." />
-<meta name="description" content="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench." />
-<meta content="dependencies, cycles between modules, Java EE, cyclical dependencies between modules, projects, cyclical dependencies" name="DC.subject" />
-<meta content="dependencies, cycles between modules, Java EE, cyclical dependencies between modules, projects, cyclical dependencies" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcircleb.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjcircle" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Cyclical dependencies between Java EE modules</title>
-</head>
-<body id="cjcircle"><a name="cjcircle"><!-- --></a>
-
-
-<h1 class="id_title">Cyclical dependencies between Java EE modules</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">A cyclical dependency between two or
-more modules in an enterprise application most commonly occurs when projects
-are imported from outside the Workbench.</p>
-
-<p class="anchor_topictop" />
-
-<p>When a cycle exists between two or more modules in an enterprise application,
-the Java™ builder
-cannot accurately compute the build order of the projects. Full builds fail
-under these conditions, or require several invocations.</p>
-
-<p>Therefore, the best practice is to componentize your projects or modules.
-This allows you to have your module dependencies function as a tree instead
-of a cycle diagram. This practice has the added benefit of producing a better
-factored and layered application.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-<div><a href="../topics/tjcircleb.html" title="You can resolve cyclical dependencies after an EAR is imported.">Correcting cyclical dependencies after an EAR is imported</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.dita
deleted file mode 100644
index aca0056fd..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.dita
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjearproj" xml:lang="en-us">
-<title outputclass="id_title">Enterprise application projects</title>
-<shortdesc outputclass="id_shortdesc">An enterprise application project ties
-together the resources that are required to deploy a J2EE enterprise application.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>enterprise applications<indexterm>projects<indexterm>artifacts</indexterm></indexterm></indexterm>
-<indexterm>J2EE<indexterm>enterprise application projects<indexterm>overview</indexterm></indexterm></indexterm>
-<indexterm>projects<indexterm>enterprise applications</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>An enterprise application project contains a set of references to other
-J2EE modules and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> projects that are combined to compose an EAR file.
-These projects can be Web modules, EJB modules, application client modules,
-connector modules, general utility <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> JAR files, and EJB client JAR files.
-Enterprise application projects created in the workbench include a deployment
-descriptor, as well as files that are common to all J2EE modules that are
-defined in the deployment descriptor.</p>
-<p>When a J2EE module project is created, it can be associated with an enterprise
-application project. The project wizards aid this by allowing you to specify
-a new or existing enterprise application project. Enterprise application projects
-are exported as EAR (enterprise archive) files that include all files defined
-in the Enterprise Application project as well as the appropriate archive file
-for each J2EE module or utility JAR project defined in the deployment descriptor,
-such as Web archive (WAR) files and EJB JAR files.</p>
-<p>An enterprise application can contain utility JAR files that are to be
-used by the contained modules. This allows sharing of code at the application
-level by multiple Web, EJB, or application client modules. These JAR files
-are commonly referred to as utility JAR files. The utility JAR files defined
-for an enterprise application project can be actual JAR files in the project,
-or you can include utility <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> projects that are designated to become
-the utility JAR files during assembly and deployment.</p>
-<p>To start developing J2EE applications, you typically first create an enterprise
-application project to tie together your Web, EJB, and application client
-modules. The enterprise application project is used to compose an entire application
-from the various modules. Since no source code is built directly into an enterprise
-application, these projects are not <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> projects, and they are not compiled
-by the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> builder.</p>
-<p>When you create an enterprise application project using the workbench,
-the following key files are automatically created:<dl><dlentry outputclass="id_projectfiles_top">
-<dt>META-INF/application.xml</dt>
-<dd>This file is the deployment descriptor for the enterprise application,
-as defined in the J2EE specification, that is responsible for associating
-J2EE modules to a specific EAR file. This file is created in the <uicontrol>META-INF</uicontrol> folder.</dd>
-</dlentry><dlentry>
-<dt>.settings/.component</dt>
-<dd>This file matches the location of each module's source code to the location
-of the module at deployment. For each module included for deployment with
-the EAR file, the .component file lists its source path and deployment path.
-This file is created in the <uicontrol>.settings</uicontrol> folder.</dd>
-</dlentry><dlentry>
-<dt>.settings/org.eclipse.wst.common.project.facet.core.xml</dt>
-<dd>This file lists the facets of the enterprise application project. See <xref
-href="cfacets.dita"></xref>. This file is created in the <uicontrol>.settings</uicontrol> folder.</dd>
-</dlentry><dlentry outputclass="id_projectfiles_bottom">
-<dt>.project</dt>
-<dd>This is a workbench artifact, the standard project description file.</dd>
-</dlentry></dl></p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html
deleted file mode 100644
index 4e915f48f..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Enterprise application projects" />
-<meta name="abstract" content="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application." />
-<meta name="description" content="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application." />
-<meta content="enterprise applications, projects, artifacts, J2EE, enterprise application projects, overview" name="DC.subject" />
-<meta content="enterprise applications, projects, artifacts, J2EE, enterprise application projects, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjrar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjearproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Enterprise application projects</title>
-</head>
-<body id="cjearproj"><a name="cjearproj"><!-- --></a>
-
-
-<h1 class="id_title">Enterprise application projects</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">An enterprise application project ties
-together the resources that are required to deploy a J2EE enterprise application.</p>
-
-<p class="anchor_topictop" />
-
-<p>An enterprise application project contains a set of references to other
-J2EE modules and Java™ projects that are combined to compose an EAR file.
-These projects can be Web modules, EJB modules, application client modules,
-connector modules, general utility Java JAR files, and EJB client JAR files.
-Enterprise application projects created in the workbench include a deployment
-descriptor, as well as files that are common to all J2EE modules that are
-defined in the deployment descriptor.</p>
-
-<p>When a J2EE module project is created, it can be associated with an enterprise
-application project. The project wizards aid this by allowing you to specify
-a new or existing enterprise application project. Enterprise application projects
-are exported as EAR (enterprise archive) files that include all files defined
-in the Enterprise Application project as well as the appropriate archive file
-for each J2EE module or utility JAR project defined in the deployment descriptor,
-such as Web archive (WAR) files and EJB JAR files.</p>
-
-<p>An enterprise application can contain utility JAR files that are to be
-used by the contained modules. This allows sharing of code at the application
-level by multiple Web, EJB, or application client modules. These JAR files
-are commonly referred to as utility JAR files. The utility JAR files defined
-for an enterprise application project can be actual JAR files in the project,
-or you can include utility Java projects that are designated to become
-the utility JAR files during assembly and deployment.</p>
-
-<p>To start developing J2EE applications, you typically first create an enterprise
-application project to tie together your Web, EJB, and application client
-modules. The enterprise application project is used to compose an entire application
-from the various modules. Since no source code is built directly into an enterprise
-application, these projects are not Java projects, and they are not compiled
-by the Java builder.</p>
-
-<div class="p">When you create an enterprise application project using the workbench,
-the following key files are automatically created:<dl>
-<dt class="dlterm">META-INF/application.xml</dt>
-
-<dd>This file is the deployment descriptor for the enterprise application,
-as defined in the J2EE specification, that is responsible for associating
-J2EE modules to a specific EAR file. This file is created in the <span class="uicontrol">META-INF</span> folder.</dd>
-
-
-<dt class="dlterm">.settings/.component</dt>
-
-<dd>This file matches the location of each module's source code to the location
-of the module at deployment. For each module included for deployment with
-the EAR file, the .component file lists its source path and deployment path.
-This file is created in the <span class="uicontrol">.settings</span> folder.</dd>
-
-
-<dt class="dlterm">.settings/org.eclipse.wst.common.project.facet.core.xml</dt>
-
-<dd>This file lists the facets of the enterprise application project. See <a href="cfacets.html" title="Facets define characteristics and requirements&#10;for Java EE projects and are used as part of the runtime configuration. ">Project facets</a>. This file is created in the <span class="uicontrol">.settings</span> folder.</dd>
-
-
-<dt class="dlterm">.project</dt>
-
-<dd>This is a workbench artifact, the standard project description file.</dd>
-
-</dl>
-</div>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjrar.html" title="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs).">Creating a connector project</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita
deleted file mode 100644
index 0d62b190c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title"><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5: Overview</title>
-<shortdesc outputclass="id_shortdesc">Using the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> Platform, Enterprise Edition (<tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE)
-architecture, you can build distributed Web and enterprise applications. This
-architecture helps you focus on presentation and application issues, rather
-than on systems issues.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5</indexterm><indexterm>Oerview</indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<p>You can use the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 tools and features to create applications
-that are structured around modules with different purposes, such as Web sites
-and Enterprise <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="JavaBeans">JavaBeans</tm> (EJB) applications. When you use EJB
-3.0 components, you can create a distributed, secure application with transactional
-support. When you develop applications that access persistent data, you can
-use the new <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> Persistence API (JPA). This standard simplifies
-the creation and use of persistent entities, as well as adding new features.
-For developing presentation logic, you can use technologies such as JavaServer
-Pages (JSP) or JavaServer Faces (JSF).</p>
-<p>Using the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 5 Platform Enterprise Edition (Java EE) , you
-can develop applications more quickly and conveniently than in previous versions.
-The <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 platform replaces <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Enterprise Edition (J2EE), version
-1.4. The product tools support for both versions. Java EE 5 significantly
-enhances ease of use providing<ul>
-<li>Reduced development time</li>
-<li>Reduced application complexity</li>
-<li>Improved application performance</li>
-</ul></p>
-<p>Java EE 5 provides a simplified programming model, including the following
-tools:<ul>
-<li>Inline configuration with annotations, making deployment descriptors now
-optional</li>
-<li>Dependency injection, hiding resource creation and lookup from application
-code</li>
-<li>Java persistence API (JPA) allows data management without explicit SQL
-or JDBC</li>
-<li>Use of plain old Java objects (POJOs) for Enterprise JavaBeans and Web
-services</li>
-</ul></p>
-<p>Java EE 5 provides simplified packaging rules for enterprise applications:<ul>
-<li>Web applications us .WAR files</li>
-<li>Resource adapters use .RAR files</li>
-<li>Enterprise applications use .EAR files</li>
-<li>The <codeph>lib</codeph> directory contains shared .JAR files</li>
-<li>A .JAR file with <codeph>Main-Class</codeph> implies an application client</li>
-<li>A .JAR file with @Stateless annotation implies an EJB application</li>
-<li>Many simple applications no longer require deployment descriptors, including<ul>
-<li>EJB applications (.JAR files)</li>
-<li>Web applications that use JSP technology only</li>
-<li>Application clients</li>
-<li>Enterprise applications (.EAR files)</li>
-</ul></li>
-</ul></p>
-<p>Java EE 5 provides simplified resource access using dependency injection:<ul>
-<li>In the Dependency Injection pattern, an external entity automatically
-supplies an object's dependencies.<ul>
-<li>The object need not request these resources explicitly</li>
-</ul></li>
-<li>In Java EE 5, dependency injection can be applied to all resources that
-a component needs<ul>
-<li>Creation and lookup of resources are hidden from application code</li>
-</ul></li>
-<li>Dependency injection can be applied throughout Java EE 5 technology:<ul>
-<li>EJB containers</li>
-<li>Web containers</li>
-<li>Clients</li>
-<li>Web services</li>
-</ul></li>
-</ul></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html
deleted file mode 100644
index 09d8d6446..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Java EE 5: Overview" />
-<meta name="abstract" content="Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues." />
-<meta name="description" content="Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues." />
-<meta content="Java EE 5, Oerview" name="DC.subject" />
-<meta content="Java EE 5, Oerview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE 5: Overview</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Java EE 5: Overview</h1>
-
-
-
-<div><p class="id_shortdesc">Using the Java™ Platform, Enterprise Edition (Java EE)
-architecture, you can build distributed Web and enterprise applications. This
-architecture helps you focus on presentation and application issues, rather
-than on systems issues.</p>
-
-<p>You can use the Java EE 5 tools and features to create applications
-that are structured around modules with different purposes, such as Web sites
-and Enterprise JavaBeans™ (EJB) applications. When you use EJB
-3.0 components, you can create a distributed, secure application with transactional
-support. When you develop applications that access persistent data, you can
-use the new Java Persistence API (JPA). This standard simplifies
-the creation and use of persistent entities, as well as adding new features.
-For developing presentation logic, you can use technologies such as JavaServer
-Pages (JSP) or JavaServer Faces (JSF).</p>
-
-<div class="p">Using the Java EE 5 Platform Enterprise Edition (Java EE) , you
-can develop applications more quickly and conveniently than in previous versions.
-The Java EE
-5 platform replaces Java 2 Enterprise Edition (J2EE), version
-1.4. The product tools support for both versions. Java EE 5 significantly
-enhances ease of use providing<ul>
-<li>Reduced development time</li>
-
-<li>Reduced application complexity</li>
-
-<li>Improved application performance</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides a simplified programming model, including the following
-tools:<ul>
-<li>Inline configuration with annotations, making deployment descriptors now
-optional</li>
-
-<li>Dependency injection, hiding resource creation and lookup from application
-code</li>
-
-<li>Java persistence API (JPA) allows data management without explicit SQL
-or JDBC</li>
-
-<li>Use of plain old Java objects (POJOs) for Enterprise JavaBeans and Web
-services</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides simplified packaging rules for enterprise applications:<ul>
-<li>Web applications us .WAR files</li>
-
-<li>Resource adapters use .RAR files</li>
-
-<li>Enterprise applications use .EAR files</li>
-
-<li>The <samp class="codeph">lib</samp> directory contains shared .JAR files</li>
-
-<li>A .JAR file with <samp class="codeph">Main-Class</samp> implies an application client</li>
-
-<li>A .JAR file with @Stateless annotation implies an EJB application</li>
-
-<li>Many simple applications no longer require deployment descriptors, including<ul>
-<li>EJB applications (.JAR files)</li>
-
-<li>Web applications that use JSP technology only</li>
-
-<li>Application clients</li>
-
-<li>Enterprise applications (.EAR files)</li>
-
-</ul>
-</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides simplified resource access using dependency injection:<ul>
-<li>In the Dependency Injection pattern, an external entity automatically
-supplies an object's dependencies.<ul>
-<li>The object need not request these resources explicitly</li>
-
-</ul>
-</li>
-
-<li>In Java EE 5, dependency injection can be applied to all resources that
-a component needs<ul>
-<li>Creation and lookup of resources are hidden from application code</li>
-
-</ul>
-</li>
-
-<li>Dependency injection can be applied throughout Java EE 5 technology:<ul>
-<li>EJB containers</li>
-
-<li>Web containers</li>
-
-<li>Clients</li>
-
-<li>Web services</li>
-
-</ul>
-</li>
-
-</ul>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cjavaee5.html" title="The Java EE 5 programming model simplifies the process of creating Java applications.">Developing Java EE Applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita
deleted file mode 100644
index 408bd00e8..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjpers" xml:lang="en-us">
-<title outputclass="id_title"><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective</title>
-<shortdesc outputclass="id_shortdesc">The <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective includes workbench views
-that you can use when developing resources for enterprise applications, EJB
-modules, Web modules, application client modules, and connector projects or
-modules.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE<indexterm>workbench perspectives</indexterm></indexterm>
-<indexterm>enterprise applications<indexterm>Java EE perspective</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>You can rearrange the location, tiling, and size of the views within the
-perspective. You can also add other views to the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective by clicking <menucascade>
-<uicontrol>Window</uicontrol><uicontrol>Show View</uicontrol></menucascade> and
-selecting the view.</p>
-<p>The workbench provides synchronization between different views and editors.
-This is also true in the J2EE perspective.</p>
-<p>By default, the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective includes the following
-workbench views:</p>
-<dl><dlentry outputclass="id_perspectiveviews_top">
-<dt><uicontrol>Project Explorer</uicontrol></dt>
-<dd>The Project Explorer view provides an integrated view of your projects
-and their artifacts related to J2EE development. You can show or hide your
-projects based on working sets. This view displays navigable models of J2EE
-deployment descriptors, <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> artifacts (source folders, packages,
-and classes), navigable models of the available Web services, and specialized
-views of Web modules to simplify the development of dynamic Web applications.
-In addition, EJB database mapping and the configuration of projects for a
-J2EE application server are made readily available.</dd>
-</dlentry><dlentry>
-<dt><uicontrol> Outline</uicontrol></dt>
-<dd>The Outline view in the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective shows the outline of
-the file that you are editing. For example, if you are using a tabbed deployment
-descriptor editor, the Outline view shows the outline for the selected page's
-elements, and if you are editing on the Source tab, the outline for the XML
-source is displayed. If you are editing an enterprise bean in the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> editor,
-the Outline view shows the outline for the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> class.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Tasks</uicontrol></dt>
-<dd>The Tasks view lists the to-do items that you have entered.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Problems</uicontrol></dt>
-<dd>The Problems view displays problems, warnings, or errors associated with
-the selected project. You can double-click on an item to address the specific
-problem in the appropriate resource.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Properties</uicontrol></dt>
-<dd>The Properties view provides a tabular view of the properties and associated
-values of objects in files you have open in an editor.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Servers</uicontrol></dt>
-<dd>The Servers view shows all the created server instances. You can start
-and stop each server from this view, and you can launch the test client.</dd>
-</dlentry><dlentry outputclass="id_perspectiveviews_bottom">
-<dt><uicontrol>Snippets</uicontrol></dt>
-<dd>The Snippets view provides categorized pieces of code that you can insert
-into appropriate places in your source code.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Data Source Explorer</uicontrol></dt>
-<dd>The Data Source Explorer provides a list of configured connection profiles.
-If categories are enabled, you can see the list grouped into categories. Use
-the Data Source Explorer to connect to, navigate, and interact with resources
-associated with the selected connection profile. It also provides import and
-export capabilities to share connection profile definitions with other Eclipse
-Workbenches. </dd>
-</dlentry><dlentry>
-<dt><uicontrol>Status bar</uicontrol></dt>
-<dd>The Status bar provides a description of the location of selected objects
-in the Project Explorer views in the left side. When file and deployment descriptors
-are open, the status bar shows the read-only state of the files and the line
-and column numbers when applicable. Sometimes when long operations run, a
-status monitor will appear in the status bar, along with a button with a stop
-sign icon. Clicking the stop sign stops the operation when the operation can
-be cancelled.</dd>
-</dlentry></dl>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html
deleted file mode 100644
index 54ea3ffb7..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Java EE perspective" />
-<meta name="abstract" content="The Java EE perspective includes workbench views that you can use when developing resources for enterprise applications, EJB modules, Web modules, application client modules, and connector projects or modules." />
-<meta name="description" content="The Java EE perspective includes workbench views that you can use when developing resources for enterprise applications, EJB modules, Web modules, application client modules, and connector projects or modules." />
-<meta content="Java EE, workbench perspectives, enterprise applications, Java EE perspective" name="DC.subject" />
-<meta content="Java EE, workbench perspectives, enterprise applications, Java EE perspective" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjpers" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE perspective</title>
-</head>
-<body id="cjpers"><a name="cjpers"><!-- --></a>
-
-
-<h1 class="id_title">Java EE perspective</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">The Java™ EE perspective includes workbench views
-that you can use when developing resources for enterprise applications, EJB
-modules, Web modules, application client modules, and connector projects or
-modules.</p>
-
-<p class="anchor_topictop" />
-
-<p>You can rearrange the location, tiling, and size of the views within the
-perspective. You can also add other views to the Java EE perspective by clicking <span class="menucascade">
-<span class="uicontrol">Window</span> &gt; <span class="uicontrol">Show View</span></span> and
-selecting the view.</p>
-
-<p>The workbench provides synchronization between different views and editors.
-This is also true in the J2EE perspective.</p>
-
-<p>By default, the Java EE perspective includes the following
-workbench views:</p>
-
-<dl>
-<dt class="dlterm"><span class="uicontrol">Project Explorer</span></dt>
-
-<dd>The Project Explorer view provides an integrated view of your projects
-and their artifacts related to J2EE development. You can show or hide your
-projects based on working sets. This view displays navigable models of J2EE
-deployment descriptors, Java artifacts (source folders, packages,
-and classes), navigable models of the available Web services, and specialized
-views of Web modules to simplify the development of dynamic Web applications.
-In addition, EJB database mapping and the configuration of projects for a
-J2EE application server are made readily available.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol"> Outline</span></dt>
-
-<dd>The Outline view in the Java EE perspective shows the outline of
-the file that you are editing. For example, if you are using a tabbed deployment
-descriptor editor, the Outline view shows the outline for the selected page's
-elements, and if you are editing on the Source tab, the outline for the XML
-source is displayed. If you are editing an enterprise bean in the Java editor,
-the Outline view shows the outline for the Java class.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Tasks</span></dt>
-
-<dd>The Tasks view lists the to-do items that you have entered.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Problems</span></dt>
-
-<dd>The Problems view displays problems, warnings, or errors associated with
-the selected project. You can double-click on an item to address the specific
-problem in the appropriate resource.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Properties</span></dt>
-
-<dd>The Properties view provides a tabular view of the properties and associated
-values of objects in files you have open in an editor.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Servers</span></dt>
-
-<dd>The Servers view shows all the created server instances. You can start
-and stop each server from this view, and you can launch the test client.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Snippets</span></dt>
-
-<dd>The Snippets view provides categorized pieces of code that you can insert
-into appropriate places in your source code.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Data Source Explorer</span></dt>
-
-<dd>The Data Source Explorer provides a list of configured connection profiles.
-If categories are enabled, you can see the list grouped into categories. Use
-the Data Source Explorer to connect to, navigate, and interact with resources
-associated with the selected connection profile. It also provides import and
-export capabilities to share connection profile definitions with other Eclipse
-Workbenches. </dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Status bar</span></dt>
-
-<dd>The Status bar provides a description of the location of selected objects
-in the Project Explorer views in the left side. When file and deployment descriptors
-are open, the status bar shows the read-only state of the files and the line
-and column numbers when applicable. Sometimes when long operations run, a
-status monitor will appear in the status bar, along with a button with a stop
-sign icon. Clicking the stop sign stops the operation when the operation can
-be cancelled.</dd>
-
-</dl>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm">Working sets</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.dita
deleted file mode 100644
index 8ca49e104..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.dita
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjview" xml:lang="en-us">
-<title outputclass="id_title">Project Explorer view in the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-perspective</title>
-<shortdesc outputclass="id_shortdesc">While developing J2EE applications in
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-perspective, the Project Explorer view is your main view of your J2EE projects
-and resources.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>views<indexterm>Project Explorer</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>The Project Explorer view provides an integrated view of all project resources,
-including models of J2EE deployment descriptors, <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> artifacts, resources, Web services,
-databases, and dynamic Web project artifacts.</p>
-<p>You should use this view to work with your J2EE deployment descriptors
-and their content. You can view an enterprise application project and see
-all of the modules associated with it. </p>
-<p>You can also filter what you see in the Project Explorer view to hide projects,
-folders, or files that you don't want to see. To enable or disable filters,
-select <uicontrol>Customize View...</uicontrol> from the drop-down menu at
-the top right corner of the view. For more information, see <xref href="cjviewfilters.dita">Filters
-in the Project Explorer view</xref>.</p>
-<p>Alternately, you can filter what you see by showing or hiding working sets,
-groups of related resources or projects. For more information, see <xref format="html"
-href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" scope="peer">Working
-Sets<desc></desc></xref>.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html
deleted file mode 100644
index d9ba4d280..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Project Explorer view in the Java EE perspective" />
-<meta name="abstract" content="While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources." />
-<meta name="description" content="While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources." />
-<meta content="views, Project Explorer" name="DC.subject" />
-<meta content="views, Project Explorer" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjviewfilters.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjview" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Project Explorer view in the Java EE
-perspective</title>
-</head>
-<body id="cjview"><a name="cjview"><!-- --></a>
-
-
-<h1 class="id_title">Project Explorer view in the Java EE
-perspective</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">While developing J2EE applications in
-the Java™ EE
-perspective, the Project Explorer view is your main view of your J2EE projects
-and resources.</p>
-
-<p class="anchor_topictop" />
-
-<p>The Project Explorer view provides an integrated view of all project resources,
-including models of J2EE deployment descriptors, Java artifacts, resources, Web services,
-databases, and dynamic Web project artifacts.</p>
-
-<p>You should use this view to work with your J2EE deployment descriptors
-and their content. You can view an enterprise application project and see
-all of the modules associated with it. </p>
-
-<p>You can also filter what you see in the Project Explorer view to hide projects,
-folders, or files that you don't want to see. To enable or disable filters,
-select <span class="uicontrol">Customize View...</span> from the drop-down menu at
-the top right corner of the view. For more information, see <a href="cjviewfilters.html">Filters in the Project Explorer view</a>.</p>
-
-<p>Alternately, you can filter what you see by showing or hiding working sets,
-groups of related resources or projects. For more information, see <a href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" title="">Working Sets</a>.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjviewfilters.html" title="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see.">Filtering in the Project Explorer view</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm">Working sets</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.dita
deleted file mode 100644
index be377a148..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjviewfilters" xml:lang="en-us">
-<title outputclass="id_title">Filters in the Project Explorer view</title>
-<shortdesc outputclass="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>filters<indexterm>Project Explorer view</indexterm></indexterm>
-<indexterm>views<indexterm>Project Explorer filters</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>To enable or disable filters, complete the following steps:<ol>
-<li>Open the Select Common Navigator Filters window by selecting <uicontrol>Customize
-View...</uicontrol> from the drop-down menu at the top right corner of the
-view.</li>
-<li>On the <uicontrol>Filters</uicontrol> tab, select the check boxes next
-to the filters you want to enable. For example, when the <uicontrol>Closed
- projects</uicontrol> filter is enabled, closed projects are not shown in
-the  Project Explorer view. Other filters can hide empty packages, non-java
-files, and files with names ending in ".class".</li>
-<li>On the Available Extensions and Filters tab, the filters work in the opposite
-way: the selected check boxes describe the projects, folders, and files that
-are shown in the Project Explorer view. For example, if you clear the checkbox
-next to <uicontrol>J2EE Deployment Descriptors</uicontrol>, the deployment
-descriptors are hidden from each project in the view.</li>
-</ol></p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.html
deleted file mode 100644
index bdd09290c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Filters in the Project Explorer view" />
-<meta name="abstract" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta name="description" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta content="filters, Project Explorer view, views, Project Explorer filters" name="DC.subject" />
-<meta content="filters, Project Explorer view, views, Project Explorer filters" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjviewfilters" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Filters in the Project Explorer view</title>
-</head>
-<body id="cjviewfilters"><a name="cjviewfilters"><!-- --></a>
-
-
-<h1 class="id_title">Filters in the Project Explorer view</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</p>
-
-<p class="anchor_topictop" />
-
-<div class="p">To enable or disable filters, complete the following steps:<ol>
-<li>Open the Select Common Navigator Filters window by selecting <span class="uicontrol">Customize
-View...</span> from the drop-down menu at the top right corner of the
-view.</li>
-
-<li>On the <span class="uicontrol">Filters</span> tab, select the check boxes next
-to the filters you want to enable. For example, when the <span class="uicontrol">Closed
- projects</span> filter is enabled, closed projects are not shown in
-the  Project Explorer view. Other filters can hide empty packages, non-java
-files, and files with names ending in ".class".</li>
-
-<li>On the Available Extensions and Filters tab, the filters work in the opposite
-way: the selected check boxes describe the projects, folders, and files that
-are shown in the Project Explorer view. For example, if you clear the checkbox
-next to <span class="uicontrol">J2EE Deployment Descriptors</span>, the deployment
-descriptors are hidden from each project in the view.</li>
-
-</ol>
-</div>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita
deleted file mode 100644
index 05e2c23a9..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<?Pub Sty _display FontColor="red"?>
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title">Types of annotations</title>
-<shortdesc outputclass="id_shortdesc"><tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-6 and Java EE 5 define a number of types or groups of annotations,
-defined in a number of <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Specification
-Requests (JSRs).</shortdesc><?Pub Caret 32?>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5<indexterm>annotations<indexterm>types</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>For additional information on <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-6.0, see the official specification: <xref
-href="http://jcp.org/en/jsr/detail?id=316" scope="external">JSR 316:
-JavaTM Platform, Enterprise Edition 6 (Java EE 6) Specification</xref></p>
-<p><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 5 defines the following types of annotations:</p>
-<ul>
-<li>JSR 250: Common annotations<b></b></li>
-<li>JSR-220: EJB 3.0 annotations</li>
-<li>JSR-181: Web Services annotations</li>
-<li>JSR-220: Java Persistence API annotations</li>
-<li>JSR-222: JaxB annotations</li>
-<li>JSR-224: WS2 annotations</li>
-</ul>
-<p>For additional information on <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5.0, see the official specification: <xref
-href="http://jcp.org/en/jsr/detail?id=244" scope="external">JSR 244: <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> Platform, Enterprise Edition 5 (<tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 5) Specification</xref></p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
-<?Pub *0000002199?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html
deleted file mode 100644
index 78b94d7ab..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Types of annotations" />
-<meta name="abstract" content="Java EE 6 and Java EE 5 define a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs)." />
-<meta name="description" content="Java EE 6 and Java EE 5 define a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs)." />
-<meta content="Java EE 5, annotations, types" name="DC.subject" />
-<meta content="Java EE 5, annotations, types" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tdefiningannotations.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Types of annotations</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Types of annotations</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">Java™ EE
-6 and Java EE 5 define a number of types or groups of annotations,
-defined in a number of Java Specification
-Requests (JSRs).</p>
-
-<p class="anchor_topictop" />
-
-<p>For additional information on Java EE
-6.0, see the official specification: <a href="http://jcp.org/en/jsr/detail?id=316" target="_blank">JSR 316: JavaTM Platform, Enterprise Edition 6 (Java EE 6) Specification</a></p>
-
-<p>Java EE 5 defines the following types of annotations:</p>
-
-<ul>
-<li>JSR 250: Common annotations<strong /></li>
-
-<li>JSR-220: EJB 3.0 annotations</li>
-
-<li>JSR-181: Web Services annotations</li>
-
-<li>JSR-220: Java Persistence API annotations</li>
-
-<li>JSR-222: JaxB annotations</li>
-
-<li>JSR-224: WS2 annotations</li>
-
-</ul>
-
-<p>For additional information on Java EE
-5.0, see the official specification: <a href="http://jcp.org/en/jsr/detail?id=244" target="_blank">JSR 244: Java Platform, Enterprise Edition 5 (Java EE 5) Specification</a></p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tdefiningannotations.html" title="You can use the @Interface annotation to define your own annotation definition.">Defining and using annotations</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.dita
deleted file mode 100644
index 833c39f3c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.dita
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="ph-importexport" xml:lang="en-us">
-<title outputclass="id_title">Importing and exporting projects and files</title>
-<shortdesc outputclass="id_shortdesc">These topics cover how to import files
-and projects into the workbench and export files and projects to disk.</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html
deleted file mode 100644
index 836ce484a..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Importing and exporting projects and files" />
-<meta name="abstract" content="These topics cover how to import files and projects into the workbench and export files and projects to disk." />
-<meta name="description" content="These topics cover how to import files and projects into the workbench and export files and projects to disk." />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexprar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimprar.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.webtools.doc.user/topics/twimpwar.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.webtools.doc.user/topics/twcrewar.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ejb.doc.user/topics/teimp.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ejb.doc.user/topics/teexp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjcircle.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcircleb.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ph-importexport" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing and exporting projects and files</title>
-</head>
-<body id="ph-importexport"><a name="ph-importexport"><!-- --></a>
-
-
-<h1 class="id_title">Importing and exporting projects and files</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">These topics cover how to import files
-and projects into the workbench and export files and projects to disk.</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tjexpapp.html">Exporting an application client project</a></strong><br />
-You can export an application client project as a JAR file.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjexpear.html">Exporting an enterprise application into an EAR file</a></strong><br />
-Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjexprar.html">Exporting connector projects to RAR files</a></strong><br />
-You can export a connector project to a RAR file in preparation for deploying it to a server.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjimpear.html">Importing an enterprise application EAR file</a></strong><br />
-Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjimpapp.html">Importing an application client JAR file</a></strong><br />
-Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjimprar.html">Importing a connector project RAR file</a></strong><br />
-Connector projects are deployed into RAR files. You can import a connector project by importing a deployed RAR file.</li>
-<li class="ulchildlink"><strong><a href="../../org.eclipse.wst.webtools.doc.user/topics/twimpwar.html">Importing Web archive (WAR) files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../../org.eclipse.wst.webtools.doc.user/topics/twcrewar.html">Exporting Web Archive (WAR) files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../../org.eclipse.jst.ejb.doc.user/topics/teimp.html">Importing EJB JAR files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../../org.eclipse.jst.ejb.doc.user/topics/teexp.html">Exporting EJB projects to EJB JAR files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../topics/cjcircle.html">Cyclical dependencies between Java EE modules</a></strong><br />
-A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjcircleb.html">Correcting cyclical dependencies after an EAR is imported</a></strong><br />
-You can resolve cyclical dependencies after an EAR is imported.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita
deleted file mode 100644
index 5f6b4eb6e..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="ph-j2eeapp" xml:lang="en-us">
-<title outputclass="id_title">Java EE applications</title>
-<shortdesc outputclass="id_shortdesc">These topics deal with the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Enterprise
-Edition (Java EE).</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html
deleted file mode 100644
index 4c1f4ab84..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Java EE applications" />
-<meta name="abstract" content="These topics deal with the Java Enterprise Edition (Java EE)." />
-<meta name="description" content="These topics deal with the Java Enterprise Edition (Java EE)." />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjpers.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjview.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjviewfilters.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-ref.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ph-j2eeapp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE applications</title>
-</head>
-<body id="ph-j2eeapp"><a name="ph-j2eeapp"><!-- --></a>
-
-
-<h1 class="id_title">Java EE applications</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">These topics deal with the Java™ Enterprise
-Edition (Java EE).</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjavaee5.html">Developing Java EE Applications</a></strong><br />
-The Java EE 5 programming model simplifies the process of creating Java applications.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjarch.html">J2EE architecture</a></strong><br />
-The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjpers.html">Java EE perspective</a></strong><br />
-The Java EE perspective includes workbench views that you can use when developing resources for enterprise applications, EJB modules, Web modules, application client modules, and connector projects or modules.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjview.html">Project Explorer view in the Java EE perspective</a></strong><br />
-While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjviewfilters.html">Filtering in the Project Explorer view</a></strong><br />
-You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see.</li>
-<li class="ulchildlink"><strong><a href="../topics/ph-projects.html">Working with projects</a></strong><br />
-The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjval.html">Validating code in enterprise applications</a></strong><br />
-The workbench includes validators that check certain files in your enterprise application module projects for errors.</li>
-<li class="ulchildlink"><strong><a href="../topics/ph-ref.html">Reference</a></strong><br />
-The following reference material on J2EE is available:</li>
-</ul>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.dita
deleted file mode 100644
index 57572fa5e..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.dita
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="phprojects" xml:lang="en-us">
-<title outputclass="id_title">Working with projects</title>
-<shortdesc outputclass="id_shortdesc">The workbench can work with many different
-types of projects. The following topics cover creating and managing some of
-the types of projects related to J2EE development.</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html
deleted file mode 100644
index da1702302..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Working with projects" />
-<meta name="abstract" content="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development." />
-<meta name="description" content="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development." />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjrar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcreatingawebproject.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twebfragproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjtargetserver.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="phprojects" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with projects</title>
-</head>
-<body id="phprojects"><a name="phprojects"><!-- --></a>
-
-
-<h1 class="id_title">Working with projects</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">The workbench can work with many different
-types of projects. The following topics cover creating and managing some of
-the types of projects related to J2EE development.</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjearproj.html">Enterprise application projects</a></strong><br />
-An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjappcliproj.html">Application client projects</a></strong><br />
-Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjear.html">Creating an enterprise application project</a></strong><br />
-Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjappproj.html">Creating an application client project</a></strong><br />
-You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjrar.html">Creating a connector project</a></strong><br />
-A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs).</li>
-<li class="ulchildlink"><strong><a href="../topics/tcreatingawebproject.html">Creating Web projects</a></strong><br />
-You can use wizards to create Web modules in your Java EE project.</li>
-<li class="ulchildlink"><strong><a href="../topics/twebfragproj.html">Creating Web fragment projects</a></strong><br />
-You can use the Web fragment project wizard to create Web fragment projects in your workspace.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjtargetserver.html">Specifying target servers for J2EE projects</a></strong><br />
-When you develop J2EE applications, you can specify the server runtime environments for your J2EE projects. The target server is specified during project creation and import, and it can be changed in the project properties. The target server setting is the default mechanism for setting the class path for J2EE projects.</li>
-<li class="ulchildlink"><strong><a href="../topics/cfacets.html">Project facets</a></strong><br />
-Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.</li>
-<li class="ulchildlink"><strong><a href="../topics/ph-importexport.html">Importing and exporting projects and files</a></strong><br />
-These topics cover how to import files and projects into the workbench and export files and projects to disk.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java Enterprise Edition (Java EE).">Java EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.dita
deleted file mode 100644
index 71f8c8c2b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.dita
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="ph-ref" xml:lang="en-us">
-<title outputclass="id_title">Reference</title>
-<shortdesc outputclass="id_shortdesc">The following reference material on
-J2EE is available:</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html
deleted file mode 100644
index f7ba46ea4..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Reference" />
-<meta name="abstract" content="The following reference material on J2EE is available:" />
-<meta name="description" content="The following reference material on J2EE is available:" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rjlimitcurrent.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ph-ref" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Reference</title>
-</head>
-<body id="ph-ref"><a name="ph-ref"><!-- --></a>
-
-
-<h1 class="id_title">Reference</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">The following reference material on
-J2EE is available:</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/rvalidators.html">J2EE Validators</a></strong><br />
-This table lists the validators that are available for the different project types and gives a brief description of each validator.</li>
-<li class="ulchildlink"><strong><a href="../topics/rvalerr.html">Common validation errors and solutions</a></strong><br />
-This table lists the common error messages you may encounter when you validate your projects.</li>
-<li class="ulchildlink"><strong><a href="../topics/rjlimitcurrent.html">Limitations of J2EE development tools</a></strong><br />
-This topic outlines current known limitations and restrictions for J2EE tooling.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java Enterprise Edition (Java EE).">Java EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.dita
deleted file mode 100644
index 9cbad0940..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.dita
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rjlimitcurrent" xml:lang="en-us">
-<title outputclass="id_title">Limitations of J2EE development tools</title>
-<shortdesc outputclass="id_shortdesc">This topic outlines current known limitations
-and restrictions for J2EE tooling.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>J2EE<indexterm>tool limitations</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<refbody outputclass="id_refbody">
-<section outputclass="id_spacesLimitation"><p outputclass="anchor_topictop"></p><title>Spaces
-not supported in JAR URIs within an enterprise application</title>Spaces are
-not supported in the URI for modules or utility JAR files in an enterprise
-application. The "Class-Path:" attribute of a MANIFEST.MF file in a JAR file
-or module is a space-delimited list of relative paths within an enterprise
-application. A JAR file would not be able to reference another JAR file in
-the EAR if the URI of the referenced JAR file contained spaces.</section>
-<section outputclass="id_EARDBCSLimitation"><title>Enterprise application
-project names should not contain DBCS characters</title><p id="limitation_ear_dbcs">When
-you create an enterprise application project, it is recommended that you do
-not give it a name that contains double-byte character set (DBCS) characters.</p></section>
-<section outputclass="id_utilityJARLimitation"><title><tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build
-path updates when removing the dependency on a Utility JAR file</title>When
-removing the dependency on a Utility JAR, the corresponding <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> project
-will be removed from the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> build path only if the dependent JAR
-is still referenced by the EAR project. For example, suppose you create a
-J2EE 1.3 Web project and EAR along with the JUnit <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> Example project. Next, add the JUnit
-project as a Utility JAR in the EAR, then add JUnit as a <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> JAR
-Dependency of the Web project. If you then wanted to remove the dependency
-between JUnit and the Web project, remove the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> JAR Dependency from the Web project
-first, then remove the Utility JAR from the EAR. Follow this order to ensure
-that this works correctly.</section>
-<section outputclass="id_JARdepLimitation"><title><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> JAR Dependencies page fails to update <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build
-path</title>The <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> JAR Dependencies page is not synchronized with
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build
-path page in the project properties dialog. Therefore, a change applied in
-one may not be reflected in the other within the same dialog session. There
-are also some instances where flipping back and forth between the pages will
-cause the update from one to cancel out the update from another when the <uicontrol>OK</uicontrol> button
-is clicked or if the <uicontrol>Apply</uicontrol> button is clicked prior
-to the <uicontrol>OK</uicontrol> button. Typically this will appear as if
-a JAR dependency was added, but the project did not get added to the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build
-path. The workaround is to reopen the properties dialogs, switch to the JAR
-dependency page, clear and re-select the dependent JAR files, then click <uicontrol>OK</uicontrol>.</section>
-<section outputclass="id_locationLimitation"><title>'Invalid project description'
-error when using a non-default project location for a new J2EE project</title>When
-you create a new J2EE project (including <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm>, enterprise application, Dynamic Web,
-EJB, application client, and connector projects), you cannot use a project
-location that is already used by another project in the workbench. If you
-choose a project location that is used by another project, the wizard displays
-an "Invalid project description" error dialog or message. If after you receive
-this message you then select a valid project location by clicking the Browse
-button, the project creation will still not finish. The workaround is to click
-Cancel and reopen the project creation wizard.</section>
-<example outputclass="anchor_topicbottom"></example>
-</refbody>
-</reference>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html
deleted file mode 100644
index c055e4487..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Limitations of J2EE development tools" />
-<meta name="abstract" content="This topic outlines current known limitations and restrictions for J2EE tooling." />
-<meta name="description" content="This topic outlines current known limitations and restrictions for J2EE tooling." />
-<meta content="J2EE, tool limitations" name="DC.subject" />
-<meta content="J2EE, tool limitations" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rjlimitcurrent" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Limitations of J2EE development tools</title>
-</head>
-<body id="rjlimitcurrent"><a name="rjlimitcurrent"><!-- --></a>
-
-
-<h1 class="id_title">Limitations of J2EE development tools</h1>
-
-
-
-<div class="id_refbody"><p class="id_shortdesc">This topic outlines current known limitations
-and restrictions for J2EE tooling.</p>
-
-<div class="id_spacesLimitation"><h4 class="sectiontitle">Spaces
-not supported in JAR URIs within an enterprise application</h4><p class="anchor_topictop" />
-Spaces are
-not supported in the URI for modules or utility JAR files in an enterprise
-application. The "Class-Path:" attribute of a MANIFEST.MF file in a JAR file
-or module is a space-delimited list of relative paths within an enterprise
-application. A JAR file would not be able to reference another JAR file in
-the EAR if the URI of the referenced JAR file contained spaces.</div>
-
-<div class="id_EARDBCSLimitation"><h4 class="sectiontitle">Enterprise application
-project names should not contain DBCS characters</h4><p id="rjlimitcurrent__limitation_ear_dbcs"><a name="rjlimitcurrent__limitation_ear_dbcs"><!-- --></a>When
-you create an enterprise application project, it is recommended that you do
-not give it a name that contains double-byte character set (DBCS) characters.</p>
-</div>
-
-<div class="id_utilityJARLimitation"><h4 class="sectiontitle">Java™ build
-path updates when removing the dependency on a Utility JAR file</h4>When
-removing the dependency on a Utility JAR, the corresponding Java project
-will be removed from the Java build path only if the dependent JAR
-is still referenced by the EAR project. For example, suppose you create a
-J2EE 1.3 Web project and EAR along with the JUnit Java Example project. Next, add the JUnit
-project as a Utility JAR in the EAR, then add JUnit as a Java JAR
-Dependency of the Web project. If you then wanted to remove the dependency
-between JUnit and the Web project, remove the Java JAR Dependency from the Web project
-first, then remove the Utility JAR from the EAR. Follow this order to ensure
-that this works correctly.</div>
-
-<div class="id_JARdepLimitation"><h4 class="sectiontitle">Java JAR Dependencies page fails to update Java build
-path</h4>The Java JAR Dependencies page is not synchronized with
-the Java build
-path page in the project properties dialog. Therefore, a change applied in
-one may not be reflected in the other within the same dialog session. There
-are also some instances where flipping back and forth between the pages will
-cause the update from one to cancel out the update from another when the <span class="uicontrol">OK</span> button
-is clicked or if the <span class="uicontrol">Apply</span> button is clicked prior
-to the <span class="uicontrol">OK</span> button. Typically this will appear as if
-a JAR dependency was added, but the project did not get added to the Java build
-path. The workaround is to reopen the properties dialogs, switch to the JAR
-dependency page, clear and re-select the dependent JAR files, then click <span class="uicontrol">OK</span>.</div>
-
-<div class="id_locationLimitation"><h4 class="sectiontitle">'Invalid project description'
-error when using a non-default project location for a new J2EE project</h4>When
-you create a new J2EE project (including Java, enterprise application, Dynamic Web,
-EJB, application client, and connector projects), you cannot use a project
-location that is already used by another project in the workbench. If you
-choose a project location that is used by another project, the wizard displays
-an "Invalid project description" error dialog or message. If after you receive
-this message you then select a valid project location by clicking the Browse
-button, the project creation will still not finish. The workaround is to click
-Cancel and reopen the project creation wizard.</div>
-
-<div class="anchor_topicbottom" />
-
-</div>
-
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.dita
deleted file mode 100644
index fd4f2de31..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.dita
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rtunevalidat" xml:lang="en-us">
-<title>Tuning validators</title>
-<shortdesc>Whether or not a validator validates a particular resource depends
-on the filters that are in place for that validator.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>code validation<indexterm>tuning</indexterm></indexterm>
-<indexterm>validation<indexterm>tuning</indexterm></indexterm></keywords>
-</metadata></prolog>
-<refbody>
-<section><p>When a validator is first developed, the implementer of the validator
-defines a default set of filters. These filters may be based on:<ul>
-<li>file extensions</li>
-<li>folder of file names</li>
-<li>project natures</li>
-<li>project facets</li>
-<li>content types</li>
-</ul>Through the Validation Filters dialog, you are able to further tune these
-settings.Normally you would simply keep the defaults, however two reasons
-why you may want to tune validation are:<ul>
-<li>Performance: if you have a very large workspace, you could reduce the
-amount of validation.</li>
-<li>Non standard conventions: if you use a  non standard naming convention
-(for example stores XML in files with an .acme-xml extension), you could still
-enable the appropriate validators to run against those files.</li>
-</ul>You can access this dialog by clicking <menucascade><uicontrol>Window</uicontrol>
-<uicontrol>Preferences</uicontrol><uicontrol>Validation</uicontrol></menucascade> and
-then clicking <uicontrol>Settings</uicontrol> beside each validator.</p><p>Filters
-are stored in groups. There are two types of groups: Include groups and Exclude
-groups. You can have as many Include groups as you like. Filters inside of
-an Include group cause resources to be validated. If any rule matches then
-the entire group matches. Inside of a group the filter rules are OR’d together.
-However individual Include groups are AND’ed together. You can have one Exclude
-group. If any of its filter rules match, then the resource is excluded. Exclusion
-takes precedence over inclusion.</p></section>
-<example><p>These rules are illustrated with this hypothetical example:<image
-href="../images/validatefilters.jpg" placement="break"><alt>screen capture
-of the validation filters panel showing include and exclude groups</alt></image><ul>
-<li>If the resource is in the disabled folder, it will be excluded because
-exclusion takes precedence over everything else.</li>
-<li>If the resource does not have the JSP source content type, and it does
-not have the JSP fragment source content type, and it does not have a file
-extension of .jsp or .jspf then it will be excluded because none of the rules
-in the first group matched.</li>
-<li>If the project does not have the module core nature then it will be excluded
-because the single rule in the second group did not match.</li>
-<li>Otherwise the resource will be validated by this particular validator.</li>
-</ul>To add a rule to a group, select the group on the left, and click <uicontrol>Add
-Rule</uicontrol>.</p></example>
-</refbody>
-</reference>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html
deleted file mode 100644
index 635049ff3..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Tuning validators" />
-<meta name="abstract" content="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator." />
-<meta name="description" content="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator." />
-<meta content="code validation, tuning, validation" name="DC.subject" />
-<meta content="code validation, tuning, validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rtunevalidat" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Tuning validators</title>
-</head>
-<body id="rtunevalidat"><a name="rtunevalidat"><!-- --></a>
-
-
-<h1 class="topictitle1">Tuning validators</h1>
-
-
-
-<div><p>Whether or not a validator validates a particular resource depends
-on the filters that are in place for that validator.</p>
-
-<div class="section"><div class="p">When a validator is first developed, the implementer of the validator
-defines a default set of filters. These filters may be based on:<ul>
-<li>file extensions</li>
-
-<li>folder of file names</li>
-
-<li>project natures</li>
-
-<li>project facets</li>
-
-<li>content types</li>
-
-</ul>
-Through the Validation Filters dialog, you are able to further tune these
-settings.Normally you would simply keep the defaults, however two reasons
-why you may want to tune validation are:<ul>
-<li>Performance: if you have a very large workspace, you could reduce the
-amount of validation.</li>
-
-<li>Non standard conventions: if you use a  non standard naming convention
-(for example stores XML in files with an .acme-xml extension), you could still
-enable the appropriate validators to run against those files.</li>
-
-</ul>
-You can access this dialog by clicking <span class="menucascade"><span class="uicontrol">Window</span>
- &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Validation</span></span> and
-then clicking <span class="uicontrol">Settings</span> beside each validator.</div>
-<p>Filters
-are stored in groups. There are two types of groups: Include groups and Exclude
-groups. You can have as many Include groups as you like. Filters inside of
-an Include group cause resources to be validated. If any rule matches then
-the entire group matches. Inside of a group the filter rules are OR’d together.
-However individual Include groups are AND’ed together. You can have one Exclude
-group. If any of its filter rules match, then the resource is excluded. Exclusion
-takes precedence over inclusion.</p>
-</div>
-
-<div class="example"><div class="p">These rules are illustrated with this hypothetical example:<br /><img src="../images/validatefilters.jpg" alt="screen capture&#10;of the validation filters panel showing include and exclude groups" /><br /><ul>
-<li>If the resource is in the disabled folder, it will be excluded because
-exclusion takes precedence over everything else.</li>
-
-<li>If the resource does not have the JSP source content type, and it does
-not have the JSP fragment source content type, and it does not have a file
-extension of .jsp or .jspf then it will be excluded because none of the rules
-in the first group matched.</li>
-
-<li>If the project does not have the module core nature then it will be excluded
-because the single rule in the second group did not match.</li>
-
-<li>Otherwise the resource will be validated by this particular validator.</li>
-
-</ul>
-To add a rule to a group, select the group on the left, and click <span class="uicontrol">Add
-Rule</span>.</div>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.dita
deleted file mode 100644
index b4c14dfa5..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.dita
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rvalerr" xml:lang="en-us">
-<title outputclass="id_title">Common validation errors and solutions</title>
-<shortdesc outputclass="id_shortdesc">This table lists the common error messages<?Pub Caret?>
-you may encounter when you validate your projects.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>code validation<indexterm>error solutions</indexterm></indexterm>
-<indexterm>validation<indexterm>error solutions</indexterm></indexterm></keywords>
-</metadata></prolog>
-<refbody outputclass="id_refbody">
-<example outputclass="anchor_topictop"></example>
-<table frame="all">
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="col1" colwidth="60*"/>
-<colspec colname="col2" colwidth="72*"/><colspec colname="col3" colwidth="164*"/>
-<thead>
-<row outputclass="id_tableHeadRow">
-<entry>Message prefix</entry>
-<entry>Message</entry>
-<entry>Explanation</entry>
-</row>
-</thead>
-<tbody>
-<row outputclass="id_appclientValidator">
-<entry nameend="col3" namest="col1"><uicontrol>Application Client validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ1000">
-<entry colname="col1">CHKJ1000</entry>
-<entry colname="col2">Validation failed because the application client file
-is not valid. Ensure that the deployment descriptor is valid.</entry>
-<entry colname="col3">The application-client.xml file cannot be loaded. The
-project metadata cannot be initialized from the application-client.xml file.
-  <ol>
-<li>Ensure the following:  <ul>
-<li>that the META-INF folder exists in the application client project</li>
-<li>that META-INF contains the application-client.xml file</li>
-<li>that META-INF is in the project's classpath.</li>
-</ul>  </li>
-<li>Validate the syntax of the application-client.xml file: in the Navigator
-view, highlight the application-client.xml file, right-click, and select <uicontrol>Validate
-XML file</uicontrol>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol> </entry>
-</row>
-<row outputclass="id_EARValidator">
-<entry nameend="col3" namest="col1"><uicontrol>EAR validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ1001">
-<entry colname="col1">CHKJ1001</entry>
-<entry colname="col2">The EAR project {0} is invalid.</entry>
-<entry colname="col3">The application.xml file cannot be loaded. The project
-metadata cannot be initialized from the application.xml file.  <ol>
-<li>Ensure the following:  <ul>
-<li>that the META-INF folder exists in the EAR project</li>
-<li>that META-INF contains <codeph>application.xml</codeph></li>
-<li>that META-INF is in the project's classpath.</li>
-</ul>  </li>
-<li>Validate the syntax of the application.xml file: in the Navigator view,
-highlight the application.xml file, right-click, and select <uicontrol>Validate
-XML file</uicontrol>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol></entry>
-</row>
-<row outputclass="id_EJBValidator">
-<entry nameend="col3" namest="col1"><uicontrol>EJB validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ2019">
-<entry>CHKJ2019</entry>
-<entry>The {0} key class must be serializable at runtime. </entry>
-<entry morerows="2">The EJB is compliant with the EJB specification. This
-message is a warning that problems may occur. The warning appears when a type
-needs to be serializable at runtime and when serializability cannot be verified
-at compile-time. A type is serializable if, at runtime, it is a primitive
-type, a primitive array, a remote object, or if it implements java.io.Serializable.
-This message flags java.lang.Object and it cannot be disabled. You can either
-make the object serializable at compile-time or ignore the warning. </entry>
-</row>
-<row outputclass="id_CHKJ2412">
-<entry>CHKJ2412</entry>
-<entry>The return type must be serializable at runtime. </entry>
-</row>
-<row outputclass="id_CHKJ2413">
-<entry>CHKJ2413</entry>
-<entry>Argument {1} of {0} must be serializable at runtime.</entry>
-</row>
-<row outputclass="id_CHKJ2102">
-<entry>CHKJ2102</entry>
-<entry>Either a finder descriptor, or a matching custom finder method on the
-{0} class, must be defined.</entry>
-<entry>A finder descriptor must exist for every finder method. </entry>
-</row>
-<row outputclass="id_CHKJ2873">
-<entry>CHKJ2873</entry>
-<entry>Migrate this bean's datasource binding to a CMP Connection Factory
-binding.</entry>
-<entry></entry>
-</row>
-<row outputclass="id_CHKJ2874">
-<entry>CHKJ2874</entry>
-<entry>Migrate this EJB module's default datasource binding to a default CMP
-Connection Factory binding.</entry>
-<entry></entry>
-</row>
-<row outputclass="id_CHKJ2875E">
-<entry colname="col1">CHKJ2875E       </entry>
-<entry colname="col2">&lt;ejb-client-jar> {0} must exist in every EAR file
-that contains this EJB module.</entry>
-<entry colname="col3">If <codeph>&lt;ejb-client-jar></codeph> is specified
-in <filepath>ejb-jar.xml</filepath>, a corresponding EJB client project must
-contain the home and remote interfaces and any other types that a client will
-need. If these types are all contained in a single EJB project, delete the <codeph>&lt;ejb-client-jar></codeph> line
-in the deployment descriptor. Otherwise, ensure that the EJB client project
-exists, is open, and is a project utility JAR in every EAR that uses this
-EJB project as a module.</entry>
-</row>
-<row outputclass="id_CHKJ2905">
-<entry>CHKJ2905</entry>
-<entry>The EJB validator did not run because ejb-jar.xml could not be loaded.
-Run the XML validator for more information.</entry>
-<entry>CHKJ2905 means that the project's metadata could not be initialized
-from ejb-jar.xml. <ol>
-<li>Ensure the following:  <ul>
-<li>that the META-INF folder exists in the EJB project</li>
-<li>that META-INF contains ejb-jar.xml</li>
-<li>that META-INF is in the project's classpath.</li>
-</ul>  </li>
-<li>Validate the syntax of the ejb-jar.xml file: in the Navigator view, highlight
-the ejb-jar.xml file, right-click, and select <uicontrol>Validate XML file</uicontrol>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol></entry>
-</row>
-<row outputclass="id_JSPValidator">
-<entry nameend="col3" namest="col1"><uicontrol>JSP validator</uicontrol></entry>
-</row>
-<row outputclass="id_IWAW0482">
-<entry colname="col1">IWAW0482</entry>
-<entry colname="col2">No valid JspTranslator</entry>
-<entry colname="col3">There is a path problem with the project; the JSP Validator
-needs access to the WAS runtime code. If IWAW0482E appears on all web projects,
-check the Variable or JRE path:   <ol>
-<li>Check the global preferences (<uicontrol>Window > Preferences > Java >Installed
-JREs</uicontrol>) and make sure that the location for the JRE is pointing
-to a valid JRE directory.  </li>
-<li>Ensure that the classpath variables (<uicontrol>Window > Preferences >
-Java > Classpath Variables</uicontrol>) are set correctly.</li>
-</ol> </entry>
-</row>
-<row outputclass="id_WARValidator">
-<entry nameend="col3" namest="col1"><uicontrol>WAR validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ3008">
-<entry colname="col1">CHKJ3008</entry>
-<entry colname="col2">Missing or invalid WAR file.</entry>
-<entry colname="col3">The web.xml file cannot be loaded. The project metadata
-cannot be initialized from the web.xml file.   <ol>
-<li>Ensure the following:  <ul>
-<li>that the WEB-INF folder exists in the web project</li>
-<li>that WEB-INF contains the web.xml file</li>
-<li>that WEB-INF is in the project's classpath.</li>
-</ul>  </li>
-<li>Validate the syntax of the web.xml file: in the Navigator view, highlight
-the web.xml file, right-click, and select <uicontrol>Validate XML file</uicontrol>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol></entry>
-</row>
-<row outputclass="id_XMLValidator">
-<entry nameend="col3" namest="col1"><uicontrol>XML validator</uicontrol></entry>
-</row>
-<row>
-<entry> </entry>
-<entry>The content of element type "ejb-jar" is incomplete, it must match
-"(description?,display-name?,small-icon?,large-icon?,enterprise-beans,assembly-descriptor?,ejb-client-jar?)".</entry>
-<entry>The EJB 1.1 and 2.0 specifications mandate that at least one enterprise
-bean must exist in an EJB .jar file. This error message is normal during development
-of EJB .jar files and can be ignored until you perform a production action,
-such as exporting or deploying code. Define at least one enterprise bean in
-the project.</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-<example outputclass="anchor_topicbottom"></example>
-</refbody>
-</reference>
-<?Pub *0000008883?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html
deleted file mode 100644
index 179e73418..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Common validation errors and solutions" />
-<meta name="abstract" content="This table lists the common error messages you may encounter when you validate your projects." />
-<meta name="description" content="This table lists the common error messages you may encounter when you validate your projects." />
-<meta content="code validation, error solutions, validation" name="DC.subject" />
-<meta content="code validation, error solutions, validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rvalerr" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Common validation errors and solutions</title>
-</head>
-<body id="rvalerr"><a name="rvalerr"><!-- --></a>
-
-
-<h1 class="id_title">Common validation errors and solutions</h1>
-
-
-
-<div class="id_refbody"><p class="id_shortdesc">This table lists the common error messages
-you may encounter when you validate your projects.</p>
-
-<div class="anchor_topictop" />
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-
-<thead align="left">
-<tr class="id_tableHeadRow">
-<th valign="top" width="20.27027027027027%" id="N10078">Message prefix</th>
-
-<th valign="top" width="24.324324324324326%" id="N1007F">Message</th>
-
-<th valign="top" width="55.4054054054054%" id="N10086">Explanation</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr class="id_appclientValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">Application Client validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ1000">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ1000</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Validation failed because the application client file
-is not valid. Ensure that the deployment descriptor is valid.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">The application-client.xml file cannot be loaded. The
-project metadata cannot be initialized from the application-client.xml file.
-  <ol>
-<li>Ensure the following:  <ul>
-<li>that the META-INF folder exists in the application client project</li>
-
-<li>that META-INF contains the application-client.xml file</li>
-
-<li>that META-INF is in the project's classpath.</li>
-
-</ul>
-  </li>
-
-<li>Validate the syntax of the application-client.xml file: in the Navigator
-view, highlight the application-client.xml file, right-click, and select <span class="uicontrol">Validate
-XML file</span>.</li>
-
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-
-</ol>
- </td>
-
-</tr>
-
-<tr class="id_EARValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">EAR validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ1001">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ1001</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The EAR project {0} is invalid.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">The application.xml file cannot be loaded. The project
-metadata cannot be initialized from the application.xml file.  <ol>
-<li>Ensure the following:  <ul>
-<li>that the META-INF folder exists in the EAR project</li>
-
-<li>that META-INF contains <samp class="codeph">application.xml</samp></li>
-
-<li>that META-INF is in the project's classpath.</li>
-
-</ul>
-  </li>
-
-<li>Validate the syntax of the application.xml file: in the Navigator view,
-highlight the application.xml file, right-click, and select <span class="uicontrol">Validate
-XML file</span>.</li>
-
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-
-</ol>
-</td>
-
-</tr>
-
-<tr class="id_EJBValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">EJB validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ2019">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2019</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The {0} key class must be serializable at runtime. </td>
-
-<td rowspan="3" valign="top" width="55.4054054054054%" headers="N10086 ">The EJB is compliant with the EJB specification. This
-message is a warning that problems may occur. The warning appears when a type
-needs to be serializable at runtime and when serializability cannot be verified
-at compile-time. A type is serializable if, at runtime, it is a primitive
-type, a primitive array, a remote object, or if it implements java.io.Serializable.
-This message flags java.lang.Object and it cannot be disabled. You can either
-make the object serializable at compile-time or ignore the warning. </td>
-
-</tr>
-
-<tr class="id_CHKJ2412">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2412</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The return type must be serializable at runtime. </td>
-
-</tr>
-
-<tr class="id_CHKJ2413">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2413</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Argument {1} of {0} must be serializable at runtime.</td>
-
-</tr>
-
-<tr class="id_CHKJ2102">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2102</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Either a finder descriptor, or a matching custom finder method on the
-{0} class, must be defined.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">A finder descriptor must exist for every finder method. </td>
-
-</tr>
-
-<tr class="id_CHKJ2873">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2873</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Migrate this bean's datasource binding to a CMP Connection Factory
-binding.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">&nbsp;</td>
-
-</tr>
-
-<tr class="id_CHKJ2874">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2874</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Migrate this EJB module's default datasource binding to a default CMP
-Connection Factory binding.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">&nbsp;</td>
-
-</tr>
-
-<tr class="id_CHKJ2875E">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2875E       </td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">&lt;ejb-client-jar&gt; {0} must exist in every EAR file
-that contains this EJB module.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">If <samp class="codeph">&lt;ejb-client-jar&gt;</samp> is specified
-in <span class="filepath">ejb-jar.xml</span>, a corresponding EJB client project must
-contain the home and remote interfaces and any other types that a client will
-need. If these types are all contained in a single EJB project, delete the <samp class="codeph">&lt;ejb-client-jar&gt;</samp> line
-in the deployment descriptor. Otherwise, ensure that the EJB client project
-exists, is open, and is a project utility JAR in every EAR that uses this
-EJB project as a module.</td>
-
-</tr>
-
-<tr class="id_CHKJ2905">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2905</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The EJB validator did not run because ejb-jar.xml could not be loaded.
-Run the XML validator for more information.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">CHKJ2905 means that the project's metadata could not be initialized
-from ejb-jar.xml. <ol>
-<li>Ensure the following:  <ul>
-<li>that the META-INF folder exists in the EJB project</li>
-
-<li>that META-INF contains ejb-jar.xml</li>
-
-<li>that META-INF is in the project's classpath.</li>
-
-</ul>
-  </li>
-
-<li>Validate the syntax of the ejb-jar.xml file: in the Navigator view, highlight
-the ejb-jar.xml file, right-click, and select <span class="uicontrol">Validate XML file</span>.</li>
-
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-
-</ol>
-</td>
-
-</tr>
-
-<tr class="id_JSPValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">JSP validator</span></td>
-
-</tr>
-
-<tr class="id_IWAW0482">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">IWAW0482</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">No valid JspTranslator</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">There is a path problem with the project; the JSP Validator
-needs access to the WAS runtime code. If IWAW0482E appears on all web projects,
-check the Variable or JRE path:   <ol>
-<li>Check the global preferences (<span class="uicontrol">Window &gt; Preferences &gt; Java &gt;Installed
-JREs</span>) and make sure that the location for the JRE is pointing
-to a valid JRE directory.  </li>
-
-<li>Ensure that the classpath variables (<span class="uicontrol">Window &gt; Preferences &gt;
-Java &gt; Classpath Variables</span>) are set correctly.</li>
-
-</ol>
- </td>
-
-</tr>
-
-<tr class="id_WARValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">WAR validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ3008">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ3008</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Missing or invalid WAR file.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">The web.xml file cannot be loaded. The project metadata
-cannot be initialized from the web.xml file.   <ol>
-<li>Ensure the following:  <ul>
-<li>that the WEB-INF folder exists in the web project</li>
-
-<li>that WEB-INF contains the web.xml file</li>
-
-<li>that WEB-INF is in the project's classpath.</li>
-
-</ul>
-  </li>
-
-<li>Validate the syntax of the web.xml file: in the Navigator view, highlight
-the web.xml file, right-click, and select <span class="uicontrol">Validate XML file</span>.</li>
-
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-
-</ol>
-</td>
-
-</tr>
-
-<tr class="id_XMLValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">XML validator</span></td>
-
-</tr>
-
-<tr>
-<td valign="top" width="20.27027027027027%" headers="N10078 "> </td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The content of element type "ejb-jar" is incomplete, it must match
-"(description?,display-name?,small-icon?,large-icon?,enterprise-beans,assembly-descriptor?,ejb-client-jar?)".</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">The EJB 1.1 and 2.0 specifications mandate that at least one enterprise
-bean must exist in an EJB .jar file. This error message is normal during development
-of EJB .jar files and can be ignored until you perform a production action,
-such as exporting or deploying code. Define at least one enterprise bean in
-the project.</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-<div class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rvalidators.html" title="This table lists the validators that are available for the different project types and gives a brief description of each validator.">J2EE Validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.dita
deleted file mode 100644
index 51bdd7f1b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.dita
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rvalidators" xml:lang="en-us">
-<title outputclass="id_title">J2EE Validators</title>
-<shortdesc outputclass="id_shortdesc">This table lists the validators that
-are available for the different project types and gives a brief description
-of each validator.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>J2EE validators</indexterm></indexterm>
-<indexterm>code validation<indexterm>J2EE validators</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<refbody outputclass="id_refbody">
-<example outputclass="anchor_topictop"></example>
-<table frame="all">
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="col1" colwidth="50*"/>
-<colspec colname="col2" colwidth="50*"/>
-<thead>
-<row outputclass="id_toprow">
-<entry>Validator name</entry>
-<entry>Description</entry>
-</row>
-</thead>
-<tbody>
-<row outputclass="id_appclientValidator">
-<entry align="left" valign="top">Application Client Validator</entry>
-<entry align="left" valign="top">The Application Client Validator validates
-the following Application Client project resources:   <ul>
-<li>Deployment descriptor (application-client.xml)</li>
-<li>EJB references</li>
-<li>Resource references</li>
-</ul></entry>
-</row>
-<row outputclass="id_connectorValidator">
-<entry colname="col1">Connector Validator</entry>
-<entry colname="col2">The Connector validator checks for invalid J2EE specification
-levels in connector projects.</entry>
-</row>
-<row outputclass="id_DTDValidator">
-<entry align="left" valign="top">DTD Validator</entry>
-<entry align="left" valign="top">The DTD validator determines whether the
-current state of a DTD is semantically valid. XML files are validated according
-to the XML specification <xref format="html" href="http://www.w3.org/TR/2000/REC-xml-20001006"
-scope="external"> Extensible Markup Language (XML) 1.0<desc></desc></xref> from
-the W3C Web site. As well, the DTD validator checks for errors such as references
-to entities and elements that do not exist.</entry>
-</row>
-<row outputclass="id_EARValidator">
-<entry align="left" valign="top">EAR Validator</entry>
-<entry align="left" valign="top">The EAR Validator validates the following:
- <ul>
-<li>EAR deployment descriptor (application.xml)</li>
-<li>EJB references of all module projects in the enterprise application project</li>
-<li>Security roles</li>
-<li>Resource references</li>
-<li>Manifest files for all contained or referenced modules and utility JAR
-files</li>
-<li>Target server consistency between the enterprise application project and
-any utility and module projects</li>
-<li>Existence of projects for each module defined in enterprise application</li>
-</ul>  <p>Note that the EAR Validator only ensures the validity and dependency
-of the module projects with respect to the enterprise application project.</p></entry>
-</row>
-<row outputclass="id_EJBValidator">
-<entry align="left" valign="top">EJB Validator</entry>
-<entry align="left" valign="top">The EJB Validator verifies that enterprise
-beans contained in an EJB project comply with the Sun Enterprise <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm> Specifications
-(1.1, 2.0, and 2.1), depending on the level of the bean. Code validation for
-the EJB 1.0 specification is not supported. Specifically, the EJB Validator
-validates the following resources: <ul>
-<li><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> .class
-files that are members of an enterprise bean (home interface, remote interface,
-enterprise bean class, and, if the bean is an entity bean, the key class)</li>
-<li>ejb-jar.xml</li>
-</ul></entry>
-</row>
-<row outputclass="id_ELValidator">
-<entry colname="col1">EL Syntax Validator</entry>
-<entry colname="col2"></entry>
-</row>
-<row outputclass="id_HTMLValidator">
-<entry align="left" valign="top">HTML Syntax Validator</entry>
-<entry align="left" valign="top">The HTML Syntax Validator validates HTML
-basic syntax and HTML DTD compliance in the following Web project resources:
- <ul>
-<li>HTML files</li>
-<li>JSP files</li>
-</ul></entry>
-</row>
-<row outputclass="id_JSPValidator">
-<entry align="left" valign="top">JSP Syntax Validator</entry>
-<entry align="left" valign="top">The JSP Syntax Validator validates JSP files
-in a project by translating them into the corresponding <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> code
-and then checking the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> code for compile errors.</entry>
-</row>
-<row outputclass="id_WARValidator">
-<entry align="left" valign="top">War Validator</entry>
-<entry align="left" valign="top">The War Validator validates the following
-web project resources:   <ul>
-<li>Deployment descriptor (web.xml)</li>
-<li>Servlets</li>
-<li>Security roles</li>
-<li>Servlet &amp; servlet mappings</li>
-<li>EJB references</li>
-</ul></entry>
-</row>
-<row outputclass="id_WSDLValidator">
-<entry colname="col1">WSDL Validator</entry>
-<entry colname="col2">The WSDL validator checks the following in WSDL files: <ul>
-<li>XML syntax</li>
-<li>XML Schema types in the &lt;types> section</li>
-<li>Referential integrity of the various constructs in WSDL </li>
-</ul>The validator also includes an extension point to allow other validators
-to be plugged into the WSDL validation to provide additional verification
-of the WSDL file. Through this mechanism, interoperability is checked by validating
-a WSDL file against WS-I Profiles. </entry>
-</row>
-<row outputclass="id_WSIValidator">
-<entry colname="col1">WS-I Message Validator</entry>
-<entry colname="col2">WS-I Message validator checks SOAP messages against
-WS-I Profiles. A user can capture and verify SOAP messages using the TCP/IP
-Monitor. The validator checks a message log that is saved as a project resource
-(.wsimsg). The log conforms to a format as specified by WS-I.</entry>
-</row>
-<row outputclass="id_XMLSchemaValidator">
-<entry align="left" valign="top">XML Schema Validator</entry>
-<entry align="left" valign="top">The XML schema validator determines whether
-the current state of an XML schema file is semantically valid. XML schemas
-are validated according to the XML Schema specification <xref format="html"
-href="http://www.w3.org/TR/xmlschema-1/" scope="local"> XML Schema Part 1:
-Structures<desc></desc></xref> from the W3C Web site.</entry>
-</row>
-<row outputclass="id_XMLValidator">
-<entry align="left" valign="top">XML Validator</entry>
-<entry align="left" valign="top">The XML validator ensures that an XML file
-is well-formed. It also verifies if an XML file is valid - that is, it follows
-the constraints established in the DTD or XML schema the XML file is associated
-with.</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-<example outputclass="anchor_topicbottom"></example>
-</refbody>
-</reference>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html
deleted file mode 100644
index 67c41efdf..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="J2EE Validators" />
-<meta name="abstract" content="This table lists the validators that are available for the different project types and gives a brief description of each validator." />
-<meta name="description" content="This table lists the validators that are available for the different project types and gives a brief description of each validator." />
-<meta content="validation, J2EE validators, code validation" name="DC.subject" />
-<meta content="validation, J2EE validators, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rvalidators" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>J2EE Validators</title>
-</head>
-<body id="rvalidators"><a name="rvalidators"><!-- --></a>
-
-
-<h1 class="id_title">J2EE Validators</h1>
-
-
-
-<div class="id_refbody"><p class="id_shortdesc">This table lists the validators that
-are available for the different project types and gives a brief description
-of each validator.</p>
-
-<div class="anchor_topictop" />
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-
-<thead align="left">
-<tr class="id_toprow">
-<th valign="top" width="50%" id="N10073">Validator name</th>
-
-<th valign="top" width="50%" id="N1007A">Description</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr class="id_appclientValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">Application Client Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The Application Client Validator validates
-the following Application Client project resources:   <ul>
-<li>Deployment descriptor (application-client.xml)</li>
-
-<li>EJB references</li>
-
-<li>Resource references</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr class="id_connectorValidator">
-<td valign="top" width="50%" headers="N10073 ">Connector Validator</td>
-
-<td valign="top" width="50%" headers="N1007A ">The Connector validator checks for invalid J2EE specification
-levels in connector projects.</td>
-
-</tr>
-
-<tr class="id_DTDValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">DTD Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The DTD validator determines whether the
-current state of a DTD is semantically valid. XML files are validated according
-to the XML specification <a href="http://www.w3.org/TR/2000/REC-xml-20001006" target="_blank" title="">Extensible Markup Language (XML) 1.0</a> from
-the W3C Web site. As well, the DTD validator checks for errors such as references
-to entities and elements that do not exist.</td>
-
-</tr>
-
-<tr class="id_EARValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">EAR Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The EAR Validator validates the following:
- <ul>
-<li>EAR deployment descriptor (application.xml)</li>
-
-<li>EJB references of all module projects in the enterprise application project</li>
-
-<li>Security roles</li>
-
-<li>Resource references</li>
-
-<li>Manifest files for all contained or referenced modules and utility JAR
-files</li>
-
-<li>Target server consistency between the enterprise application project and
-any utility and module projects</li>
-
-<li>Existence of projects for each module defined in enterprise application</li>
-
-</ul>
-  <p>Note that the EAR Validator only ensures the validity and dependency
-of the module projects with respect to the enterprise application project.</p>
-</td>
-
-</tr>
-
-<tr class="id_EJBValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">EJB Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The EJB Validator verifies that enterprise
-beans contained in an EJB project comply with the Sun Enterprise JavaBeans™ Specifications
-(1.1, 2.0, and 2.1), depending on the level of the bean. Code validation for
-the EJB 1.0 specification is not supported. Specifically, the EJB Validator
-validates the following resources: <ul>
-<li>Java™ .class
-files that are members of an enterprise bean (home interface, remote interface,
-enterprise bean class, and, if the bean is an entity bean, the key class)</li>
-
-<li>ejb-jar.xml</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr class="id_ELValidator">
-<td valign="top" width="50%" headers="N10073 ">EL Syntax Validator</td>
-
-<td valign="top" width="50%" headers="N1007A ">&nbsp;</td>
-
-</tr>
-
-<tr class="id_HTMLValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">HTML Syntax Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The HTML Syntax Validator validates HTML
-basic syntax and HTML DTD compliance in the following Web project resources:
- <ul>
-<li>HTML files</li>
-
-<li>JSP files</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr class="id_JSPValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">JSP Syntax Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The JSP Syntax Validator validates JSP files
-in a project by translating them into the corresponding Java code
-and then checking the Java code for compile errors.</td>
-
-</tr>
-
-<tr class="id_WARValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">War Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The War Validator validates the following
-web project resources:   <ul>
-<li>Deployment descriptor (web.xml)</li>
-
-<li>Servlets</li>
-
-<li>Security roles</li>
-
-<li>Servlet &amp; servlet mappings</li>
-
-<li>EJB references</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr class="id_WSDLValidator">
-<td valign="top" width="50%" headers="N10073 ">WSDL Validator</td>
-
-<td valign="top" width="50%" headers="N1007A ">The WSDL validator checks the following in WSDL files: <ul>
-<li>XML syntax</li>
-
-<li>XML Schema types in the &lt;types&gt; section</li>
-
-<li>Referential integrity of the various constructs in WSDL </li>
-
-</ul>
-The validator also includes an extension point to allow other validators
-to be plugged into the WSDL validation to provide additional verification
-of the WSDL file. Through this mechanism, interoperability is checked by validating
-a WSDL file against WS-I Profiles. </td>
-
-</tr>
-
-<tr class="id_WSIValidator">
-<td valign="top" width="50%" headers="N10073 ">WS-I Message Validator</td>
-
-<td valign="top" width="50%" headers="N1007A ">WS-I Message validator checks SOAP messages against
-WS-I Profiles. A user can capture and verify SOAP messages using the TCP/IP
-Monitor. The validator checks a message log that is saved as a project resource
-(.wsimsg). The log conforms to a format as specified by WS-I.</td>
-
-</tr>
-
-<tr class="id_XMLSchemaValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">XML Schema Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The XML schema validator determines whether
-the current state of an XML schema file is semantically valid. XML schemas
-are validated according to the XML Schema specification <a href="http://www.w3.org/TR/xmlschema-1/" title="">XML Schema Part 1: Structures</a> from the W3C Web site.</td>
-
-</tr>
-
-<tr class="id_XMLValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">XML Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The XML validator ensures that an XML file
-is well-formed. It also verifies if an XML file is valid - that is, it follows
-the constraints established in the DTD or XML schema the XML file is associated
-with.</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-<div class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rvalerr.html" title="This table lists the common error messages you may encounter when you validate your projects.">Common validation errors and solutions</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita
deleted file mode 100644
index 41da49af6..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="taddingfacet" xml:lang="en-us">
-<title outputclass="id_title">Adding a facet to a Java EE project</title>
-<shortdesc outputclass="id_shortdesc">This topic explains how to add a facet
-to an existing project in your workspace.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>projects<indexterm>facets<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>Java EE<indexterm>adding project facets</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p
-conref="cfacets.dita#cfacets/aboutfacet"></p> <p>New projects generally have
-facets added to them when they are created. To add another facet to a project
-that already exists, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, right-click the project
-and then select <uicontrol>Properties</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Project Facets</uicontrol> page in the in
-the Properties window.</cmd><info>This page lists the facets in the project
-and their versions.</info></step>
-<step><cmd>Click <uicontrol>Modify Project</uicontrol> and select the check
-boxes next to the facets you want the project to have.</cmd><info><p>Only
-the facets that are valid for the project are listed:<ul>
-<li>The list of runtimes selected for the project limits the facets shown
-in the list. Only the facets compatible with all selected target runtimes
-are shown.</li>
-<li>The currently selected facets and their version numbers limit the other
-facets shown in the list. For example, if the project contains the Dynamic
-Web Module facet, the EJB Module facet is not listed because these two facets
-cannot be in the same project.</li>
-</ul>You can find out more about the requirements and limitations for each
-facet by right-clicking the facet name and then clicking <uicontrol>Show Constraints</uicontrol>.</p><p>You
-can also choose a preset combination of facets from the <uicontrol>Presets</uicontrol> list.</p></info>
-</step>
-<step><cmd>Choose a version number for the facet by clicking the current version
-number and selecting the version number you want from the drop-down list.</cmd>
-</step>
-<step importance="optional"><cmd>To remove a facet, clear its check box.</cmd>
-<info>Not all facets can be removed.</info></step>
-<step importance="optional"><cmd>If you want to limit the project so it will
-be compatible with one or more runtimes, click on the Runtimes tab and select
-the runtimes that you want the project to be compatible with.</cmd><info>For
-more information on runtimes, see <xref href="tjtargetserver.dita"></xref>.</info>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to exit the Modify Faceted
-Project dialog and then click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html
deleted file mode 100644
index ce600b608..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding a facet to a Java EE project" />
-<meta name="abstract" content="This topic explains how to add a facet to an existing project in your workspace." />
-<meta name="description" content="This topic explains how to add a facet to an existing project in your workspace." />
-<meta content="projects, facets, adding, Java EE, adding project facets" name="DC.subject" />
-<meta content="projects, facets, adding, Java EE, adding project facets" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddingfacet" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding a facet to a Java EE project</title>
-</head>
-<body id="taddingfacet"><a name="taddingfacet"><!-- --></a>
-
-
-<h1 class="id_title">Adding a facet to a Java EE project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">This topic explains how to add a facet
-to an existing project in your workspace.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>When you add a facet to a project, that project is configured
-to perform a certain task, fulfill certain requirements, or have certain characteristics.
-For example, the EAR facet sets up a project to function as an enterprise
-application by adding a deployment descriptor and setting up the project's
-classpath.</p>
- <p>New projects generally have
-facets added to them when they are created. To add another facet to a project
-that already exists, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java™ EE perspective, right-click the project
-and then select <span class="uicontrol">Properties</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project Facets</span> page in the in
-the Properties window.</span> This page lists the facets in the project
-and their versions.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Modify Project</span> and select the check
-boxes next to the facets you want the project to have.</span> <div class="p">Only
-the facets that are valid for the project are listed:<ul>
-<li>The list of runtimes selected for the project limits the facets shown
-in the list. Only the facets compatible with all selected target runtimes
-are shown.</li>
-
-<li>The currently selected facets and their version numbers limit the other
-facets shown in the list. For example, if the project contains the Dynamic
-Web Module facet, the EJB Module facet is not listed because these two facets
-cannot be in the same project.</li>
-
-</ul>
-You can find out more about the requirements and limitations for each
-facet by right-clicking the facet name and then clicking <span class="uicontrol">Show Constraints</span>.</div>
-<p>You
-can also choose a preset combination of facets from the <span class="uicontrol">Presets</span> list.</p>
-
-</li>
-
-<li class="stepexpand"><span>Choose a version number for the facet by clicking the current version
-number and selecting the version number you want from the drop-down list.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To remove a facet, clear its check box.</span>
- Not all facets can be removed.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to limit the project so it will
-be compatible with one or more runtimes, click on the Runtimes tab and select
-the runtimes that you want the project to be compatible with.</span> For
-more information on runtimes, see <a href="tjtargetserver.html" title="When you develop J2EE applications,&#10;you can specify the server runtime environments for your J2EE projects. The&#10;target server is specified during project creation and import, and it can&#10;be changed in the project properties. The target server setting is the default&#10;mechanism for setting the class path for J2EE projects.">Specifying target servers for J2EE projects</a>.
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to exit the Modify Faceted
-Project dialog and then click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
-<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita
deleted file mode 100644
index 212244de3..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tchangefacet" xml:lang="en-us">
-<title outputclass="id_title">Changing the version of a facet</title>
-<shortdesc outputclass="id_shortdesc">You can change the version of a facet
-in a Java EE project by editing the facets for the project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>facets<indexterm>changing versions</indexterm></indexterm>
-<indexterm>Java EE<indexterm>changing facet versions</indexterm></indexterm>
-<indexterm>projects<indexterm>changing facet versions</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>Changing
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler
-version of a Java EE project involves changing the version of the <uicontrol>Java</uicontrol> facet.
-For more information, see <xref href="tchangejavalevel.dita"></xref>.</p><p>To
-change the version of a facet in your project, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, right-click the project
-and then select <uicontrol>Properties</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Project Facets</uicontrol> page in the in
-the Properties window.</cmd><info> This page lists the facets in the project
-and their versions.</info></step>
-<step><cmd>Click <uicontrol>Modify Project</uicontrol> and click the facet
-you want to change.</cmd></step>
-<step><cmd>Select the version of the facet from the drop-down box next to
-the facet's name.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to close the Modify Faceted
-Project window and then click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html
deleted file mode 100644
index f3d52109c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Changing the version of a facet" />
-<meta name="abstract" content="You can change the version of a facet in a Java EE project by editing the facets for the project." />
-<meta name="description" content="You can change the version of a facet in a Java EE project by editing the facets for the project." />
-<meta content="facets, changing versions, Java EE, changing facet versions, projects" name="DC.subject" />
-<meta content="facets, changing versions, Java EE, changing facet versions, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tchangefacet" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Changing the version of a facet</title>
-</head>
-<body id="tchangefacet"><a name="tchangefacet"><!-- --></a>
-
-
-<h1 class="id_title">Changing the version of a facet</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can change the version of a facet
-in a Java EE project by editing the facets for the project.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>Changing
-the Java™ compiler
-version of a Java EE project involves changing the version of the <span class="uicontrol">Java</span> facet.
-For more information, see <a href="tchangejavalevel.html" title="You can change the version of Java used&#10;in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a>.</p>
-<p>To
-change the version of a facet in your project, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java EE perspective, right-click the project
-and then select <span class="uicontrol">Properties</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project Facets</span> page in the in
-the Properties window.</span>  This page lists the facets in the project
-and their versions.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Modify Project</span> and click the facet
-you want to change.</span></li>
-
-<li class="stepexpand"><span>Select the version of the facet from the drop-down box next to
-the facet's name.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to close the Modify Faceted
-Project window and then click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a Java EE project</a></div>
-<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita
deleted file mode 100644
index f85e99eb2..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tchangejavalevel" xml:lang="en-us">
-<title outputclass="id_title">Changing the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> compiler version for a Java EE project</title>
-<shortdesc outputclass="id_shortdesc">You can change the version of <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> used
-in a Java EE project by changing the value of the <uicontrol>Java</uicontrol> facet.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE<indexterm>project compiler level</indexterm></indexterm>
-<indexterm>projects<indexterm>Java compiler level</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>The <uicontrol>Java</uicontrol> facet
-applies only to J2EE projects. To set the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> compiler level of a non-Java EE project,
-such as a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> project, see <xref format="html" href="../../org.eclipse.jdt.doc.user/reference/ref-properties-compiler.htm"
-scope="peer">Java Compiler</xref>.</p><p>To change the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler
-version, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, right-click the project
-and then select <uicontrol>Properties</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Project Facets</uicontrol> page in the in
-the Properties window.</cmd><info> This page lists the facets in the project
-and their versions.</info></step>
-<step><cmd>Click <uicontrol>Modify Project</uicontrol>.</cmd></step>
-<step><cmd>Double click the version number next to the<uicontrol>Java</uicontrol> facet
-to select a different level of <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> compiler.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to close the Modify Faceted
-Project window and then click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html
deleted file mode 100644
index e82fa29c9..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Changing the Java compiler version for a Java EE project" />
-<meta name="abstract" content="You can change the version of Java used in a Java EE project by changing the value of the Java facet." />
-<meta name="description" content="You can change the version of Java used in a Java EE project by changing the value of the Java facet." />
-<meta content="Java EE, project compiler level, projects, Java compiler level" name="DC.subject" />
-<meta content="Java EE, project compiler level, projects, Java compiler level" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tchangejavalevel" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Changing the Java compiler version for a Java EE project</title>
-</head>
-<body id="tchangejavalevel"><a name="tchangejavalevel"><!-- --></a>
-
-
-<h1 class="id_title">Changing the Java compiler version for a Java EE project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can change the version of Java™ used
-in a Java EE project by changing the value of the <span class="uicontrol">Java</span> facet.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>The <span class="uicontrol">Java</span> facet
-applies only to J2EE projects. To set the Java compiler level of a non-Java EE project,
-such as a Java project, see <a href="../../org.eclipse.jdt.doc.user/reference/ref-properties-compiler.htm">Java Compiler</a>.</p>
-<p>To change the Java compiler
-version, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java EE perspective, right-click the project
-and then select <span class="uicontrol">Properties</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project Facets</span> page in the in
-the Properties window.</span>  This page lists the facets in the project
-and their versions.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Modify Project</span>.</span></li>
-
-<li class="stepexpand"><span>Double click the version number next to the<span class="uicontrol">Java</span> facet
-to select a different level of Java compiler.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to close the Modify Faceted
-Project window and then click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a Java EE project</a></div>
-<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.dita
deleted file mode 100644
index 434fa96c3..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.dita
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="creatingawebproject" xml:lang="en-us">
-<title>Creating Web projects</title>
-<shortdesc>You can use wizards to create Web modules in your <tm
-tmtype="tm" trademark="Java">Java</tm> EE project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm keyref="tcreatwebmodule|1|JavaEEWebmodulecreating"
-status="new">Java EE<indexterm>Web module<indexterm>creating</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<steps>
-<step><cmd>In the <tm tmtype="tm" trademark="Java">Java</tm> EE perspective,
-right-click your enterprise application project and select <menucascade>
-<uicontrol>New</uicontrol><uicontrol>Dynamic Web project</uicontrol>
-</menucascade>. The Dynamic Web project wizard opens.</cmd></step>
-<step><cmd>In the <uicontrol>Name</uicontrol> field, type a name for
-the Web project. To change the default <uicontrol>Project location</uicontrol>,
-click the <uicontrol>Browse</uicontrol> button to select a new location.</cmd>
-<info><p>If you specify a non-default project location that is already
-being used by another project, the project creation fails.</p></info>
-</step>
-<step><cmd>The <uicontrol>Target runtime</uicontrol> field is pre-populated
-with the selection from the enterprise project.</cmd></step>
-<step><cmd>In the <uicontrol>Dynamic Web Module version</uicontrol> field,
-accept the default value of <uicontrol>2.5</uicontrol>.</cmd></step>
-<step importance="optional"><cmd>Select a pre-defined project configuration
-from the <uicontrol>Configurations</uicontrol> drop-down list.</cmd>
-</step>
-<step importance="optional"><cmd>If you want to modify the configuration
-details, click <uicontrol>modify</uicontrol>:</cmd><info></info></step><?Pub
-Caret 67?>
-<step importance="optional"><cmd>Select one or more project facets
-from the <uicontrol>Project Facets</uicontrol> list. To specify server
-runtime environments, click <uicontrol>Show Runtimes</uicontrol> and
-select one or more runtimes. After making your selections, you can
-save your custom configuration by clicking <uicontrol>Save</uicontrol>.</cmd>
-</step>
-<step importance="optional"><cmd>Select the <uicontrol>Add project
-to an EAR module</uicontrol> check box to add the new module to an
-enterprise module (EAR) project.</cmd><info>Type a new project name
-or select an existing enterprise module project from the drop-down
-list in the <uicontrol>EAR Project Name</uicontrol> combination box.
-Or, click <uicontrol>New</uicontrol> to launch the New EAR module
-Project wizard.</info></step>
-<step><cmd>Click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>On the Dynamic Web Project page, in the <uicontrol>Context
-Root:</uicontrol> field, specify a folder for your source files or
-accept the default value.</cmd></step>
-<step><cmd>In the <uicontrol>Content Directory:</uicontrol> field,
-specify a folder for your source files or accept the default value
-(WebContent).</cmd></step>
-<step><cmd>In the <uicontrol>Java Source Directory</uicontrol> field,
-specify a folder for your source files or accept the default value
-(src).</cmd></step>
-<step><cmd>In the <uicontrol>Output Folder:</uicontrol> field, specify
-a folder for your output files or accept the default value (WebContent/WEB-INF/classes).</cmd>
-<info></info></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.html
deleted file mode 100644
index 74286963d..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating Web projects" />
-<meta name="abstract" content="You can use wizards to create Web modules in your Java EE project." />
-<meta name="description" content="You can use wizards to create Web modules in your Java EE project." />
-<meta content="Java EE, Web module, creating" name="DC.subject" />
-<meta content="Java EE, Web module, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="creatingawebproject" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating Web projects</title>
-</head>
-<body id="creatingawebproject"><a name="creatingawebproject"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating Web projects</h1>
-
-
-
-<div><p>You can use wizards to create Web modules in your Java EE project.</p>
-
-<ol>
-<li class="stepexpand"><span>In the Java EE perspective,
-right-click your enterprise application project and select <span class="menucascade">
-<span class="uicontrol">New</span> &gt; <span class="uicontrol">Dynamic Web project</span>
-</span>. The Dynamic Web project wizard opens.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Name</span> field, type a name for
-the Web project. To change the default <span class="uicontrol">Project location</span>,
-click the <span class="uicontrol">Browse</span> button to select a new location.</span>
- <p>If you specify a non-default project location that is already
-being used by another project, the project creation fails.</p>
-
-</li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">Target runtime</span> field is pre-populated
-with the selection from the enterprise project.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Dynamic Web Module version</span> field,
-accept the default value of <span class="uicontrol">2.5</span>.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select a pre-defined project configuration
-from the <span class="uicontrol">Configurations</span> drop-down list.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to modify the configuration
-details, click <span class="uicontrol">modify</span>:</span> </li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select one or more project facets
-from the <span class="uicontrol">Project Facets</span> list. To specify server
-runtime environments, click <span class="uicontrol">Show Runtimes</span> and
-select one or more runtimes. After making your selections, you can
-save your custom configuration by clicking <span class="uicontrol">Save</span>.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <span class="uicontrol">Add project
-to an EAR module</span> check box to add the new module to an
-enterprise module (EAR) project.</span> Type a new project name
-or select an existing enterprise module project from the drop-down
-list in the <span class="uicontrol">EAR Project Name</span> combination box.
-Or, click <span class="uicontrol">New</span> to launch the New EAR module
-Project wizard.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>On the Dynamic Web Project page, in the <span class="uicontrol">Context
-Root:</span> field, specify a folder for your source files or
-accept the default value.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Content Directory:</span> field,
-specify a folder for your source files or accept the default value
-(WebContent).</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Java Source Directory</span> field,
-specify a folder for your source files or accept the default value
-(src).</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Output Folder:</span> field, specify
-a folder for your output files or accept the default value (WebContent/WEB-INF/classes).</span>
- </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita
deleted file mode 100644
index fb4f6b821..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimpear" xml:lang="en-us">
-<title outputclass="id_title">Defining and using annotations</title>
-<shortdesc outputclass="id_shortdesc">You can use the @Interface annotation
-to define your own annotation definition.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5<indexterm>annotations</indexterm><indexterm>defining</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p><p><b>Defining
-your own annotations</b></p></context>
-<steps>
-<step><cmd>Use the @Interface annotation to define your own annotation definition:</cmd>
-<info><p><ul>
-<li>Annotation definitions resemble interface definitions</li>
-<li>Annotation method declarations have neither parameters nor <codeph>throws</codeph> clauses,
-and return one of the following elements:<ul>
-<li>primitives</li>
-<li>String</li>
-<li>Class</li>
-<li>enum</li>
-<li>array of the above types</li>
-</ul></li>
-<li>Methods may have default values</li>
-</ul></p><p><codeblock>public @interface CreatedBy{
-     String name();
-     String date();
-     boolean contractor() default false;
-}          </codeblock><codeblock>@CreatedBy(name = "Mary Smith",date="02/02/2008");
-public class MyClass{....}         </codeblock></p></info></step>
-</steps>
-<postreq outputclass="id_postreq"><p><b>Meta-annotations</b>: Meta-annotations
-(annotations of annotations) provide additional information on how an annotation
-should be used:<ul>
-<li>@Target<ul>
-<li>Restricts the use of an annotation</li>
-<li>Single argument must be from Enum ElementType <ul>
-<li>{TYPE, FIELD,METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE}</li>
-</ul></li>
-</ul></li>
-<li>@Retention<ul>
-<li>Indicates where the annotation information will be retained</li>
-<li>Single argument must be from Enum RetentionPolicy<ul>
-<li>{SOURCE, CLASS, RUNTIME}</li>
-</ul></li>
-</ul></li>
-<li>@Documented<ul>
-<li>Marker for annotations that should be included in Javadoc</li>
-</ul></li>
-<li>@Inherited<ul>
-<li>marker for Type annotations that are to be inherited by subtypes</li>
-</ul></li>
-</ul><b>Other built-in annotations</b>: <ul>
-<li>@Overrides<ul>
-<li>Applied to a method</li>
-<li>Indicates that the compiler should generate an error if the method does
-not actually override a superclass method.</li>
-</ul></li>
-<li>@Deprecated<ul>
-<li>Applied to a method</li>
-<li>Indicates that the compiler should generate a warning when the method
-is used externally</li>
-</ul></li>
-<li>@SuppressWarnings<ul>
-<li>Applies to a type or a method</li>
-<li>Indicates that the compiler should supress warnings for that element and
-all subelements<p><codeblock>@Deprecated
-public void oldMethod() {...}
-
-@ SupressWarnings
-public void yesIknowIuseDeprecatedMethods() {...}</codeblock></p></li>
-</ul></li>
-</ul></p><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html
deleted file mode 100644
index 8410135cc..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Defining and using annotations" />
-<meta name="abstract" content="You can use the @Interface annotation to define your own annotation definition." />
-<meta name="description" content="You can use the @Interface annotation to define your own annotation definition." />
-<meta content="Java EE 5, annotations, defining" name="DC.subject" />
-<meta content="Java EE 5, annotations, defining" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cannotations.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ctypesofanno.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimpear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Defining and using annotations</title>
-</head>
-<body id="tjimpear"><a name="tjimpear"><!-- --></a>
-
-
-<h1 class="id_title">Defining and using annotations</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can use the @Interface annotation
-to define your own annotation definition.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
-<p><strong>Defining
-your own annotations</strong></p>
-</div>
-
-
-<div class="p"><span>Use the @Interface annotation to define your own annotation definition:</span>
- <div class="p"><ul>
-<li>Annotation definitions resemble interface definitions</li>
-
-<li>Annotation method declarations have neither parameters nor <samp class="codeph">throws</samp> clauses,
-and return one of the following elements:<ul>
-<li>primitives</li>
-
-<li>String</li>
-
-<li>Class</li>
-
-<li>enum</li>
-
-<li>array of the above types</li>
-
-</ul>
-</li>
-
-<li>Methods may have default values</li>
-
-</ul>
-</div>
-<div class="p"><pre>public @interface CreatedBy{
-     String name();
-     String date();
-     boolean contractor() default false;
-}          </pre>
-<pre>@CreatedBy(name = "Mary Smith",date="02/02/2008");
-public class MyClass{....}         </pre>
-</div>
-</div>
-
-
-<div class="id_postreq"><div class="p"><strong>Meta-annotations</strong>: Meta-annotations
-(annotations of annotations) provide additional information on how an annotation
-should be used:<ul>
-<li>@Target<ul>
-<li>Restricts the use of an annotation</li>
-
-<li>Single argument must be from Enum ElementType <ul>
-<li>{TYPE, FIELD,METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE}</li>
-
-</ul>
-</li>
-
-</ul>
-</li>
-
-<li>@Retention<ul>
-<li>Indicates where the annotation information will be retained</li>
-
-<li>Single argument must be from Enum RetentionPolicy<ul>
-<li>{SOURCE, CLASS, RUNTIME}</li>
-
-</ul>
-</li>
-
-</ul>
-</li>
-
-<li>@Documented<ul>
-<li>Marker for annotations that should be included in Javadoc</li>
-
-</ul>
-</li>
-
-<li>@Inherited<ul>
-<li>marker for Type annotations that are to be inherited by subtypes</li>
-
-</ul>
-</li>
-
-</ul>
-<strong>Other built-in annotations</strong>: <ul>
-<li>@Overrides<ul>
-<li>Applied to a method</li>
-
-<li>Indicates that the compiler should generate an error if the method does
-not actually override a superclass method.</li>
-
-</ul>
-</li>
-
-<li>@Deprecated<ul>
-<li>Applied to a method</li>
-
-<li>Indicates that the compiler should generate a warning when the method
-is used externally</li>
-
-</ul>
-</li>
-
-<li>@SuppressWarnings<ul>
-<li>Applies to a type or a method</li>
-
-<li>Indicates that the compiler should supress warnings for that element and
-all subelements<div class="p"><pre>@Deprecated
-public void oldMethod() {...}
-
-@ SupressWarnings
-public void yesIknowIuseDeprecatedMethods() {...}</pre>
-</div>
-</li>
-
-</ul>
-</li>
-
-</ul>
-</div>
-<p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/ctypesofanno.html">Types of annotations</a></strong><br />
-Java EE 6 and Java EE 5 define a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs).</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cannotations.html" title="The goal of Java EE 5 and Java EE 6 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 and Java EE 6 support the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere.">Java EE 5 and Java EE 6 support for annotations</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita
deleted file mode 100644
index 9639608df..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjappproj" xml:lang="en-us">
-<title outputclass="id_title">Creating an application client project</title>
-<shortdesc outputclass="id_shortdesc">You can use a wizard to create a new
-application client project and add it to a new or existing enterprise application
-project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>creating</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>Application
-client projects contain the resources needed for application client modules
-and programs that run on networked client systems. An application client project
-is deployed as a JAR file.</p><p>Like the other types of projects, application
-client projects can contain one or more project facets, which represent units
-of functionality in the project. A new application client project should have
-the Application Client module facet. Depending on what you want to use the
-project for, you may want to enable other facets for the project.</p><p>To
-create a J2EE application client project, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Project</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>Java
-EE</uicontrol><uicontrol>Application Client Project</uicontrol></menucascade> and
-click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>Project Name</uicontrol> field, type a name for
-the application client project. </cmd></step>
-<step importance="optional"><cmd>To change the default project location, clear
-the <uicontrol>Use default</uicontrol> check box under <uicontrol>Project
-contents</uicontrol> and select a new location with the <uicontrol>Browse</uicontrol> button.</cmd>
-<info>If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<note>If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible Java EE version based on the version of the project
-being created. If you want to specify a different version or a different location
-for the enterprise application, you must use the New Enterprise Application
-Project wizard.</note></info></step>
-<step importance="optional"><cmd>To add the new project to an enterprise application
-project, select the <uicontrol>Add project to an EAR</uicontrol> check box
-and select a project in the <uicontrol>EAR Project Name</uicontrol> list.</cmd>
-<info>If you choose to add the project to an existing EAR project, the <uicontrol>Target
-runtime</uicontrol> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> field, select the
-target runtime for the project.</cmd></step>
-<step importance="optional"><cmd>To use a predefined configuration for your
-project, select a configuration in the <uicontrol>Configurations</uicontrol> list.
-You can click the <uicontrol>Modify</uicontrol> button to do the following:</cmd>
-<info><ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <uicontrol>Details</uicontrol> tab.
-You can also choose a preset combination of facets from the <uicontrol>Configurations</uicontrol> list.</li>
-<li>Limit your project to be compatible with one or more runtimes. Click the <uicontrol>Show
-Runtimes</uicontrol> tab and select the runtimes that you want the project
-to be compatible with. </li>
-</ul>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>In the <uicontrol>Source Folder</uicontrol> field, enter the name
-of the folder to use for source code. </cmd></step>
-<step importance="optional"><cmd>To create a default class for the module,
-select the <uicontrol>Create a default Main class</uicontrol> check box.</cmd>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html
deleted file mode 100644
index ab95ff861..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating an application client project" />
-<meta name="abstract" content="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project." />
-<meta name="description" content="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project." />
-<meta content="application client projects, creating" name="DC.subject" />
-<meta content="application client projects, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjappproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating an application client project</title>
-</head>
-<body id="tjappproj"><a name="tjappproj"><!-- --></a>
-
-
-<h1 class="id_title">Creating an application client project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can use a wizard to create a new
-application client project and add it to a new or existing enterprise application
-project.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>Application
-client projects contain the resources needed for application client modules
-and programs that run on networked client systems. An application client project
-is deployed as a JAR file.</p>
-<p>Like the other types of projects, application
-client projects can contain one or more project facets, which represent units
-of functionality in the project. A new application client project should have
-the Application Client module facet. Depending on what you want to use the
-project for, you may want to enable other facets for the project.</p>
-<p>To
-create a J2EE application client project, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Project</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">Java
-EE</span> &gt; <span class="uicontrol">Application Client Project</span></span> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project Name</span> field, type a name for
-the application client project. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To change the default project location, clear
-the <span class="uicontrol">Use default</span> check box under <span class="uicontrol">Project
-contents</span> and select a new location with the <span class="uicontrol">Browse</span> button.</span>
- If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<div class="note"><span class="notetitle">Note:</span> If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible Java EE version based on the version of the project
-being created. If you want to specify a different version or a different location
-for the enterprise application, you must use the New Enterprise Application
-Project wizard.</div>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To add the new project to an enterprise application
-project, select the <span class="uicontrol">Add project to an EAR</span> check box
-and select a project in the <span class="uicontrol">EAR Project Name</span> list.</span>
- If you choose to add the project to an existing EAR project, the <span class="uicontrol">Target
-runtime</span> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> field, select the
-target runtime for the project.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To use a predefined configuration for your
-project, select a configuration in the <span class="uicontrol">Configurations</span> list.
-You can click the <span class="uicontrol">Modify</span> button to do the following:</span>
- <ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <span class="uicontrol">Details</span> tab.
-You can also choose a preset combination of facets from the <span class="uicontrol">Configurations</span> list.</li>
-
-<li>Limit your project to be compatible with one or more runtimes. Click the <span class="uicontrol">Show
-Runtimes</span> tab and select the runtimes that you want the project
-to be compatible with. </li>
-
-</ul>
-Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Source Folder</span> field, enter the name
-of the folder to use for source code. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To create a default class for the module,
-select the <span class="uicontrol">Create a default Main class</span> check box.</span>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita
deleted file mode 100644
index de2003e51..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjcircleb" xml:lang="en-us">
-<title outputclass="id_title">Correcting cyclical dependencies after an EAR
-is imported</title>
-<shortdesc outputclass="id_shortdesc">You can resolve cyclical dependencies
-after an EAR is imported.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>dependencies<indexterm>correcting cyclical</indexterm></indexterm>
-<indexterm>EAR files<indexterm>correcting cyclical dependencies</indexterm></indexterm>
-<indexterm>projects<indexterm>correcting cyclical dependencies</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>A
-cyclical dependency between two or more modules in an enterprise application
-most commonly occurs when projects are imported from outside the workbench.
-When a cycle exists between two or more modules in an enterprise application,
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> builder
-cannot accurately compute the build order of the projects. Full builds fail
-under these conditions, or require several invocations.</p><p>Therefore, the
-best practice is to organize your projects or modules into components. This
-allows your module dependencies to function as a tree instead of a cycle diagram.
-This practice has the added benefit of producing a better factored and layered
-application.</p><p>To reorganize your project to correct cyclical dependencies,
-complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Identify all the classes within the JAR files that have cyclical
-dependencies and move those classes into a common <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> project or JAR file.</cmd></step>
-<step><cmd>Use the enterprise application editor to map utility JAR files
-to the common projects.</cmd></step>
-<step><cmd>For each module of the JAR in the application, use the JAR dependency
-editor or properties page to set dependencies only to the JAR files that are
-truly required.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html
deleted file mode 100644
index 66113d397..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Correcting cyclical dependencies after an EAR is imported" />
-<meta name="abstract" content="You can resolve cyclical dependencies after an EAR is imported." />
-<meta name="description" content="You can resolve cyclical dependencies after an EAR is imported." />
-<meta content="dependencies, correcting cyclical, EAR files, correcting cyclical dependencies, projects" name="DC.subject" />
-<meta content="dependencies, correcting cyclical, EAR files, correcting cyclical dependencies, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjcircle.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjcircleb" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Correcting cyclical dependencies after an EAR
-is imported</title>
-</head>
-<body id="tjcircleb"><a name="tjcircleb"><!-- --></a>
-
-
-<h1 class="id_title">Correcting cyclical dependencies after an EAR
-is imported</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can resolve cyclical dependencies
-after an EAR is imported.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>A
-cyclical dependency between two or more modules in an enterprise application
-most commonly occurs when projects are imported from outside the workbench.
-When a cycle exists between two or more modules in an enterprise application,
-the Java™ builder
-cannot accurately compute the build order of the projects. Full builds fail
-under these conditions, or require several invocations.</p>
-<p>Therefore, the
-best practice is to organize your projects or modules into components. This
-allows your module dependencies to function as a tree instead of a cycle diagram.
-This practice has the added benefit of producing a better factored and layered
-application.</p>
-<p>To reorganize your project to correct cyclical dependencies,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li><span>Identify all the classes within the JAR files that have cyclical
-dependencies and move those classes into a common Java project or JAR file.</span></li>
-
-<li><span>Use the enterprise application editor to map utility JAR files
-to the common projects.</span></li>
-
-<li><span>For each module of the JAR in the application, use the JAR dependency
-editor or properties page to set dependencies only to the JAR files that are
-truly required.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjcircle.html" title="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.">Cyclical dependencies between Java EE modules</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.dita
deleted file mode 100644
index c89f63317..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.dita
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjear" xml:lang="en-us">
-<title outputclass="id_title">Creating an enterprise application project</title>
-<shortdesc outputclass="id_shortdesc">Using the wizard to create an enterprise
-application project allows you to package many web applications and modules
-in a project and deploy these modules as a J2EE enterprise application.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>enterprise applications<indexterm>projects<indexterm>creating</indexterm></indexterm></indexterm>
-<indexterm>J2EE<indexterm>enterprise application projects<indexterm>creating</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>Enterprise
-application projects contain references to the resources needed for enterprise
-applications and can contain a combination of Web modules, JAR files, connector
-modules, EJB modules, and application client modules. An enterprise application
-project is deployed in the form of an EAR file, and is therefore sometimes
-referred to as an EAR project. The modules in an enterprise application project
-are mapped to other J2EE projects. The mapping information is stored in metadata
-files within the enterprise application project. The metadata files are used
-for exporting the project to an EAR file and for running the project on the
-server.</p><p>Like the other types of projects, enterprise application projects
-can contain one or more project facets, which represent units of functionality
-in the project. To be deployed as an EAR file, the new project must have the
-EAR facet. Depending on what you want to use the project for, you may want
-to enable other facets for the project.</p><p conref="rjlimitcurrent.dita#rjlimitcurrent/limitation_ear_dbcs"></p><p>To
-create a J2EE enterprise application project, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Project</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>J2EE</uicontrol>
-<uicontrol>Enterprise Application Project</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Project Name</uicontrol> field, type a name for
-the new project. </cmd></step>
-<step importance="optional"><cmd>To change the default project location, clear
-the <uicontrol>Use default</uicontrol> check box under <uicontrol>Project
-contents</uicontrol> and select a new location with the <uicontrol>Browse</uicontrol> button.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> field, select the
-target runtime for the project.</cmd><info>You can click the <uicontrol>New</uicontrol> button
-to create a new runtime for the project to use.</info></step>
-<step importance="optional"><cmd>To use a predefined configuration for your
-project, select a configuration in the <uicontrol>Configuration</uicontrol> list.
-You can click the <uicontrol>Modify</uicontrol> button to do the following:</cmd>
-<info><ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <uicontrol>Details</uicontrol> tab.
-You can also choose a preset combination of facets from the <uicontrol>Configurations</uicontrol> list.</li>
-<li>Limit your project to be compatible with one or more runtimes. Click the <uicontrol>Show
-Runtimes</uicontrol> tab and select the runtimes that you want the project
-to be compatible with. </li>
-</ul>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>On the J2EE Modules to Add to the EAR page of the wizard, select
-the existing modules that you want to add to the new enterprise application
-project.</cmd></step>
-<step importance="optional"><cmd>To create new modules to add to the project,
-click the <uicontrol>New Module</uicontrol> button to do one of the following:</cmd>
-<choicetable keycol="0">
-<chrow><choption>Creating one module</choption><chdesc>Clear the <uicontrol>Create
-default modules</uicontrol> check box, select the type of module you want
-to create, click <uicontrol>Next</uicontrol> and follow the New Project wizard
-for that type of project.</chdesc></chrow>
-<chrow><choption>Creating two or more modules</choption><chdesc>Select the <uicontrol>Create
-default modules</uicontrol> check box, select the check boxes for each type
-of project you want to create, and click <uicontrol>Finish</uicontrol>.</chdesc>
-</chrow>
-</choicetable>
-<info>You can enter a name for each module. Each of these modules will have
-the default settings for that type of project and they will have the same
-server target as the new enterprise application.</info></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html
deleted file mode 100644
index 301dbe627..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating an enterprise application project" />
-<meta name="abstract" content="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application." />
-<meta name="description" content="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application." />
-<meta content="enterprise applications, projects, creating, J2EE, enterprise application projects" name="DC.subject" />
-<meta content="enterprise applications, projects, creating, J2EE, enterprise application projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating an enterprise application project</title>
-</head>
-<body id="tjear"><a name="tjear"><!-- --></a>
-
-
-<h1 class="id_title">Creating an enterprise application project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Using the wizard to create an enterprise
-application project allows you to package many web applications and modules
-in a project and deploy these modules as a J2EE enterprise application.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>Enterprise
-application projects contain references to the resources needed for enterprise
-applications and can contain a combination of Web modules, JAR files, connector
-modules, EJB modules, and application client modules. An enterprise application
-project is deployed in the form of an EAR file, and is therefore sometimes
-referred to as an EAR project. The modules in an enterprise application project
-are mapped to other J2EE projects. The mapping information is stored in metadata
-files within the enterprise application project. The metadata files are used
-for exporting the project to an EAR file and for running the project on the
-server.</p>
-<p>Like the other types of projects, enterprise application projects
-can contain one or more project facets, which represent units of functionality
-in the project. To be deployed as an EAR file, the new project must have the
-EAR facet. Depending on what you want to use the project for, you may want
-to enable other facets for the project.</p>
-<p>When
-you create an enterprise application project, it is recommended that you do
-not give it a name that contains double-byte character set (DBCS) characters.</p>
-<p>To
-create a J2EE enterprise application project, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Project</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">J2EE</span>
- &gt; <span class="uicontrol">Enterprise Application Project</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project Name</span> field, type a name for
-the new project. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To change the default project location, clear
-the <span class="uicontrol">Use default</span> check box under <span class="uicontrol">Project
-contents</span> and select a new location with the <span class="uicontrol">Browse</span> button.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> field, select the
-target runtime for the project.</span> You can click the <span class="uicontrol">New</span> button
-to create a new runtime for the project to use.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To use a predefined configuration for your
-project, select a configuration in the <span class="uicontrol">Configuration</span> list.
-You can click the <span class="uicontrol">Modify</span> button to do the following:</span>
- <ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <span class="uicontrol">Details</span> tab.
-You can also choose a preset combination of facets from the <span class="uicontrol">Configurations</span> list.</li>
-
-<li>Limit your project to be compatible with one or more runtimes. Click the <span class="uicontrol">Show
-Runtimes</span> tab and select the runtimes that you want the project
-to be compatible with. </li>
-
-</ul>
-Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>On the J2EE Modules to Add to the EAR page of the wizard, select
-the existing modules that you want to add to the new enterprise application
-project.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To create new modules to add to the project,
-click the <span class="uicontrol">New Module</span> button to do one of the following:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N1016C-option" align="left">Option</th>
-<th valign="bottom" id="N1016C-desc" align="left">Description</th></tr></thead>
-<tbody>
-<tr><td valign="top" headers="N1016C-option" id="N10176">Creating one module</td>
-<td valign="top" headers="N1016C-desc N10176">Clear the <span class="uicontrol">Create
-default modules</span> check box, select the type of module you want
-to create, click <span class="uicontrol">Next</span> and follow the New Project wizard
-for that type of project.</td>
-</tr>
-
-<tr><td valign="top" headers="N1016C-option" id="N10191">Creating two or more modules</td>
-<td valign="top" headers="N1016C-desc N10191">Select the <span class="uicontrol">Create
-default modules</span> check box, select the check boxes for each type
-of project you want to create, and click <span class="uicontrol">Finish</span>.</td>
-
-</tr>
-
-</tbody></table>
-
- You can enter a name for each module. Each of these modules will have
-the default settings for that type of project and they will have the same
-server target as the new enterprise application.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.dita
deleted file mode 100644
index d99519b66..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.dita
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjexpapp" xml:lang="en-us">
-<title outputclass="id_title">Exporting an application client project</title>
-<shortdesc outputclass="id_shortdesc">You can export an application client
-project as a JAR file.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>exporting</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>To
-export an application client project from the workbench, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Export</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an export destination</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>App Client JAR file</uicontrol></menucascade>,
-and then click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>Application Client project</uicontrol> list,
-select the application client project you want to export.</cmd></step>
-<step><cmd>In the <uicontrol>Destination</uicontrol> field, enter the full
-path and JAR file name where you want to export the application client project.</cmd>
-</step>
-<step importance="optional"><cmd>To export source files, select the <uicontrol>Export
-source files</uicontrol> check box.</cmd></step>
-<step importance="optional"><cmd>If you are exporting to an existing JAR file
-and you do not want to be warned about overwriting it, select the <uicontrol>Overwrite
-existing file</uicontrol> check box.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html
deleted file mode 100644
index 466746573..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting an application client project" />
-<meta name="abstract" content="You can export an application client project as a JAR file." />
-<meta name="description" content="You can export an application client project as a JAR file." />
-<meta content="application client projects, exporting" name="DC.subject" />
-<meta content="application client projects, exporting" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjexpapp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting an application client project</title>
-</head>
-<body id="tjexpapp"><a name="tjexpapp"><!-- --></a>
-
-
-<h1 class="id_title">Exporting an application client project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can export an application client
-project as a JAR file.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>To
-export an application client project from the workbench, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">Export</span></span>.</span></li>
-
-<li><span>Under <span class="uicontrol">Select an export destination</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> &gt; <span class="uicontrol">App Client JAR file</span></span>,
-and then click <span class="uicontrol">Next</span>.</span></li>
-
-<li><span>In the <span class="uicontrol">Application Client project</span> list,
-select the application client project you want to export.</span></li>
-
-<li><span>In the <span class="uicontrol">Destination</span> field, enter the full
-path and JAR file name where you want to export the application client project.</span>
-</li>
-
-<li><strong>Optional: </strong><span>To export source files, select the <span class="uicontrol">Export
-source files</span> check box.</span></li>
-
-<li><strong>Optional: </strong><span>If you are exporting to an existing JAR file
-and you do not want to be warned about overwriting it, select the <span class="uicontrol">Overwrite
-existing file</span> check box.</span></li>
-
-<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.dita
deleted file mode 100644
index c51e5b219..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjexpear" xml:lang="en-us">
-<title outputclass="id_title">Exporting an enterprise application into an
-EAR file</title>
-<shortdesc outputclass="id_shortdesc">Enterprise applications are deployed
-in the form of an EAR file. Use the Export wizard to export an enterprise
-application project into an EAR file for deployment.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EAR<indexterm>files<indexterm>exporting</indexterm></indexterm></indexterm>
-<indexterm>enterprise applications<indexterm>projects<indexterm>exporting</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>To
-export an enterprise application project into an EAR file, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Export</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an export destination</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>EAR file</uicontrol></menucascade>,
-and then click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>EAR project</uicontrol> list, select the enterprise
-application project you want to export.</cmd></step>
-<step><cmd>In the <uicontrol>Destination</uicontrol> field, enter the full
-path and EAR file name where you want to export the enterprise application
-project that is selected in the <uicontrol>EAR application</uicontrol> field.</cmd>
-</step>
-<step importance="optional"><cmd>To export source files, select the <uicontrol>Export
-source files</uicontrol> check box.</cmd></step>
-<step importance="optional"><cmd>If you are exporting to an existing EAR file
-and you do not want to be warned about overwriting it, select the <uicontrol>Overwrite
-existing file</uicontrol> check box.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<result outputclass="id_result">The wizard exports the contents of the EAR
-project to the specified EAR file. Additionally, for each project that corresponds
-to a module or utility JAR in the application, the project contents are exported
-into a nested module or JAR file in the EAR file. If any unsaved changes exist
-on any of the files in any of the referenced projects, you are prompted to
-save these files prior to export.</result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html
deleted file mode 100644
index d07260148..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting an enterprise application into an EAR file" />
-<meta name="abstract" content="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment." />
-<meta name="description" content="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment." />
-<meta content="EAR, files, exporting, enterprise applications, projects" name="DC.subject" />
-<meta content="EAR, files, exporting, enterprise applications, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjexpear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting an enterprise application into an
-EAR file</title>
-</head>
-<body id="tjexpear"><a name="tjexpear"><!-- --></a>
-
-
-<h1 class="id_title">Exporting an enterprise application into an
-EAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Enterprise applications are deployed
-in the form of an EAR file. Use the Export wizard to export an enterprise
-application project into an EAR file for deployment.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>To
-export an enterprise application project into an EAR file, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">Export</span></span>.</span></li>
-
-<li><span>Under <span class="uicontrol">Select an export destination</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> &gt; <span class="uicontrol">EAR file</span></span>,
-and then click <span class="uicontrol">Next</span>.</span></li>
-
-<li><span>In the <span class="uicontrol">EAR project</span> list, select the enterprise
-application project you want to export.</span></li>
-
-<li><span>In the <span class="uicontrol">Destination</span> field, enter the full
-path and EAR file name where you want to export the enterprise application
-project that is selected in the <span class="uicontrol">EAR application</span> field.</span>
-</li>
-
-<li><strong>Optional: </strong><span>To export source files, select the <span class="uicontrol">Export
-source files</span> check box.</span></li>
-
-<li><strong>Optional: </strong><span>If you are exporting to an existing EAR file
-and you do not want to be warned about overwriting it, select the <span class="uicontrol">Overwrite
-existing file</span> check box.</span></li>
-
-<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_result">The wizard exports the contents of the EAR
-project to the specified EAR file. Additionally, for each project that corresponds
-to a module or utility JAR in the application, the project contents are exported
-into a nested module or JAR file in the EAR file. If any unsaved changes exist
-on any of the files in any of the referenced projects, you are prompted to
-save these files prior to export.</div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.dita
deleted file mode 100644
index aa2405b48..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjexprar" xml:lang="en-us">
-<title outputclass="id_title">Exporting connector projects to RAR files</title>
-<shortdesc outputclass="id_shortdesc">You can export a connector project to
-a RAR file in preparation for deploying it to a server.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>connector projects<indexterm>exporting</indexterm></indexterm>
-<indexterm>RAR files<indexterm>exporting</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>To
-export the contents of a connector project to a RAR file, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Export</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an export destination</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>RAR file</uicontrol></menucascade>,
-and then click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>Connector project</uicontrol> list, select the
-connector project to export.</cmd></step>
-<step><cmd>In the <uicontrol>Destination</uicontrol> field, enter the full
-path and RAR file name where you want to export the connector project.</cmd>
-</step>
-<step importance="optional"><cmd>To export source files, select the <uicontrol>Export
-source files</uicontrol> check box.</cmd></step>
-<step importance="optional"><cmd>If you are exporting to an existing RAR file
-and you do not want to be warned about overwriting it, select the <uicontrol>Overwrite
-existing file</uicontrol> check box.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd><stepresult outputclass="id_result">The
-wizard exports the contents of the RAR project to the specified RAR file.</stepresult>
-</step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html
deleted file mode 100644
index bd537fb70..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting connector projects to RAR files" />
-<meta name="abstract" content="You can export a connector project to a RAR file in preparation for deploying it to a server." />
-<meta name="description" content="You can export a connector project to a RAR file in preparation for deploying it to a server." />
-<meta content="connector projects, exporting, RAR files" name="DC.subject" />
-<meta content="connector projects, exporting, RAR files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjexprar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting connector projects to RAR files</title>
-</head>
-<body id="tjexprar"><a name="tjexprar"><!-- --></a>
-
-
-<h1 class="id_title">Exporting connector projects to RAR files</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can export a connector project to
-a RAR file in preparation for deploying it to a server.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>To
-export the contents of a connector project to a RAR file, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">Export</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an export destination</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> &gt; <span class="uicontrol">RAR file</span></span>,
-and then click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Connector project</span> list, select the
-connector project to export.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Destination</span> field, enter the full
-path and RAR file name where you want to export the connector project.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To export source files, select the <span class="uicontrol">Export
-source files</span> check box.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you are exporting to an existing RAR file
-and you do not want to be warned about overwriting it, select the <span class="uicontrol">Overwrite
-existing file</span> check box.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span> The
-wizard exports the contents of the RAR project to the specified RAR file.
-</li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.dita
deleted file mode 100644
index 78a47c141..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimpapp" xml:lang="en-us">
-<title outputclass="id_title">Importing an application client JAR file</title>
-<shortdesc outputclass="id_shortdesc">Application client projects are deployed
-as JAR files. You can import an application client project that has been deployed
-into a JAR file by using the Import wizard.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>importing</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>To
-import an application client JAR file using the wizard, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Import</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an import source</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>App Client JAR file</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Application Client file</uicontrol> field, enter
-the location and name of the application client JAR file that you want to
-import.</cmd></step>
-<step><cmd>In the <uicontrol>Application Client project</uicontrol> field,
-type a new project name or accept the default project name. </cmd><info>The
-application client project will be created based on the version of the application
-client JAR file, and it will use the default location.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> drop-down list, select
-the application server that you want to target for your development. This
-selection affects the run time settings by modifying the class path entries
-for the project.</cmd></step>
-<step importance="optional"><cmd>To add the new module to an enterprise application
-project, select the <uicontrol>Add project to an EAR</uicontrol> check box
-and then select an existing enterprise application project from the list or
-create a new one by clicking <uicontrol>New</uicontrol>.</cmd><info><note>If
-you type a new enterprise application project name, the enterprise application
-project will be created in the default location with the lowest compatible
-J2EE version based on the version of the project being created. If you want
-to specify a different version or a different location for the enterprise
-application, you must use the New Enterprise Application Project wizard.</note></info>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to import the application client
-JAR file.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html
deleted file mode 100644
index d008ac82b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing an application client JAR file" />
-<meta name="abstract" content="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard." />
-<meta name="description" content="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard." />
-<meta content="application client projects, importing" name="DC.subject" />
-<meta content="application client projects, importing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimpapp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing an application client JAR file</title>
-</head>
-<body id="tjimpapp"><a name="tjimpapp"><!-- --></a>
-
-
-<h1 class="id_title">Importing an application client JAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Application client projects are deployed
-as JAR files. You can import an application client project that has been deployed
-into a JAR file by using the Import wizard.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>To
-import an application client JAR file using the wizard, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">Import</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> &gt; <span class="uicontrol">App Client JAR file</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Application Client file</span> field, enter
-the location and name of the application client JAR file that you want to
-import.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Application Client project</span> field,
-type a new project name or accept the default project name. </span> The
-application client project will be created based on the version of the application
-client JAR file, and it will use the default location.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> drop-down list, select
-the application server that you want to target for your development. This
-selection affects the run time settings by modifying the class path entries
-for the project.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To add the new module to an enterprise application
-project, select the <span class="uicontrol">Add project to an EAR</span> check box
-and then select an existing enterprise application project from the list or
-create a new one by clicking <span class="uicontrol">New</span>.</span> <div class="note"><span class="notetitle">Note:</span> If
-you type a new enterprise application project name, the enterprise application
-project will be created in the default location with the lowest compatible
-J2EE version based on the version of the project being created. If you want
-to specify a different version or a different location for the enterprise
-application, you must use the New Enterprise Application Project wizard.</div>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to import the application client
-JAR file.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.dita
deleted file mode 100644
index cd6c4ae3c..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimpear" xml:lang="en-us">
-<title outputclass="id_title">Importing an enterprise application EAR file</title>
-<shortdesc outputclass="id_shortdesc">Enterprise application projects are
-deployed into EAR files. You can import an enterprise application project
-by importing it from a deployed EAR file.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EAR<indexterm>files<indexterm>importing</indexterm></indexterm></indexterm>
-<indexterm>enterprise applications<indexterm>projects<indexterm>importing</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>You
-can also choose to import utility JAR files as utility <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> projects.
-You can also use the wizard to change the new project names for the EAR file
-and modules that will be imported.</p><p>To import an EAR file using the wizard,
-complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Import</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an import source</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>EAR file</uicontrol></menucascade> and
-click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>EAR file</uicontrol> field, enter the location
-and name of the application client JAR file that you want to import. </cmd>
-</step>
-<step><cmd>In the <uicontrol>EAR project</uicontrol> field, accept the default
-project name or type a new project name. </cmd></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> drop-down list, select
-the application server that you want to target for your development.</cmd>
-<info>This selection affects the run time settings by modifying the class
-path entries for the project. Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>Select any utility JAR files from the project that you want to
-import as utility projects.</cmd></step>
-<step><cmd>In the <uicontrol>Module Root Location</uicontrol> field, specify
-the root directory for all of the projects that will be imported or created
-during import, and click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>On the EAR Module and Utility JAR Projects page, select the projects
-that you want to import with the EAR file. You can edit the new project name
-for each module and utility project to be imported.</cmd><info></info></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to import the contents of the
-EAR file.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html
deleted file mode 100644
index 7780a5a41..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing an enterprise application EAR file" />
-<meta name="abstract" content="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file." />
-<meta name="description" content="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file." />
-<meta content="EAR, files, importing, enterprise applications, projects" name="DC.subject" />
-<meta content="EAR, files, importing, enterprise applications, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcircleb.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjcircle.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimpear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing an enterprise application EAR file</title>
-</head>
-<body id="tjimpear"><a name="tjimpear"><!-- --></a>
-
-
-<h1 class="id_title">Importing an enterprise application EAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Enterprise application projects are
-deployed into EAR files. You can import an enterprise application project
-by importing it from a deployed EAR file.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>You
-can also choose to import utility JAR files as utility Java™ projects.
-You can also use the wizard to change the new project names for the EAR file
-and modules that will be imported.</p>
-<p>To import an EAR file using the wizard,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">Import</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> &gt; <span class="uicontrol">EAR file</span></span> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">EAR file</span> field, enter the location
-and name of the application client JAR file that you want to import. </span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">EAR project</span> field, accept the default
-project name or type a new project name. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> drop-down list, select
-the application server that you want to target for your development.</span>
- This selection affects the run time settings by modifying the class
-path entries for the project. Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>Select any utility JAR files from the project that you want to
-import as utility projects.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Module Root Location</span> field, specify
-the root directory for all of the projects that will be imported or created
-during import, and click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>On the EAR Module and Utility JAR Projects page, select the projects
-that you want to import with the EAR file. You can edit the new project name
-for each module and utility project to be imported.</span> </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to import the contents of the
-EAR file.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cjcircle.html" title="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.">Cyclical dependencies between Java EE modules</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
-<div><a href="../topics/tjcircleb.html" title="You can resolve cyclical dependencies after an EAR is imported.">Correcting cyclical dependencies after an EAR is imported</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.dita
deleted file mode 100644
index 5d9a2945a..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.dita
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimprar" xml:lang="en-us">
-<title outputclass="id_title">Importing a connector project RAR file</title>
-<shortdesc outputclass="id_shortdesc">Connector projects are deployed into
-RAR files. You can import a connector project by importing a deployed RAR
-file.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>connector projects<indexterm>importing</indexterm></indexterm>
-<indexterm>RAR files<indexterm>importing</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>To
-import a connector project RAR file using the wizard, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Import</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an import source</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>RAR file</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Connector file</uicontrol> field, enter the full
-path and name of the connector RAR file that you want to import. </cmd></step>
-<step><cmd>In the <uicontrol>Connector module</uicontrol> combination box,
-type a new project name or select a connector project from the drop-down list. </cmd>
-<info>If you type a new project name in this field, the connector project
-will be created based on the version of the connector RAR file, and it will
-use the default location.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> drop-down list, select
-the application server that you want to target for your development. </cmd>
-<info>This selection affects the run-time settings by modifying the class
-path entries for the project.</info></step>
-<step importance="optional"><cmd>To add the new module to an enterprise application
-project, select the <uicontrol>Add project to an EAR</uicontrol> check box
-and then select an existing enterprise application  project from the list
-or create a new one by clicking <uicontrol>New</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>EAR application</uicontrol> combination box,
-type a new project name or select an existing enterprise application project
-from the drop-down list. Or, click the <uicontrol>New</uicontrol> button to
-launch the New Enterprise Application Project wizard.</cmd><info><note>If
-you type a new enterprise application  project name, the enterprise application
- project will be created in the default location with the lowest compatible
-J2EE version based on the version of the project being created. If you want
-to specify a different version or a different location for the enterprise
-application, you must use the New Enterprise Application Project wizard.</note></info>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to import the connector RAR
-file.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html
deleted file mode 100644
index 4ee63463b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing a connector project RAR file" />
-<meta name="abstract" content="Connector projects are deployed into RAR files. You can import a connector project by importing a deployed RAR file." />
-<meta name="description" content="Connector projects are deployed into RAR files. You can import a connector project by importing a deployed RAR file." />
-<meta content="connector projects, importing, RAR files" name="DC.subject" />
-<meta content="connector projects, importing, RAR files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimprar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing a connector project RAR file</title>
-</head>
-<body id="tjimprar"><a name="tjimprar"><!-- --></a>
-
-
-<h1 class="id_title">Importing a connector project RAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Connector projects are deployed into
-RAR files. You can import a connector project by importing a deployed RAR
-file.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>To
-import a connector project RAR file using the wizard, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">Import</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> &gt; <span class="uicontrol">RAR file</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Connector file</span> field, enter the full
-path and name of the connector RAR file that you want to import. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Connector module</span> combination box,
-type a new project name or select a connector project from the drop-down list. </span>
- If you type a new project name in this field, the connector project
-will be created based on the version of the connector RAR file, and it will
-use the default location.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> drop-down list, select
-the application server that you want to target for your development. </span>
- This selection affects the run-time settings by modifying the class
-path entries for the project.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To add the new module to an enterprise application
-project, select the <span class="uicontrol">Add project to an EAR</span> check box
-and then select an existing enterprise application  project from the list
-or create a new one by clicking <span class="uicontrol">New</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">EAR application</span> combination box,
-type a new project name or select an existing enterprise application project
-from the drop-down list. Or, click the <span class="uicontrol">New</span> button to
-launch the New Enterprise Application Project wizard.</span> <div class="note"><span class="notetitle">Note:</span> If
-you type a new enterprise application  project name, the enterprise application
- project will be created in the default location with the lowest compatible
-J2EE version based on the version of the project being created. If you want
-to specify a different version or a different location for the enterprise
-application, you must use the New Enterprise Application Project wizard.</div>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to import the connector RAR
-file.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.dita
deleted file mode 100644
index 861366d94..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.dita
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjrar" xml:lang="en-us">
-<title outputclass="id_title">Creating a connector project</title>
-<shortdesc outputclass="id_shortdesc">A connector is a J2EE standard extension
-mechanism for containers to provide connectivity to enterprise information
-systems (EISs).</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>connector projects<indexterm>creating</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>A
-connector is specific to an EIS and consists of a resource adapter and application
-development tools. A resource adapter is a system-level software driver that
-is used by an EJB container or an application client to connect to an EIS.
-Connectors comply with the J2EE Connector architecture (JCA).</p><p>Like the
-other types of projects, connector projects can contain one or more project
-facets, which represent units of functionality in the project. A new connector
-project should have the J2C Module facet. Depending on what you want to use
-the project for, you may want to enable other facets for the project.</p><note
-type="restriction">J2EE 1.2 specification level does not include connector
-capability.</note><p>To create a new connector project, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Project</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>J2EE</uicontrol>
-<uicontrol>Connector Project</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Project Name</uicontrol> field, type a name for
-the connector project. </cmd></step>
-<step importance="optional"><cmd>To change the default project location, clear
-the <uicontrol>Use default</uicontrol> check box under <uicontrol>Project
-contents</uicontrol> and select a new location with the <uicontrol>Browse</uicontrol> button.</cmd>
-<info>If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<note>If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible J2EE version based on the version of the project
-being created. If you want to specify a different version or a different location
-for the enterprise application, you must use the New Enterprise Application
-Project wizard.</note></info></step>
-<step importance="optional"><cmd>If you want to add the new project to an
-enterprise application project, select the <uicontrol>Add project to an EAR</uicontrol> check
-box and select a project in the <uicontrol>EAR Project Name</uicontrol> list.</cmd>
-<info>If you choose to add the project to an existing EAR project, the <uicontrol>Target
-runtime</uicontrol> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> field, select the
-target runtime for the project.</cmd></step>
-<step importance="optional"><cmd>To use a predefined configuration for your
-project, select a configuration in the <uicontrol>Configuration</uicontrol> list.
-You can click the <uicontrol>Modify</uicontrol> button to do the following:</cmd>
-<info><ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <uicontrol>Details</uicontrol> tab.
-You can also choose a preset combination of facets from the <uicontrol>Configurations</uicontrol> list.</li>
-<li>Limit your project to be compatible with one or more runtimes. Click the <uicontrol>Show
-Runtimes</uicontrol> tab and select the runtimes that you want the project
-to be compatible with. </li>
-</ul>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>In the <uicontrol>Source Folder</uicontrol> field, enter the name
-of the folder to use for source code.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html
deleted file mode 100644
index 35783495f..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a connector project" />
-<meta name="abstract" content="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs)." />
-<meta name="description" content="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs)." />
-<meta content="connector projects, creating" name="DC.subject" />
-<meta content="connector projects, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjrar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a connector project</title>
-</head>
-<body id="tjrar"><a name="tjrar"><!-- --></a>
-
-
-<h1 class="id_title">Creating a connector project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">A connector is a J2EE standard extension
-mechanism for containers to provide connectivity to enterprise information
-systems (EISs).</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>A
-connector is specific to an EIS and consists of a resource adapter and application
-development tools. A resource adapter is a system-level software driver that
-is used by an EJB container or an application client to connect to an EIS.
-Connectors comply with the J2EE Connector architecture (JCA).</p>
-<p>Like the
-other types of projects, connector projects can contain one or more project
-facets, which represent units of functionality in the project. A new connector
-project should have the J2C Module facet. Depending on what you want to use
-the project for, you may want to enable other facets for the project.</p>
-<div class="restriction"><span class="restrictiontitle">Restriction:</span> J2EE 1.2 specification level does not include connector
-capability.</div>
-<p>To create a new connector project, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Project</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">J2EE</span>
- &gt; <span class="uicontrol">Connector Project</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project Name</span> field, type a name for
-the connector project. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To change the default project location, clear
-the <span class="uicontrol">Use default</span> check box under <span class="uicontrol">Project
-contents</span> and select a new location with the <span class="uicontrol">Browse</span> button.</span>
- If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<div class="note"><span class="notetitle">Note:</span> If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible J2EE version based on the version of the project
-being created. If you want to specify a different version or a different location
-for the enterprise application, you must use the New Enterprise Application
-Project wizard.</div>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to add the new project to an
-enterprise application project, select the <span class="uicontrol">Add project to an EAR</span> check
-box and select a project in the <span class="uicontrol">EAR Project Name</span> list.</span>
- If you choose to add the project to an existing EAR project, the <span class="uicontrol">Target
-runtime</span> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> field, select the
-target runtime for the project.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To use a predefined configuration for your
-project, select a configuration in the <span class="uicontrol">Configuration</span> list.
-You can click the <span class="uicontrol">Modify</span> button to do the following:</span>
- <ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <span class="uicontrol">Details</span> tab.
-You can also choose a preset combination of facets from the <span class="uicontrol">Configurations</span> list.</li>
-
-<li>Limit your project to be compatible with one or more runtimes. Click the <span class="uicontrol">Show
-Runtimes</span> tab and select the runtimes that you want the project
-to be compatible with. </li>
-
-</ul>
-Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Source Folder</span> field, enter the name
-of the folder to use for source code.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.dita
deleted file mode 100644
index 1d0269174..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.dita
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjtargetserver" xml:lang="en-us">
-<title outputclass="id_title">Specifying target servers for J2EE projects</title>
-<shortdesc outputclass="id_shortdesc">When you develop J2EE applications,
-you can specify the server runtime environments for your J2EE projects.
-The target server is specified during project creation and import,
-and it can be changed in the project properties. The target server
-setting is the default mechanism for setting the class path for J2EE
-projects.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>J2EE<indexterm>target servers</indexterm></indexterm>
-<indexterm>projects<indexterm>target servers</indexterm></indexterm>
-<indexterm>target servers<indexterm>J2EE applications</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>In
-order to support different application servers that use different
-JDK levels for their <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Runtime
-Environment (JRE), the workbench prompts you for a target server setting
-for each J2EE project. For example, if you want to take advantage
-of the features of JDK 1.4.2, your applications require different
-class path entries than those that were used in previous versions
-of the workbench. By prompting you to specify a target server, the
-workbench enforces that proper entries are added for running on the
-server you choose.</p><p>You can also add more than one target server
-for your project. In this case, the workbench prevents you from adding
-any facets not supported by all of the target servers. If you add
-more than one target server, choose a server that will contribute
-to the project's class path as the primary server.</p><p>When the
-project is created, the class path of the project is updated with
-two class path containers. One container is the JDK container and
-the other is the server container. The JDK container points to the
-directory that contains the JAR files that are necessary to support
-the JDK version. The server container points to the directory that
-contains the multiple public JAR files available in the selected server.
-The project then compiles based on the required JAR files located
-in these folders, and you do not need to worry about adding additional
-JAR files from the server during development. When the project is
-compiled, the JAR files are included in the class path. You can still
-add your own JAR files to the class path.</p><p>The target runtime
-environment is specified in the org.eclipse.wst.common.project.facet.core.xml
-file in the project's .settings folder. You should not edit this file
-manually; instead, use the properties window as described in this
-topic.</p><p>All J2EE project creation and import wizards prompt you
-to specify the target server for the resulting projects. The list
-of target servers that you can choose from is filtered based on installed
-runtimes, the J2EE level of the application, and the J2EE module type.
-For example, for EJB projects only application servers that support
-Enterprise <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="JavaBeans">JavaBeans</tm> are displayed. All
-projects inside a single EAR file must be targeted to the same server.
-If you create a new project and add it to an existing EAR project
-during creation, the project inherits the target server setting of
-the EAR project.</p><note>Utility <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> projects
-that are added to an application are targeted to the same target server
-as the application. Web library projects that are added to a Web project
-are targeted to the same target server as the Web project.</note><p>To
-modify the target runtime and default server for an existing project,
-complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-perspective, right-click the enterprise application or module project,
-and select <uicontrol>Properties</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Targeted Runtimes</uicontrol> page
-in the Properties dialog.</cmd></step>
-<step><cmd>In the <uicontrol>Targeted Runtimes</uicontrol> list, select
-the check boxes next to each of the runtimes that you want to develop
-the project for. If you don't see the runtime that you want to use,
-you need to add it to the runtimes in the workbench. For more information,
-see <xref
-href="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita"
-scope="peer">Defining the installed server runtime environments</xref>.</cmd>
-<info><note>Only the runtimes compatible with the project's facets
-are shown. You can select the <uicontrol>Show all runtimes</uicontrol> check
-box to display the runtimes not compatible with the project's current
-facet configuration. These runtimes are grayed out.</note></info></step>
-<step><cmd>To select the primary runtime, click on a runtime and then
-click the <uicontrol>Make Primary</uicontrol> button.</cmd><info>If
-you select any runtimes for the project, you must make one of those
-runtimes the primary runtime for the project. If you select only one
-runtime from the list, that runtime is automatically made the primary
-runtime. The primary runtime is shown in bold text.</info></step>
-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html
deleted file mode 100644
index dd91bf63b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Specifying target servers for J2EE projects" />
-<meta name="abstract" content="When you develop J2EE applications, you can specify the server runtime environments for your J2EE projects. The target server is specified during project creation and import, and it can be changed in the project properties. The target server setting is the default mechanism for setting the class path for J2EE projects." />
-<meta name="description" content="When you develop J2EE applications, you can specify the server runtime environments for your J2EE projects. The target server is specified during project creation and import, and it can be changed in the project properties. The target server setting is the default mechanism for setting the class path for J2EE projects." />
-<meta content="J2EE, target servers, projects, target servers, J2EE applications" name="DC.subject" />
-<meta content="J2EE, target servers, projects, target servers, J2EE applications" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjtargetserver" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Specifying target servers for J2EE projects</title>
-</head>
-<body id="tjtargetserver"><a name="tjtargetserver"><!-- --></a>
-
-
-<h1 class="id_title">Specifying target servers for J2EE projects</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">When you develop J2EE applications,
-you can specify the server runtime environments for your J2EE projects. The
-target server is specified during project creation and import, and it can
-be changed in the project properties. The target server setting is the default
-mechanism for setting the class path for J2EE projects.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>In
-order to support different application servers that use different JDK levels
-for their Java™ Runtime Environment (JRE), the workbench prompts
-you for a target server setting for each J2EE project. For example, if you
-want to take advantage of the features of JDK 1.4.2, your applications require
-different class path entries than those that were used in previous versions
-of the workbench. By prompting you to specify a target server, the workbench
-enforces that proper entries are added for running on the server you choose.</p>
-<p>You
-can also add more than one target server for your project. In this case, the
-workbench prevents you from adding any facets not supported by all of the
-target servers. If you add more than one target server, choose a server that
-will contribute to the project's class path as the primary server.</p>
-<p>When
-the project is created, the class path of the project is updated with two
-class path containers. One container is the JDK container and the other is
-the server container. The JDK container points to the directory that contains
-the JAR files that are necessary to support the JDK version. The server container
-points to the directory that contains the multiple public JAR files available
-in the selected server. The project then compiles based on the required JAR
-files located in these folders, and you do not need to worry about adding
-additional JAR files from the server during development. When the project
-is compiled, the JAR files are included in the class path. You can still add
-your own JAR files to the class path.</p>
-<p>The target runtime environment
-is specified in the org.eclipse.wst.common.project.facet.core.xml file in
-the project's .settings folder. You should not edit this file manually; instead,
-use the properties window as described in this topic.</p>
-<p>All J2EE project
-creation and import wizards prompt you to specify the target server for the
-resulting projects. The list of target servers that you can choose from is
-filtered based on installed runtimes, the J2EE level of the application, and
-the J2EE module type. For example, for EJB projects only application servers
-that support Enterprise JavaBeans™ are displayed. All projects
-inside a single EAR file must be targeted to the same server. If you create
-a new project and add it to an existing EAR project during creation, the project
-inherits the target server setting of the EAR project.</p>
-<div class="note"><span class="notetitle">Note:</span> Utility Java projects
-that are added to an application are targeted to the same target server as
-the application. Web library projects that are added to a Web project are
-targeted to the same target server as the Web project.</div>
-<p>To modify
-the target runtime and default server for an existing project, complete the
-following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java EE perspective, right-click the enterprise
-application or module project, and select <span class="uicontrol">Properties</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Targeted Runtimes</span> page in the
-Properties dialog.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Targeted Runtimes</span> list, select the
-check boxes next to each of the runtimes that you want to develop the project
-for. If you don't see the runtime that you want to use, you need to add it
-to the runtimes in the workbench. For more information, see <a href="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html">Defining the installed server runtime environments</a>.</span> <div class="note"><span class="notetitle">Note:</span> Only the
-runtimes compatible with the project's facets are shown. You can select the <span class="uicontrol">Show
-all runtimes</span> check box to display the runtimes not compatible
-with the project's current facet configuration. These runtimes are grayed
-out.</div>
-</li>
-
-<li class="stepexpand"><span>To select the primary runtime, click on a runtime and then click
-the <span class="uicontrol">Make Primary</span> button.</span> If you select any
-runtimes for the project, you must make one of those runtimes the primary
-runtime for the project. If you select only one runtime from the list, that
-runtime is automatically made the primary runtime. The primary runtime is
-shown in bold text.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html">Defining the installed server runtime environments</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.dita
deleted file mode 100644
index d17be81a6..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.dita
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjval" xml:lang="en-us">
-<title outputclass="id_title">Validating code in enterprise applications</title>
-<shortdesc outputclass="id_shortdesc">The workbench includes validators that
-check certain files in your enterprise application module projects for errors.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>build validation<indexterm>enabling</indexterm></indexterm>
-<indexterm>code validation<indexterm>overview</indexterm></indexterm><indexterm>validation<indexterm>overview</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>By
-default, the workbench validates your files automatically after any build,
-including automatic builds. You can also begin the validation process manually
-without building.</p><p>On the workbench Preferences window, you can enable
-or disable validators to be used on your projects. Also, you can enable or
-disable validators for each enterprise application module project individually
-on the Properties page for that project.</p><p>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.</p><p>To validate your files,
-complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step importance="optional"><cmd>Review the check box options available near
-the top of the window to customize your validation settings:</cmd>
-<choicetable>
-<chhead><choptionhd>Option</choptionhd><chdeschd>Description</chdeschd></chhead>
-<chrow><choption>Allow projects to override these preference settings</choption>
-<chdesc>Select to set individual validation settings for one or more of your
-projects.</chdesc></chrow>
-<chrow><choption>Suspend all validators</choption><chdesc>Select to prevent
-validation at the global level.</chdesc></chrow>
-<chrow><choption>Save all modified resources automatically prior to validating</choption>
-<chdesc>Select to save resources you have modified before the validation begins.</chdesc>
-</chrow><chrow><choption>Show a confirmation dialog when performing manual validation</choption>
-<chdesc>Select to show an informational dialog after a manual validation request has completed.</chdesc>
-</chrow>
-</choicetable>
-</step>
-<step><cmd>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</cmd><info>Each validator has
-a check box to specify whether it is used on manual validation and/or on build
-validation.</info></step>
-<step><cmd>Tune a validator by clicking
-the button in the <uicontrol>Settings</uicontrol> column.</cmd>
-<info>Not all validators have additional settings.</info></step>
-<step><cmd>Begin the validation process by one of the following methods:</cmd>
-<choices>
-<choice>Right-click a project and click <uicontrol>Validate</uicontrol>.</choice>
-<choice>Start a build.</choice>
-</choices>
-</step>
-</steps>
-<result outputclass="id_result">Any err<?Pub Caret?>ors found by the validators
-are listed in the Problems view.<p>If you want to set individual validation
-settings for one or more of your projects, see <xref href="tjvalglobalpref.dita"></xref> for
-more information.</p></result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000003949?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html
deleted file mode 100644
index 178facea5..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Validating code in enterprise applications" />
-<meta name="abstract" content="The workbench includes validators that check certain files in your enterprise application module projects for errors." />
-<meta name="description" content="The workbench includes validators that check certain files in your enterprise application module projects for errors." />
-<meta content="build validation, enabling, code validation, overview, validation" name="DC.subject" />
-<meta content="build validation, enabling, code validation, overview, validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjval" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Validating code in enterprise applications</title>
-</head>
-<body id="tjval"><a name="tjval"><!-- --></a>
-
-
-<h1 class="id_title">Validating code in enterprise applications</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">The workbench includes validators that
-check certain files in your enterprise application module projects for errors.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>By
-default, the workbench validates your files automatically after any build,
-including automatic builds. You can also begin the validation process manually
-without building.</p>
-<p>On the workbench Preferences window, you can enable
-or disable validators to be used on your projects. Also, you can enable or
-disable validators for each enterprise application module project individually
-on the Properties page for that project.</p>
-<p>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.</p>
-<p>To validate your files,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Review the check box options available near
-the top of the window to customize your validation settings:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N100A9-option">Option</th>
-<th valign="bottom" id="N100A9-desc">Description</th></tr></thead>
-<tbody>
-
-<tr><td valign="top" headers="N100A9-option" id="N100C2"><strong>Allow projects to override these preference settings</strong></td>
-
-<td valign="top" headers="N100A9-desc N100C2">Select to set individual validation settings for one or more of your
-projects.</td>
-</tr>
-
-<tr><td valign="top" headers="N100A9-option" id="N100D2"><strong>Suspend all validators</strong></td>
-<td valign="top" headers="N100A9-desc N100D2">Select to prevent
-validation at the global level.</td>
-</tr>
-
-<tr><td valign="top" headers="N100A9-option" id="N100E1"><strong>Save all modified resources automatically prior to validating</strong></td>
-
-<td valign="top" headers="N100A9-desc N100E1">Select to save resources you have modified before the validation begins.</td>
-
-</tr>
-<tr><td valign="top" headers="N100A9-option" id="N100F1"><strong>Show a confirmation dialog when performing manual validation</strong></td>
-
-<td valign="top" headers="N100A9-desc N100F1">Select to show an informational dialog after a manual validation request has completed.</td>
-
-</tr>
-
-</tbody></table>
-
-</li>
-
-<li class="stepexpand"><span>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</span> Each validator has
-a check box to specify whether it is used on manual validation and/or on build
-validation.</li>
-
-<li class="stepexpand"><span>Tune a validator by clicking
-the button in the <span class="uicontrol">Settings</span> column.</span>
- Not all validators have additional settings.</li>
-
-<li class="stepexpand"><span>Begin the validation process by one of the following methods:</span>
-<ul>
-<li>Right-click a project and click <span class="uicontrol">Validate</span>.</li>
-
-<li>Start a build.</li>
-
-</ul>
-
-</li>
-
-</ol>
-
-<div class="id_result">Any errors found by the validators
-are listed in the Problems view.<p>If you want to set individual validation
-settings for one or more of your projects, see <a href="tjvalglobalpref.html" title="For a given project, you can override&#10;the global validation preferences.">Overriding global validation preferences</a> for
-more information.</p>
-</div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rvalerr.html" title="This table lists the common error messages you may encounter when you validate your projects.">Common validation errors and solutions</a></div>
-<div><a href="../topics/rvalidators.html" title="This table lists the validators that are available for the different project types and gives a brief description of each validator.">J2EE Validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.dita
deleted file mode 100644
index afe3aa197..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.dita
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvaldisable" xml:lang="en-us">
-<title outputclass="id_title">Disabling validation</title>
-<shortdesc outputclass="id_shortdesc">You can disable one or more validators
-individually or disable validation entirely. Also, you can set validation
-settings for your entire workspace and for individual projects.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>disabling</indexterm></indexterm>
-<indexterm>code validation<indexterm>disabling</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p>To
-disable validators in your project or workspace, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step><cmd>To disable individual validators, clear the check boxes next to
-each validator that you want to disable.</cmd><info>Each validator has a check
-box to specify whether it is enabled for manual validation or on a build.</info>
-</step>
-<step importance="optional"><cmd><?Pub Caret1?>You can also change the following
-check box options on this page:</cmd>
-<choicetable>
-<chhead><choptionhd>Option</choptionhd><chdeschd>Description</chdeschd></chhead>
-<chrow><choption>Allow projects to override these preference settings</choption>
-<chdesc>Select to set individual validation settings for one or more of your
-projects.</chdesc></chrow>
-<chrow><choption>Suspend all validators</choption><chdesc>Select to prevent
-validation at the global level. If you select this check box, you can still
-enable validation at the project level.</chdesc></chrow>
-</choicetable>
-</step>
-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<result>If you want to set individual validation settings for one or more
-of your projects, see <xref href="tjvalglobalpref.dita"></xref></result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002445?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html
deleted file mode 100644
index b918db48e..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Disabling validation" />
-<meta name="abstract" content="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects." />
-<meta name="description" content="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects." />
-<meta content="validation, disabling, code validation" name="DC.subject" />
-<meta content="validation, disabling, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvaldisable" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Disabling validation</title>
-</head>
-<body id="tjvaldisable"><a name="tjvaldisable"><!-- --></a>
-
-
-<h1 class="id_title">Disabling validation</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can disable one or more validators
-individually or disable validation entirely. Also, you can set validation
-settings for your entire workspace and for individual projects.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>To
-disable validators in your project or workspace, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><span>To disable individual validators, clear the check boxes next to
-each validator that you want to disable.</span> Each validator has a check
-box to specify whether it is enabled for manual validation or on a build.
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>You can also change the following
-check box options on this page:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N1009D-option">Option</th>
-<th valign="bottom" id="N1009D-desc">Description</th></tr></thead>
-<tbody>
-
-<tr><td valign="top" headers="N1009D-option" id="N100B6"><strong>Allow projects to override these preference settings</strong></td>
-
-<td valign="top" headers="N1009D-desc N100B6">Select to set individual validation settings for one or more of your
-projects.</td>
-</tr>
-
-<tr><td valign="top" headers="N1009D-option" id="N100C6"><strong>Suspend all validators</strong></td>
-<td valign="top" headers="N1009D-desc N100C6">Select to prevent
-validation at the global level. If you select this check box, you can still
-enable validation at the project level.</td>
-</tr>
-
-</tbody></table>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section">If you want to set individual validation settings for one or more
-of your projects, see <a href="tjvalglobalpref.html" title="For a given project, you can override&#10;the global validation preferences.">Overriding global validation preferences</a></div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.dita
deleted file mode 100644
index 50487df7b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvalglobalpref" xml:lang="en-us">
-<title outputclass="id_title">Overriding global validation preferences</title>
-<shortdesc outputclass="id_shortdesc">For a given project, you can override
-the global validation preferences.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>overriding global preferences</indexterm></indexterm>
-<indexterm>code validation<indexterm>overriding global preferences</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>The
-default validation preferences are specified globally on the Validation page
-of the Preferences dialog. To allow projects to override these default validation
-preferences, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step><cmd>Select the <uicontrol>Allow projects to override these preference
-settings</uicontrol> check box and click <uicontrol>OK</uicontrol>.</cmd>
-<stepresult>Now individual projects can override the global preferences.</stepresult>
-</step>
-<step><cmd>Right-click a project and then click <uicontrol>Properties</uicontrol>.</cmd><?Pub Caret?>
-</step>
-<step><cmd>In the left pane of the Properties window, click <uicontrol>Validation</uicontrol>.</cmd>
-</step>
-<step><cmd>Select the <uicontrol>Override validation preferences</uicontrol> check
-box.</cmd><info>This check box is available only if you checked the <uicontrol>Allow
-projects to override these preference settings</uicontrol> check box on the
-workbench validation preferences page.</info></step>
-<step><cmd>To prevent validation for this project, select the <uicontrol>Suspend
-all validators</uicontrol> check box.</cmd></step>
-<step><cmd>In the list of validators, select the check boxes next to each
-validator you want to use.</cmd><info>Each validator has a check box to specify
-whether it is used on manual validation or on a build.</info></step>
-<step><cmd>Choose an alternate implementation for a validator by clicking
-the button in the <uicontrol>Settings</uicontrol> column, then click <uicontrol>OK</uicontrol>.</cmd>
-<info>Not all validators have alternate implementations.</info></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002816?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html
deleted file mode 100644
index 09e64249b..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Overriding global validation preferences" />
-<meta name="abstract" content="For a given project, you can override the global validation preferences." />
-<meta name="description" content="For a given project, you can override the global validation preferences." />
-<meta content="validation, overriding global preferences, code validation" name="DC.subject" />
-<meta content="validation, overriding global preferences, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvalglobalpref" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Overriding global validation preferences</title>
-</head>
-<body id="tjvalglobalpref"><a name="tjvalglobalpref"><!-- --></a>
-
-
-<h1 class="id_title">Overriding global validation preferences</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">For a given project, you can override
-the global validation preferences.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>The
-default validation preferences are specified globally on the Validation page
-of the Preferences dialog. To allow projects to override these default validation
-preferences, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Allow projects to override these preference
-settings</span> check box and click <span class="uicontrol">OK</span>.</span>
- Now individual projects can override the global preferences.
-</li>
-
-<li class="stepexpand"><span>Right-click a project and then click <span class="uicontrol">Properties</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the left pane of the Properties window, click <span class="uicontrol">Validation</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Override validation preferences</span> check
-box.</span> This check box is available only if you checked the <span class="uicontrol">Allow
-projects to override these preference settings</span> check box on the
-workbench validation preferences page.</li>
-
-<li class="stepexpand"><span>To prevent validation for this project, select the <span class="uicontrol">Suspend
-all validators</span> check box.</span></li>
-
-<li class="stepexpand"><span>In the list of validators, select the check boxes next to each
-validator you want to use.</span> Each validator has a check box to specify
-whether it is used on manual validation or on a build.</li>
-
-<li class="stepexpand"><span>Choose an alternate implementation for a validator by clicking
-the button in the <span class="uicontrol">Settings</span> column, then click <span class="uicontrol">OK</span>.</span>
- Not all validators have alternate implementations.</li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.dita
deleted file mode 100644
index 03b800f8a..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvalmanual" xml:lang="en-us">
-<title outputclass="id_title">Manually validating code</title>
-<shortdesc outputclass="id_shortdesc">When you run a manual validation, all
-resources in the selected project are validated according to the validation
-settings.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>manual</indexterm></indexterm><indexterm>code
-validation<indexterm>manual</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>The
-validators used depend on the global and project validation settings. When
-you validate a project manually, the global settings are used unless both
-of the following are true:<ul>
-<li>The <uicontrol>Allow projects to override these preference settings</uicontrol> check
-box is selected on the global validation preferences page.</li>
-<li>The <uicontrol>Override validation preferences</uicontrol> check box is
-selected on the project's validation preferences page.</li>
-</ul></p><p>Whether the workbench uses the global or project validation preferences,
-only the validators selected to run on manual validation are used when you
-run a manual validation.</p><p>To manually invoke an immediate code validation,
-complete the following steps<?Pub Caret?>:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Select the project that you want to validate.</cmd></step>
-<step><cmd>Right-click the project and then click <uicontrol>Validate</uicontrol>.</cmd>
-<info>If this option is not available, validation is disabled or there are
-no validators enabled for the project. To enable validation at the global
-level, see <xref href="tjval.dita"></xref>. To enable validators for this
-project, see <xref href="tjvalglobalpref.dita"></xref>.</info></step>
-</steps>
-<result outputclass="id_result">The workbench validates the project using
-the enabled validators. Any errors found by the validators are listed in the
-Problems view.</result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002296?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html
deleted file mode 100644
index d5714685e..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Manually validating code" />
-<meta name="abstract" content="When you run a manual validation, all resources in the selected project are validated according to the validation settings." />
-<meta name="description" content="When you run a manual validation, all resources in the selected project are validated according to the validation settings." />
-<meta content="validation, manual, code validation" name="DC.subject" />
-<meta content="validation, manual, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvalmanual" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Manually validating code</title>
-</head>
-<body id="tjvalmanual"><a name="tjvalmanual"><!-- --></a>
-
-
-<h1 class="id_title">Manually validating code</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">When you run a manual validation, all
-resources in the selected project are validated according to the validation
-settings.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <div class="p">The
-validators used depend on the global and project validation settings. When
-you validate a project manually, the global settings are used unless both
-of the following are true:<ul>
-<li>The <span class="uicontrol">Allow projects to override these preference settings</span> check
-box is selected on the global validation preferences page.</li>
-
-<li>The <span class="uicontrol">Override validation preferences</span> check box is
-selected on the project's validation preferences page.</li>
-
-</ul>
-</div>
-<p>Whether the workbench uses the global or project validation preferences,
-only the validators selected to run on manual validation are used when you
-run a manual validation.</p>
-<p>To manually invoke an immediate code validation,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Select the project that you want to validate.</span></li>
-
-<li class="stepexpand"><span>Right-click the project and then click <span class="uicontrol">Validate</span>.</span>
- If this option is not available, validation is disabled or there are
-no validators enabled for the project. To enable validation at the global
-level, see <a href="tjval.html" title="The workbench includes validators that&#10;check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a>. To enable validators for this
-project, see <a href="tjvalglobalpref.html" title="For a given project, you can override&#10;the global validation preferences.">Overriding global validation preferences</a>.</li>
-
-</ol>
-
-<div class="id_result">The workbench validates the project using
-the enabled validators. Any errors found by the validators are listed in the
-Problems view.</div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.dita
deleted file mode 100644
index 5e5e5cf4f..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvalselect" xml:lang="en-us">
-<title outputclass="id_title">Selecting code validators</title>
-<shortdesc outputclass="id_shortdesc">You can select specific validators to
-run during manual and build code validation. You can set each validator to
-run on manual validation, build validation, both, or neither. </shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>selecting validators</indexterm></indexterm>
-<indexterm>code validation<indexterm>selecting validators</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p>To
-choose the validators that you want to use for a project, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step><cmd>Clear the <uicontrol>Suspend all validators</uicontrol> check box.</cmd>
-</step>
-<step importance="optional"><cmd><?Pub Caret1?>If you want to set individual
-validation settings for one or more of your projects, select the <uicontrol>Allow
-projects to override these preference settings</uicontrol> check box.</cmd>
-</step>
-<step><cmd>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</cmd><info>Each validator has
-a check box to specify whether it is used on manual validation or on a build.<note>If
-you deselect any validator that is currently selected, any messages associated
-with the deselected validator will be removed from the task list,
-the next time you perform a full build.</note></info>
-</step>
-<step><cmd>Tune a validator by clicking
-the button in the <uicontrol>Settings</uicontrol> column.</cmd>
-<info>Not all validators have additional settings.</info></step>
-</steps>
-<result>If you want to set individual validation settings for one or more
-of your projects, see <xref href="tjvalglobalpref.dita"></xref>. Like the
-global validation preferences, you can set validators at the project level
-to run on manual validation, build validation, both, or neither.</result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002685?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html
deleted file mode 100644
index b2799aaa3..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Selecting code validators" />
-<meta name="abstract" content="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither." />
-<meta name="description" content="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither." />
-<meta content="validation, selecting validators, code validation" name="DC.subject" />
-<meta content="validation, selecting validators, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvalselect" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Selecting code validators</title>
-</head>
-<body id="tjvalselect"><a name="tjvalselect"><!-- --></a>
-
-
-<h1 class="id_title">Selecting code validators</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can select specific validators to
-run during manual and build code validation. You can set each validator to
-run on manual validation, build validation, both, or neither. </p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>To
-choose the validators that you want to use for a project, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><span>Clear the <span class="uicontrol">Suspend all validators</span> check box.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to set individual
-validation settings for one or more of your projects, select the <span class="uicontrol">Allow
-projects to override these preference settings</span> check box.</span>
-</li>
-
-<li class="stepexpand"><span>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</span> Each validator has
-a check box to specify whether it is used on manual validation or on a build.<div class="note"><span class="notetitle">Note:</span> If
-you deselect any validator that is currently selected, any messages associated
-with the deselected validator will be removed from the task list,
-the next time you perform a full build.</div>
-
-</li>
-
-<li class="stepexpand"><span>Tune a validator by clicking
-the button in the <span class="uicontrol">Settings</span> column.</span>
- Not all validators have additional settings.</li>
-
-</ol>
-
-<div class="section">If you want to set individual validation settings for one or more
-of your projects, see <a href="tjvalglobalpref.html" title="For a given project, you can override&#10;the global validation preferences.">Overriding global validation preferences</a>. Like the
-global validation preferences, you can set validators at the project level
-to run on manual validation, build validation, both, or neither.</div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita
deleted file mode 100644
index c6bcc6b4f..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="cjviewfiltersCait" xml:lang="en-us">
-<title id="id_title">Filtering in the Project Explorer view</title>
-<shortdesc outputclass="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>filters<indexterm>Project Explorer view</indexterm></indexterm>
-<indexterm>views<indexterm>Project Explorer filters</indexterm></indexterm>
-<indexterm>projects<indexterm>filtering</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p>To
-enable or disable filters, complete the following steps</p></context>
-<steps>
-<step><cmd>Open the Select Common Navigator Filters window by selecting <uicontrol>Customize
-View...</uicontrol> from the drop-down menu at the top right corner of the
-view. </cmd></step>
-<step><cmd>On the <uicontrol>Filters</uicontrol> tab, select the check boxes
-next to the filters you want to enable.</cmd><info> For example, when the <uicontrol>Closed
-projects</uicontrol> filter is enabled, closed projects are not shown in the
-Project Explorer view. Other filters can hide empty packages, non-java files,
-and files with names ending in ".class".</info></step>
-<step><cmd>On the <uicontrol>Content</uicontrol> tab, the filters work in
-the opposite way: the selected check boxes describe the projects, folders,
-and files that are shown in the Project Explorer view. Select the check boxes
-next to the filters you want to hide.</cmd><info>For example, if you clear
-the check box next to <uicontrol>J2EE EJB Deployment Descriptors</uicontrol>,
-the deployment descriptors are hidden from each project in the view.</info>
-</step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html
deleted file mode 100644
index c4a6e5b46..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Filtering in the Project Explorer view" />
-<meta name="abstract" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta name="description" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta content="filters, Project Explorer view, views, Project Explorer filters, projects, filtering" name="DC.subject" />
-<meta content="filters, Project Explorer view, views, Project Explorer filters, projects, filtering" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjview.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjviewfiltersCait" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Filtering in the Project Explorer view</title>
-</head>
-<body id="cjviewfiltersCait"><a name="cjviewfiltersCait"><!-- --></a>
-
-
-<h1 class="topictitle1">Filtering in the Project Explorer view</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>To
-enable or disable filters, complete the following steps</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the Select Common Navigator Filters window by selecting <span class="uicontrol">Customize
-View...</span> from the drop-down menu at the top right corner of the
-view. </span></li>
-
-<li class="stepexpand"><span>On the <span class="uicontrol">Filters</span> tab, select the check boxes
-next to the filters you want to enable.</span>  For example, when the <span class="uicontrol">Closed
-projects</span> filter is enabled, closed projects are not shown in the
-Project Explorer view. Other filters can hide empty packages, non-java files,
-and files with names ending in ".class".</li>
-
-<li class="stepexpand"><span>On the <span class="uicontrol">Content</span> tab, the filters work in
-the opposite way: the selected check boxes describe the projects, folders,
-and files that are shown in the Project Explorer view. Select the check boxes
-next to the filters you want to hide.</span> For example, if you clear
-the check box next to <span class="uicontrol">J2EE EJB Deployment Descriptors</span>,
-the deployment descriptors are hidden from each project in the view.
-</li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjview.html" title="While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources.">Project Explorer view in the Java EE perspective</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.dita
deleted file mode 100644
index 90a48e213..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.dita
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="webfragmentproj" xml:lang="en-us">
-<title>Creating Web fragment projects</title>
-<shortdesc>You can use the Web fragment project wizard to create Web
-fragment projects in your workspace.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm keyref="tcreatwebmodule|1|JavaEEWebmodulecreating"
-status="new">Java EE<indexterm>Web fragment projects<indexterm>creating</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<prereq><p>A web fragment is a logical partitioning of the web application
-in such a way that the frameworks being used within the web application
-can define all the artifacts without requiring you to edit or add
-information in the web.xml. It can include almost all the same elements
-that the web.xml descriptor uses, with these requirements:</p><ul>
-<li>The top level element for the descriptor must be web-fragment</li>
-<li>The corresponding descriptor file must be called web-fragment.xml</li>
-</ul><p>If a framework is packaged as a jar file and has metadata
-information in the form of deployment descriptor, then the web-fragment.xml
-descriptor must be in the META-INF/ directory of the jar file.</p><p>A
-web fragment is a mechanism for either defining or extending the deployment
-descriptor of a web application by means of pluggable library jars
-that contain both the incremental deployment information (in the web-fragment.xml)
-and potentially any related or relevant classes.  The web fragment
-is also packaged as a library (jar), with the web-fragment.xml in
-the META-INF directory. Consequently, the web fragment project is
-essentially a Utility project, with the addition of a web fragment
-facet to it. The web fragment facet enables you to add relevant context-sensitive
-functionality to the fragment project.</p></prereq>
-<steps>
-<step><cmd>In the <tm tmtype="tm" trademark="Java">Java</tm> EE perspective,
-select <menucascade><uicontrol>File</uicontrol><uicontrol>New</uicontrol>
-<uicontrol>Web Fragment Project</uicontrol></menucascade>. Alternatively,
-right-click the Enterprise Explorer context menu, and select <menucascade>
-<uicontrol>New</uicontrol><uicontrol>Web Fragment Project</uicontrol>
-</menucascade>. The Web fragment wizard opens.</cmd></step>
-<step><cmd>In the <uicontrol>Name</uicontrol> field, type a name for
-the Web fragment project. To change the default <uicontrol>Project
-contents</uicontrol>, click the <uicontrol>Browse</uicontrol> button
-to select a new location.</cmd><info><p>If you specify a non-default
-project location that is already being used by another project, the
-project creation fails.</p></info></step>
-<step><cmd>The <uicontrol>Target runtime</uicontrol> field is pre-populated
-with the selection from the enterprise project.</cmd></step>
-<step importance="optional"><cmd>Select a pre-defined project configuration
-from the <uicontrol>Configurations</uicontrol> drop-down list.</cmd>
-</step>
-<step importance="optional"><cmd>If you want to modify the configuration
-details, click <uicontrol>modify</uicontrol>:</cmd></step>
-<step importance="optional"><cmd>Select one or more project facets
-from the <uicontrol>Project Facets</uicontrol> list. To specify server
-runtime environments, click <uicontrol>Show Runtimes</uicontrol> and
-select one or more runtimes. After making your selections, you can
-save your custom configuration by clicking <uicontrol>Save</uicontrol>.</cmd>
-</step>
-<step importance="optional"><cmd>Select the <uicontrol>Add project
-to Dynamic Web project</uicontrol> check box to add the new module
-to an enterprise module (WAR) project.</cmd><info>Type a new project
-name or select an existing enterprise module project from the drop-down
-list in the <uicontrol>Dynamic Web project name</uicontrol> combination
-box. Or, click <uicontrol>New</uicontrol> to launch the New EAR module
-Project wizard.</info></step>
-<step><cmd>Select <uicontrol>Add project to working sets</uicontrol> to
-add the Web fragment project to an existing working set, or click <uicontrol>Select</uicontrol> to
-locate a working set, and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>On the Configure project for building a <tm tmtype="tm"
-trademark="Java">Java</tm> application page, on the <uicontrol>Source
-folders on build path</uicontrol> field, click <uicontrol>Add Folder...</uicontrol> to
-add folders for your source on the build path, or accept the default
-value (src).</cmd></step>
-<step><cmd>In the <uicontrol>Default output Folder:</uicontrol> field,
-specify a folder for your output files or accept the default value
-(bin), and click <uicontrol>Finish</uicontrol>.</cmd></step>
-<step><cmd>In Package Explorer view, you see the resulting Web Fragment
-project folders:</cmd><info><image href="../images/webfrag.jpg"
-placement="break"><alt>Web fragment folders</alt></image><?Pub Caret 21?></info>
-</step>
-</steps>
-</taskbody>
-</task>
-<?Pub *0000005097?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.html
deleted file mode 100644
index e3a42e538..000000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating Web fragment projects" />
-<meta name="abstract" content="You can use the Web fragment project wizard to create Web fragment projects in your workspace." />
-<meta name="description" content="You can use the Web fragment project wizard to create Web fragment projects in your workspace." />
-<meta content="Java EE, Web fragment projects, creating" name="DC.subject" />
-<meta content="Java EE, Web fragment projects, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="webfragmentproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating Web fragment projects</title>
-</head>
-<body id="webfragmentproj"><a name="webfragmentproj"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating Web fragment projects</h1>
-
-
-
-<div><p>You can use the Web fragment project wizard to create Web
-fragment projects in your workspace.</p>
-
-<div class="p"><p>A web fragment is a logical partitioning of the web application
-in such a way that the frameworks being used within the web application
-can define all the artifacts without requiring you to edit or add
-information in the web.xml. It can include almost all the same elements
-that the web.xml descriptor uses, with these requirements:</p>
-<ul>
-<li>The top level element for the descriptor must be web-fragment</li>
-
-<li>The corresponding descriptor file must be called web-fragment.xml</li>
-
-</ul>
-<p>If a framework is packaged as a jar file and has metadata
-information in the form of deployment descriptor, then the web-fragment.xml
-descriptor must be in the META-INF/ directory of the jar file.</p>
-<p>A
-web fragment is a mechanism for either defining or extending the deployment
-descriptor of a web application by means of pluggable library jars
-that contain both the incremental deployment information (in the web-fragment.xml)
-and potentially any related or relevant classes.  The web fragment
-is also packaged as a library (jar), with the web-fragment.xml in
-the META-INF directory. Consequently, the web fragment project is
-essentially a Utility project, with the addition of a web fragment
-facet to it. The web fragment facet enables you to add relevant context-sensitive
-functionality to the fragment project.</p>
-</div>
-
-
-<ol>
-<li class="stepexpand"><span>In the Java EE perspective,
-select <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">New</span>
- &gt; <span class="uicontrol">Web Fragment Project</span></span>. Alternatively,
-right-click the Enterprise Explorer context menu, and select <span class="menucascade">
-<span class="uicontrol">New</span> &gt; <span class="uicontrol">Web Fragment Project</span>
-</span>. The Web fragment wizard opens.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Name</span> field, type a name for
-the Web fragment project. To change the default <span class="uicontrol">Project
-contents</span>, click the <span class="uicontrol">Browse</span> button
-to select a new location.</span> <p>If you specify a non-default
-project location that is already being used by another project, the
-project creation fails.</p>
-</li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">Target runtime</span> field is pre-populated
-with the selection from the enterprise project.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select a pre-defined project configuration
-from the <span class="uicontrol">Configurations</span> drop-down list.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to modify the configuration
-details, click <span class="uicontrol">modify</span>:</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select one or more project facets
-from the <span class="uicontrol">Project Facets</span> list. To specify server
-runtime environments, click <span class="uicontrol">Show Runtimes</span> and
-select one or more runtimes. After making your selections, you can
-save your custom configuration by clicking <span class="uicontrol">Save</span>.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <span class="uicontrol">Add project
-to Dynamic Web project</span> check box to add the new module
-to an enterprise module (WAR) project.</span> Type a new project
-name or select an existing enterprise module project from the drop-down
-list in the <span class="uicontrol">Dynamic Web project name</span> combination
-box. Or, click <span class="uicontrol">New</span> to launch the New EAR module
-Project wizard.</li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">Add project to working sets</span> to
-add the Web fragment project to an existing working set, or click <span class="uicontrol">Select</span> to
-locate a working set, and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>On the Configure project for building a Java application page, on the <span class="uicontrol">Source
-folders on build path</span> field, click <span class="uicontrol">Add Folder...</span> to
-add folders for your source on the build path, or accept the default
-value (src).</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Default output Folder:</span> field,
-specify a folder for your output files or accept the default value
-(bin), and click <span class="uicontrol">Finish</span>.</span></li>
-
-<li class="stepexpand"><span>In Package Explorer view, you see the resulting Web Fragment
-project folders:</span> <br /><img src="../images/webfrag.jpg" alt="Web fragment folders" /><br />
-</li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/.cvsignore b/docs/org.eclipse.jst.j2ee.infopop/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.jst.j2ee.infopop/.project b/docs/org.eclipse.jst.j2ee.infopop/.project
deleted file mode 100644
index 63eb8c98c..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.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.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml
deleted file mode 100644
index 373458803..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml
+++ /dev/null
@@ -1,92 +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>
-
-<!-- Page 1, Create an Enterprise Bean  -->
-<context id="antejb0000" title="Create an Enterprise Bean">
-<description>Use this page to select the enterprise bean type: session bean, message-driven bean, or container managed entity bean.
-
-You must install and enable XDoclet before creating an entity bean. Complete the following steps:
-1 - Download and install XDoclet from http://xdoclet.sourceforge.net/xdoclet/install.html
-2 - Click the <b>preferences</b> link in the wizard to configure the XDoclet Runtime Preferences. Another way to get to the XDoclet Runtime Preferences page is from <b>Window > Preferences > XDoclet</b>.
-3 - Check the <b>Enable XDoclet Builder</b> check box.
-4 - Select the version of XDoclet that you have installed.
-5 - Use the Browse button to locate the installation directory for XDoclet (<b>XDoclet Home</b>).
-6 - Click <b>OK</b> to save the preferences.
-
-After installing and configuring XDoclet, select the bean type you want to create and click <b>Next</b>.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
-<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
-<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
-<topic label="Configuring XDoclet annotation support" href="../org.eclipse.jst.ejb.doc.user/topics/txdocletconf.html"/>
-<topic label="EJB architecture" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html"/>
-<!-- link to org.eclipse.jst.annotation.user.doc  annotation tagging -->
-</context>
-
-<!-- Page 2, Enterprise Bean class file definition -->
-<context id="antejb1100">
-<description>Enter the <b>Project</b>, <b>Module Name</b>, and workspace <b>Folder</b> for the new enterprise bean.
-
-Enter the <b>Java package</b> and <b>Class name</b> for the new enterprise bean. 
-Change the <b>Superclass</b> if your class will override a class other than java.lang.Object.
-
-<!-- Select the <b>Generate an annotated bean class</b> check box to add J2EE annotations to the source file. -->
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
-<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
-<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
-<!-- link to org.eclipse.jst.annotation.user.doc  annotation tagging -->
-</context>
-
-<!-- Page 3, Enterprise Bean details -->
-<context id="antejb1000">
-<description>Specify the EJB, JNDI and Display names for the enterprise bean. 
-The <b>EJB name</b> is the name of the enterprise bean class.
-The <b>JNDI name</b> is a logical name used by the server to locate an enterprise bean at runtime.
-The <b>Display name</b> is a short name for the enterprise bean that is used by tools.
-
-Optionally, provide a text <b>Description</b> of the enterprise bean class.
-
-Select the <b>State Type</b> (stateless or stateful) if you are creating a session bean.
-A stateful session bean maintains client-specific session information, or conversational state, across multiple method calls and transactions.
-A stateless session bean does not maintain conversational state.
-
-Select the <b>Transaction Type</b> (container or bean) for the enterprise bean. This specifies whether the container or the bean will handle transaction demarcation.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
-<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
-<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
-</context>
-
-<!-- Page 4, Enterprise Bean modifiers, interfaces and method stubs -->
-<context id="antejb1200">
-<description>Select the type of <b>Modifiers</b> for the bean class.
-
-Select the <b>Interfaces</b> that your bean class will implement. Use the <b>Add</b> and <b>Remove</b> buttons to create the list of interfaces.
-
-Select which method stubs you want created in the bean class.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-</context>
-
-
-
- 
-</contexts>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml
deleted file mode 100644
index 5eb25583f..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml
+++ /dev/null
@@ -1,54 +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="APPCLIENT_EXPORT_APPCLIENT_WIZARD_PAGE1">
-<description>Use this wizard to export an application client project into a JAR file.  Select the application project to export, and provide a directory and filename for the exported JAR file.
-
-Select <b>Export source files</b> to include source files in the JAR file. 
-
-Select <b>Overwrite existing file</b> to replace an existing file. 
-</description>
-<!--topic label="Exporting an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjexpapp.html"/-->
-<!--topic label="Creating an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjappproj.html"/-->
-</context>
-<context id="EAR_EXPORT_PAGE1">
-<description>Use this wizard to export an enterprise application project into an EAR file. Select the enterprise application project to export, and provide a directory and filename for the exported EAR file.
-
-Select <b>Export source files</b> to include source files in the EAR file. 
-
-Select <b>Overwrite existing file</b> to replace an existing file. 
-</description>
-<!--topic label="Exporting an enterprise application into an EAR file" href="../com.ibm.etools.j2eeapp.doc/topics/tjexpear.html"/-->
-<!--topic label="Creating an enterprise application project" href="../com.ibm.etools.j2eeapp.doc/topics/tjear.html"/-->
-</context>
-<context id="EJB_EXPORT_PAGE1">
-<description>Use this wizard to export an EJB module into a JAR file. Select the EJB module to export, and provide a directory and filename for the exported JAR file.
-
-Select <b>Export source files</b> to include source files in the JAR file. 
-
-Select <b>Overwrite existing file</b> to replace an existing file. </description>
-<!--topic label="Exporting an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teexp.html"/-->
-<!--topic label="Importing an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teimp.html"/-->
-</context>
-
-<context id="EXPORT_RAR_WIZARD_PAGE">
-<description>Use this wizard to export a connector project into a RAR file.  Select the connector project to export, and provide a directory and filename for the exported RAR file.
-
-Select <b>Export source files</b> to include source files in the RAR file. 
-
-Select <b>Overwrite existing file</b> to replace an existing file. 
-</description>
-<!--topic label="Exporting a connector project to a RAR file" href="../com.ibm.etools.j2ee.doc/topics/tjexprar.html"/-->
-<!--topic label="Creating a connector project" href="../com.ibm.etools.j2ee.doc/topics/tjrar.html"/-->
-</context>
-</contexts>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml
deleted file mode 100644
index f013fc479..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml
+++ /dev/null
@@ -1,57 +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="APPCLIENT_IMPORT_APPCLIENT_WIZARD_PAGE1">
-<description>Use this wizard to import an application client JAR file. Locate the application client JAR file on your file system using the <b>Browse</b> button. Optionally, modify the project name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for. 
-
-You can also specify whether or not to add the imported application client module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjimpapp.html"/-->
-<!--topic label="Creating an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjappproj.html"/-->
-</context>
-
-<context id="EAR_IMPORT_EAR_WIZARD_PAGE1">
-    <!-- wizard broken at time of this writing -->
-<description>Use this wizard to import an enterprise application EAR file.  Locate the enterprise application EAR file on your file system using the <b>Browse</b> button. Optionally, modify the project name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the resulting projects will be developed for. 
-</description>
-<!--topic label="Importing an enterprise application EAR file" href="../com.ibm.etools.j2eeapp.doc/topics/tjimpear.html"/-->
-<!--topic label="Creating an enterprise application project" href="../com.ibm.etools.j2eeapp.doc/topics/tjear.html"/-->
-</context>
-
-
-<context id="EJB_IMPORT_EJB_WIZARD_PAGE1">
-<description>Use this wizard to import an EJB JAR file. Locate the EJB JAR file on your file system using the <b>Browse</b> button. Optionally, modify the module name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for. 
-
-You can also specify whether or not to add the imported EJB module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teimp.html"/-->
-<!--topic label="Creating an EJB project" href="../com.ibm.etools.ejb.assembly.doc/topics/tecrtpro.html"/-->
-</context>
-
-<context id="IMPORT_RAR_WIZARD_PAGE">
-<description>Use this wizard to import a JCA Connector RAR file. Locate the Connector RAR file on your file system using the <b>Browse</b> button. Optionally, modify the module name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for. 
-
-You can also specify whether or not to add the imported connector module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing a connector project RAR file" href="../com.ibm.etools.j2ee.doc/topics/tjimprar.html"/-->
-<!--topic label="Creating a connector project" href="../com.ibm.etools.j2ee.doc/hmtl/tjrar.html"/-->
-</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml
deleted file mode 100644
index 14bd53265..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml
+++ /dev/null
@@ -1,24 +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="com.ibm.wtp.ui.ProjectNavigator">
-<description>The J2EE Project Explorer view provides a hierarchical view of the content models for resources in the workbench. From this view, you can open the various project files in the appropriate editor. 
-
-By right-clicking on modules, you can access the pop-up context menu for additional development options.
-</description>
-<!--topic label="J2EE Hierarchy and Project Navigator views" href="../com.ibm.etools.j2eeapp.doc/topics/cjview.html"/-->
-<!--topic label="J2EE perspective" href="../com.ibm.etools.j2eeapp.doc/topics/cjpers.html"/-->
-</context>
-
-
-</contexts>
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 4bb5c9213..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.infopop; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml
deleted file mode 100644
index e7b6e4219..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml
+++ /dev/null
@@ -1,75 +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>
-<!--Eclipse preferences -->
-
-<context id="FlexibleProject">
-	<!-- Flexible Java Project  preferences-->
-<description>Select <b>Allow Multiple modules per project</b> to allow an enterprise application (EAR) project to contain more than one module
-of a particular type. For instance, more than one Application Client module. 
-</description>
-<!-- links to Flexible java project stuff-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE1">
-	<!-- J2EE Annotations  preferences main-->
-<description>Select the J2EE Annotation Provider  to use. 
-
-J2EE Annotations allow programmers to add specialized Javadoc tags to their source code, which can be used to generate code artifacts from templates.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!-- http://xdoclet.sourceforge.net/xdoclet/index.html -->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE2">
-	<!-- J2EE Annotations  preferences XDoclet-->
-<description>Use this page to set the XDoclet runtime preferences. XDoclet must be installed on the local system to use this function.
-
-Select <b>Enable XDoclet Builder</b> to turn on annotation-based artifact creation.
-
-Select the <b>Version</b> of XDoclet. Supported versions include 1.2.1, 1.2.2, 1.2.3; XDoclet version 1.1.2 is no longer supported.
-
-Provide the installation directory (<b>XDoclet Home</b>) for XDoclet on the local system.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!-- http://xdoclet.sourceforge.net/xdoclet/index.html -->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE3">
-	<!-- J2EE Annotations  preferences ejbdoclet-->
-<description>Ejbdoclet is a subset of the XDoclet specification that specifies details on EJB deployment descriptors.
-The syntax of deployment descriptors differs, depending on the vendor of  the Application Server being used. 
-
-Use this page to define which Application Server vendors to support. You can select one or more Application Server
-vendors, including JBoss, JOnAS, WebLogic, and WebSphere. Also select the version of the Application Server to support.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!--http://xdoclet.sourceforge.net/xdoclet/ant/xdoclet/modules/ejb/EjbDocletTask.html -->
-<!-- http://www.jboss.org-->
-<!-- http://jonas.objectweb.org/-->
-<!-- http:/www.bea.com-->
-<!-- http://www.ibm.com/software/websphere/-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-
-
-</contexts>
-
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml
deleted file mode 100644
index a9b9ce17f..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<contexts>
-<context id="csh_outer_container" title="Project creation wizards">
-<description/>
-</context>
-<context id="APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE1" title="New application client">
-<description>Use this wizard to create an application client project.
-
-On this page, name the application client project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html" label="Application client projects"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html" label="Creating an application client project"/>
-</context>
-<context id="APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE3" title="New application client">
-<description>In the <b>Source Folder</b> field, enter the name of the folder to use for source code. If you want to create a default class for the module, select the <b>Create a default Main class</b> check box.
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html" label="Application client projects"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html" label="Creating an application client project"/>
-</context>
-<context id="EAR_NEW_EAR_WIZARD_PAGE1" title="New EAR">
-<description>Use this wizard to create an enterprise application (EAR) project. An enterprise application project ties together one or more J2EE modules, including application client modules, EJB modules, Connector modules, or Web modules.
-
-On this page, name the EAR application project and select the workspace location to store the project files. You can also select a target runtime and a common configuration for the project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html" label="Enterprise application projects"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjear.html" label="Creating an enterprise application project"/>
-</context>
-<context id="NEW_EAR_COMP_PAGE">
-<!-- This page is no longer used -->
-<description>Use this page to select the facets the project will have and the runtimes the project will support.
-
-Select the check boxes under <b>Project Facet</b> to select the facets that the project will have. You can also change the default version level of each facet.
-
-To see the runtimes that your new project will support, click <b>Show Runtimes</b>. The <b>Runtimes</b> field lists the available runtimes. Select the check boxes next to the runtimes that you want the new project to support. The <b>Project Facets</b> list shows only the facets supported by the selected runtimes, preventing you from selecting a facet that does not work on a selected runtime. You can also choose a preferred runtime by selecting a runtime and then clicking the <b>Make Preferred</b> button. The preferred runtime provides the classpath for the project.
-
-You can save the settings for this project so you can create other projects with the same settings later. To save the settings for a project, set up the project on the Select Project Facets page, click the <b>Save</b> button, and type a name for the new preset. When you create a project later, you can select that preset from the <b>Presets</b> list.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cfacets.html" label="Project facets"/>
-</context>
-<context id="NEW_EAR_ADD_MODULES_PAGE" title="New EAR">
-<description>Select the check boxes next to each J2EE module you want to add to the new enterprise application project. Click the <b>New Module</b> button to create new modules.</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjear.html" label="Creating an enterprise application project"/>
-</context>
-<context id="EAR_NEW_MODULE_PROJECTS_PAGE">
-<description>Use this page to create new J2EE modules to add to the new enterprise application. The wizard can generate a set of default J2EE modules or individual customized J2EE modules.</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjear.html" label="Creating an enterprise application project"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-</context>
-<context id="EJB_NEW_EJB_WIZARD_PAGE1">
-<description>Use this wizard to create an EJB project.
-
-On this page, name the project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html" label="Creating EJB projects"/>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html" label="EJB architecture"/>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html" label="EJB client JAR projects"/>
-</context>
-<context id="EJB_NEW_EJB_WIZARD_PAGE2">
-<description>
-
-In the Source Folder field, enter the name of the folder to use for source code. You can also specify the name of the EJB client JAR module, as well as the name of the JAR file (<b>Client JAR URI</b>).
-
-</description>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html" label="Creating EJB projects"/>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html" label="EJB client JAR projects"/>
-</context>
-<context id="JCA_NEWIZARD_PAGE1" title="New connector wizard">
-<description>Use this wizard to create a Connector project. The J2EE Connector Architecture (JCA) specifies how a J2EE application component accesses a connection-based resource.
-
-On this page, name the Connector project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjrar.html" label="Creating a connector project"/>
-</context>
-<context id="JCA_NEWIZARD_PAGE3" title="New connector wizard">
-<description>In the <b>Source Folder</b> field, enter the name of the folder to use for source code.</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjrar.html" label="Creating a connector project"/>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml
deleted file mode 100644
index 8bd3a03bd..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml
+++ /dev/null
@@ -1,40 +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>
-<!-- project preferences -->
-
-<context id="JARdep">
-		<!-- JAR dependencies preferences-->
-<description>Use this page to specify dependent JAR files for modules within the associated project.
-
-Select <b>Use EJB JARs</b>, <b>Use EJB client JARs</b>, or <b>Allow both</b> to control which JAR files are listed.  Then, select the JAR files from the list. This will update the run-time class path and Java project build path with the appropriate JAR files.
-
-The <b>Manifest Class-Path</b> field displays the manifest class-path changes based on the JAR files selected. This field is display only and shows you the class path for your module file.
-</description>
-<!-- need links to EJB base info, EJB Client info, project class paths-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="EARmod">
-	<!-- EAR modules preferences-->
-<description><!-- page is blank at the time of this writing -->
-</description>
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-
-
-</contexts>
-
diff --git a/docs/org.eclipse.jst.j2ee.infopop/about.html b/docs/org.eclipse.jst.j2ee.infopop/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/docs/org.eclipse.jst.j2ee.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.jst.j2ee.infopop/build.properties b/docs/org.eclipse.jst.j2ee.infopop/build.properties
deleted file mode 100644
index 4c7e21a78..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = EJBCreateWizard_HelpContexts.xml,\
-               ExportWizard_HelpContexts.xml,\
-               ImportWizard_HelpContexts.xml,\
-               J2EEGeneral_HelpContexts.xml,\
-               Preferences_HelpContexts.xml,\
-               ProjectCreateWizard_HelpContexts.xml,\
-               ProjectPrefs_HelpContexts.xml,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/
-generateSourceBundle=false
diff --git a/docs/org.eclipse.jst.j2ee.infopop/plugin.properties b/docs/org.eclipse.jst.j2ee.infopop/plugin.properties
deleted file mode 100644
index b56d2b5d9..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/plugin.properties
+++ /dev/null
@@ -1,15 +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
-###############################################################################
-# NLS_MESSAGEFORMAT_VAR 
-# NLS_ENCODING=UTF-8 
-
-pluginName    = J2EE tools infopops
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.jst.j2ee.infopop/plugin.xml b/docs/org.eclipse.jst.j2ee.infopop/plugin.xml
deleted file mode 100644
index d8dff6f95..000000000
--- a/docs/org.eclipse.jst.j2ee.infopop/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<plugin>
-   
-   <extension point="org.eclipse.help.contexts">
-	<contexts file="ExportWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-	<contexts file="ImportWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-	<contexts file="J2EEGeneral_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-	<contexts file="ProjectCreateWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-	<contexts file="EJBCreateWizard_HelpContexts.xml" />
-	<contexts file="ProjectPrefs_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-	<contexts file="Preferences_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
-   </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/.cvsignore b/docs/org.eclipse.jst.servlet.ui.infopop/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/.project b/docs/org.eclipse.jst.servlet.ui.infopop/.project
deleted file mode 100644
index 26eedc488..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.servlet.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/DynWebWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/DynWebWizContexts.xml
deleted file mode 100644
index e8bea47f0..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/DynWebWizContexts.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-<context id="webw1000">
-<description>Use this page to name your Web project and specify the file system location (the place where the resources you create are stored.) When the Use default check box is selected, the project will be created in the file system location where your workspace resides. To change the default file system location, clear the checkbox and locate the path using the <b>Browse</b> button. To configure additional options, select the <b>Next</b> button.
-In the Target Runtime field, select the server where you want to deploy the Web project. if a server is not already defined, click <b>New</b> to select a server runtime environment. 
-Click <b>Add project to EAR</b> to add the project to an enterprise application project. The default EAR project name is the name of the Web project appended with EAR.</description>
-<topic label="Creating a dynamic Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcreprj.html"/>
-</context>
-
-<context id="webw1100">
-<description>Presets are used to define a default set of facet versions that will configure a project for a particular type of development. Select one or more facets for the dynamic Web project. To change the version of the facet, click the facet version and select a version from the drop-down list.
-Click Show Runtimes to view the available runtimes and runtime compositions.</description>
-<topic label="Creating a dynamic Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcreprj.html"/>
-</context>
-
-<context id="webw1200">
-<description>The context root is the top-level directory of your application when it is deployed to a Web server. 
-The Content directory folder is the mandatory location of all Web resources, for example Web pages, style sheets or graphics. If the files are not placed in this directory (or in a subdirectory structure under this directory), the files will not be available when the application is executed on a server. 
-The Java source directory contains the project's Java source code for classes, beans, and servlets. When these resources are added to a Web project, they are automatically compiled and the generated files are added to the WEB-INF/classes directory.
-</description>
-<topic label="Creating a dynamic Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcreprj.html"/>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/FilterWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/FilterWizContexts.xml
deleted file mode 100644
index 25bf23c91..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/FilterWizContexts.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-
-<contexts>
-<context id="fltw1050">
-<description>
-A filter is used to give you access to the HttpServletRequest and the HttpServletResponse objects before they are passed into a servlet.
-
-Specify the <b>Project</b> and <b>Folder</b> where the filter class will be placed. The filter class should be stored in the Java source directory, which you specified when you created the Dynamic Web Project (for example src).
-
-Specify the <b>Java package</b> that the class will belong to. If you do not specify one, the class will be added into a default package.
-
-Specify the <b>Class name</b> of the filter (for example MyFilter).
-
-In the field <b>Superclass</b> specify the superclass for the filter,only if it is derived from one. Click <b>Browse</b> to choose from the available, already existing or created, superclasses. (This field is optional).
-
-Check <b>Use existing Filter class</b> and you could get an already existing class and it will be registered automatically in your web.xml.
-
-Note: If you have selected the XDoclet facet when creating the Dynamic Web Project, you can now select <b>Generate a XDoclet annotated class</b>. This will create a XDoclet annotated filter class. The annotations will generate the metadata in the web.xml deployment descriptor.
-</description>
-<topic label="Creating Filters" href="../org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html"/>
-</context>
-
-<context id="fltw1100">
-<description>
-Note that the Class Name value provided in the first page of the wizard is automatically mapped to the <b>Name</b> field on this page. 
-
-Specify the <b>Initialization Parameters</b> of the filter as name/value pairs (for example passwords).
-
-In the <b>Filter Mappings</b> field, specify the Servlet, to which the filter will be mapped. Do this by clicking the <b>Add</b> button. In the <b>Add filter mapping</b> dialog that appears after you click the <b>Add</b> button, if you select the <b>Servlet</b> radio button you can choose an existing servlet class, but if you select the <b>URL Pattern</b> radio button you have to enter the URL pattern to which you want to map the filter. In the same dialog, but from <b>Select Dispatchers</b> group, you can choose which dispatchers to be invoked in the deployment descriptor. The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE, and ERROR. 
- <b>-</b> A value of <b>FORWARD</b> means the Filter will be applied under <b>RequestDispatcher.forward()</b> calls.
- <b>-</b> A value of <b>REQUEST</b> means the Filter will be applied under ordinary client calls to the <b>path</b> or <b>servlet</b>.
- <b>-</b> A value of <b>INCLUDE</b> means the Filter will be applied under <b>RequestDispatcher.include()</b> calls.
- <b>-</b> A value of <b>ERROR</b> means the Filter will be applied under the error page mechanism.
- <b>-</b> If no despatcher is selected, it indicates that filters will be applied only under ordinary client calls to the <b>path</b> or <b>servlet</b>.
-</description>
-<topic label="Creating Filters" href="../org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html"/>
-</context>
-
-<context id="fltw1200">
-<description>
-Note that the Sun Microsystems Java Servlet Specification states that a Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore, you cannot change these modifiers. The only one available for change is the <b>final</b> modifier. 
-
-A filter class must implement the Filter interface, that's why the <b>javax.servlet.Filter</b> is provided as the default Interface. You can also add additional interfaces to implement. Click <b>Add</b> to open the <b>Interface Selection</b> dialog. In this dialog, as you type the name of the interface that you are interested to add, there will be displayed only the interfaces that match the pattern.
-
-Note: Because the methods init, doFilter and destroy are provided from javax.servlet.Filter interface and this interface is obligatory for each Filter class, the option <b>Inherited abstract methods</b> is always checked and can't be changed.
-
-Using the option <b>Constructors from superclass</b> you can choose whether to override the constructor of the class, which you specified as superclass in the first page of the wizard. Note: If you did not specify any class as superclass, you can not check this option.
-</description>
-<topic label="Creating Filters" href="../org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/ListenerWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/ListenerWizContexts.xml
deleted file mode 100644
index 6d609d145..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/ListenerWizContexts.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<contexts>
-<context id="lstw1050">
-<description>
-Specify the <b>Project</b> and <b>Folder</b> where the listener class will be placed. The listener class should be stored in the Java source directory, which you specified when you created the Dynamic Web Project (for example src).
-
-Specify the <b>Java package</b> that the class will belong to. If you do not specify one, the class will be added into a default package. Specify the <b>Class name</b> of the listener (for example MyListener).
-
-In the field <b>Superclass</b> specify the superclass for the listener class,only if your listener class is derived from one. Click <b>Browse</b> to choose from the available, already existing or created, superclasses. (This field is optional).
-
-Note: If you have selected the XDoclet facet when creating the Dynamic Web Project, you can now select <b>Generate a XDoclet annotated class</b>. This will create a XDoclet annotated listener class. The annotations will generate the metadata in the web.xml deployment descriptor.
-</description>
-<topic label="Creating Listeners" href="../org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html"/>
-</context>
-
-<context id="lstw1100">
-<description>
-From the <b>Servlet Context Events</b> group, you can select any appropriate group of method stubs to be created in the listener file. These are the methods of the two basic listener interfaces, that are provided from the <b>javax.servlet</b> package:
-  <b>-</b> The <b>ServletContextListener</b> interface is used to listen to the ServletContext life cycle events.
-  <b>-</b> The <b>ServletContextAttributeListener</b> interface is used to be notified when any attribute is added to the ServletContext or if any of the ServletContext's attributes are changed or removed. 
-
-From the <b>HTTP Session Events</b> group, you can select any appropriate group of method stubs to be created in the listener class. These are the methods of the listener interfaces provided from the <b>javax.servlet.http</b> package:
-  <b>-</b> The <b>HttpSessionListener</b> and <b>HttpSessionActivationListener</b> interfaces are used to listen to creation, invalidation, activation, passivation and timeout of an HttpEvent object. 
-  <b>-</b> The <b>HttpSessionAttributeListener</b> and <b>HttpSessionBindingListener</b> interfaces are used to be notified when any attribute is added to, removed from, or replaced in the HttpSession object. 
-
-From the <b>Servlet Request Events</b> group, you can select any appropriate group of method stubs to be created in the listener class. These are the methods of the additional listener interfaces provided from the <b>javax.servlet</b> package:
-  <b>-</b> The <b>ServletRequestListener</b> interface is used to be notified when a servlet request has started being processed by web components.
-  <b>-</b> The <b>ServletRequestAttributeListener</b> interface is used to be notified when any attribute is added to, removed from or replaced in the ServletRequest object.
-
-You can click the <b>Select All</b> button to select all available groups of method stubs or click the <b>Clear</b> button to clear all already selected method stubs.
-</description>
-<topic label="Creating Listeners" href="../org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html"/> 
-</context>
-
-<context id="lstw1200">
-<description>
-Note that the Sun Microsystems Java Servlet Specification states that a Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore, you cannot change these modifiers. The only one available for change is the <b>final</b> modifier. 
-
-Note that the listener interface of the selected method stubs provided in the previous page of the wizard, is automatically mapped to the Interfaces field on this page. You can click the <b>Add</b> button to add additional interfaces to implement.
-
-If the <b>Inherited abstract methods</b> option is checked, it means that you want to override the methods provided by the interface, which is defined in the <b>Interfaces</b> filed.
-
-Using the option <b>Constructors from superclass</b> you can choose whether to override the constructor of the class, which you specified as superclass in the first page of the wizard. Note: If you did not specify any class as superclass, you can not check this option.
-</description>
-<topic label="Creating Listeners" href="../org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.servlet.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index ae1bc0007..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.servlet.ui.infopop; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/ServletWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/ServletWizContexts.xml
deleted file mode 100644
index 8942b51d5..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/ServletWizContexts.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-<context id="srvw1050">
-<description>
-Specify the <b>Project</b> and <b>Folder</b> where the servlet class will be placed. The servlet class should be stored in the Java source directory that you specified when you created the Dynamic Web Project (for example src). 
-
-Specify the <b>Java package</b> that the class will belong to (it is added into a default package if you do not specify one).
-
-Specify the <b>Class name</b> of the servlet (for example HelloServlet).
-
-In the field <b>Superclass</b> specify a superclass for the servlet class. A servlet created by this wizard can have HttpServlet, or any class that has HttpServlet in its hierarchy as its superclass. Click <b>Browse</b> to choose from the available superclasses.
-
-Check <b>Use existing Servlet class</b> and you could get an already existing class and it will be registered automatically in your web.xml.
-
-Note: If you have selected the XDoclet facet when creating the Dynamic Web Project, you can now select <b>Generate a XDoclet annotated class</b>. This will create a XDoclet annotated servlet class. The annotations will generate the metadata in the web.xml deployment descriptor.
-</description>
-<topic label="Creating Servlets" href="../org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html"/>
-</context>
-
-<context id="srvw1100">
-<description>
-Note that the Class Name value provided in the first page of the wizard is automatically mapped to the <b>Name</b> field on this page. 
-
-Specify the <b>Initialization Parameters</b> of the servlet as name/value pairs, for example passwords.
-
-In the <b>URL Mappings</b> field, specify the URL pattern to be mapped with the servlet.
-</description>
-<topic label="Creating Servlets" href="../org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html"/>
-</context>
-
-<context id="srvw1200">
-<description>
-Note that the Sun Microsystems Java Servlet Specification states that a Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore, you cannot change these modifiers. The only one available for change is the <b>final</b> modifier.  
-
-If one of the HttpServlet or GenericServlet classes is not specified as a superclass of the Servlet class, the <b>javax.servlet.Servlet</b> is provided as the default interface and defines life cycle methods. You can use the wizard to add additional interfaces to implement.Click <b>Add</b> to open the
-<b>Interface Selection</b> dialog. In this dialog, as you type the name of the interface that you are interested in adding in the <b>Choose interfaces</b> field, the list of available interfaces listed in the <b>Matching items</b> list box updates dynamically to display only the interfaces that match the pattern. 
-
-When the <b>Inherited abstract methods</b> option is checked you can select which methods, provided by HttpServlet class, to be overridden. The available methods are:
-  - <b>init, service and destroy</b> which carries of the servlet's life cycle; 
-  - <b>getServletConfig and getServletInfo</b>, which returns respectively servlet's ServletConfig object containing initialization and startup parameters and information about the current servlet;  
-  - the six <b>doXXX</b> that get called when a related HTTP request method is used. 
-
-Note: If you did not specify HttpServlet class as superclass in the first page of the wizard, the option <b>Inherited abstract methods</b> is always checked and can not be changed, because each servlet must implement the methods of the javax.servlet.Servlet interface: init, service, destroy, getServletConfig and getServletInfo.   
-
-Using the option <b>Constructors from superclass</b> you can choose whether to override the constructor of the class, which you specified as superclass in the first page of the wizard. Note: If you did not specify any class as superclass, you can not check this option.
-</description>
-<topic label="Creating Servlets" href="../org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/about.html b/docs/org.eclipse.jst.servlet.ui.infopop/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/docs/org.eclipse.jst.servlet.ui.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.jst.servlet.ui.infopop/build.properties b/docs/org.eclipse.jst.servlet.ui.infopop/build.properties
deleted file mode 100644
index 0768accd2..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = ServletWizContexts.xml,\
-               FilterWizContexts.xml,\
-               ListenerWizContexts.xml,\
-               about.html,\
-               plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               DynWebWizContexts.xml
-src.includes = build.properties
-generateSourceBundle=false
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.properties b/docs/org.eclipse.jst.servlet.ui.infopop/plugin.properties
deleted file mode 100644
index 21abadf85..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-
-pluginName     = Servlet infopop
-pluginProvider = Eclipse.org
-\ No newline at end of file
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.xml b/docs/org.eclipse.jst.servlet.ui.infopop/plugin.xml
deleted file mode 100644
index aff6d1f5a..000000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-      <contexts file="ServletWizContexts.xml" plugin ="org.eclipse.jst.servlet.ui"/>
-   <contexts file="DynWebWizContexts.xml" plugin ="org.eclipse.jst.servlet.ui"/>
-   <contexts
-         file="ListenerWizContexts.xml"
-         plugin="org.eclipse.jst.servlet.ui">
-   </contexts>
-   <contexts
-         file="FilterWizContexts.xml"
-         plugin="org.eclipse.jst.servlet.ui">
-   </contexts>
-
-</extension>
-
-
-</plugin>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore b/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.project b/docs/org.eclipse.wst.web.ui.infopop/.project
deleted file mode 100644
index 10c4a6e98..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 8a60c5259..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Static Web infopop
-Bundle-SymbolicName: org.eclipse.wst.web.ui.infopop; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml b/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
deleted file mode 100644
index bf0f403b0..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-<context id="webw2000">
-<description> Use this page to name your Web project and specify the file system location (the place where the resources you create are stored.) When the Use default check box is selected, the project will be created in the file system location where your workspace resides. To change the default file system location, clear the checkbox and locate the path using the <b>Browse</b> button. To configure additional options, select the <b>Next</b> button.
-In the Target Runtime field, select the server where you want to publish the Web project. if a server is not already defined, click <b>New</b> to select a server runtime environment. </description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2100">
-<description>Presets are used to define a default set of facet versions that will configure a project for a particular type of development. The Static Web Module facet enables the project to be deployed as a static
-Web module. Click Show Runtimes to view the available runtimes and runtime compositions.</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2200">
-<description>The Web content folder is where the elements of your Web site such as Web pages, graphics and style sheets are stored. This directory structure is necessary to ensure that the content of your Web site will be included in the WAR file at deployment and that link validation will work correctly.
-</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-
-</contexts>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/about.html b/docs/org.eclipse.wst.web.ui.infopop/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/docs/org.eclipse.wst.web.ui.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.web.ui.infopop/build.properties b/docs/org.eclipse.wst.web.ui.infopop/build.properties
deleted file mode 100644
index 0c7c1a9ed..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = StaticWebWizContexts.xml,\
-               about.html,\
-               plugin.xml,\
-               plugin.properties,\
-               META-INF/
-src.includes = build.properties
-generateSourceBundle=false
-\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.properties b/docs/org.eclipse.wst.web.ui.infopop/plugin.properties
deleted file mode 100644
index b61d2de9c..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/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     = Static Web infopop
-pluginProvider = Eclipse.org
-\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml b/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
deleted file mode 100644
index 20ac01893..000000000
--- a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-      <contexts file="StaticWebWizContexts.xml" plugin ="org.eclipse.wst.web.ui"/>
-</extension>
-
-
-</plugin>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_core.feature/.cvsignore b/features/org.eclipse.jst.enterprise_core.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.enterprise_core.feature/.project b/features/org.eclipse.jst.enterprise_core.feature/.project
deleted file mode 100644
index b522b4769..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_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.jst.enterprise_core.feature/build.properties b/features/org.eclipse.jst.enterprise_core.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.enterprise_core.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.jst.enterprise_core.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_core.feature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/feature.properties
deleted file mode 100644
index 1174af3e0..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/feature.properties
+++ /dev/null
@@ -1,168 +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=JST Enterprise Core
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JST enterprise 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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_core.feature/feature.xml b/features/org.eclipse.jst.enterprise_core.feature/feature.xml
deleted file mode 100644
index f33027924..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/feature.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_core.feature"
-      label="%featureName"
-      version="3.2.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.webservice"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.jca"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jee.ejb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/license.html b/features/org.eclipse.jst.enterprise_core.feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46ac..000000000
--- a/features/org.eclipse.jst.enterprise_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 (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 (&quot;Source Zips&quot;) 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 &quot;about.html&quot; files (&quot;Abouts&quot;) 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.jst.enterprise_core.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_core.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a75..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_core.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index c3f19257e..000000000
--- a/features/org.eclipse.jst.enterprise_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=J2EE Standard Tools - Enterprise 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.jst.enterprise_core.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d68..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_core.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 85bf6e4bc..000000000
--- a/features/org.eclipse.jst.enterprise_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=J2EE Standard Tools - Enterprise Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f10..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.enterprise_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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 027c77e8b..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,168 +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=JST Enterprise Core Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST enterprise 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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46ac..000000000
--- a/features/org.eclipse.jst.enterprise_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 (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 (&quot;Source Zips&quot;) 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 &quot;about.html&quot; files (&quot;Abouts&quot;) 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.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index c3f19257e..000000000
--- a/features/org.eclipse.jst.enterprise_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=J2EE Standard Tools - Enterprise 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.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d68..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 85bf6e4bc..000000000
--- a/features/org.eclipse.jst.enterprise_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=J2EE Standard Tools - Enterprise Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore b/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore
deleted file mode 100644
index 95a8d29f1..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-features
-plugins
-build.xml
-org.eclipse.jst.enterprise_sdk.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/.project b/features/org.eclipse.jst.enterprise_sdk.feature/.project
deleted file mode 100644
index 44e698217..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_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.jst.enterprise_sdk.feature/build.properties b/features/org.eclipse.jst.enterprise_sdk.feature/build.properties
deleted file mode 100644
index 925a0405c..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
-
-generate.feature@org.eclipse.jst.enterprise_ui.feature.source=org.eclipse.jst.enterprise_ui.feature, feature@org.eclipse.jst.enterprise_core.feature.source
-
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties b/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties
deleted file mode 100644
index ac7ab720a..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties
+++ /dev/null
@@ -1,168 +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=JST Enterprise Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST enterprise 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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
deleted file mode 100644
index 69f564be7..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_sdk.feature"
-      label="%featureName"
-      version="3.2.3.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <includes
-         id="org.eclipse.jst.enterprise_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.enterprise_ui.feature.source"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/license.html b/features/org.eclipse.jst.enterprise_sdk.feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore b/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/.project b/features/org.eclipse.jst.enterprise_ui.feature/.project
deleted file mode 100644
index 956956314..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_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.jst.enterprise_ui.feature/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_ui.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/feature.properties
deleted file mode 100644
index 890349405..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# 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=Eclipse Java EE Developer Tools
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Eclipse Java EE Developer Tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006, 2009 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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature/feature.xml
deleted file mode 100644
index c906e0de4..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_ui.feature"
-      label="%featureName"
-      version="3.2.3.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.jst.jee.ui">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <includes
-         id="org.eclipse.jst.enterprise_userdoc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.enterprise_core.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.creation.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.consumption.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.jca.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.navigator.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.webservice.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.consumption.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.servlet.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.uddiregistry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.creation.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.servlet.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.creation.ejb.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ejb.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotations.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotation.model"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotations.emitter"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.xdoclet.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jee.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ejb.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.jaxrs.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.jaxrs.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46ac..000000000
--- a/features/org.eclipse.jst.enterprise_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 (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 (&quot;Source Zips&quot;) 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 &quot;about.html&quot; files (&quot;Abouts&quot;) 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.jst.enterprise_ui.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_ui.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a75..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_ui.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index e00fafaaf..000000000
--- a/features/org.eclipse.jst.enterprise_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=J2EE Standard Tools - Enterprise 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.jst.enterprise_ui.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 30a575c96..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_ui.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index d6209ea83..000000000
--- a/features/org.eclipse.jst.enterprise_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=J2EE Standard Tools - Enterprise UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 2ff923484..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.jst.enterprise_core.feature.source = org.eclipse.jst.enterprise_core.feature
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.enterprise_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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index c06addbeb..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties
+++ /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
-###############################################################################
-# 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=JST Enterprise UI Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST enterprise 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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46ac..000000000
--- a/features/org.eclipse.jst.enterprise_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 (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 (&quot;Source Zips&quot;) 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 &quot;about.html&quot; files (&quot;Abouts&quot;) 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.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index e00fafaaf..000000000
--- a/features/org.eclipse.jst.enterprise_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=J2EE Standard Tools - Enterprise 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.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 30a575c96..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index d6209ea83..000000000
--- a/features/org.eclipse.jst.enterprise_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=J2EE Standard Tools - Enterprise UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore b/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore
deleted file mode 100644
index 4b5f609bf..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.jst.enterprise_userdoc.feature_1.0.0.jar
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/.project b/features/org.eclipse.jst.enterprise_userdoc.feature/.project
deleted file mode 100644
index ffcfb55b8..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_userdoc.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.jst.enterprise_userdoc.feature/build.properties b/features/org.eclipse.jst.enterprise_userdoc.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.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.jst.enterprise_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties b/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties
deleted file mode 100644
index 81e5bd10f..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,168 +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=JST Enterprise User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JST enterprise user documentation
-
-# "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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml b/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
deleted file mode 100644
index 40feac973..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_userdoc.feature"
-      label="%featureName"
-      version="3.2.100.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-
-   <plugin
-         id="org.eclipse.jst.ejb.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/license.html b/features/org.eclipse.jst.enterprise_userdoc.feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/.cvsignore b/features/org.eclipse.jst.web_core.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.web_core.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_core.feature/.project b/features/org.eclipse.jst.web_core.feature/.project
deleted file mode 100644
index 5eac7ba28..000000000
--- a/features/org.eclipse.jst.web_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_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.jst.web_core.feature/build.properties b/features/org.eclipse.jst.web_core.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.web_core.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.jst.web_core.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/epl-v10.html b/features/org.eclipse.jst.web_core.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_core.feature/feature.properties b/features/org.eclipse.jst.web_core.feature/feature.properties
deleted file mode 100644
index c4ed750f1..000000000
--- a/features/org.eclipse.jst.web_core.feature/feature.properties
+++ /dev/null
@@ -1,168 +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=JST Web Core
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JST Web 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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_core.feature/feature.xml b/features/org.eclipse.jst.web_core.feature/feature.xml
deleted file mode 100644
index 049cfe194..000000000
--- a/features/org.eclipse.jst.web_core.feature/feature.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_core.feature"
-      label="%featureName"
-      version="3.2.3.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <includes
-         id="org.eclipse.wst.ws_core.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jem.beaninfo.vm.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jem.beaninfo.vm"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jem.beaninfo"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jem.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jem.workbench"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.annotations.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.annotations.controller"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.frameworks"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.web"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jee"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jee.web"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.standard.schemas"
-         download-size="224"
-         install-size="224"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_core.feature/license.html b/features/org.eclipse.jst.web_core.feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.web_core.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46ac..000000000
--- a/features/org.eclipse.jst.web_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 (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 (&quot;Source Zips&quot;) 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 &quot;about.html&quot; files (&quot;Abouts&quot;) 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.jst.web_core.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_core.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a75..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_core.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index cedcbea0d..000000000
--- a/features/org.eclipse.jst.web_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=J2EE Standard Tools - Web 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.jst.web_core.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d68..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_core.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index f188816f6..000000000
--- a/features/org.eclipse.jst.web_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=J2EE Standard Tools - Web Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f10..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.web_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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 8d0348a4e..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,167 +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=JST Web Core Developer Resources
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST Web 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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46ac..000000000
--- a/features/org.eclipse.jst.web_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 (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 (&quot;Source Zips&quot;) 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 &quot;about.html&quot; files (&quot;Abouts&quot;) 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.jst.web_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index cedcbea0d..000000000
--- a/features/org.eclipse.jst.web_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=J2EE Standard Tools - Web 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.jst.web_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d68..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index f188816f6..000000000
--- a/features/org.eclipse.jst.web_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=J2EE Standard Tools - Web Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_sdk.feature/.cvsignore b/features/org.eclipse.jst.web_sdk.feature/.cvsignore
deleted file mode 100644
index 262183fe9..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-build.xml
-org.eclipse.jst.web_sdk.feature_1.0.0.bin.dist.zip
-features
-plugins
-dev.properties
diff --git a/features/org.eclipse.jst.web_sdk.feature/.project b/features/org.eclipse.jst.web_sdk.feature/.project
deleted file mode 100644
index 0aa6f523e..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_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.jst.web_sdk.feature/build.properties b/features/org.eclipse.jst.web_sdk.feature/build.properties
deleted file mode 100644
index f8e0401a7..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
-
-
-generate.feature@org.eclipse.jst.web_ui.feature.source=org.eclipse.jst.web_ui.feature, feature@org.eclipse.jst.web_core.feature.source
diff --git a/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_sdk.feature/epl-v10.html b/features/org.eclipse.jst.web_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_sdk.feature/feature.properties b/features/org.eclipse.jst.web_sdk.feature/feature.properties
deleted file mode 100644
index 8c5fb589c..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/feature.properties
+++ /dev/null
@@ -1,168 +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=JST Web Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST Web 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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_sdk.feature/feature.xml b/features/org.eclipse.jst.web_sdk.feature/feature.xml
deleted file mode 100644
index 659109b39..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_sdk.feature"
-      label="%featureName"
-      version="3.2.3.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <includes
-         id="org.eclipse.wst.ws_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.web_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.web_ui.feature.source"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.doc.dev"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_sdk.feature/license.html b/features/org.eclipse.jst.web_sdk.feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/.cvsignore b/features/org.eclipse.jst.web_ui.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.web_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_ui.feature/.project b/features/org.eclipse.jst.web_ui.feature/.project
deleted file mode 100644
index 75b769791..000000000
--- a/features/org.eclipse.jst.web_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_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.jst.web_ui.feature/build.properties b/features/org.eclipse.jst.web_ui.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/epl-v10.html b/features/org.eclipse.jst.web_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_ui.feature/feature.properties b/features/org.eclipse.jst.web_ui.feature/feature.properties
deleted file mode 100644
index db09174c1..000000000
--- a/features/org.eclipse.jst.web_ui.feature/feature.properties
+++ /dev/null
@@ -1,168 +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=JST Web UI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JST Web 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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_ui.feature/feature.xml b/features/org.eclipse.jst.web_ui.feature/feature.xml
deleted file mode 100644
index 644ad47a4..000000000
--- a/features/org.eclipse.jst.web_ui.feature/feature.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_ui.feature"
-      label="%featureName"
-      version="3.2.3.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <includes
-         id="org.eclipse.wst.ws_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.web_userdoc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.web_core.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.jsdt.web.support.jsp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.annotations.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_ui.feature/license.html b/features/org.eclipse.jst.web_ui.feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.web_ui.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46ac..000000000
--- a/features/org.eclipse.jst.web_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 (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 (&quot;Source Zips&quot;) 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 &quot;about.html&quot; files (&quot;Abouts&quot;) 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.jst.web_ui.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_ui.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a75..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_ui.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 307bab915..000000000
--- a/features/org.eclipse.jst.web_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=J2EE Standard Tools - Web 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.jst.web_ui.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 30a575c96..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_ui.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index e711acf76..000000000
--- a/features/org.eclipse.jst.web_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=J2EE Standard Tools - Web UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index a7c973f3b..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.jst.web_core.feature.source = org.eclipse.jst.web_core.feature
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.web_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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 8fd164f8a..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,168 +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=JST Web UI Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST Web 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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46ac..000000000
--- a/features/org.eclipse.jst.web_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 (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 (&quot;Source Zips&quot;) 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 &quot;about.html&quot; files (&quot;Abouts&quot;) 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.jst.web_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40c8..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 307bab915..000000000
--- a/features/org.eclipse.jst.web_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=J2EE Standard Tools - Web 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.jst.web_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 30a575c96..000000000
--- a/features/org.eclipse.jst.web_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.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index e711acf76..000000000
--- a/features/org.eclipse.jst.web_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=J2EE Standard Tools - Web UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a3a..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3da..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_userdoc.feature/.cvsignore b/features/org.eclipse.jst.web_userdoc.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_userdoc.feature/.project b/features/org.eclipse.jst.web_userdoc.feature/.project
deleted file mode 100644
index 56501046f..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_userdoc.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.jst.web_userdoc.feature/build.properties b/features/org.eclipse.jst.web_userdoc.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.web_userdoc.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.jst.web_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html b/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_userdoc.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 (&quot;AGREEMENT&quot;). 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'>&quot;Contribution&quot; 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'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; 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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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 &quot;AS IS&quot; 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]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_userdoc.feature/feature.properties b/features/org.eclipse.jst.web_userdoc.feature/feature.properties
deleted file mode 100644
index 943c2c69e..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# 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=JST Web User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JST Web user documentation
-
-# "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\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_userdoc.feature/feature.xml b/features/org.eclipse.jst.web_userdoc.feature/feature.xml
deleted file mode 100644
index fb49be37d..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_userdoc.feature"
-      label="%featureName"
-      version="3.2.2.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <plugin
-         id="org.eclipse.jst.jsf.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_userdoc.feature/license.html b/features/org.eclipse.jst.web_userdoc.feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.classpath b/plugins/org.eclipse.jem.beaninfo.vm.common/.classpath
deleted file mode 100644
index 27da7db4d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="beaninfoCommon"/>
-	<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.jem.beaninfo.vm.common/.cvsignore b/plugins/org.eclipse.jem.beaninfo.vm.common/.cvsignore
deleted file mode 100644
index 9b8171d4d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-bin_beaninfocommon
-bin_vm_beaninfovm
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.project b/plugins/org.eclipse.jem.beaninfo.vm.common/.project
deleted file mode 100644
index e3ce76930..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.beaninfo.vm.common</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.rtp.tools.rose.builder</name>
-			<arguments>
-				<dictionary>
-					<key>rose</key>
-					<value></value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.ibm.rtp.tools.rose.toolnature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 445b26349..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-#Wed Nov 26 00:55:05 EST 2008
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-eclipse.preferences.version=1
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 855e13665..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:18 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 59dc1688c..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jun 16 11:09:08 EDT 2005
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.jem.beaninfo/bin_vm_beaninfovm
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.beaninfo.vm.common/META-INF/MANIFEST.MF
deleted file mode 100644
index d0fbdb89d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jem.beaninfo.vm.common
-Bundle-Version: 2.0.300.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.beaninfo.common,
- org.eclipse.jem.internal.beaninfo.common;x-internal:=true
-Import-Package: org.eclipse.jem.internal.proxy.common;resolution:=optional,
- org.eclipse.jem.internal.proxy.core;resolution:=optional
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Description: %Bundle-Description.0
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/about.html b/plugins/org.eclipse.jem.beaninfo.vm.common/about.html
deleted file mode 100644
index afceed0cc..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
deleted file mode 100644
index 3b63c764f..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.beaninfo.common;
-
- 
-
-/**
- * Constants for the BaseBeanInfo for arguments. This class is common between
- * the IDE and the remote vm so that these constants can be used on both sides.
- * <p>
- * These are constants used in FeatureAttributes as keys. The other special
- * constants that are not keys in FeatureAttributes are left in BaseBeanInfo
- * since they are not needed on both sides.
- * 
- * @since 1.2.0
- */
-public interface IBaseBeanInfoConstants {
-
-	/**
-	 * Indicator used to describe a factory instantiation pattern. 
-	 * <p>
-	 * This will be on the attributes of the BeanDescriptor for the factory class. It will be complete, in that if this
-	 * factory is inherited from another factory, it must copy in the superclass's factory attribute. They won't be
-	 * automatically merged.
-	 * <p>
-	 * The format is an Object[][]. The first dimension at index zero is for toolkit wide information and then indexes one and beyond are one for each creation method name. The second dimension is for one entry
-	 * of classwide data and the rest are the data for 
-	 * each creation method.
-	 * <p>
-	 * The first entry at Object[0] will be <code>{initString, isShared, onFreeform}</code> where:
-	 * <dl>
-	 * <dt>initString
-	 * <dd>The init string that should be used to create an instance of the toolkit if it needs one, or <code>null</code> if it doesn't
-	 * need one (i.e. all static) or if the default constructor should be used.
-	 * This is used when a component is dropped from the palette that is for a toolkit component.
-	 * <dt>isShared
-	 * <dd><code>false</code> if each call to the creation method should have a new instance of the toolkit. This means that the toolkit manages only
-	 * one instance. This is more like a controller than a toolkit in this case. <code>true</code> if it should
-	 * try to reuse the toolkit of the parent if it has one,  or any other found toolkit of the same type, (i.e. a subtype will be acceptable).  
-	 * This is used when a component is dropped from the palette that is for a toolkit component.
-	 * <dt>onFreeform
-	 * <dd><code>true</code> if the toolkit is created that it should appear on the freeform surface to be selectable. This would be of use
-	 * if the toolkit had properties that need to be set. If the toolkit had no properties then it doesn't need to be selectable and should
-	 * not be on the freeform. Use <code>false</code> in that case.
-	 * </dl> 
-	 * <p>
-	 * The second and other entries of the array are of the format:
-	 * <code>{methodName, returnedClassname, isStatic, Object[], ...}</code> where:
-	 * <dl>
-	 * <dt>methodName
-	 * <dd>The name of the creation method this entry is for (String).
-	 * <dt>returnedClassname
-	 * <dd>The name of the class that is created and returned from the method (String).
-	 * <dt>isStatic
-	 * <dd><code>Boolean.TRUE</code> if the method is a static method, <code>Boolean.FALSE</code> if not. 
-	 * This is used when a component is dropped from the palette that is for a toolkit component.
-	 * <dt>Object[]
-	 * <dd>Zero or more arrays. The array contains the name of the properties for each method signature that each
-	 * respective argument is for, or <code>null</code> if that arg is not a property. There can be more than one array if there
-	 * is more than one factory method of the same name, and returns the same type, but what is different is only the number of arguments.
-	 * If there is a
-	 * factory method that has no properties as arguments or has no arguments, don't include an array for it. For example if there was only one factory method and it had no
-	 * arguments then there would not be any arrays.
-	 * Currently cannot handle where more than one method has the same number of arguments but different types for the arguments.
-	 * </dl>
-	 * <p>
-	 * A example is:
-	 * <pre><code>
-	 * new Object[][] {
-	 *   {"new a.b.c.Toolkit(\"ABC\")", Boolean.TRUE, Boolean.FALSE},
-	 *   {"createButton", "a.b.c.Button", Boolean.FALSE, new Object[] {"parent", "text"}, new Object[] {"parent"}}
-	 * }
-	 * </code>
-	 * </pre>
-	 * <p>
-	 * This example says that this class is toolkit (factory). To construct an instead use <code>"new a.b.c.Toolkit(\"ABC\")"</code> and it is shared
-	 * with other objects created from this factory instance. Also, the factory method is "createButton", returns an "a.b.c.Button", and it is
-	 * not a static call (i.e. use a toolkit instance to create it). It has two forms of factory methods. One is two arguments where the first
-	 * arg is the parent property and the second arg is the text property. The other form has only one argument, the parent property.
-	 * <p>
-	 * The way this is used in a palette entry to drop a new object that a toolkit can create is to have an expression of the form
-	 * <code>{toolkit:classname}.factorymethod(args)</code>. So for the above example it would be <code>{toolkit:a.b.c.Toolkit}.createButton(parent)</code>.
-	 * The classname <b>must</b> be fully-qualified and if an inner class it must use the "$" instead of "." for the name, i.e. a.b.c.Toolkit.InnerFactory
-	 * would be a.b.c.Toolkit$InnerFactory. 
-	 * <p>
-	 * <b>NOTE:</b> This is an EXPERIMENTAL API and can change in the future until committed.  
-	 *   
-	 * @since 1.2.0
-	 */	
-	public static final String FACTORY_CREATION = "FACTORY_CREATION";//$NON-NLS-1$
-		
-	/**
-	 * Category indicator for apply property arguments. Category is a pre-defined attribute name too. That is where the category is stored in a
-	 * descriptor.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String CATEGORY = "category"; //$NON-NLS-1$
-	
-	/**
-	 * Enumeration values indicator for apply property arguments. Enumeration values is a pre-defined attribute name too. That is where the
-	 * enumeration values are stored.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String ENUMERATIONVALUES = "enumerationValues";//$NON-NLS-1$
-	
-	// The keys for icon file names, NOT THE java.awt.icon key.
-	public static final String ICONCOLOR16X16URL = "ICON_COLOR_16x16_URL"; //$NON-NLS-1$	
-	public static final String ICONCOLOR32X32URL = "ICON_COLOR_32x32_URL"; //$NON-NLS-1$     	// Not used
-	public static final String ICONMONO16X16URL = "ICON_MONO_16x16_URL"; //$NON-NLS-1$        	// Not used
-	public static final String ICONMONO32X32URL = "ICON_MONO_32x32_URL"; //$NON-NLS-1$			// Not used
-
-
-	/**
-	 * FeatureAttribute key for explicit property changes. The value is a Boolean. <code>true</code>
-	 * indicates that the Customize Bean customizer supplied by the BeanInfo will indicate which
-	 * properties it has changed through firing {@link java.beans.PropertyChangeEvent} instead of the 
-	 * Visual Editor automatically trying to determine the set of changed properties.
-	 * <p>
-	 * The default if not set is <code>false</code>.
-	 * 
-	 * @since 1.1.0.1
-	 */
-	public static final String EXPLICIT_PROPERTY_CHANGE = "EXPLICIT_PROPERTY_CHANGE"; //$NON-NLS-1$
-
-	/**
-	 * Used by Visual Editor as feature attribute key/value to indicate that it must create an implicit setting of a property(s).
-	 * For example {@link javax.swing.JFrame#getContentPane()}. There must be a content pane
-	 * set in the VE model so that users can drop the components on it. Setting this here
-	 * means that the default content pane from the JFrame will show up in the editor to use.
-	 * <p>
-	 * This should be used with care in that not all properties are required to always show up.
-	 * They can be queried when needed.
-	 * <p>
-	 * The value can be either a {@link String} for one property. Or it can be a {@link String[]} for more
-	 * than one property.
-	 * 
-	 * @since 1.2.0
-	 */
-	public static final String REQUIRED_IMPLICIT_PROPERTIES = "requiredImplicitProperties";	//$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
deleted file mode 100644
index 724b0d811..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the BeanDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the BeanDescriptor. 
- * @since 1.1.0
- */
-public class BeanRecord extends FeatureRecord {
-
-	private static final long serialVersionUID = 1105979920664L;
-	
-	public String customizerClassName;
-	public boolean mergeInheritedProperties;
-	public boolean mergeInheritedOperations;
-	public boolean mergeInheritedEvents;
-	/**
-	 * Names of properties that are to not be inherited in getAllProperties(). It is set only
-	 * if the list is not the full list of inherited properties.
-	 * If all inherited or mergeInheritedProperties is false, then the field will be <code>null</code>. Save space that way.
-	 */
-	public String[] notInheritedPropertyNames;
-	/**
-	 * Names of operations that are to not be inherited in getEAllOperations(). It is set only
-	 * if the list is not the full list of inherited operations. 
-	 * If all are inherited or if mergeInheritedOperations is false, then the field will be <code>null</code>. Save space that way.
-	 */
-	public String[] notInheritedOperationNames;
-	/**
-	 * Names of events that are to not be inherited in getAllEvents(). It is set only
-	 * if the list is not the full list of inherited events.
-	 * If all are inherited or if mergeInheritedEvents is false, then the field will be <code>null</code>. Save space that way.
-	 */
-	public String[] notInheritedEventNames;
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
deleted file mode 100644
index b235382cc..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the EventSetDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the EventSetDescriptor. 
- * @since 1.1.0
- */
-public class EventSetRecord extends FeatureRecord {
-	
-	private static final long serialVersionUID = 1105980773420L;
-	
-	public ReflectMethodRecord addListenerMethod;
-	public String eventAdapterClassName;
-	public MethodRecord[] listenerMethodDescriptors;
-	public String listenerTypeName;
-	public ReflectMethodRecord removeListenerMethod;
-	public boolean inDefaultEventSet;
-	public boolean unicast;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
deleted file mode 100644
index 960afd9d4..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
+++ /dev/null
@@ -1,772 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.Arrays;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-
- 
-
-/**
- * This is the value for a FeatureAttribute. It wrappers the true java object.
- * Use the getObject method to get the java value.
- * <p>
- * We can only represent Strings, primitives, and arrays. (Primitives will converted
- * to their wrapper class (e.g. Long), and byte, short, and int will move up to Long,
- * and float will move up to Double).  And any kind of valid array on the java BeanInfo side
- * will be converted to an Object array on the IDE side. We don't have the capability to allow more complex objects 
- * because the IDE may not have the necessary classes available to it that 
- * the BeanInfo may of had available to it. Invalid objects will be represented
- * by the singleton instance of {@link org.eclipse.jem.internal.beaninfo.common.InvalidObject}.
- * <p>
- * <b>Note:</b>
- * Class objects that are values of Feature attributes on the java BeanInfo side will be
- * converted to simple strings containing the classname when moved to the client (IDE) side.
- * That is because the classes probably will not be available on the IDE side, but can be
- * used to reconstruct the class when used back on the java vm side. 
- * @since 1.1.0
- */
-public class FeatureAttributeValue implements Serializable {
-	
-	private transient Object value;
-	private transient Object internalValue;
-	private boolean implicitValue;
-	private static final long serialVersionUID = 1105717634844L;
-	
-	/**
-	 * Create the value with the given init string.
-	 * <p>
-	 * This is not meant to be used by clients.
-	 * @param initString
-	 * 
-	 * @since 1.1.0
-	 */
-	public FeatureAttributeValue(String initString) {
-		// Use the init string to create the value. This is our
-		// own short-hand for this.
-		if (initString.startsWith(IMPLICIT)) {
-			setImplicitValue(true);
-			initString = initString.substring(IMPLICIT.length());
-		}
-		value = parseString(initString);
-	}
-	
-	/**
-	 * This is used when customer wants to fluff one up.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	public FeatureAttributeValue() {
-		
-	}
-	
-	/**
-	 * @return Returns the value.
-	 * 
-	 * @since 1.1.0
-	 */
-	public Object getValue() {
-		return value;
-	}
-	
-	/**
-	 * Set a value.
-	 * @param value The value to set.
-	 * @since 1.1.0
-	 */
-	public void setValue(Object value) {
-		this.value = value;
-		this.setInternalValue(null);
-	}
-		
-	/**
-	 * Set the internal value.
-	 * @param internalValue The internalValue to set.
-	 * 
-	 * @since 1.1.0
-	 */
-	public void setInternalValue(Object internalValue) {
-		this.internalValue = internalValue;
-	}
-
-	/**
-	 * This is the internal value. It is the <code>value</code> massaged into an easier to use form
-	 * in the IDE. It will not be serialized out. It will not be reconstructed from an init string.
-	 * <p> 
-	 * It does not need to be used. It will be cleared if
-	 * a new value is set. For example, if the value is a complicated array (because you can't have
-	 * special classes in the attribute value on the BeanInfo side) the first usage of this value can
-	 * be translated into an easier form to use, such as a map.
-	 * 
-	 * @return Returns the internalValue.
-	 * 
-	 * @since 1.1.0
-	 */
-	public Object getInternalValue() {
-		return internalValue;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		if (value == null)
-			return super.toString();
-		StringBuffer out = new StringBuffer(100);
-		if (isImplicitValue())
-			out.append(IMPLICIT);
-		makeString(value, out);
-		return out.toString();
-	}
-	
-
-	/**
-	 * Helper method to take the object and turn it into the
-	 * string form that is required for EMF serialization.
-	 * <p>
-	 * This is used internally. It can be used for development 
-	 * purposes by clients, but they would not have any real
-	 * runtime need for this.
-	 * <p>
-	 * Output format would be (there won't be any newlines in the actual string)
-	 * <pre>
-	 *   String: "zxvzxv"
-	 *   Number: number
-	 *   Boolean: true or false
-	 *   Character: 'c'
-	 *   null: null
-	 * 
-	 *   Array: (all arrays will be turned into Object[])
-	 *     [dim]{e1, e2}
-	 *     [dim1][dim2]{[dim1a]{e1, e2}, [dim2a]{e3, e4}}
-	 *   where en are objects that follow the pattern for single output above.
-	 * 
-	 *   Any invalid object (i.e. not one of the ones we handle) will be:
-	 *     INV
-	 * 
-	 *   Arrays of invalid types (not Object, String, Number, Boolean, Character,
-	 *     or primitives) will be marked as INV.
-	 * </pre>
-	 * @param value
-	 * @return serialized form as a string.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String makeString(Object value) {
-		StringBuffer out = new StringBuffer(100);
-		makeString(value, out);
-		return out.toString();
-	}
-		
-	private static final Pattern QUOTE = Pattern.compile("\"");	// Pattern for searching for double-quote. Make it static so don't waste time compiling each time. //$NON-NLS-1$
-	private static final String NULL = "null";	// Output string for null //$NON-NLS-1$
-	private static final String INVALID = "INV";	// Invalid object flag. //$NON-NLS-1$
-	private static final String IMPLICIT = "implicit,";	// Implicit flag. //$NON-NLS-1$
-	
-	/*
-	 * Used for recursive building of the string.
-	 */
-	private static void makeString(Object value, StringBuffer out) {
-		if (value == null)
-			out.append(NULL);
-		else if (value instanceof String || value instanceof Class) {
-			// String: "string" or "string\"stringend" if str included a double-quote.
-			out.append('"');
-			// If class, turn value into the classname.
-			String str = value instanceof String ? (String) value : ((Class) value).getName();
-			if (str.indexOf('"') != -1) {
-				// Replace double-quote with escape double-quote so we can distinquish it from the terminating double-quote.
-				out.append(QUOTE.matcher(str).replaceAll("\\\\\""));	// Don't know why we need the back-slash to be doubled for replaceall, but it doesn't work otherwise. //$NON-NLS-1$
-			} else
-				out.append(str);
-			out.append('\"');
-		} else if (value instanceof Number) {
-			// Will go out as either a integer number or a floating point number. 
-			// When read back in it will be either a Long or a Double.
-			out.append(value);
-		} else if (value instanceof Boolean) {
-			// It will go out as either true or false.
-			out.append(value);
-		} else if (value instanceof Character) {
-			// Character: 'c' or '\'' if char was a quote.
-			out.append('\'');
-			Character c = (Character) value;
-			if (c.charValue() != '\'')
-				out.append(c.charValue());
-			else
-				out.append("\\'"); //$NON-NLS-1$
-			out.append('\'');
-		} else if (value.getClass().isArray()) {
-			// Handle array format.
-			Class type = value.getClass();
-			// See if final type is a valid type.
-			Class ft = type.getComponentType();
-			int dims = 1;
-			while (ft.isArray()) {
-				dims++;
-				ft = ft.getComponentType();
-			}
-			if (ft == Object.class || ft == String.class || ft == Boolean.class || ft == Character.class || ft.isPrimitive() || Number.class.isAssignableFrom(ft)) {
-				// [length][][] {....}
-				out.append('[');
-				int length = Array.getLength(value); 
-				out.append(length);
-				out.append(']');
-				while(--dims > 0) {
-					out.append("[]"); //$NON-NLS-1$
-				}
-				out.append('{');
-				for (int i=0; i < length; i++) {
-					if (i != 0)
-						out.append(',');
-					makeString(Array.get(value, i), out);
-				}
-				out.append('}');
-			} else
-				out.append(INVALID);	// Any other kind of array is invalid.
-		} else {
-			out.append(INVALID);
-		}
-	}
-	
-	
-	/**
-	 * Helper method to take the string input from EMF serialization and turn it
-	 * into an Object.
-	 * <p>
-	 * This is used internally. It can be used for development 
-	 * purposes by clients, but they would not have any real
-	 * runtime need for this.
-	 * <p>
-	 * The object will be an object, null, or an Object array. Any value
-	 * that is invalid will be set to the {@link InvalidObject#INSTANCE} static
-	 * instance.
-	 * 
-	 * @param input
-	 * @return object decoded from the input.
-	 * 
-	 * @see #makeString(Object)
-	 * @since 1.1.0
-	 */
-	public static Object parseString(String input) {
-		return parseString(new StringParser(input));
-	}
-	
-	private static class StringParser {
-		private int next=0;
-		private int length;
-		private String input;
-		
-		public StringParser(String input) {
-			this.input = input;
-			this.length = input.length();
-		}
-		
-		public String toString() {
-			return "StringParser: \""+input+'"'; //$NON-NLS-1$
-		}
-		
-		public void skipWhitespace() {
-			while(next < length) {
-				if (!Character.isWhitespace(input.charAt(next++))) {
-					next--;	// Put it back as not yet read since it is not whitespace.
-					break;
-				}
-			}
-		}
-		
-		/**
-		 * Return the next index
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public int nextIndex() {
-			return next;
-		}
-		
-		/**
-		 * Get the length of the input
-		 * @return input length
-		 * 
-		 * @since 1.1.0
-		 */
-		public int getLength() {
-			return length;
-		}
-		
-		
-		/**
-		 * Read the current character and go to next.
-		 * @return current character
-		 * 
-		 * @since 1.1.0
-		 */
-		public char read() {
-			return next<length ? input.charAt(next++) : 0;
-		}
-		
-		/**
-		 * Backup the parser one character.
-		 * 
-		 * 
-		 * @since 1.1.0
-		 */
-		public void backup() {
-			if (--next < 0)
-				next = 0;
-		}
-		
-		/**
-		 * Peek at the char at the next index, but don't increment afterwards.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public char peek() {
-			return next<length ? input.charAt(next) : 0;
-		}
-		
-		/**
-		 * Have we read the last char.
-		 * @return <code>true</code> if read last char.
-		 * 
-		 * @since 1.1.0
-		 */
-		public boolean atEnd() {
-			return next>=length;
-		}
-		
-		/**
-		 * Skip the next number of chars.
-		 * @param skip number of chars to skip.
-		 * 
-		 * @since 1.1.0
-		 */
-		public void skip(int skip) {
-			if ((next+=skip) > length)
-				next = length;
-		}
-		
-		/**
-		 * Return the string input.
-		 * @return the string input
-		 * 
-		 * @since 1.1.0
-		 */
-		public String getInput() {
-			return input;
-		}
-				
-	}
-	
-	/*
-	 * Starting a parse for an object at the given index.
-	 * Return the parsed object or InvalidObject if no
-	 * object or if there was an error parsing.
-	 */
-	private static Object parseString(StringParser parser) {
-		parser.skipWhitespace();
-		if (!parser.atEnd()) {
-			char c = parser.read();
-			switch (c) {
-				case '"':
-					// Start of a quoted string. Scan for closing quote, ignoring escaped quotes.
-					int start = parser.nextIndex();	// Index of first char after '"'
-					char[] dequoted = null;	// Used if there is an escaped quote. That is the only thing we support escape on, quotes.
-					int dequoteIndex = 0;
-					while (!parser.atEnd()) {
-						char cc = parser.read();
-						if (cc == '"') {
-							// If we didn't dequote, then just do substring.
-							if (dequoted == null)
-								return parser.getInput().substring(start, parser.nextIndex()-1);	// next is char after '"', so end of string index is index of '"'
-							else {
-								// We have a dequoted string. So turn into a string.
-								// Gather the last group
-								int endNdx = parser.nextIndex()-1;
-								parser.getInput().getChars(start, endNdx, dequoted, dequoteIndex);
-								dequoteIndex+= (endNdx-start);
-								return new String(dequoted, 0, dequoteIndex);
-							}
-						} else if (cc == '\\') {
-							// We had an escape, see if next is a quote. If it is we need to strip out the '\'.
-							if (parser.peek() == '"') {
-								if (dequoted == null) {
-									dequoted = new char[parser.getLength()];
-								}
-								int endNdx = parser.nextIndex()-1;
-								parser.getInput().getChars(start, endNdx, dequoted, dequoteIndex);	// Get up to, but not including '\'
-								dequoteIndex+= (endNdx-start);
-								// Now also add in the escaped quote.
-								dequoted[dequoteIndex++] = parser.read();
-								start = parser.nextIndex();	// Next group is from next index.
-							}
-						}
-					}
-					break;	// If we got here, it is invalid.
-					
-				case '-':
-				case '0':
-				case '1':
-				case '2':
-				case '3':
-				case '4':
-				case '5':
-				case '6':
-				case '7':
-				case '8':
-				case '9':
-					// Possible number.
-					// Scan to next non-digit, or not part of valid number.
-					boolean numberComplete = false;
-					boolean floatType = false;
-					boolean foundE = false;
-					boolean foundESign = false;
-					start = parser.nextIndex()-1;	// We want to include the sign or first digit in the number.
-					while (!parser.atEnd() && !numberComplete) {
-						char cc = parser.read();
-						switch (cc) {
-							case '0':
-							case '1':
-							case '2':
-							case '3':
-							case '4':
-							case '5':
-							case '6':
-							case '7':
-							case '8':
-							case '9':
-								break;	// This is good, go on.
-							case '.':
-								if (floatType)
-									return InvalidObject.INSTANCE;	// We already found a '.', two are invalid.
-								floatType = true;
-								break;
-							case 'e':
-							case 'E':
-								if (foundE)
-									return InvalidObject.INSTANCE;	// We already found a 'e', two are invalid.
-								foundE = true;
-								floatType = true;	// An 'e' makes it a float, if not already.
-								break;
-							case '+':
-							case '-':
-								if (!foundE || foundESign) 
-									return InvalidObject.INSTANCE;	// A +/- with no 'e' first is invalid. Or more than one sign.
-								foundESign = true;
-								break;
-							default:
-								// Anything else is end of number.
-								parser.backup();	// Back it up so that next parse will start with this char.
-								numberComplete = true;	// So we stop scanning
-								break;
-						}
-					}
-					try {
-						if (!floatType)
-							return Long.valueOf(parser.getInput().substring(start, parser.nextIndex()));
-						else
-							return Double.valueOf(parser.getInput().substring(start, parser.nextIndex()));
-					} catch (NumberFormatException e) {
-					}
-					break; // If we got here, it is invalid.
-					
-				case 't':
-				case 'T':
-				case 'f':
-				case 'F':
-					// Possible boolean.
-					if (parser.getInput().regionMatches(true, parser.nextIndex()-1, "true", 0, 4)) { //$NON-NLS-1$
-						parser.skip(3);	// Skip over rest of string.
-						return Boolean.TRUE;
-					} else if (parser.getInput().regionMatches(true, parser.nextIndex()-1, "false", 0, 5)) { //$NON-NLS-1$
-						parser.skip(4);	// Skip over rest of string.
-						return Boolean.FALSE;						
-					}
-					break; // If we got here, it is invalid.
-					
-				case '\'':
-					// Possible character
-					char cc = parser.read();
-					// We really only support '\\' and '\'' anything else will be treated as ignore '\' because we don't know handle full escapes.
-					if (cc == '\\')
-						cc = parser.read();	// Get what's after it.
-					else if (cc == '\'')
-						break;	// '' is invalid.
-					if (parser.peek() == '\'') {
-						// So next char after "character" is is a quote. This is good.
-						parser.read();	// Now consume the quote
-						return new Character(cc);
-					}
-					break; // If we got here, it is invalid.
-					
-				case 'n':
-					// Possible null.
-					if (parser.getInput().regionMatches(parser.nextIndex()-1, "null", 0, 4)) { //$NON-NLS-1$
-						parser.skip(3);	// Skip over rest of string.
-						return null;
-					}
-					break; // If we got here, it is invalid.
-					
-				case 'I':
-					// Possible invalid value.
-					if (parser.getInput().regionMatches(parser.nextIndex()-1, INVALID, 0, INVALID.length())) {
-						parser.skip(INVALID.length()-1);	// Skip over rest of string.
-						return InvalidObject.INSTANCE;
-					}
-					break; // If we got here, it is invalid.
-					
-				case '[':
-					// Possible array.
-					// The next field should be a number, so we'll use parseString to get the number. 
-					Object size = parseString(parser);
-					if (size instanceof Long) {
-						parser.skipWhitespace();
-						cc = parser.read();	// Se if next is ']'
-						if (cc == ']') {
-							// Good, well-formed first dimension
-							int dim = 1;
-							boolean valid = true;
-							// See if there are more of just "[]". the number of them is the dim.
-							while (true) {
-								parser.skipWhitespace();
-								cc = parser.read();
-								if (cc == '[') {
-									parser.skipWhitespace();
-									cc = parser.read();
-									if (cc == ']')
-										dim++;
-									else {
-										// This is invalid.
-										valid = false;
-										parser.backup();
-										break;	// No more dims.
-									}
-								} else {
-									parser.backup();
-									break;	// No more dims.
-								}
-							}
-							if (valid) {
-								parser.skipWhitespace();
-								cc = parser.read();
-								if (cc == '{') {
-									// Good, we're at the start of the initialization code.
-									int[] dims = new int[dim];
-									int len = ((Long) size).intValue();
-									dims[0] = len;
-									Object array = Array.newInstance(Object.class, dims);
-									Arrays.fill((Object[]) array, null);	// Because newInstance used above fills the array created with empty arrays when a dim>1.
-									
-									// Now we start filling it in.
-									Object invSetting = null;	// What we will use for the invalid setting. If this is a multidim, this needs to be an array. Will not create it until needed.
-									Object entry = parseString(parser);	// Get the first entry
-									Class compType = array.getClass().getComponentType();
-									int i = -1;
-									while (true) {
-										if (++i < len) {
-											if (compType.isInstance(entry)) {
-												// Good, it can be assigned.
-												Array.set(array, i, entry);
-											} else {
-												// Bad. Need to set invalid.
-												if (invSetting == null) {
-													// We haven't created it yet.
-													if (dim == 1)
-														invSetting = InvalidObject.INSTANCE; // Great, one dimensional, we can use invalid directly
-													else {
-														// Multi-dim. Need to create a valid array that we can set.
-														int[] invDims = new int[dim - 1];
-														Arrays.fill(invDims, 1); // Length one all of the way so that the final component can be invalid object
-														invSetting = Array.newInstance(Object.class, invDims);
-														Object finalEntry = invSetting; // Final array (with component type of just Object). Start with the full array and work down.
-														for (int j = invDims.length - 1; j > 0; j--) {
-															finalEntry = Array.get(finalEntry, 0);
-														}
-														Array.set(finalEntry, 0, InvalidObject.INSTANCE);
-													}
-												}
-												Array.set(array, i, invSetting);
-											}
-										}
-										
-										parser.skipWhitespace();
-										cc = parser.read();
-										if (cc == ',') {
-											// Good, get next
-											entry = parseString(parser);
-										} else if (cc == '}') {
-											// Good, reached the end.
-											break;
-										} else {
-											if (!parser.atEnd()) {
-												parser.backup();
-												entry = parseString(parser); // Technically this should be invalid, but we'll let a whitespace also denote next entry.
-											} else {
-												// It's really screwed up. The string just ended. Log it.
-												Exception e = new IllegalStateException(parser.toString());
-												try {
-													// See if Beaninfo plugin is available (we are running under eclipse). If so, use it, else just print to error.
-													// We may be in the remote vm and so it won't be available.
-													Class biPluginClass = Class.forName("org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin"); //$NON-NLS-1$
-													Method getPlugin = biPluginClass.getMethod("getPlugin", (Class[]) null); //$NON-NLS-1$
-													Method getLogger = biPluginClass.getMethod("getLogger", (Class[]) null); //$NON-NLS-1$
-													Method log = getLogger.getReturnType().getMethod("log", new Class[] {Throwable.class, Level.class}); //$NON-NLS-1$
-													Object biPlugin = getPlugin.invoke(null, (Object[]) null);
-													Object logger = getLogger.invoke(biPlugin, (Object[]) null);
-													log.invoke(logger, new Object[] {e, Level.WARNING});
-													return InvalidObject.INSTANCE;
-												} catch (SecurityException e1) {
-												} catch (IllegalArgumentException e1) {
-												} catch (ClassNotFoundException e1) {
-												} catch (NoSuchMethodException e1) {
-												} catch (IllegalAccessException e1) {
-												} catch (InvocationTargetException e1) {
-												} catch (NullPointerException e1) {
-												}
-												e.printStackTrace();	// Not in eclipse, so just print stack trace.
-												return InvalidObject.INSTANCE;
-											}
-										}
-									}
-									
-									return array;
-								}
-							}							
-						}
-					}
-					break; // If we got here, it is invalid.
-			}
-		}
-		return InvalidObject.INSTANCE;
-	}
-	
-	private void writeObject(ObjectOutputStream out) throws IOException {
-		// Write out any hidden stuff
-		out.defaultWriteObject();
-		writeObject(value, out);
-	}
-	
-	private void writeObject(Object value, ObjectOutputStream out) throws IOException {
-		if (value == null)
-			out.writeObject(value);
-		else {
-			if (value instanceof Class)
-				out.writeObject(((Class) value).getName());
-			else if (!value.getClass().isArray()) {
-				if (value instanceof String || value instanceof Number || value instanceof Boolean || value instanceof Character)
-					out.writeObject(value);
-				else
-					out.writeObject(InvalidObject.INSTANCE);
-			} else {
-				// Array is tricky. See if it is one we can handle, if not then invalid. 
-				// To indicate array, we will first write out the Class of the Component type of the array (it will
-				// be converted to be Object or Object[]...).
-				// This will be the clue that an array is coming. Class values will never
-				// be returned, so that is how we can tell it is an array.
-				// Note: The reason we are using the component type (converted to Object) is because to reconstruct on the other side we need
-				// to use the component type plus length of the array's first dimension.
-				// 
-				// We can not just serialize the array in the normal way because it may contain invalid values, and we need to 
-				// handle that. Also, if it wasn't an Object array, we need to turn it into an object array. We need consistency
-				// in that it should always be an Object array.
-				// So output format will be:
-				// Class(component type)
-				// int(size of first dimension)
-				// Object(value of first entry) - Actually use out writeObject() format to allow nesting of arrays.
-				// Object(value of second entry)
-				// ... up to size of dimension.
-				Class type = value.getClass();
-				// See if final type is a valid type.
-				Class ft = type.getComponentType();
-				int dims = 1;
-				while (ft.isArray()) {
-					dims++;
-					ft = ft.getComponentType();
-				}
-				if (ft == Object.class || ft == String.class || ft == Boolean.class || ft == Character.class || ft.isPrimitive() || ft == Class.class || Number.class.isAssignableFrom(ft)) {
-					String jniType = dims == 1 ? "java.lang.Object" : MapTypes.getJNITypeName("java.lang.Object", dims-1); //$NON-NLS-1$ //$NON-NLS-2$
-					try {
-						Class componentType = Class.forName(jniType);
-						out.writeObject(componentType);
-						int length = Array.getLength(value);
-						out.writeInt(length);
-						for (int i = 0; i < length; i++) {
-							writeObject(Array.get(value, i), out);
-						}
-					} catch (ClassNotFoundException e) {
-						// This should never happen. Object arrays are always available.
-					}
-				} else
-					out.writeObject(InvalidObject.INSTANCE);
-			}
-		}
-	}
-	
-	
-	private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-		// Read in any hidden stuff
-		in.defaultReadObject();
-		
-		value = readActualObject(in);
-	}
-	
-	private Object readActualObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-		Object val = in.readObject();
-		if (val instanceof Class) {
-			// It must be an array. Only Class objects that come in are Arrays of Object.
-			int length = in.readInt();
-			Object array = Array.newInstance((Class) val, length);
-			for (int i = 0; i < length; i++) {
-				Array.set(array, i, readActualObject(in));
-			}
-			return array;
-		} else
-			return val;	// It is the value itself.
-	}
-
-	
-	/**
-	 * Is this FeatureAttributeValue an implicit value, i.e. one that came from
-	 * BeanInfo Introspection and not from an override file.
-	 * 
-	 * @return Returns the implicitValue.
-	 * 
-	 * @since 1.2.0
-	 */
-	public boolean isImplicitValue() {
-		return implicitValue;
-	}
-
-	
-	/**
-	 * Set the implicit value flag.
-	 * @param implicitValue The implicitValue to set.
-	 * 
-	 * @see #isImplicitValue()
-	 * @since 1.2.0
-	 */
-	public void setImplicitValue(boolean implicitValue) {
-		this.implicitValue = implicitValue;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
deleted file mode 100644
index 9d392fca3..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
- 
-
-/**
- * This is the data structure for sending the FeatureDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the FeatureDescriptor. 
- * @since 1.1.0
- */
-public class FeatureRecord implements Serializable {
-
-	private static final long serialVersionUID = 1105979276648L;
-	
-	public String name;	// Some decorators use this and others don't. Each decorator type will decide whether this is of importance.
-	public String displayName;
-	public String shortDescription;
-	public String category;
-	public boolean expert;
-	public boolean hidden;
-	public boolean preferred;
-	public String[] attributeNames;
-	public FeatureAttributeValue[] attributeValues;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
deleted file mode 100644
index e067449fa..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * These are constants needed for transferring BeanInfo results from the BeanInfo VM.
- * @since 1.1.0
- */
-public interface IBeanInfoIntrospectionConstants {
-	
-	/**
-	 * Introspection bit flag indicating do the BeanDecorator. Sent to ModelingBeanInfo.introspect method.
-	 * @since 1.1.0
-	 */
-	public static final int DO_BEAN_DECOR = 0x1;
-	
-	/**
-	 * Introspection bit flag indicating do the Properties. Sent to ModelingBeanInfo.introspect method.
-	 * @since 1.1.0
-	 */
-	public static final int DO_PROPERTIES = 0x2;
-
-	/**
-	 * Introspection bit flag indicating do the Methods. Sent to ModelingBeanInfo.introspect method.
-	 * @since 1.1.0
-	 */
-	public static final int DO_METHODS = 0x4;
-
-	/**
-	 * Introspection bit flag indicating do the Events. Sent to ModelingBeanInfo.introspect method.
-	 * @since 1.1.0
-	 */
-	public static final int DO_EVENTS = 0x8;
-
-	/**
-	 * BeanDecorator was sent command id. 
-	 * <p>
-	 * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream). 
-	 * The stream will be broken into sections.
-	 * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
-	 * Following the command id will be the type of input specific data. 
-	 * <p>
-	 * The data following the command id will be a BeanRecord from the ObjectInputStream.
-	 * 
-	 * @see BeanRecord
-	 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
-	 * @since 1.1.0
-	 */
-	public static final int BEAN_DECORATOR_SENT = 1;
-
-	/**
-	 * PropertyDecorators send command id.
-	 * <p>
-	 * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream). 
-	 * The stream will be broken into sections.
-	 * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
-	 * Following the command id will be the type of input specific data. 
-	 * <p>
-	 * The first object will be  an int and will be the number of properties and each object after that
-	 * will be a PropertyRecord/IndexedPropertyRecord. 
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
-	 * @see PropertyRecord
-	 * @see IndexedPropertyRecord
-	 */
-	public static final int PROPERTY_DECORATORS_SENT = 2;
-
-	/**
-	 * MethodDecorators send command id.
-	 * <p>
-	 * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream). 
-	 * The stream will be broken into sections.
-	 * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
-	 * Following the command id will be the type of input specific data. 
-	 * <p>
-	 * The InputStream will be Objects (use ObjectInputStream).
-	 * The first object will be  an int and will be the number of methods and each object after that
-	 * will be a MethodRecord. 
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
-	 * @see MethodRecord
-	 */
-	public static final int METHOD_DECORATORS_SENT = 3;
-	
-	/**
-	 * EventSetDecorators send command id.
-	 * <p>
-	 * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream). 
-	 * The stream will be broken into sections.
-	 * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
-	 * Following the command id will be the type of input specific data. 
-	 * <p>
-	 * The first object will be  an int and will be the number of events and each object after that
-	 * will be a EventSetRecord. 
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
-	 * @see MethodRecord
-	 */
-	public static final int EVENT_DECORATORS_SENT = 4;
-
-	/**
-	 * Done send command id.
-	 * <p>
-	 * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream). 
-	 * The stream will be broken into sections.
-	 * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
-	 * Following the command id will be the type of input specific data. 
-	 * <p>
-	 * This command id means there is no more data and it should return.
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
-	 * @see MethodRecord
-	 */
-	public static final int DONE = 5;
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
deleted file mode 100644
index 88d291615..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the IndexedPropertyDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the IndexedPropertyDescriptor. 
- * @since 1.1.0
- */
-public class IndexedPropertyRecord extends PropertyRecord {
-	private static final long serialVersionUID = 1105983227990L;
-	
-	public ReflectMethodRecord indexedReadMethod;
-	public ReflectMethodRecord indexedWriteMethod;
-	public String indexedPropertyTypeName;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
deleted file mode 100644
index 7e731ceba..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.ObjectStreamException;
-import java.io.Serializable;
- 
-
-/**
- * An indicator object for invalid object type. This is used with feature attribute
- * values from the BeanInfo classes. We can only handle certain types when we
- * bring them over from the BeanInfo VM. That is because the classes instantiated
- * in the BeanInfo class may not be available in the IDE.  So any invalid value
- * will be replaced by this class instance.
- * <p>
- * This is a singleton class.
- * There will be one instance (InvalidObject.INSTANCE) in the system. That way
- * "==" can be used to test for it.
- * 
- * @since 1.1.0
- */
-public class InvalidObject implements Serializable {
-	
-	/**
-	 * Singleton instance of InvalidObject.
-	 * @since 1.1.0
-	 */
-	public static final InvalidObject INSTANCE = new InvalidObject();
-	
-	private static final long serialVersionUID = 1105643804370L;
-	
-	/*
-	 * Nobody else should create one of these.
-	 */
-	private InvalidObject() {
-	}
-
-	private Object readResolve() throws ObjectStreamException {
-		return INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
deleted file mode 100644
index 4b37be9ed..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the MethodDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the MethodDescriptor. 
- * @since 1.1.0
- */
-public class MethodRecord extends FeatureRecord {
-	
-	private static final long serialVersionUID = 1105982213110L;
-	
-	/**
-	 * Method signature for the method this record describes.
-	 */
-	public ReflectMethodRecord methodForDescriptor;
-	/**
-	 * Parameter records array. It may be <code>null</code> if there aren't any.
-	 */
-	public ParameterRecord[] parameters;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
deleted file mode 100644
index 5b2f370bb..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the ParameterDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the ParameterDescriptor.
- * <p>
- * The only field of importance is the name, and that comes from FeatureRecord. 
- * @since 1.1.0
- */
-public class ParameterRecord extends FeatureRecord {
-
-	private static final long serialVersionUID = 1105982438955L;
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
deleted file mode 100644
index 3e032412d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the PropertyDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the PropertyDescriptor. 
- * @since 1.1.0
- */
-public class PropertyRecord extends FeatureRecord {
-	private static final long serialVersionUID = 1105979276648L;
-	
-	public String propertyEditorClassName;
-	public String propertyTypeName;
-	public ReflectMethodRecord readMethod;
-	public ReflectMethodRecord writeMethod;
-	public ReflectFieldRecord field;
-	public boolean bound;
-	public boolean constrained;
-	public Boolean designTime;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
deleted file mode 100644
index 98298394a..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
- 
-
-/**
- * This is the data structure for sending the java.lang.reflect.Field info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the java.lang.reflect.Field. 
- * @since 1.1.0
- */
-public class ReflectFieldRecord implements Serializable {
-	
-	private static final long serialVersionUID = 1105981512453L;
-	
-	public String className;
-	public String fieldName;
-	public boolean readOnly;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
deleted file mode 100644
index 9f112910d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
- 
-
-/**
- * This is the data structure for sending the java.lang.reflect.Method info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the java.lang.reflect.Method. 
- * @since 1.1.0
- */
-public class ReflectMethodRecord implements Serializable {
-	
-	private static final long serialVersionUID = 1105981512773L;
-	
-	public String className;
-	public String methodName;
-	public String[] parameterTypeNames;	// Maybe null if no parameters.
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/build.properties b/plugins/org.eclipse.jem.beaninfo.vm.common/build.properties
deleted file mode 100644
index 448843020..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-src.excludes = **/.cvsignore
-bin.includes = plugin.properties,\
-               about.html,\
-               META-INF/,\
-               .
-jars.compile.order = .
-src.includes = about.html
-source.. = beaninfoCommon/
-output.. = bin/
-
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/plugin.properties b/plugins/org.eclipse.jem.beaninfo.vm.common/plugin.properties
deleted file mode 100644
index f651b774f..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Properties file for org.eclipse.jem.beaninfo.vm.common
-Bundle-Name.0 = JEM Beaninfo Common Jar
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Description.0 = This bundle is used only as a jar by the org.eclipse.jem.beaninfo bundle, so it should never be "pre-req'd" by others, only by o.e.jem.beaninfo. Other adopters would use only that o.e.jem.beaninfo bundle.
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/.classpath b/plugins/org.eclipse.jem.beaninfo.vm/.classpath
deleted file mode 100644
index 18d82c654..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="vm_beaninfovm"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/.project b/plugins/org.eclipse.jem.beaninfo.vm/.project
deleted file mode 100644
index 8770b205e..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.beaninfo.vm</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.beaninfo.vm/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7e9799858..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Nov 26 01:23:00 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.compiler.compliance=1.4
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.beaninfo.vm/META-INF/MANIFEST.MF
deleted file mode 100644
index 5a137bd21..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jem.beaninfo.vm
-Bundle-Version: 2.0.300.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.jem.beaninfo.vm,
- org.eclipse.jem.internal.beaninfo.vm;x-internal:=true
-Require-Bundle: org.eclipse.jem.beaninfo.vm.common;bundle-version="[2.0.200,3.0.0)";visibility:=reexport
-Import-Package: org.eclipse.jem.internal.proxy.common;resolution:=optional
-Bundle-Description: %Bundle-Description.0
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/about.html b/plugins/org.eclipse.jem.beaninfo.vm/about.html
deleted file mode 100644
index 5acea59c7..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
- 
-<P>June, 2008</P>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/build.properties b/plugins/org.eclipse.jem.beaninfo.vm/build.properties
deleted file mode 100644
index 35f82280c..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/build.properties
+++ /dev/null
@@ -1,19 +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
-###############################################################################
-src.excludes = **/.cvsignore
-bin.includes = plugin.properties,\
-               about.html,\
-               META-INF/,\
-               .
-src.includes = about.html
-source.. = vm_beaninfovm/
-output.. = bin/
-
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/plugin.properties b/plugins/org.eclipse.jem.beaninfo.vm/plugin.properties
deleted file mode 100644
index 8755adf52..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Properties file for org.eclipse.jem.beaninfo.vm
-Bundle-Name.0 = JEM Beaninfo VM Jar
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Description.0 = This bundle is used only as a jar by the org.eclipse.jem.beaninfo bundle, so it should never be "pre-req'd" by others, only by o.e.jem.beaninfo. Extenders would use only that o.e.jem.beaninfo bundle.
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
deleted file mode 100644
index b51b63053..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
+++ /dev/null
@@ -1,850 +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.jem.beaninfo.vm;
-
-/*
-
-
- */
-
-import java.awt.Image;
-import java.beans.*;
-import java.lang.reflect.*;
-
-import org.eclipse.jem.beaninfo.common.IBaseBeanInfoConstants;
-
-
-/**
- * A BaseBeanInfo that provides common support for BeanInfos within the JEM environment.
- * 
- * @since 1.1.0
- */
-public abstract class BaseBeanInfo extends SimpleBeanInfo implements IBaseBeanInfoConstants {
-
-	// Constants to use to create all descriptors etc.
-	protected static java.util.ResourceBundle RESBUNDLE = java.util.ResourceBundle.getBundle("org.eclipse.jem.beaninfo.vm.beaninfo"); //$NON-NLS-1$
-
-	/**
-	 * Bound indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String BOUND = "bound";//$NON-NLS-1$
-
-	/**
-	 * Constrained indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String CONSTRAINED = "constrained";//$NON-NLS-1$
-
-	/**
-	 * Property editor class indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String PROPERTYEDITORCLASS = "propertyEditorClass";//$NON-NLS-1$
-
-	/**
-	 * Read Method indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String READMETHOD = "readMethod";//$NON-NLS-1$
-
-	/**
-	 * Write method indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String WRITEMETHOD = "writeMethod";//$NON-NLS-1$
-
-	/**
-	 * Displayname indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String DISPLAYNAME = "displayName";//$NON-NLS-1$
-	
-	/**
-	 * Expert indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String EXPERT = "expert";//$NON-NLS-1$
-
-	/**
-	 * Hidden indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String HIDDEN = "hidden";//$NON-NLS-1$
-
-	/**
-	 * Preferred indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String PREFERRED = "preferred";//$NON-NLS-1$
-
-	/**
-	 * Short description indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String SHORTDESCRIPTION = "shortDescription";//$NON-NLS-1$
-
-	/**
-	 * Customizer class indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String CUSTOMIZERCLASS = "customizerClass";//$NON-NLS-1$
-
-	/**
-	 * In Default eventset indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String INDEFAULTEVENTSET = "inDefaultEventSet";//$NON-NLS-1$
-	
-	/**
-	 * This is a Feature Attribute Key. When this key exists, the value is a java.lang.reflect.Field. It means this property
-	 * is a field and not a getter/setter. The getter/setter will be ignored and the property type will be the type of the field.
-	 * <p>
-	 * At this time, do not use field on an indexed property. This is currently an undefined situation.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String FIELDPROPERTY = "field"; //$NON-NLS-1$
-
-	/**
-	 * Obscure indicator for apply property arguments. Obsure is a pre-defined attribute name too. That is where the obscure setting is stored.
-	 * <p>
-	 * Obsure means most users don't need it. In the future such features won't even be cached so as to reduce the in-memory costs. Currently this
-	 * flag is ignored.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String OBSCURE = "ivjObscure";//$NON-NLS-1$
-
-	/**
-	 * Design time indicator for apply property arguments. Design time is a pre-defined attribute name too. That is where the design time setting is
-	 * stored.
-	 * <p>
-	 * Design time means:
-	 * <ul>
-	 * <li>Not set: Will be a property that can be connected to, and shows on property sheet (if not hidden).
-	 * <li><code>true</code>: Special property (it will show on property sheet if not hidden), but it can't be connected to. Usually this is a
-	 * property that is fluffed up for the IDE purposes but doesn't have a get/set method. This means it is a property for design time and not for
-	 * runtime.
-	 * <li><code>false</code>: This property will not show up on property sheet but it can be connected to.
-	 * </ul>
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String DESIGNTIMEPROPERTY = "ivjDesignTimeProperty"; //$NON-NLS-1$
-	
-	/**
-	 * EventAdapterClass indicator for apply property arguments. Event adapter class is a pre-defined attribute name too. That is where the event
-	 * adapter is stored.
-	 * <p>
-	 * Adapter class for eventSetDescriptors that provide default no-op implementation of the interface methods. For example
-	 * <code>java.awt.event.WindowListener</code> has an adapter of <code>java.awt.event.WindowAdapter</code>. What is stored is actually the
-	 * class name, not the class itself.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String EVENTADAPTERCLASS = "eventAdapterClass"; //$NON-NLS-1$
-
-
-	public static final boolean JVM_1_3 = System.getProperty("java.version", "").startsWith("1.3"); //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
-	
-	/**
-	 * Empty args list for those descriptors that don't have arguments.
-	 * @since 1.1.0
-	 */
-	public static final Object[] EMPTY_ARGS = new Object[0];
-
-	/**
-	 * Capitalize the string. This uppercases only the first character. So if you have property name of "abc" it will become "Abc".
-	 * 
-	 * @param s
-	 * @return string with first letter capitalized.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String capitalize(String s) {
-		if (s.length() == 0) { return s; }
-		char chars[] = s.toCharArray();
-		chars[0] = Character.toUpperCase(chars[0]);
-		return new String(chars);
-	}
-
-	/**
-	 * Create a BeanDescriptor object given an array of keyword/value arguments. Use the keywords defined in this class, e.g. BOUND, EXPERT, etc.
-	 * 
-	 * @param cls
-	 *            bean for which the bean descriptor is being created.
-	 * @param args
-	 *            arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
-	 * @return new bean descriptor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static BeanDescriptor createBeanDescriptor(Class cls, Object[] args) {
-		Class customizerClass = null;
-
-		if (args != null) {
-			/* Find the specified customizerClass */
-			for (int i = 0; i < args.length; i += 2) {
-				if (CUSTOMIZERCLASS.equals(args[i])) {
-					customizerClass = (Class) args[i + 1];
-					break;
-				}
-			}
-		}
-
-		BeanDescriptor bd = new BeanDescriptor(cls, customizerClass);
-
-		if (args != null) {
-			for (int i = 0; i < args.length; i += 2) {
-				String key = (String) args[i];
-				Object value = args[i + 1];
-				setFeatureDescriptorValue(bd, key, value);
-			}
-		}		
-		return bd;
-	}
-
-	/**
-	 * Create a beans EventSetDescriptor given the following:
-	 * 
-	 * @param cls
-	 *            The bean class
-	 * @param name
-	 *            Name of event set
-	 * @param args
-	 *            arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args.
-	 * @param lmds
-	 *            array of MethodDescriptors defining the listener methods
-	 * @param listenerType
-	 *            type of listener
-	 * @param addListenerName
-	 *            add listener method name
-	 * @param removeListenerNameremove
-	 *            listener method name
-	 * @return new event set descriptor
-	 * @since 1.1.0
-	 */
-	public static EventSetDescriptor createEventSetDescriptor(Class cls, String name, Object[] args, MethodDescriptor[] lmds, Class listenerType,
-			String addListenerName, String removeListenerName) {
-		EventSetDescriptor esd = null;
-		Class[] paramTypes = { listenerType};
-		try {
-			java.lang.reflect.Method addMethod = null;
-			java.lang.reflect.Method removeMethod = null;
-			try {
-				/* get addListenerMethod with parameter types. */
-				addMethod = cls.getMethod(addListenerName, paramTypes);
-			} catch (Exception ie) {
-				throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
-						new Object[] { addListenerName}));
-			}
-			;
-			try {
-				/* get removeListenerMethod with parameter types. */
-				removeMethod = cls.getMethod(removeListenerName, paramTypes);
-			} catch (Exception ie) {
-				throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
-						new Object[] { removeListenerName}));
-			}
-			;
-
-			esd = new EventSetDescriptor(name, listenerType, lmds, addMethod, removeMethod);
-		} catch (Exception ie) {
-			throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_E1_EXC_"), //$NON-NLS-1$
-					new Object[] { name}));
-		}
-		;
-		if (args != null) {
-			// set the event set descriptor properties
-			for (int i = 0; i < args.length; i += 2) {
-				String key = (String) args[i];
-				Object value = args[i + 1];
-				if (INDEFAULTEVENTSET.equals(key)) {
-					esd.setInDefaultEventSet(((Boolean) value).booleanValue());
-				} else
-					setFeatureDescriptorValue(esd, key, value);
-			}
-		}		
-		return esd;
-	}
-
-	/**
-	 * Create a bean's MethodDescriptor.
-	 * 
-	 * @param cls
-	 *            class of the method.
-	 * @param name
-	 *            name of the method.
-	 * @param args
-	 *            arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
-	 * @param params
-	 *            parameter descriptors or <code>null</code> if no parameter descriptors.
-	 * @param paramTypes
-	 *            parameter types
-	 * @return new method descriptor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static MethodDescriptor createMethodDescriptor(Class cls, String name, Object[] args, ParameterDescriptor[] params, Class[] paramTypes) {
-		MethodDescriptor md = null;
-		try {
-			java.lang.reflect.Method aMethod = null;
-			try {
-				/* getMethod with parameter types. */
-				aMethod = cls.getMethod(name, paramTypes);
-			} catch (Exception ie) {
-				throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
-						new Object[] { name}));
-			}
-			;
-			if (params != null && params.length > 0)
-				md = new MethodDescriptor(aMethod, params);
-			else
-				md = new MethodDescriptor(aMethod);
-		} catch (Exception ie) {
-			throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_Method_EXC_"), //$NON-NLS-1$
-					new Object[] { name}));
-		}
-		;
-		if (args != null) {
-			// set the method properties
-			for (int i = 0; i < args.length; i += 2) {
-				String key = (String) args[i];
-				Object value = args[i + 1];
-				setFeatureDescriptorValue(md, key, value);
-			}
-		}		
-		return md;
-	}
-
-	private static PropertyDescriptor createOtherPropertyDescriptor(String name, Class cls) throws IntrospectionException {
-		Method readMethod = null;
-		Method writeMethod = null;
-		String base = capitalize(name);
-		Class[] parameters = new Class[0];
-
-		// First we try boolean accessor pattern
-		try {
-			readMethod = cls.getMethod("is" + base, parameters);//$NON-NLS-1$
-		} catch (Exception ex1) {
-		}
-		if (readMethod == null) {
-			try {
-				// Else we try the get accessor pattern.
-				readMethod = cls.getMethod("get" + base, parameters);//$NON-NLS-1$
-			} catch (Exception ex2) {
-				// Find by matching methods of the class
-				readMethod = findMethod(cls, "get" + base, 0);//$NON-NLS-1$
-			}
-		}
-
-		if (readMethod == null) {
-			// For write-only properties, find the write method
-			writeMethod = findMethod(cls, "set" + base, 1);//$NON-NLS-1$
-		} else {
-			// In Sun's code, reflection fails if there are two
-			// setters with the same name and the first setter located
-			// does not have the same return type of the getter.
-			// This fixes that.
-			parameters = new Class[1];
-			parameters[0] = readMethod.getReturnType();
-			try {
-				writeMethod = cls.getMethod("set" + base, parameters);//$NON-NLS-1$
-			} catch (Exception ex3) {
-			}
-		}
-		// create the property descriptor
-		if ((readMethod != null) || (writeMethod != null)) {
-			return new PropertyDescriptor(name, readMethod, writeMethod);
-		} else {
-			throw new IntrospectionException(java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_find_the_acc1_EXC_"), //$NON-NLS-1$
-					new Object[] { name}));
-		}
-	}
-
-	/**
-	 * Create a beans parameter descriptor.
-	 * 
-	 * @param name
-	 *            name of parameter
-	 * @param args
-	 *            arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
-	 * @return new parameter descriptor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static ParameterDescriptor createParameterDescriptor(String name, Object[] args) {
-		ParameterDescriptor pd = null;
-		try {
-			pd = new ParameterDescriptor();
-		} catch (Exception ie) {
-			throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_Param1_EXC_"), //$NON-NLS-1$
-					new Object[] { name}));
-		}
-		;
-		// set the name
-		pd.setName(name);
-		if (args != null) {
-			// set the method properties
-			for (int i = 0; i < args.length; i += 2) {
-				String key = (String) args[i];
-				Object value = args[i + 1];
-				setFeatureDescriptorValue(pd, key, value);
-			}
-		}		
-		return pd;
-	}
-	
-	private static Method GETCLASS; 
-	
-	static {
-		try {
-			GETCLASS = Object.class.getMethod("getClass", (Class[]) null); //$NON-NLS-1$
-		} catch (SecurityException e) {
-		} catch (NoSuchMethodException e) {
-		}
-	}
-	/**
-	 * Create a property descriptor describing a field property.
-	 * <p>
-	 * Note: This is non-standard. The VE knows how to handle this, but any one else using BeanInfo will see this as a property with
-	 * no getter or setter.
-	 * @param name
-	 * @param field
-	 * @param args arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static PropertyDescriptor createFieldPropertyDescriptor(String name, Field field, Object[] args) {
-		try {
-			PropertyDescriptor pd = new PropertyDescriptor(name, null, null);
-			pd.setValue(FIELDPROPERTY, field);	// Set the field property so we know it is a field.
-			applyFieldArguments(pd, args);
-			// Need to set in a phony read method because Introspector will throw it away otherwise. We just use Object.getClass for this.
-			// We will ignore the property type for fields. If used outside of VE then it will look like a class property.
-			pd.setReadMethod(GETCLASS);
-			return pd;
-		} catch (IntrospectionException e) {
-			throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
-					new Object[] { name}));
-			return null;
-		}
-	}
-
-	/**
-	 * Create a bean's property descriptor.
-	 * 
-	 * @param cls
-	 *            class of who owns the property (usually the bean). It is used to look up get/set methods for the property.
-	 * @param name
-	 *            name of the property. It will use get{Name} and set{Name} to find get/set methods.
-	 * @param args
-	 *            arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc.
-	 * @return new property descriptor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static PropertyDescriptor createPropertyDescriptor(Class cls, String name, Object[] args) {
-		PropertyDescriptor pd = null;
-		try {
-			// Create assuming that the getter/setter follows reflection patterns
-			pd = new PropertyDescriptor(name, cls);
-		} catch (IntrospectionException e) {
-			// Try creating a property descriptor for read-only, write-only
-			// or if Sun's reflection fails
-			try {
-				pd = createOtherPropertyDescriptor(name, cls);
-			} catch (IntrospectionException ie) {
-				throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
-						new Object[] { name}));
-			}
-		}
-
-		applyPropertyArguments(pd, args, cls);
-
-		return pd;
-	}
-
-
-	/**
-	 * Create a new PropertyDescriptor based upon the PD sent in. It will clone the sent in one, and apply the args to override any specific setting.
-	 * Class cls is used for finding read/write methods, if any.
-	 * 
-	 * This is used when wanting to override only a few specific settings from a property descriptor from the super class.
-	 * 
-	 * @param fromPDS
-	 *            The PropertyDescriptor array to find the entry to clone. It will be changed in place in the array.
-	 * @param name
-	 *            The name of the property to find and clone and override.
-	 * @param cls
-	 *            The class to use to find read/write methods in args. If no read/write methods specified, then this may be null.
-	 * @param args
-	 *            The arguments to override from fromPD. arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if none to override
-	 */
-	public void replacePropertyDescriptor(PropertyDescriptor[] pds, String name, Class cls, Object[] args) {
-		PropertyDescriptor pd = null;
-		int iPD = findPropertyDescriptor(pds, name);
-		if (iPD == -1)
-			return;
-		PropertyDescriptor fromPD = pds[iPD];
-		try {
-
-			pd = pds[iPD] = new PropertyDescriptor(fromPD.getName(), null, null);
-		} catch (IntrospectionException e) {
-			throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
-					new Object[] { fromPD.getName()}));
-		}
-
-		// Now copy over the contents of fromPD.
-		clonePropertySettings(fromPD, pd);
-
-		// Now apply the overrides
-		applyPropertyArguments(pd, args, cls);
-		return;
-	}
-
-	private void clonePropertySettings(PropertyDescriptor fromPD, PropertyDescriptor pd) {
-		try {
-			pd.setReadMethod(fromPD.getReadMethod());
-			pd.setWriteMethod(fromPD.getWriteMethod());
-			pd.setPropertyEditorClass(fromPD.getPropertyEditorClass());
-			pd.setBound(fromPD.isBound());
-			pd.setConstrained(fromPD.isConstrained());
-			cloneFeatureSettings(fromPD, pd);
-		} catch (IntrospectionException e) {
-			throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
-					new Object[] { fromPD.getName()}));
-		}
-	}
-
-	private void cloneFeatureSettings(FeatureDescriptor fromFD, FeatureDescriptor fd) {
-		fd.setExpert(fromFD.isExpert());
-		fd.setHidden(fromFD.isHidden());
-		fd.setPreferred(fromFD.isPreferred());
-		fd.setShortDescription(fromFD.getShortDescription());
-		fd.setDisplayName(fromFD.getDisplayName());
-
-		java.util.Enumeration keys = fromFD.attributeNames();
-		while (keys.hasMoreElements()) {
-			String key = (String) keys.nextElement();
-			Object value = fromFD.getValue(key);
-			fd.setValue(key, value);
-		}
-	}
-
-	/*
-	 * The common property arguments between field and standard properties.
-	 */
-	private static boolean applyCommonPropertyArguments(PropertyDescriptor pd, String key, Object value) {
-		if (BOUND.equals(key)) {
-			pd.setBound(((Boolean) value).booleanValue());
-		} else if (CONSTRAINED.equals(key)) {
-			pd.setConstrained(((Boolean) value).booleanValue());
-		} else if (PROPERTYEDITORCLASS.equals(key)) {
-			pd.setPropertyEditorClass((Class) value);
-		} else if (FIELDPROPERTY.equals(key))
-			return true;	// This should not be applied except through createFieldProperty.
-		else
-			return false;
-		return true;
-	
-	}
-	
-	private static void applyPropertyArguments(PropertyDescriptor pd, Object[] args, Class cls) {
-		if (args != null) {
-			for (int i = 0; i < args.length; i += 2) {
-				String key = (String) args[i];
-				Object value = args[i + 1];
-				
-				if (!applyCommonPropertyArguments(pd, key, value)) {
-					if (READMETHOD.equals(key)) {
-						String methodName = (String) value;
-						Method method;
-						try {
-							method = cls.getMethod(methodName, new Class[0]);
-							pd.setReadMethod(method);
-						} catch (Exception e) {
-							throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("{0}_no_read_method_EXC_"), //$NON-NLS-1$
-									new Object[] { cls, methodName}));
-						}
-					} else if (WRITEMETHOD.equals(key)) {
-						String methodName = (String) value;
-						try {
-							if (methodName == null) {
-								pd.setWriteMethod(null);
-							} else {
-								Method method;
-								Class type = pd.getPropertyType();
-								method = cls.getMethod(methodName, new Class[] { type});
-								pd.setWriteMethod(method);
-							}
-						} catch (Exception e) {
-							throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("{0}_no_write_method_EXC_"), //$NON-NLS-1$
-									new Object[] { cls, methodName}));
-						}
-					} else {
-						// arbitrary value
-						setFeatureDescriptorValue(pd, key, value);
-					}
-				}
-			}
-		}
-	}
-
-	private static void applyFieldArguments(PropertyDescriptor pd, Object[] args) {
-		if (args != null) {
-			for (int i = 0; i < args.length; i += 2) {
-				String key = (String) args[i];
-				Object value = args[i + 1];
-
-				if (!applyCommonPropertyArguments(pd, key, value)) {
-					if (READMETHOD.equals(key)) {
-						// ignored for field.
-					} else if (WRITEMETHOD.equals(key)) {
-						// ignored for field.
-					} else {
-						// arbitrary value
-						setFeatureDescriptorValue(pd, key, value);
-					}
-				}
-			}
-		}		
-	}
-
-	/**
-	 * Find the method by comparing (name & parameter size) against the methods in the class. This is an expensive call and should be used only if
-	 * getMethod with specific parameter types can't find method.
-	 * 
-	 * @return java.lang.reflect.Method
-	 * @param aClass
-	 *            java.lang.Class
-	 * @param methodName
-	 *            java.lang.String
-	 * @param parameterCount
-	 *            int
-	 */
-	public static java.lang.reflect.Method findMethod(java.lang.Class aClass, java.lang.String methodName, int parameterCount) {
-		try {
-			/*
-			 * Since this method attempts to find a method by getting all methods from the class, this method should only be called if getMethod
-			 * cannot find the method.
-			 */
-			java.lang.reflect.Method methods[] = aClass.getMethods();
-			for (int index = 0; index < methods.length; index++) {
-				java.lang.reflect.Method method = methods[index];
-				if ((method.getParameterTypes().length == parameterCount) && (method.getName().equals(methodName))) { return method; }
-				;
-			}
-			;
-		} catch (java.lang.Throwable exception) {
-			return null;
-		}
-		;
-		return null;
-	}
-
-	/**
-	 * Find a property descriptor of a given name in the list.
-	 * 
-	 * @param pds
-	 *            The array of property descriptors to search, may be null.
-	 * @param name
-	 *            The name to search for.
-	 * @return The found property descriptor index, or -1 if not found.
-	 */
-	public static int findPropertyDescriptor(PropertyDescriptor[] pds, String name) {
-		for (int i = 0; i < pds.length; i++) {
-			if (name.equals(pds[i].getName()))
-				return i;
-		}
-		return -1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.BeanInfo#getDefaultEventIndex()
-	 */
-	public int getDefaultEventIndex() {
-		return -1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.BeanInfo#getDefaultPropertyIndex()
-	 */
-	public int getDefaultPropertyIndex() {
-		return -1;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see java.beans.SimpleBeanInfo#getBeanDescriptor()
-	 */
-	public BeanDescriptor getBeanDescriptor() {
-		// Default is to create an empty one.
-		return createBeanDescriptor(getBeanClass(), EMPTY_ARGS);
-	}
-
-	/**
-	 * Implementation for BeanInfo. This implementation will return the BeanInfo of the superclass.
-	 * 
-	 * @see BeanInfo#getAdditionalBeanInfo()
-	 * @since 1.1.0
-	 */
-	public BeanInfo[] getAdditionalBeanInfo() {
-		try {
-			BeanInfo[] result = new BeanInfo[] { Introspector.getBeanInfo(getBeanClass().getSuperclass())};
-			PropertyDescriptor[] oPDs = result[0].getPropertyDescriptors();
-			PropertyDescriptor[] nPDs = overridePropertyDescriptors(oPDs);
-			if (oPDs != nPDs)
-				result[0] = new OverridePDBeanInfo(result[0], nPDs);
-			return result;
-		} catch (IntrospectionException e) {
-			return new BeanInfo[0];
-		}
-	}
-
-	private static class OverridePDBeanInfo implements BeanInfo {
-
-		private BeanInfo originalBeanInfo;
-
-		private PropertyDescriptor[] overridePDs;
-
-		public OverridePDBeanInfo(BeanInfo bi, PropertyDescriptor[] pds) {
-			originalBeanInfo = bi;
-			overridePDs = pds;
-		}
-
-		public BeanInfo[] getAdditionalBeanInfo() {
-			return originalBeanInfo.getAdditionalBeanInfo();
-		}
-
-		public BeanDescriptor getBeanDescriptor() {
-			return originalBeanInfo.getBeanDescriptor();
-		}
-
-		public int getDefaultEventIndex() {
-			return originalBeanInfo.getDefaultEventIndex();
-		}
-
-		public int getDefaultPropertyIndex() {
-			return originalBeanInfo.getDefaultPropertyIndex();
-		}
-
-		public EventSetDescriptor[] getEventSetDescriptors() {
-			return originalBeanInfo.getEventSetDescriptors();
-		}
-
-		public Image getIcon(int iconKind) {
-			return originalBeanInfo.getIcon(iconKind);
-		}
-
-		public MethodDescriptor[] getMethodDescriptors() {
-			return originalBeanInfo.getMethodDescriptors();
-		}
-
-		public PropertyDescriptor[] getPropertyDescriptors() {
-			return overridePDs;
-		}
-	}
-
-	/**
-	 * Allow overrides to parent beaninfo. Subclasses should override this method if they wish to override and change any inherited properties. This
-	 * allows removal of inherited properties or changes of specific properties (such as change from hidden to not hidden).
-	 * 
-	 * Note: If there any changes, this must return a DIFFERENT array. If it returns the same array, then the changes will not be accepted. If just
-	 * overriding, should use pds.clone() to get the new array and then change the specific entries.
-	 * 
-	 * @param pds
-	 * @return The new changed array or the same array if no changes.
-	 * @since 1.1.0
-	 */
-	protected PropertyDescriptor[] overridePropertyDescriptors(PropertyDescriptor[] pds) {
-		return pds;
-	}
-
-	/**
-	 * Get the bean class this beaninfo is for. Used by subclasses to quickly get the bean class without having to code it over and over.
-	 * 
-	 * @return bean class for this beaninfo.
-	 * 
-	 * @since 1.1.0
-	 */
-	public abstract Class getBeanClass();
-
-	/**
-	 * Called whenever the bean information class throws an exception. By default it prints a message and then a stacktrace to sys err.
-	 * 
-	 * @param exception
-	 *            java.lang.Throwable
-	 * @since 1.1.0
-	 */
-	public void handleException(Throwable exception) {
-		System.err.println(RESBUNDLE.getString("UNCAUGHT_EXC_")); //$NON-NLS-1$
-		exception.printStackTrace();
-	}
-
-	private static void setFeatureDescriptorValue(FeatureDescriptor fd, String key, Object value) {
-		if (DISPLAYNAME.equals(key)) {
-			fd.setDisplayName((String) value);
-		} else if (EXPERT.equals(key)) {
-			fd.setExpert(((Boolean) value).booleanValue());
-		} else if (HIDDEN.equals(key)) {
-			fd.setHidden(((Boolean) value).booleanValue());
-		} else if (PREFERRED.equals(key)) {
-			fd.setPreferred(((Boolean) value).booleanValue());
-			if (JVM_1_3) {
-				// Bug in 1.3 doesn't preserve the preferred flag, so we will put it into the attributes too.
-				fd.setValue(PREFERRED, value);
-			}
-		} else if (SHORTDESCRIPTION.equals(key)) {
-			fd.setShortDescription((String) value);
-		}
-		// Otherwise assume an arbitrary-named value
-		// Assume that the FeatureDescriptor private hashTable\
-		// contains only arbitrary-named attributes
-		else {
-			fd.setValue(key, value);
-		}
-	}
-
-	/**
-	 * Fatal errors are handled by calling this method. By default it throws an Error exception.
-	 * 
-	 * @param e
-	 *            exception exception message placed into the new Error thrown.
-	 * @param s
-	 *            message added to exception message. <code>null</code> if nothing to add.
-	 * 
-	 * @throws Error
-	 *             turns exception into an Error.
-	 * @since 1.1.0
-	 */
-	protected static void throwError(Exception e, String s) {
-		throw new Error(e.toString() + " " + s);//$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
deleted file mode 100644
index 5a2a5a9b1..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties,v $
-# $Revision: 1.1 $  $Date: 2008/11/26 06:40:21 $
-#
-
-
-#
-# Properties for the IvjBeanInfo
-#
-
-#
-# IvjBeanInfo Strings
-#
-Cannot_get_the_meth1_EXC_ = IWAV0011E Cannot get the method {0}.
-Cannot_create_the_E1_EXC_ = IWAV0012E Cannot create the EventSetDescriptor for {0}.
-Cannot_create_Method_EXC_ = IWAV0013E Cannot create the MethodDescriptor for {0}.
-Cannot_find_the_acc1_EXC_ = IWAV0014E Cannot find at least the write or read accessor for property {0}.
-Cannot_create_Param1_EXC_ = IWAV0015E Cannot create the ParameterDescriptor for {0}.
-Cannot_create_the_P1      = Cannot create the PropertyDescriptor for {0}.
-{0}_no_read_method_EXC_   = IWAV0016E Class {0} doesn''t have the requested read accessor {1}.
-{0}_no_write_method_EXC_  = IWAV0017E Class {0} doesn''t have the requested write accessor {1}.
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
deleted file mode 100644
index 26e8ded8c..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties,v $
-# $Revision: 1.1 $  $Date: 2008/11/26 06:40:21 $
-#
-
-
-#
-# Properties for the VCE Beaninfo
-#
-
-#
-# IvjBeanInfo Strings
-#
-Cannot_get_the_meth1_EXC_ = IWAV0007E Cannot get the method {0}.
-Cannot_create_the_E1_EXC_ = IWAV0008E Cannot create the EventSetDescriptor for {0}.
-Cannot_create_Method_EXC_ = IWAV0009E Cannot create the MethodDescriptor for {0}.
-Cannot_find_the_acc1_EXC_ = IWAV0010E Cannot find at least the write or read accessor for property {0}.
-Cannot_create_Param1_EXC_ = IWAV0146E Cannot create the ParameterDescriptor for {0}.
-Cannot_create_the_P1_EXC_ = IWAV0147E Cannot create the PropertyDescriptor for {0}.
-{0}_no_read_method_EXC_   = IWAV0148E Class {0} doesn''t have the requested read accessor {1}.
-{0}_no_write_method_EXC_  = IWAV0149E Class {0} doesn''t have the requested write accessor {1}.
-UNCAUGHT_EXC_             = IWAV0123E --------- UNCAUGHT EXCEPTION ---------
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
deleted file mode 100644
index 3c99de2db..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
+++ /dev/null
@@ -1,77 +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.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-/**
- * Equality tester for BeanDescriptors
- */
-public class BeanDescriptorEquality extends FeatureDescriptorEquality {
-	static void INIT() {
-		try {
-			MAP_EQUALITY.put(BeanDescriptor.class, (BeanDescriptorEquality.class).getConstructor(new Class[] {BeanDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-	}
-	
-	/**
-	 * Constructor for BeanDescriptorEquality.
-	 */
-	public BeanDescriptorEquality() {
-		super();
-	}
-
-
-	public BeanDescriptorEquality(BeanDescriptor descr) {
-		super(descr);
-	}
-	
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = super.calculateHashCode();
-		BeanDescriptor bd = (BeanDescriptor) fFeature;
-		int hc = bd.getBeanClass().hashCode();
-		if (bd.getCustomizerClass() != null)
-			hc += bd.getCustomizerClass().hashCode();
-			
-		return hashcode*31 + hc;
-	}
-	 
-	public boolean equals(Object obj) {
-		if (identityTest(obj))
-			return true;
-		if (!super.equals(obj))
-			return false;
- 	
-		BeanDescriptor ob = (BeanDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
-		BeanDescriptor fb = (BeanDescriptor) fFeature;
- 		
-		if (ob.getBeanClass() != fb.getBeanClass())
-			return false;
-		if (ob.getCustomizerClass() != fb.getCustomizerClass())
-			return false;
- 			
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
deleted file mode 100644
index b53aa8a72..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.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.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-import java.util.*;
-import java.lang.reflect.Method;
-/**
- * Equality tester for EventSetDescriptors
- */
-public class EventSetDescriptorEquality extends FeatureDescriptorEquality {
-	
-	static void INIT() {
-		try {
-			MAP_EQUALITY.put(EventSetDescriptor.class, (EventSetDescriptorEquality.class).getConstructor(new Class[] {EventSetDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-	}
-	
-	private ArrayList fListenerMethodDescriptors;	// Array of MethodDescriptorEquality's.
-	
-	/**
-	 * Constructor for EventSetDescriptorEquality.
-	 */
-	public EventSetDescriptorEquality() {
-		super();
-	}
-
-
-	public EventSetDescriptorEquality(EventSetDescriptor descr) {
-		super(descr);
-	}
-	
-	/**
-	 * A new feature is being set into this object,
-	 * clear any cache members so that they can be reconstructed.
-	 *
-	 * NOTE: Subclasses - remember to call super.clearFeature();
-	 */
-	protected void clearFeature() {
-		super.clearFeature();
-		fListenerMethodDescriptors = null;
-	}
-		
-	protected ArrayList listenerMethodDescriptors() {
-		if (fListenerMethodDescriptors == null) {
-			MethodDescriptor[] mds = ((EventSetDescriptor) fFeature).getListenerMethodDescriptors();
-			fListenerMethodDescriptors = new ArrayList(mds.length);
-			for (int i=0; i<mds.length; i++)
-				fListenerMethodDescriptors.add(new MethodDescriptorEquality(mds[i]));
-		}
-		return fListenerMethodDescriptors;
-	}	
-	
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = super.calculateHashCode();
-		EventSetDescriptor bd = (EventSetDescriptor) fFeature;
-		int hc = bd.getAddListenerMethod().hashCode();
-		Method[] methods = bd.getListenerMethods();
-		int mhc = 0;
-		for (int i=0; i<methods.length; i++)
-			mhc = mhc*31 + methods[i].hashCode();
-		hc += mhc;
-		hc += listenerMethodDescriptors().hashCode();
-		hc += bd.getListenerType().hashCode();
-		hc += bd.getRemoveListenerMethod().hashCode();
-		hc += (bd.isInDefaultEventSet() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-		hc += (bd.isUnicast() ? Boolean.TRUE : Boolean.FALSE).hashCode();		
-
-		return hashcode*31 + hc;
-	}
-
-	 
-	public boolean equals(Object obj) {
-		if (identityTest(obj))
-			return true;
-			
-		if (!super.equals(obj))
- 			return false;
- 	
-		EventSetDescriptor oe = (EventSetDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
-		EventSetDescriptor fe = (EventSetDescriptor) fFeature;
-		
-		EventSetDescriptorEquality oee = (EventSetDescriptorEquality) obj;
- 		
-		if (!oe.getAddListenerMethod().equals(fe.getAddListenerMethod()))
-			return false;
-		if (!java.util.Arrays.equals(oe.getListenerMethods(), fe.getListenerMethods()))
-			return false;	
-		if (oe.getListenerType() != fe.getListenerType())
-			return false;
-		if (oe.getRemoveListenerMethod() != fe.getRemoveListenerMethod())
-			return false;
-		if (oe.isInDefaultEventSet() != fe.isInDefaultEventSet())
-			return false;
-		if (oe.isUnicast() != oe.isUnicast())
-			return false;
-		
-		if (fListenerMethodDescriptors != null || oee.fListenerMethodDescriptors != null) {
-			// We are in a Map lookup situation, so one side has listener method equalities, so we will compare that way.
-			if (!oee.listenerMethodDescriptors().equals(listenerMethodDescriptors()))			
-				return false;
-		} else {
-			// We are in the building the list phases, don't waste space building entire list.
-			MethodDescriptor[] ours = fe.getListenerMethodDescriptors();
-			MethodDescriptor[] theirs = oe.getListenerMethodDescriptors();
-			if (ours.length != theirs.length)
-				return false;
-			if (ours.length > 0) {
-				MethodDescriptorEquality workingOurs = new MethodDescriptorEquality();
-				MethodDescriptorEquality workingThiers = new MethodDescriptorEquality();
-				for (int i = 0; i < ours.length; i++) {
-					workingOurs.setFeature(ours[i]);
-					workingThiers.setFeature(theirs[i]);
-					if (!workingOurs.equals(workingThiers))
-						return false;
-				}
-			}			
-		}
-			
-		return true;			
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
deleted file mode 100644
index 9888393fd..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
+++ /dev/null
@@ -1,201 +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.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-import java.util.*;
-import java.lang.reflect.*;
-/**
- * This object is used to test for semantic equality (equals())
- * between feature objects. It is needed because Feature's don't
- * provide a semantic equality, only an identity equality. Need
- * semantic equality so that keys in map can be found equal
- * semantically.
- */
-
-public class FeatureDescriptorEquality {
-	protected FeatureDescriptor fFeature;
-	
-	private HashMap fValues;	// The key/values for this feature. We grab them out
-								// so that we don't have to keep re-getting them for equality
-								// compares. This is done the first time needed in the equals
-								// statement.
-								
-	private int fHashCode = 0;	// Hashcode of this equality object. The hashcode for the feature is expensive
-					// so we will calculate it once (the assumption is that
-					// features once created aren't changed, which for our
-					// purposes here in beaninfo land is good).
-		
-	protected static HashMap MAP_EQUALITY = new HashMap(10);	// Map from descriptor to equality type.
-	static {
-		try {
-			MAP_EQUALITY.put(FeatureDescriptor.class, (FeatureDescriptorEquality.class).getConstructor(new Class[] {FeatureDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-		// Need to set up the others.
-		BeanDescriptorEquality.INIT();
-		EventSetDescriptorEquality.INIT();		
-		IndexedPropertyDescriptorEquality.INIT();
-		MethodDescriptorEquality.INIT();		
-		ParameterDescriptorEquality.INIT();
-	}
-			
-	/**
-	 * Create the appropriate descriptor equality for this object.
-	 */
-	public static FeatureDescriptorEquality createEquality(FeatureDescriptor descr) {
-		try {
-			return (FeatureDescriptorEquality) ((Constructor) MAP_EQUALITY.get(descr.getClass())).newInstance(new Object[] {descr});
-		} catch (IllegalAccessException e) {
-		} catch (InstantiationException e) {
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-		
-	public FeatureDescriptorEquality() {
-	}
-	
-	/**
-	 * NOTE: Every subclass needs to implement an override for the methods:
-	 *       calculateHashCode
-	 *       equals
-	 *       clearFeature - if it has any cache values
-	 */
-					
-	public FeatureDescriptorEquality(FeatureDescriptor feature) {
-		setFeature(feature);
-	}
-	
-	public final void setFeature(FeatureDescriptor feature) {
-		clearFeature();
-		fFeature = feature;
-	}
-	
-	/**
-	 * A new feature is being set into this object,
-	 * clear any cache members so that they can be reconstructed.
-	 *
-	 * NOTE: Subclasses - remember to call super.clearFeature();
-	 */
-	protected void clearFeature() {
-		fValues = null;
-		fHashCode = 0;
-	}
-	
-	public final int hashCode() {
-		if (fHashCode == 0)
-			fHashCode = calculateHashCode();
-		return fHashCode;
-	}
-
-	protected final HashMap values() {
-		if (fValues == null) {
-			fValues = new HashMap(5);
-			
-			Enumeration keys = fFeature.attributeNames();
-			while (keys.hasMoreElements()) {
-				String key = (String) keys.nextElement();
-				fValues.put(key, fFeature.getValue(key));
-			}
-		}
-		return fValues;
-	}
-	
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = 0;
-		if (fFeature.getName() != null)
-			hashcode += fFeature.getName().hashCode();
-			
-		if (fFeature.getDisplayName() != fFeature.getName())
-			hashcode += fFeature.getDisplayName().hashCode();
-		if (fFeature.getShortDescription() != fFeature.getDisplayName())
-			hashcode += fFeature.getShortDescription().hashCode();			
-			
-		hashcode += (fFeature.isExpert() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-		hashcode += (fFeature.isHidden() ? Boolean.TRUE : Boolean.FALSE).hashCode();		
-		hashcode += (fFeature.isPreferred() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-		
-		hashcode += values().hashCode();
-		return hashcode;
-	}
-	
-	/**
-	 * equals: See if this is equal semantically.
-	 *
-	 * NOTE: Every subclass needs to implement this and
-	 *       the first few lines should be:
-	 *         if (identityTest())
-	 *           return true;
-	 *         if (!super.equals(obj))
-	 *           return false;
-	 */
-	 
-	 public boolean equals(Object obj) {
-		if (identityTest(obj))
-			return true;
-		if (!(obj instanceof FeatureDescriptorEquality))
-			return false;
-			
-		FeatureDescriptorEquality ofe = (FeatureDescriptorEquality) obj;	 		
-	 	FeatureDescriptor of = ofe.fFeature;
-	 		
-	 	if (fFeature.getClass() != of.getClass())
-	 		return false;
-	 		
-	 	if (!fFeature.getName().equals(of.getName()))
-	 		return false;
-	 	if (!fFeature.getDisplayName().equals(of.getDisplayName()))
-	 		return false;
-	 	if (!fFeature.getShortDescription().equals(of.getShortDescription()))
-	 		return false;	 
-	 	if (fFeature.isExpert() != of.isExpert() ||
-		 		fFeature.isHidden() != of.isHidden() ||
-		 		fFeature.isPreferred() != of.isPreferred())
-	 		return false;
-	 	
-		if (!values().equals(ofe.values()))
-			return false;
-		return true;
-	 }
-	 
-	 /*
-	  * Identity test: Tests for quick identity of
-	  * descriptors. If this returns true, then 
-	  * no other tests required.
-	  */
-	 protected boolean identityTest(Object obj) {
-	 	if (!(obj instanceof FeatureDescriptorEquality))
-	 		return false;
-	 	if (this == obj)
-	 		return true;
-
-	 	if (((FeatureDescriptorEquality) obj).fFeature == fFeature)
-	 		return true;
-	 		
-	 	return false;	 	
-	 }	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
deleted file mode 100644
index 42100e47d..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
+++ /dev/null
@@ -1,91 +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.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-/**
- * IndexedPropertyDescriptor equality tester
- */
-public class IndexedPropertyDescriptorEquality extends PropertyDescriptorEquality {
-
-	static void INIT() {
-		try {
-			MAP_EQUALITY.put(IndexedPropertyDescriptor.class, (IndexedPropertyDescriptorEquality.class).getConstructor(new Class[] {PropertyDescriptor.class}));
-			MAP_EQUALITY.put(PropertyDescriptor.class, (IndexedPropertyDescriptorEquality.class).getConstructor(new Class[] {PropertyDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-	}	
-	
-	public IndexedPropertyDescriptorEquality() {
-	}
-	
-	public IndexedPropertyDescriptorEquality(PropertyDescriptor descr) {
-		super(descr);
-	}	
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = super.calculateHashCode();
-		if (fFeature instanceof IndexedPropertyDescriptor) {
-			IndexedPropertyDescriptor pd = (IndexedPropertyDescriptor) fFeature;
-			
-			int hc = pd.getIndexedPropertyType().hashCode();
-	
-			if (pd.getIndexedReadMethod() != null)
-				hc += pd.getIndexedReadMethod().hashCode();
-			if (pd.getIndexedWriteMethod() != null)
-				hc += pd.getIndexedWriteMethod().hashCode();
-			return hashcode*31 + hc;
-		} else
-			return hashcode;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof FeatureDescriptorEquality))
-			return false;
-		if (identityTest(obj))
-			return true;
-		if (fFeature.getClass() != ((FeatureDescriptorEquality) obj).fFeature.getClass())
-			return false;	// If they aren't both PropertyDesciptors or IndexedPropertyDescriptors, then they don't match.
-		if (!super.equals(obj))
-			return false;
- 	
-		if (fFeature instanceof IndexedPropertyDescriptor) {
-			IndexedPropertyDescriptor op = (IndexedPropertyDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
-			IndexedPropertyDescriptor fp = (IndexedPropertyDescriptor) fFeature;
-
-			if (op.getIndexedPropertyType() != fp.getIndexedPropertyType())
-				return false;
-			if (op.getIndexedReadMethod() != fp.getIndexedReadMethod())
-				return false;
-			if (op.getIndexedWriteMethod() != fp.getIndexedWriteMethod())
-				return false; 
-		}													
-			
-		return true;
-	}
-
-
-	
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
deleted file mode 100644
index a56159c1e..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-import java.util.*;
-/**
- * Equality tester for MethodDescriptors
- */
-public class MethodDescriptorEquality extends FeatureDescriptorEquality {
-	
-	static void INIT() {
-		try {
-			MAP_EQUALITY.put(MethodDescriptor.class, (MethodDescriptorEquality.class).getConstructor(new Class[] {MethodDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-	}	
-	
-	private ArrayList fParameterDescriptors;	// Array of ParameterDescriptorEquality's.
-	
-	public MethodDescriptorEquality() {
-	}
-	
-	public MethodDescriptorEquality(MethodDescriptor descr) {
-		super(descr);
-	}
-	
-	/**
-	 * A new feature is being set into this object,
-	 * clear any cache members so that they can be reconstructed.
-	 *
-	 * NOTE: Subclasses - remember to call super.clearFeature();
-	 */
-	protected void clearFeature() {
-		super.clearFeature();
-		fParameterDescriptors = null;
-	}	
-	
-	protected ArrayList parameterDescriptors() {
-		if (fParameterDescriptors == null) {
-			ParameterDescriptor[] pds = ((MethodDescriptor) fFeature).getParameterDescriptors();
-			if (pds != null) {			
-				fParameterDescriptors = new ArrayList(pds.length);
-				for (int i=0; i<pds.length; i++)
-					fParameterDescriptors.add(new ParameterDescriptorEquality(pds[i]));
-			}
-		}
-		return fParameterDescriptors;
-	}
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = super.calculateHashCode();
-		MethodDescriptor bd = (MethodDescriptor) fFeature;
-		int hc = bd.getMethod().hashCode();
-		if (parameterDescriptors() != null)
-			hc += parameterDescriptors().hashCode(); 
-
-		return hashcode*31 + hc;
-	}
-
-	public boolean equals(Object obj) {
-		if (identityTest(obj))
-			return true;
-			
-		if (!super.equals(obj))
-			return false;
-
-		MethodDescriptorEquality oem = (MethodDescriptorEquality) obj;
-		MethodDescriptor om = (MethodDescriptor) oem.fFeature;
-		MethodDescriptor fm = (MethodDescriptor) fFeature;
- 		
-		if (fm.getMethod() != om.getMethod())
-			return false;
-				
-		if (fParameterDescriptors != null || oem.fParameterDescriptors != null) {
-			// We are in a Map lookup situation, so one side has listener method equalities, so we will compare that way.
-			if (parameterDescriptors() == null)
-				if (((MethodDescriptorEquality) obj).parameterDescriptors() != null)
-					return false;
-				else ;
-			else
-				if (!parameterDescriptors().equals(((MethodDescriptorEquality) obj).parameterDescriptors()))
-					return false;
-		} else {
-			// We are in the building the list phases, don't waste space building entire list.
-			ParameterDescriptor[] ours = fm.getParameterDescriptors();
-			ParameterDescriptor[] theirs = om.getParameterDescriptors();
-			if (ours == theirs)
-				return true;
-			else if (ours == null)
-				if (theirs != null)
-					return false;
-				else
-					;
-			else if (theirs == null)
-				return false;
-			else if (ours.length != theirs.length)
-				return false;
-			else if (ours.length > 0) {
-				ParameterDescriptorEquality workingOurs = new ParameterDescriptorEquality();
-				ParameterDescriptorEquality workingThiers = new ParameterDescriptorEquality();
-				for (int i = 0; i < ours.length; i++) {
-					workingOurs.setFeature(ours[i]);
-					workingThiers.setFeature(theirs[i]);
-					if (!workingOurs.equals(workingThiers))
-						return false;
-				}
-			}			
-		}
-				
- 			
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
deleted file mode 100644
index 1344589c0..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
+++ /dev/null
@@ -1,863 +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.jem.internal.beaninfo.vm;
-
-/*
-
-
- */
-
-import java.beans.*;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.eclipse.jem.beaninfo.common.IBaseBeanInfoConstants;
-import org.eclipse.jem.beaninfo.vm.BaseBeanInfo;
-import org.eclipse.jem.internal.beaninfo.common.*;
-import org.eclipse.jem.internal.proxy.common.*;
-
-/**
- * This class is the beaninfo class that is created when beaninfo modeling introspects a bean. Its purpose is to gather together and analyze the
- * beaninfo. For example, it checks with the supertype beaninfo to see if all of the supertype's descriptors are included in this list. If they are,
- * then it knows that it does a straight inheritance of the supertype's descriptors, and those descriptors can be removed from the list. This makes it
- * easier on the model side so that there isn't a great proliferation of descriptors all describing the same properties. In that case they can be
- * merged from the supertype model. If some are not found, then that means this beaninfo is trying to hide some of them, and in that case this is the
- * definitive list and inheritance shouldn't be used on the model side. However, for those features which are essentially the inherited feature (i.e.
- * the BeanInfo simply filtered out some inherited but not all), they will be returnable (by name). The IDE side will take these that are "inherited"
- * and will return the actual structured feature from the inherited class.
- * 
- * The test for seeing if the super feature is included in the beaninfo is first to see if the the feature is in the beaninfo by name, if it is then
- * it is marked as included. Then a check is made on equality, if they are equal, then the feature is removed from the beaninfo list, but the merge
- * flag is still left on, and removed inherited feature is added to the list of inherited features. If all inherited features are found, this list is
- * cleared and flag is set which simply says merge all inherited. This allows merging to occur but it also allows overrides to occur.
- * 
- * Note: Test for identity is different between JDK 1.5 and above and below. 1.5 and above, we can use actual equals() because the same descriptor is
- * returned from inherited features. In 1.3, clones were always returned and equals() would answer false, so we need to create a special equality
- * descriptor which turns the equals() into one that can test clones for semantic equality. See Java Bug ID#4996673 The problem was supposed to be
- * fixed in 1.4 but it was not fixed. Originally a new clone was created each time a beaninfo was requested. That is no longer done in 1.4, but the
- * processing to create the original beaninfo does a clone accidently under the covers. Looking at 1.5 it looks this was fixed, but it hasn't been
- * tested here yet.
- */
-
-public abstract class ModelingBeanInfo implements ICallback {
-
-	private static boolean PRE15;
-	static {
-		String version = System.getProperty("java.version", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		PRE15 = version.startsWith("1."); //$NON-NLS-1$
-		if (PRE15) {
-			// Continue to check, get the revision.
-			int revision = 0;
-			if (version.length() > 2) {
-				int revEnd = version.indexOf('.', 2);
-				revision = version.length() > 2 ? Integer.parseInt(revEnd != -1 ? version.substring(2, revEnd) : version.substring(2)) : 0;
-				PRE15 = revision < 5;
-			}
-		}
-	}
-
-	static class FeatureEqualitySet extends HashSet {
-
-		/**
-		 * Comment for <code>serialVersionUID</code>
-		 * 
-		 * @since 1.1.0
-		 */
-		private static final long serialVersionUID = -3744776740604328324L;
-		private FeatureDescriptorEquality workingKey;
-
-		public FeatureEqualitySet(List features) {
-			super(features.size());
-			// Get first feature to fiqure out type of working key. This will not be reentrant.
-			workingKey = FeatureDescriptorEquality.createEquality((FeatureDescriptor) features.get(0));
-			this.addAll(features);
-		}
-
-		/**
-		 * @see java.util.Collection#add(Object)
-		 */
-		public boolean add(Object o) {
-			return super.add(FeatureDescriptorEquality.createEquality((FeatureDescriptor) o));
-		}
-
-		/**
-		 * @see java.util.Collection#contains(Object)
-		 */
-		public boolean contains(Object o) {
-			workingKey.setFeature((FeatureDescriptor) o);
-			return super.contains(workingKey);
-		}
-
-	}
-
-	// The following fields indicate if the super info should be merged
-	// in on the model side. no merge means there were no inherited methods at all. So the
-	// beaninfo presented is definitive. If merge, then get...Descriptors will return just
-	// the ones for this level, and getSuper...Descriptors will return the inherited ones.
-	// Though in this case, if the returned super list is null, then that means use ALL of
-	// the inherited ones.
-	// The super list returns simply the names, don't need to have the full descriptors in that case.
-	protected boolean fMergeInheritedEvents = false, fMergeInheritedMethods = false, fMergeInheritedProperties = false;
-
-	protected final BeanInfo fTargetBeanInfo; // The beaninfo being modeled.
-
-	// Local descriptors
-	protected EventSetDescriptor[] fEventSets;
-
-	protected MethodDescriptor[] fMethods;
-
-	protected PropertyDescriptor[] fProperties;
-
-	// Not inherited descriptor names, will be null if no merge or if merge all. This is list of names to NOT merge. It is usually shorter than the list to merge from super.
-
-	// Methods are special. You can have duplicates, so name is not sufficient.
-	// So for methods,
-	// will use an array of Strings where:
-	//   For each one the full signature
-	//   will be in the list, e.g. "name:methodName(argtype,..." where argtype is the fullyqualified
-	//   classname (using "." notation for inner classes), and using format "java.lang.String[]" for
-	//   arrays.
-	//
-	// This is because even if there are no duplicates, it will take less time/space to simply create the entries
-	// then it would to create a set to see if there are duplicates and then create the final array.
-	protected String[] fNotInheritedEventSets;
-
-	protected String[] fNotInheritedMethods;
-
-	protected String[] fNotInheritedProperties;
-	
-	protected int doFlags;
-
-	/**
-	 * Method used to do introspection and create the appropriate ModelingBeanInfo
-	 * 
-	 * This will always introspect.
-	 */
-	public static ModelingBeanInfo introspect(Class introspectClass, int doFlags) throws IntrospectionException {
-		return introspect(introspectClass, true, doFlags);
-	}
-
-	/**
-	 * Method used to do introspection and create the appropriate ModelingBeanInfo
-	 * 
-	 * introspectIfNoBeanInfo: If this is true, then if no explicit beaninfo was found for this class, then introspection will be done anyway. The
-	 * Introspector will use reflection for local methods/events/properties of this class and then add in the results of the superclass introspection.
-	 * If this parameter is false, then if the explicit beaninfo is not found, then no introspection will be done and null will be returned.
-	 */
-	public static ModelingBeanInfo introspect(Class introspectClass, boolean introspectIfNoBeanInfo, int doFlags) throws IntrospectionException {
-		if (!Beans.isDesignTime())
-			Beans.setDesignTime(true);	// Since this a jem beaninfo specific vm, we should also be considered design time.
-		if (!introspectIfNoBeanInfo) {
-			// Need to check if the beaninfo is explicitly supplied.
-			// If not, then we return null.
-			// The checks will be the same that Introspector will use.
-
-			boolean found = false;
-			// 1. Is there a BeanInfo class in the same package
-			if (!classExists(introspectClass.getName() + "BeanInfo", introspectClass)) { //$NON-NLS-1$
-				// 2. Is this class a BeanInfo class for itself.
-				if (!(BeanInfo.class).isAssignableFrom(introspectClass)) {
-					// 3. Can this class be found in the Beaninfo searchpath.
-					String[] searchPath = Introspector.getBeanInfoSearchPath();
-					int startClassname = introspectClass.getName().lastIndexOf(".") + 1; //$NON-NLS-1$
-					String biName = "." + introspectClass.getName().substring(startClassname) + "BeanInfo"; //$NON-NLS-1$ //$NON-NLS-2$
-					for (int i = 0; i < searchPath.length; i++) {
-						if (classExists(searchPath[i] + biName, introspectClass)) {
-							found = true;
-							break;
-						}
-					}
-				} else
-					found = true;
-			} else
-				found = true;
-
-			if (!found)
-				return null;
-		}
-
-		BeanInfo bInfo = Introspector.getBeanInfo(introspectClass);
-		Class superClass = introspectClass.getSuperclass();
-
-		if (superClass == null)
-			return PRE15 ? (ModelingBeanInfo) new ModelingBeanInfoPre15(bInfo, doFlags) : new ModelingBeanInfo15(bInfo, doFlags);
-		else
-			return PRE15 ? (ModelingBeanInfo) new ModelingBeanInfoPre15(bInfo, Introspector.getBeanInfo(superClass), doFlags) : new ModelingBeanInfo15(bInfo,
-					Introspector.getBeanInfo(superClass), doFlags);
-	}
-
-	/**
-	 * See if this class exists, first in the class loader of the sent class, then in the system loader, then the bootstrap loader, and finally the
-	 * current thread context class loader.
-	 */
-	protected static boolean classExists(String className, Class fromClass) {
-		if (fromClass.getClassLoader() != null)
-			try {
-				fromClass.getClassLoader().loadClass(className);
-				return true;
-			} catch (ClassNotFoundException e) {
-			}
-		if (ClassLoader.getSystemClassLoader() != null)
-			try {
-				ClassLoader.getSystemClassLoader().loadClass(className);
-				return true;
-			} catch (ClassNotFoundException e) {
-			}
-		try {
-			Class.forName(className);
-			return true;
-		} catch (ClassNotFoundException e) {
-		}
-
-		try {
-			// Use the classloader from the current Thread.
-			ClassLoader cl = Thread.currentThread().getContextClassLoader();
-			cl.loadClass(className);
-			return true;
-		} catch (ClassNotFoundException e) {
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Used only for Object since that is the only bean that doesn't have a superclass. Superclass beaninfo required for all other classes. If this is
-	 * constructed then this means no merge and the list is definitive.
-	 */
-	protected ModelingBeanInfo(BeanInfo beanInfo, int doFlags) {
-		fTargetBeanInfo = beanInfo;
-		this.doFlags = doFlags;
-	}
-
-	protected ModelingBeanInfo(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
-		this(beanInfo, doFlags);
-
-		// Now go through the beaninfo to determine the merge state.
-		// The default is no merge.
-
-		if ((doFlags & IBeanInfoIntrospectionConstants.DO_EVENTS) != 0) {
-			List full = addAll(beanInfo.getEventSetDescriptors());
-			List inherited = addAll(superBeanInfo.getEventSetDescriptors());
-
-			fMergeInheritedEvents = stripList(full, inherited);
-			if (fMergeInheritedEvents) {
-				if (!full.isEmpty())
-					fEventSets = (EventSetDescriptor[]) full.toArray(new EventSetDescriptor[full.size()]);
-				if (!inherited.isEmpty())
-					createEventArray(inherited); // This is actually a list of those NOT inherited.
-			}
-		}
-
-		if ((doFlags & IBeanInfoIntrospectionConstants.DO_METHODS) != 0) {
-			List full = addAll(beanInfo.getMethodDescriptors());
-			List inherited = addAll(superBeanInfo.getMethodDescriptors());
-
-			fMergeInheritedMethods = stripList(full, inherited);
-			if (fMergeInheritedMethods) {
-				if (!full.isEmpty())
-					fMethods = (MethodDescriptor[]) full.toArray(new MethodDescriptor[full.size()]);
-				if (!inherited.isEmpty())
-					createMethodEntries(inherited); // This is actually a list of those NOT inherited.
-			}
-		}
-
-		if ((doFlags & IBeanInfoIntrospectionConstants.DO_PROPERTIES) != 0) {
-			List full = addAll(beanInfo.getPropertyDescriptors());
-			List inherited = addAll(superBeanInfo.getPropertyDescriptors());
-
-			fMergeInheritedProperties = stripList(full, inherited);
-			if (fMergeInheritedProperties) {
-				if (!full.isEmpty())
-					fProperties = (PropertyDescriptor[]) full.toArray(new PropertyDescriptor[full.size()]);
-				if (!inherited.isEmpty())
-					createPropertyArray(inherited); // This is actually a list of those NOT inherited.
-			}
-		}
-	}
-
-	protected void createEventArray(List features) {
-		fNotInheritedEventSets = createDescriptorNames(features);
-	}
-
-	protected void createMethodEntries(List features) {
-		int s = features.size();
-		fNotInheritedMethods = new String[s];
-		for (int i = 0; i < s; i++) {
-			fNotInheritedMethods[i] = longName((MethodDescriptor) features.get(i));
-		}
-	}
-
-	protected String longName(MethodDescriptor md) {
-		String n = md.getName();
-		StringBuffer sb = new StringBuffer(n.length() + 20);
-		sb.append(n);
-		sb.append(':');
-		Method m = md.getMethod();
-		sb.append(m.getName());
-		sb.append('(');
-		Class[] parms = m.getParameterTypes();
-		for (int j = 0; j < parms.length; j++) {
-			if (j > 0)
-				sb.append(',');
-			if (!parms[j].isArray())
-				sb.append(parms[j].getName().replace('$', '.'));
-			else {
-				Class finalType = parms[j].getComponentType();
-				int insrt = sb.length();
-				while (finalType.isArray()) {
-					sb.append("[]"); //$NON-NLS-1$
-					finalType = finalType.getComponentType();
-				}
-				sb.insert(insrt, finalType.getName().replace('$', '.'));
-			}
-		}
-		return sb.toString();
-	}
-
-	protected void createPropertyArray(List features) {
-		fNotInheritedProperties = createDescriptorNames(features);
-	}
-
-	protected String[] createDescriptorNames(List features) {
-		String[] result = new String[features.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = ((FeatureDescriptor) features.get(i)).getName();
-		}
-		return result;
-	}
-
-	protected List addAll(Object[] set) {
-		if (set != null) {
-			ArrayList l = new ArrayList(set.length);
-			for (int i = 0; i < set.length; i++) {
-				l.add(set[i]);
-			}
-			return l;
-		} else
-			return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * If this returns true, then all of the super class's events should be merged in. If it returns false, then the events returned are it, there are
-	 * no others.
-	 */
-	public boolean isMergeInheritedEvents() {
-		return fMergeInheritedEvents;
-	}
-
-	/**
-	 * If this returns true, then all of the super class's methods should be merged in. If it returns false, then the methods returned are it, there
-	 * are no others.
-	 */
-	public boolean isMergeInheritedMethods() {
-		return fMergeInheritedMethods;
-	}
-
-	/**
-	 * If this returns true, then all of the super class's properties should be merged in. If it returns false, then the properties returned are it,
-	 * there are no others.
-	 */
-	public boolean isMergeInheritedProperties() {
-		return fMergeInheritedProperties;
-	}
-
-	public BeanInfo[] getAdditionalBeanInfo() {
-		return fTargetBeanInfo.getAdditionalBeanInfo();
-	}
-
-	public BeanDescriptor getBeanDescriptor() {
-		return fTargetBeanInfo.getBeanDescriptor();
-	}
-
-	public EventSetDescriptor[] getEventSetDescriptors() {
-		return fMergeInheritedEvents ? fEventSets : fTargetBeanInfo.getEventSetDescriptors();
-	}
-
-	public java.awt.Image getIcon(int iconKind) {
-		return fTargetBeanInfo.getIcon(iconKind);
-	}
-
-	public MethodDescriptor[] getMethodDescriptors() {
-		return fMergeInheritedMethods ? fMethods : fTargetBeanInfo.getMethodDescriptors();
-	}
-
-	public PropertyDescriptor[] getPropertyDescriptors() {
-		return fMergeInheritedProperties ? fProperties : fTargetBeanInfo.getPropertyDescriptors();
-	}
-
-	public String[] getNotInheritedEventSetDescriptors() {
-		return fNotInheritedEventSets;
-	}
-
-	public String[] getNotInheritedMethodDescriptors() {
-		return fNotInheritedMethods;
-	}
-
-	public String[] getNotInheritedPropertyDescriptors() {
-		return fNotInheritedProperties;
-	}
-
-	protected String computeKey(FeatureDescriptor feature) {
-		return feature instanceof MethodDescriptor ? longName((MethodDescriptor) feature) : feature.getName();
-	}
-
-	/*
-	 * Strip the list down using the Equality objects.
-	 */
-	protected boolean stripList(List fullList, List inheritedList) {
-		// The process is to create a boolean list mirroring the inheritedList.
-		// This boolean list indicates if the corresponding (by index)
-		// entry from the inheritedList is to be retained in the final computed
-		// list.
-		//
-		// A Hashmap is created where the key is the computedKey from the inheritedList
-		// and the value is the index into the inheritedList. This is so that we can quickly determine if the
-		// entry is matching.
-		//
-		// Then the fullList will be stepped through and see if there is
-		// an entry in the Hashmap for it. If there is an entry, then
-		// the entry is checked to see if it is semantically equal.
-		// If it is, then the boolean list entry is marked so that
-		// the inheritedList entry will be retained, the fullList entry removed and the counter
-		// of the number of entries in the inheritedList copy is incremented.
-		// If they aren't semantically equal, then we know that this is
-		// an override. In that case, the fullList entry is kept, the inheritedList
-		// entry is not retained, but we don't prevent merge later.
-		//
-		// If the fullList entry is not found in the HashMap, then we know it is not
-		// from the inheritedList, so it will be retained in the fullList.
-		//
-		// If we get all of the way through, then we know that what is left
-		// in fullList is just this level.
-		//
-		// When we return we know that
-		//   a) fullList has only the features that are found at the local level
-		//   b) inheritedList if not empty contains the ones from super that SHOULD NOT be inherited.
-		//      If it is empty, then if this method returns true, then ALL should be inherited,
-		//      or if this method returns false, then it doesn't matter because we aren't merging any.
-		//
-		// All of this is based upon the assumption that the list can
-		// get quite large (which it does for javax.swing) and that
-		// a simple n-squared order search would be too slow.
-
-		if (fullList.isEmpty()) {
-			return false; // There are none in the full list, so there should be none, and don't merge.
-		} else if (inheritedList.isEmpty())
-			return false; // There are no inheritedList features, so treat as no merge.
-
-		// We have some features and some inheritedList features, so we need to go through the lists.
-
-		// Create a working copy of the FeatureDescriptorEquality for fullList and stripList and just reuse them
-		FeatureDescriptorEquality workingStrip = FeatureDescriptorEquality.createEquality((FeatureDescriptor) inheritedList.get(0));
-		FeatureDescriptorEquality workingFull = FeatureDescriptorEquality.createEquality((FeatureDescriptor) fullList.get(0));
-
-		int inheritedSize = inheritedList.size();
-		boolean[] copy = new boolean[inheritedSize];
-
-		HashMap inheritedMap = new HashMap(inheritedSize);
-		for (int i = 0; i < inheritedSize; i++) {
-			FeatureDescriptor f = (FeatureDescriptor) inheritedList.get(i);
-			String key = computeKey(f);
-			Object value = inheritedMap.get(key);
-			if (value == null)
-				inheritedMap.put(key, new Integer(i));
-			else {
-				// Shouldn't occur.
-			}
-
-		}
-
-		// When we are done with this processing, inheritedList will contain the super that should not be used, and full list will contain only the locals
-		// (those defined at this class level).;
-		int inheritedRetained = 0;
-		Iterator fullItr = fullList.iterator();
-		// Continue while we've retained less than the full super amount. If we've retained all of the inheritedList, there is no
-		// need to continue processing the fullList because there can't possibly be any inheritedList entries left to find.
-		while (inheritedRetained < inheritedSize && fullItr.hasNext()) {
-			FeatureDescriptor f = (FeatureDescriptor) fullItr.next();
-			boolean foundFull = false;
-			Object index = inheritedMap.get(computeKey(f));
-			if (index != null) {
-				workingFull.setFeature(f);
-				int ndx = ((Integer) index).intValue();
-				workingStrip.setFeature((FeatureDescriptor) inheritedList.get(ndx));
-				if (workingFull.equals(workingStrip)) {
-					// They are semantically identical, so retain in the inheritedList.
-					copy[ndx] = true;
-					foundFull = true;
-					inheritedRetained++;
-				}
-			}
-
-			if (foundFull) {
-				// We found the inheritedList entry semantically equal in the full list somewhere, so we need to remove the full entry.
-				fullItr.remove();
-			}
-		}
-
-		if (inheritedRetained == inheritedSize) {
-			inheritedList.clear(); // All were found in inheritedList, so just clear the inheritedList and return just what was left in the found.
-								   // Those in full found in super had been removed from full during the processing.
-			return true; // We merge with all inherited. 
-		} else	if (inheritedRetained != 0) {
-			// Some were retained, take out of the list those that were retained.
-			// When done the list will contain those that should be dropped from the inherited list.
-			// We start from end because the actual number of bytes moved overall will be less than if we started from the front.
-			for (ListIterator itr = inheritedList.listIterator(inheritedList.size()); itr.hasPrevious();) {
-				int i = itr.previousIndex();
-				itr.previous();	// To back up the itr so that remove can remove it. We actually don't care what the value is.
-				if (copy[i])
-					itr.remove();
-			}
-			return true;	// We merge, and the list is not empty but it did have some removed, so we leave the list alone. Those are not inherited.
-		} else
-			return false;	// All were removed (retained == 0). None were retained. So we just don't do a merge. The list will be ignored.
-	}
-
-	// The modeling beaninfo is also used to send itself back in serialized mode as a callback.
-
-	private IVMCallbackServer vmServer;
-
-	private int callbackID;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.common.ICallback#initializeCallback(org.eclipse.jem.internal.proxy.common.IVMServer, int)
-	 */
-	public void initializeCallback(IVMCallbackServer vmServer, int callbackID) {
-		this.vmServer = vmServer;
-		this.callbackID = callbackID;
-	}
-	
-	public void send() throws IOException, CommandException {
-		if (doFlags != 0) {
-			ObjectOutputStream stream = new ObjectOutputStream(vmServer.requestStream(callbackID, 0));
-			if ((doFlags & IBeanInfoIntrospectionConstants.DO_BEAN_DECOR) != 0)
-				sendBeanDecorator(stream);
-			if ((doFlags & IBeanInfoIntrospectionConstants.DO_PROPERTIES) != 0)
-				sendPropertyDecorators(stream);
-			if ((doFlags & IBeanInfoIntrospectionConstants.DO_METHODS) != 0)
-				sendMethodDecorators(stream);
-			if ((doFlags & IBeanInfoIntrospectionConstants.DO_EVENTS) != 0)
-				sendEventDecorators(stream);
-			stream.writeInt(IBeanInfoIntrospectionConstants.DONE);
-			stream.close();
-		}
-	}
-
-	/**
-	 * Called by IDE to send the bean decorator information back through the callback.
-	 * @throws CommandException
-	 * @throws IOException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void sendBeanDecorator(ObjectOutputStream stream) throws IOException, CommandException {
-		BeanRecord br = new BeanRecord();
-		BeanDescriptor bd = getBeanDescriptor();
-
-		if (bd != null) {
-			br.customizerClassName = getClassName(bd.getCustomizerClass());
-			br.mergeInheritedProperties = isMergeInheritedProperties();
-			br.mergeInheritedOperations = isMergeInheritedMethods();
-			br.mergeInheritedEvents = isMergeInheritedEvents();
-			br.notInheritedPropertyNames = getNotInheritedPropertyDescriptors();
-			br.notInheritedOperationNames = getNotInheritedMethodDescriptors();
-			br.notInheritedEventNames = getNotInheritedEventSetDescriptors();
-			fill(bd, br, BEAN_RECORD_TYPE);
-		}
-		stream.writeInt(IBeanInfoIntrospectionConstants.BEAN_DECORATOR_SENT);
-		stream.writeObject(br);
-	}
-
-	/**
-	 * Called by IDE to send the property decorators information back through the callback.
-	 * 
-	 * @throws CommandException
-	 * @throws IOException
-	 * @since 1.1.0
-	 */
-	public void sendPropertyDecorators(ObjectOutputStream stream) throws IOException, CommandException {
-		PropertyDescriptor[] properties = getPropertyDescriptors();
-		if (properties != null && properties.length > 0) {
-			// Now start writing the records.
-			stream.writeInt(IBeanInfoIntrospectionConstants.PROPERTY_DECORATORS_SENT);
-			stream.writeInt(properties.length);
-			for (int i = 0; i < properties.length; i++) {
-				PropertyDescriptor pd = properties[i];
-				// Much of the two types are common, so if indexed, fill in the index part and then pass on to property part.
-				PropertyRecord usepr = null;
-				int useType = 0;
-				if (pd.getClass() == IndexedPropertyDescriptor.class) {
-					IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
-					IndexedPropertyRecord ipr = new IndexedPropertyRecord();
-					usepr = ipr;
-					useType = INDEXEDPROPERTY_RECORD_TYPE;
-					ipr.indexedReadMethod = getReflectedMethodRecord(ipd.getIndexedReadMethod());
-					ipr.indexedWriteMethod = getReflectedMethodRecord(ipd.getIndexedWriteMethod());
-					ipr.indexedPropertyTypeName = getClassName(ipd.getIndexedPropertyType());
-				} else {
-					usepr = new PropertyRecord();
-					useType = PROPERTY_RECORD_TYPE;
-				}
-				usepr.propertyEditorClassName = getClassName(pd.getPropertyEditorClass());
-				usepr.propertyTypeName = getClassName(pd.getPropertyType());
-				usepr.readMethod = getReflectedMethodRecord(pd.getReadMethod());
-				usepr.writeMethod = getReflectedMethodRecord((pd.getWriteMethod()));
-				usepr.bound = pd.isBound();
-				usepr.constrained = pd.isConstrained();
-				usepr.designTime = null;
-				usepr.field = null;
-				fill(pd, usepr, useType);
-				stream.writeObject(usepr);
-			}
-		}
-	}
-
-	/**
-	 * Called by IDE to send the method decorators information back through the callback.
-	 * 
-	 * @throws CommandException
-	 * @throws IOException
-	 * @since 1.1.0
-	 */
-	public void sendMethodDecorators(ObjectOutputStream stream) throws IOException, CommandException {
-		MethodDescriptor[] methods = getMethodDescriptors();
-		if (methods != null && methods.length > 0) {
-			// Now start writing the records.
-			stream.writeInt(IBeanInfoIntrospectionConstants.METHOD_DECORATORS_SENT);
-			stream.writeInt(methods.length);
-			for (int i = 0; i < methods.length; i++) {
-				MethodRecord mr = new MethodRecord();
-				fill(mr, methods[i]);
-				stream.writeObject(mr);
-			}
-		}
-	}
-
-	/**
-	 * Fill in a MethodRecord from the MethodDescriptor.
-	 * @param mr
-	 * @param md
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fill(MethodRecord mr, MethodDescriptor md) {
-		mr.methodForDescriptor = getReflectedMethodRecord(md.getMethod());
-		ParameterDescriptor[] parms = md.getParameterDescriptors();
-		if (parms == null)
-			mr.parameters = null;
-		else {
-			mr.parameters = new ParameterRecord[parms.length];
-			for (int j = 0; j < parms.length; j++) {
-				ParameterRecord pr = new ParameterRecord();
-				fill(parms[j], pr, PARAMETER_RECORD_TYPE);
-				mr.parameters[j] = pr;
-			}
-		}
-		fill(md, mr, METHOD_RECORD_TYPE);
-	}
-
-	/**
-	 * Called by IDE to send the event set decorators information back through the callback.
-	 * 
-	 * @throws CommandException
-	 * @throws IOException
-	 * @since 1.1.0
-	 */
-	public void sendEventDecorators(ObjectOutputStream stream ) throws IOException, CommandException {
-		EventSetDescriptor[] events = getEventSetDescriptors();
-		if (events != null && events.length > 0) {
-			// Now start writing the records.
-			stream.writeInt(IBeanInfoIntrospectionConstants.EVENT_DECORATORS_SENT);
-			stream.writeInt(events.length);
-			for (int i = 0; i < events.length; i++) {
-				EventSetDescriptor ed = events[i];
-				EventSetRecord er = new EventSetRecord();
-				er.addListenerMethod = getReflectedMethodRecord(ed.getAddListenerMethod());
-				MethodDescriptor[] mds = ed.getListenerMethodDescriptors();
-				if (mds == null)
-					er.listenerMethodDescriptors = null;
-				else {
-					er.listenerMethodDescriptors = new MethodRecord[mds.length];
-					for (int j = 0; j < mds.length; j++) {
-						fill(er.listenerMethodDescriptors[j] = new MethodRecord(), mds[j]);
-					}
-				}
-				er.listenerTypeName = getClassName(ed.getListenerType());
-				er.removeListenerMethod = getReflectedMethodRecord(ed.getRemoveListenerMethod());
-				er.inDefaultEventSet = ed.isInDefaultEventSet();
-				er.unicast = ed.isUnicast();
-				er.eventAdapterClassName = null;
-				fill(ed, er, EVENTSET_RECORD_TYPE);
-				stream.writeObject(er);
-			}
-		}
-	}
-
-	protected static final int BEAN_RECORD_TYPE = 0;
-
-	protected static final int PROPERTY_RECORD_TYPE = 1;
-
-	protected static final int INDEXEDPROPERTY_RECORD_TYPE = 2;
-	
-	protected static final int METHOD_RECORD_TYPE = 3;
-	
-	protected static final int PARAMETER_RECORD_TYPE = 4;
-	
-	protected static final int EVENTSET_RECORD_TYPE = 5;
-
-	/**
-	 * Fill in the special attr/values for the given record type. The default handles the standard ones.
-	 * 
-	 * @param record
-	 * @param descr
-	 * @param attributeName
-	 * @param recordType
-	 *            type of record ultimately being processed.
-	 * @return <code>true</code> if this attribute is a special one and processed, <code>false</code> if not special and should be added to
-	 *         attributes list transferred to IDE.
-	 * 
-	 * @see ModelingBeanInfo#PROPERTY_RECORD_TYPE
-	 * @since 1.1.0
-	 */
-	protected boolean fillFromAttributes(FeatureRecord record, FeatureDescriptor descr, String attributeName, int recordType) {
-		switch (recordType) {
-			case INDEXEDPROPERTY_RECORD_TYPE:
-			case PROPERTY_RECORD_TYPE:
-				if (BaseBeanInfo.DESIGNTIMEPROPERTY.equals(attributeName)) {
-					((PropertyRecord) record).designTime = (Boolean) descr.getValue(attributeName);
-					return true;
-				} else if (BaseBeanInfo.FIELDPROPERTY.equals(attributeName)) {
-					Field f = (Field) descr.getValue(attributeName);
-					// We have a field, set the property type to this since we couldn't correctly create this otherwise.
-					PropertyRecord pr = (PropertyRecord) record;
-					pr.propertyTypeName = getClassName(f.getType());
-					pr.field = getReflectedFieldRecord(f);
-					pr.readMethod = null;	// Need to wipe out our dummy.
-					pr.writeMethod = null;	// Or if it set, not valid for a field.
-					return true;
-				}
-				break;
-			case EVENTSET_RECORD_TYPE:
-				if (BaseBeanInfo.EVENTADAPTERCLASS.equals(attributeName)) {
-					((EventSetRecord) record).eventAdapterClassName = (String) descr.getValue(attributeName);
-					return true;
-				}
-				break;
-			default:
-				break; // Didn't handle it.
-		}
-		return false;
-	}
-
-	/**
-	 * Fill in the feature portion of the Descriptor into the record. We can be reusing some records (so we don't keep allocating when not needed), so
-	 * we will null out unset fields.
-	 * 
-	 * @param descr
-	 * @param record
-	 * @param recordType
-	 *            type of record ultimately being processed. Used for fillFromAttributes.
-	 * 
-	 * @see ModelingBeanInfo#PROPERTY_RECORD_TYPE
-	 * @since 1.1.0
-	 */
-	protected void fill(FeatureDescriptor descr, FeatureRecord record, int recordType) {
-		record.name = descr.getName();
-		String dn = descr.getDisplayName();
-		if (!record.name.equals(dn))
-			record.displayName = dn; // display name returns name if display name not set. We don't want to send it if identical. (Note some Beaninfos are setting displayname the same text but not same string).
-		else
-			record.displayName = null;
-		String shd = descr.getShortDescription();
-		if (!dn.equals(shd))
-			record.shortDescription = shd; // short description returns displayname if short description not set. We don't want to send it if
-										   // identical.
-		else
-			record.shortDescription = null;
-		record.expert = descr.isExpert();
-		record.hidden = descr.isHidden();
-		record.preferred = descr.isPreferred();
-		record.category = null; // Clear out in case not set.
-		Enumeration attrs = descr.attributeNames();
-		if (attrs.hasMoreElements()) {
-			// We don't have a way of knowing how many there are ahead of time, so we will build into lists and then turn into arrays at the end.
-			List names = new ArrayList();
-			List values = new ArrayList();
-			while (attrs.hasMoreElements()) {
-				String attrName = (String) attrs.nextElement();
-				if (attrName.equals(IBaseBeanInfoConstants.CATEGORY))
-					record.category = (String) descr.getValue(IBaseBeanInfoConstants.CATEGORY);
-				else if (attrName.equals(BaseBeanInfo.PREFERRED)) {
-					// A bug in Java 1.3, doing setPreferred was lost. So for those also stored it in attributes. So if set here, then use it.
-					record.preferred = ((Boolean) descr.getValue(BaseBeanInfo.PREFERRED)).booleanValue();
-				} else if (!fillFromAttributes(record, descr, attrName, recordType)) {
-					// Just copy accross. FillfromAttributes didn't handle it.
-					FeatureAttributeValue fv = new FeatureAttributeValue();
-					fv.setValue(descr.getValue(attrName));
-					names.add(attrName);
-					values.add(fv);
-				}
-			}
-			if (!names.isEmpty()) {
-				record.attributeNames = (String[]) names.toArray(new String[names.size()]);
-				record.attributeValues = (FeatureAttributeValue[]) values.toArray(new FeatureAttributeValue[values.size()]);
-			} else {
-				record.attributeNames = null;
-				record.attributeValues = null;
-			}
-		} else {
-			record.attributeNames = null;
-			record.attributeValues = null;
-		}
-
-	}
-
-	/*
-	 * Get the classname from the class. If classs is null, then this return null.
-	 */
-	private String getClassName(Class classs) {
-		return classs != null ? classs.getName() : null;
-	}
-
-	private ReflectMethodRecord getReflectedMethodRecord(Method method) {
-		if (method != null) {
-			ReflectMethodRecord rmr = new ReflectMethodRecord();
-			rmr.className = getClassName(method.getDeclaringClass());
-			rmr.methodName = method.getName();
-			Class[] parmTypes = method.getParameterTypes();
-			if (parmTypes.length > 0) {
-				rmr.parameterTypeNames = new String[parmTypes.length];
-				for (int i = 0; i < parmTypes.length; i++) {
-					rmr.parameterTypeNames[i] = getClassName(parmTypes[i]);
-				}
-			}
-			return rmr;
-		} else
-			return null;
-	}
-	
-	private ReflectFieldRecord getReflectedFieldRecord(Field field) {
-		if (field != null) {
-			ReflectFieldRecord rf = new ReflectFieldRecord();
-			rf.className = getClassName(field.getDeclaringClass());
-			rf.fieldName = field.getName();
-			rf.readOnly = Modifier.isFinal(field.getModifiers());
-			return rf;
-		} else
-			return null;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
deleted file mode 100644
index 04d2cb68f..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
+++ /dev/null
@@ -1,43 +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.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.BeanInfo;
-
-/**
- * This was supposed to for 1.4 or above where it can use identity
- * to test for inherited features, but it still is not correct
- * in 1.4. See the header comments in ModelingBeanInfo.
- * @see org.eclipse.jem.internal.beaninfo.vm.ModelingBeanInfo
- */
-public class ModelingBeanInfo15 extends ModelingBeanInfo {
-
-	/**
-	 * Constructor for ModelingBeanInfo15.
-	 * @param beanInfo
-	 */
-	public ModelingBeanInfo15(BeanInfo beanInfo, int doFlags) {
-		super(beanInfo, doFlags);
-	}
-
-	/**
-	 * Constructor for ModelingBeanInfo15.
-	 * @param beanInfo
-	 * @param superBeanInfo
-	 */
-	public ModelingBeanInfo15(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
-		super(beanInfo, superBeanInfo, doFlags);
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
deleted file mode 100644
index bd2d85cbb..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.BeanInfo;
-
-/**
- * This is the modeling BeanInfo for Pre-JDK 1.4.
- */
-public class ModelingBeanInfoPre15 extends ModelingBeanInfo {
-
-	public ModelingBeanInfoPre15(BeanInfo beanInfo, int doFlags) {
-		super(beanInfo, doFlags);
-	}
-
-	public ModelingBeanInfoPre15(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
-		super(beanInfo, superBeanInfo, doFlags);
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
deleted file mode 100644
index 8e09fcdf5..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
+++ /dev/null
@@ -1,37 +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.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-/**
- * ParameterDescriptor equality tester
- */
-public class ParameterDescriptorEquality extends FeatureDescriptorEquality {
-	
-	static void INIT() {
-		try {
-			MAP_EQUALITY.put(ParameterDescriptor.class, (ParameterDescriptorEquality.class).getConstructor(new Class[] {ParameterDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-	}	
-	
-	public ParameterDescriptorEquality() {
-	}
-	
-	public ParameterDescriptorEquality(ParameterDescriptor descr) {
-		super(descr);
-	}	
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
deleted file mode 100644
index 75d5eee64..000000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
+++ /dev/null
@@ -1,83 +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.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-/**
- * PropertyDescriptor equality tester
- */
-public abstract class PropertyDescriptorEquality extends FeatureDescriptorEquality {	
-	
-	public PropertyDescriptorEquality() {
-	}
-	
-	public PropertyDescriptorEquality(PropertyDescriptor descr) {
-		super(descr);
-	}	
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = super.calculateHashCode();
-		PropertyDescriptor pd = (PropertyDescriptor) fFeature;
-		int hc = 0;
-		if (pd.getPropertyEditorClass() != null)
-			hc += pd.getPropertyEditorClass().hashCode();
-		if (pd.getPropertyType() != null)
-			hc += pd.getPropertyType().hashCode();
-		if (pd.getReadMethod() != null)
-			hc += pd.getReadMethod().hashCode();
-		if (pd.getWriteMethod() != null)
-			hc += pd.getWriteMethod().hashCode();
-			
-		hc += (pd.isBound() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-		hc += (pd.isConstrained() ? Boolean.TRUE : Boolean.FALSE).hashCode();		
-						
-		return hashcode*31 + hc;
-	}
-
-	public boolean equals(Object obj) {
-		if (identityTest(obj))
-			return true;
-			
-		if (!super.equals(obj))
-			return false;
- 	
-		PropertyDescriptor op = (PropertyDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
-		PropertyDescriptor fp = (PropertyDescriptor) fFeature;
- 		
-		if (op.getPropertyEditorClass() != fp.getPropertyEditorClass())
-			return false;
-		if (op.getReadMethod() != fp.getReadMethod())
-			return false;
-		if (op.getWriteMethod() != fp.getWriteMethod())
-			return false;
-		if (op.isBound() != fp.isBound())
-			return false;				
-		if (op.isConstrained() != fp.isConstrained())
-			return false;														
-			
-		return true;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/.classpath b/plugins/org.eclipse.jem.beaninfo/.classpath
deleted file mode 100644
index 58f054853..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="beaninfo"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.beaninfo/.cvsignore b/plugins/org.eclipse.jem.beaninfo/.cvsignore
deleted file mode 100644
index 15aa9ec1e..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-@dot
-org.eclipse.jem.beaninfo*
diff --git a/plugins/org.eclipse.jem.beaninfo/.options b/plugins/org.eclipse.jem.beaninfo/.options
deleted file mode 100644
index 5b246520d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jem.beaninfo/debug/logtrace=default
-org.eclipse.jem.beaninfo/debug/logtracefile=default
-org.eclipse.jem.beaninfo/debug/loglevel=default
diff --git a/plugins/org.eclipse.jem.beaninfo/.project b/plugins/org.eclipse.jem.beaninfo/.project
deleted file mode 100644
index c562a5580..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.project
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-    <name>org.eclipse.jem.beaninfo</name>
-    <comment></comment>
-    <projects></projects>
-    <buildSpec>
-        <buildCommand>
-            <name>org.eclipse.jdt.core.javabuilder</name>
-            <arguments></arguments>
-        </buildCommand>
-        <buildCommand>
-            <name>org.eclipse.pde.ManifestBuilder</name>
-            <arguments></arguments>
-        </buildCommand>
-        <buildCommand>
-            <name>org.eclipse.pde.SchemaBuilder</name>
-            <arguments></arguments>
-        </buildCommand>
-    </buildSpec>
-    <natures>
-        <nature>org.eclipse.pde.PluginNature</nature>
-        <nature>org.eclipse.jdt.core.javanature</nature>
-    </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5a36f5590..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Apr 15 21:15:04 EDT 2007
-eclipse.preferences.version=1
-encoding//beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties=8859_1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b88ad8645..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,294 +0,0 @@
-#Sat Mar 31 23:05:43 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=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.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 855e13665..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:18 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 59dc1688c..000000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jun 16 11:09:08 EDT 2005
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.jem.beaninfo/bin_vm_beaninfovm
diff --git a/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF
deleted file mode 100644
index 36dcafd4e..000000000
--- a/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem.beaninfo; singleton:=true
-Bundle-Version: 2.0.300.qualifier
-Bundle-Activator: org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.internal.beaninfo,
- org.eclipse.jem.internal.beaninfo.adapters,
- org.eclipse.jem.internal.beaninfo.core,
- org.eclipse.jem.internal.beaninfo.impl
-Require-Bundle: org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.change;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.beaninfo.vm;bundle-version="[2.0.200,3.0.0)";visibility:=reexport
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.jem.beaninfo/about.html b/plugins/org.eclipse.jem.beaninfo/about.html
deleted file mode 100644
index 5acea59c7..000000000
--- a/plugins/org.eclipse.jem.beaninfo/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
- 
-<P>June, 2008</P>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java
deleted file mode 100644
index 13821d5f6..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java
+++ /dev/null
@@ -1,432 +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.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jem.java.JavaClass;
-import java.net.URL;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bean Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to BeanDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames <em>Not Inherited Event Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator()
- * @model
- * @generated
- */
-
-
-public interface BeanDecorator extends FeatureDecorator{
-	
-	/**
-	 * Returns the value of the '<em><b>Merge Super Properties</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Super Properties</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the properties of super types be merged when asking for eAllAttributes/eAllReferences.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Super Properties</em>' attribute.
-	 * @see #isSetMergeSuperProperties()
-	 * @see #unsetMergeSuperProperties()
-	 * @see #setMergeSuperProperties(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperProperties()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isMergeSuperProperties();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Super Properties</em>' attribute.
-	 * @see #isSetMergeSuperProperties()
-	 * @see #unsetMergeSuperProperties()
-	 * @see #isMergeSuperProperties()
-	 * @generated
-	 */
-	void setMergeSuperProperties(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMergeSuperProperties()
-	 * @see #isMergeSuperProperties()
-	 * @see #setMergeSuperProperties(boolean)
-	 * @generated
-	 */
-	void unsetMergeSuperProperties();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Merge Super Properties</em>' attribute is set.
-	 * @see #unsetMergeSuperProperties()
-	 * @see #isMergeSuperProperties()
-	 * @see #setMergeSuperProperties(boolean)
-	 * @generated
-	 */
-	boolean isSetMergeSuperProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Merge Super Methods</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Super Behaviors</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the methods of super types be merged when asking for eAllBehaviors.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Super Methods</em>' attribute.
-	 * @see #isSetMergeSuperMethods()
-	 * @see #unsetMergeSuperMethods()
-	 * @see #setMergeSuperMethods(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperMethods()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isMergeSuperMethods();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Super Methods</em>' attribute.
-	 * @see #isSetMergeSuperMethods()
-	 * @see #unsetMergeSuperMethods()
-	 * @see #isMergeSuperMethods()
-	 * @generated
-	 */
-	void setMergeSuperMethods(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMergeSuperMethods()
-	 * @see #isMergeSuperMethods()
-	 * @see #setMergeSuperMethods(boolean)
-	 * @generated
-	 */
-	void unsetMergeSuperMethods();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Merge Super Methods</em>' attribute is set.
-	 * @see #unsetMergeSuperMethods()
-	 * @see #isMergeSuperMethods()
-	 * @see #setMergeSuperMethods(boolean)
-	 * @generated
-	 */
-	boolean isSetMergeSuperMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Merge Super Events</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Super Events</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the events of super types be merged when asking for eAllEvents.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Super Events</em>' attribute.
-	 * @see #isSetMergeSuperEvents()
-	 * @see #unsetMergeSuperEvents()
-	 * @see #setMergeSuperEvents(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperEvents()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isMergeSuperEvents();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Super Events</em>' attribute.
-	 * @see #isSetMergeSuperEvents()
-	 * @see #unsetMergeSuperEvents()
-	 * @see #isMergeSuperEvents()
-	 * @generated
-	 */
-	void setMergeSuperEvents(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMergeSuperEvents()
-	 * @see #isMergeSuperEvents()
-	 * @see #setMergeSuperEvents(boolean)
-	 * @generated
-	 */
-	void unsetMergeSuperEvents();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Merge Super Events</em>' attribute is set.
-	 * @see #unsetMergeSuperEvents()
-	 * @see #isMergeSuperEvents()
-	 * @see #setMergeSuperEvents(boolean)
-	 * @generated
-	 */
-	boolean isSetMergeSuperEvents();
-
-	/**
-	 * Returns the value of the '<em><b>Introspect Properties</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Introspect Properties</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the properties from the introspection be added to the class. This allows properties to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Introspect Properties</em>' attribute.
-	 * @see #setIntrospectProperties(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectProperties()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isIntrospectProperties();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Introspect Properties</em>' attribute.
-	 * @see #isIntrospectProperties()
-	 * @generated
-	 */
-	void setIntrospectProperties(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Introspect Methods</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Introspect Behaviors</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the methods from the introspection be added to the class. This allows methods to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Introspect Methods</em>' attribute.
-	 * @see #setIntrospectMethods(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectMethods()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isIntrospectMethods();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Introspect Methods</em>' attribute.
-	 * @see #isIntrospectMethods()
-	 * @generated
-	 */
-	void setIntrospectMethods(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Introspect Events</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Introspect Events</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the events from the introspection be added to the class. This allows events to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Introspect Events</em>' attribute.
-	 * @see #setIntrospectEvents(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectEvents()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isIntrospectEvents();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Introspect Events</em>' attribute.
-	 * @see #isIntrospectEvents()
-	 * @generated
-	 */
-	void setIntrospectEvents(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Customizer Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Customizer Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Customizer Class</em>' reference.
-	 * @see #setCustomizerClass(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_CustomizerClass()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getCustomizerClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Customizer Class</em>' reference.
-	 * @see #getCustomizerClass()
-	 * @generated
-	 */
-	void setCustomizerClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Do Beaninfo</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Do Beaninfo</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This means do we go and get the beaninfo from the remote vm. If false, then it will not try to get the beaninfo. This doesn't prevent introspection through reflection. That is controled by the separate introspect... attributes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Do Beaninfo</em>' attribute.
-	 * @see #setDoBeaninfo(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_DoBeaninfo()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isDoBeaninfo();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Do Beaninfo</em>' attribute.
-	 * @see #isDoBeaninfo()
-	 * @generated
-	 */
-	void setDoBeaninfo(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Not Inherited Property Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the list of inherited property names to not use in getAllProperties(). These names are properties that should not be inherited and should not show through. If the inherited property is not on the list then it will show in getAllProperties().
-	 * <p>
-	 * This list will be empty if all properties are inherited or if the mergeSuperProperties flag is false.
-	 * <p>
-	 * Note: This attribute is not meant to be changed by clients. It is an internal attribute.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Not Inherited Property Names</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedPropertyNames()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getNotInheritedPropertyNames();
-
-	/**
-	 * Returns the value of the '<em><b>Not Inherited Method Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the list of inherited method names to not use in eAllOperations(). These names are operations that should not be inherited and should not show through. If the inherited operation is not on the list then it will show in getAllOperations().
-	 * <p>
-	 * This list will be empty if all operations are inherited or if the mergeSuperBehaviors flag is false.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Not Inherited Method Names</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedMethodNames()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getNotInheritedMethodNames();
-
-	/**
-	 * Returns the value of the '<em><b>Not Inherited Event Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the list of inherited event names to not use in getAllEvents(). These names are events that should not be inherited and should not show through. If the inherited event is not on the list then it will show in getAllEvents().
-	 * <p>
-	 * This list will be empty if all events are inherited or if the mergeSuperEvents flag is false.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Not Inherited Event Names</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedEventNames()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getNotInheritedEventNames();
-
-	/**
-	 * Return the URL of a 16x16 Color icon
-	 */
-	URL getIconURL();
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.java
deleted file mode 100644
index 852eba272..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.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.jem.internal.beaninfo;
-/*
-
-
- */
-
-import org.eclipse.jem.java.JavaEvent;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bean Event</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Event from Introspection/Reflection.
- * <p>
- * The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanEvent()
- * @model
- * @generated
- */
-
-public interface BeanEvent extends JavaEvent{
-
-	
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java
deleted file mode 100644
index 3cc9a1122..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.ecore.EFactory;
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage
- * @generated
- */
-
-
-public interface BeaninfoFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	BeaninfoFactory eINSTANCE = org.eclipse.jem.internal.beaninfo.impl.BeaninfoFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Feature Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Feature Decorator</em>'.
-	 * @generated
-	 */
-	FeatureDecorator createFeatureDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Event Set Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Event Set Decorator</em>'.
-	 * @generated
-	 */
-	EventSetDecorator createEventSetDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Method Proxy</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Proxy</em>'.
-	 * @generated
-	 */
-	MethodProxy createMethodProxy();
-
-	/**
-	 * Returns a new object of class '<em>Property Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Property Decorator</em>'.
-	 * @generated
-	 */
-	PropertyDecorator createPropertyDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Indexed Property Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Indexed Property Decorator</em>'.
-	 * @generated
-	 */
-	IndexedPropertyDecorator createIndexedPropertyDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Bean Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bean Decorator</em>'.
-	 * @generated
-	 */
-	BeanDecorator createBeanDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Method Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Decorator</em>'.
-	 * @generated
-	 */
-	MethodDecorator createMethodDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Parameter Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Parameter Decorator</em>'.
-	 * @generated
-	 */
-	ParameterDecorator createParameterDecorator();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	BeaninfoPackage getBeaninfoPackage();
-
-	/**
-	 * Returns a new object of class '<em>Bean Event</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bean Event</em>'.
-	 * @generated
-	 */
-	BeanEvent createBeanEvent();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java
deleted file mode 100644
index 3dd81d39f..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java
+++ /dev/null
@@ -1,3271 +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.jem.internal.beaninfo;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.jem.java.JavaRefPackage;
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoFactory
- * @model kind="package"
- * @generated
- */
-
-public interface BeaninfoPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "beaninfo"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jem.internal.beaninfo.beaninfo"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	BeaninfoPackage eINSTANCE = org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl.init();
-
-	
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl <em>Feature Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureDecorator()
-	 * @generated
-	 */
-	int FEATURE_DECORATOR = 0;
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__EANNOTATIONS = EcorePackage.EANNOTATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__SOURCE = EcorePackage.EANNOTATION__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__DETAILS = EcorePackage.EANNOTATION__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__EMODEL_ELEMENT = EcorePackage.EANNOTATION__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__CONTENTS = EcorePackage.EANNOTATION__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__REFERENCES = EcorePackage.EANNOTATION__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__DISPLAY_NAME = EcorePackage.EANNOTATION_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__SHORT_DESCRIPTION = EcorePackage.EANNOTATION_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__CATEGORY = EcorePackage.EANNOTATION_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__EXPERT = EcorePackage.EANNOTATION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__HIDDEN = EcorePackage.EANNOTATION_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__PREFERRED = EcorePackage.EANNOTATION_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__MERGE_INTROSPECTION = EcorePackage.EANNOTATION_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = EcorePackage.EANNOTATION_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__IMPLICITLY_SET_BITS = EcorePackage.EANNOTATION_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG = EcorePackage.EANNOTATION_FEATURE_COUNT + 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl <em>Event Set Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getEventSetDecorator()
-	 * @generated
-	 */
-	int EVENT_SET_DECORATOR = 2;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl <em>Method Proxy</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodProxy()
-	 * @generated
-	 */
-	int METHOD_PROXY = 7;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl <em>Property Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getPropertyDecorator()
-	 * @generated
-	 */
-	int PROPERTY_DECORATOR = 5;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl <em>Indexed Property Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getIndexedPropertyDecorator()
-	 * @generated
-	 */
-	int INDEXED_PROPERTY_DECORATOR = 6;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl <em>Bean Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanDecorator()
-	 * @generated
-	 */
-	int BEAN_DECORATOR = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl <em>Method Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodDecorator()
-	 * @generated
-	 */
-	int METHOD_DECORATOR = 3;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl <em>Parameter Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getParameterDecorator()
-	 * @generated
-	 */
-	int PARAMETER_DECORATOR = 4;
-	/**
-	 * The meta object id for the '<em>Feature Attribute Value</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeValue()
-	 * @generated
-	 */
-	int FEATURE_ATTRIBUTE_VALUE = 11;
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__ATTRIBUTES = EcorePackage.EANNOTATION_FEATURE_COUNT + 10;
-	/**
-	 * The number of structural features of the '<em>Feature Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR_FEATURE_COUNT = EcorePackage.EANNOTATION_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Merge Super Properties</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_SUPER_PROPERTIES = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Merge Super Methods</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_SUPER_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Merge Super Events</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_SUPER_EVENTS = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Introspect Properties</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__INTROSPECT_PROPERTIES = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Introspect Methods</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__INTROSPECT_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Introspect Events</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__INTROSPECT_EVENTS = FEATURE_DECORATOR_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Do Beaninfo</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__DO_BEANINFO = FEATURE_DECORATOR_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Not Inherited Property Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Not Inherited Method Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Not Inherited Event Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Customizer Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__CUSTOMIZER_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 10;
-	/**
-	 * The number of structural features of the '<em>Bean Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>In Default Event Set</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Unicast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__UNICAST = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Listener Methods Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl <em>Bean Event</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanEvent()
-	 * @generated
-	 */
-	int BEAN_EVENT = 8;
-	/**
-	 * The feature id for the '<em><b>Add Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__ADD_LISTENER_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Listener Methods</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__LISTENER_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Listener Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__LISTENER_TYPE = FEATURE_DECORATOR_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Remove Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Event Adapter Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Ser List Mthd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__SER_LIST_MTHD = FEATURE_DECORATOR_FEATURE_COUNT + 8;
-
-	/**
-	 * The number of structural features of the '<em>Event Set Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Parms Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Descriptors</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__PARAMETER_DESCRIPTORS = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Ser Parm Desc</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__SER_PARM_DESC = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Method Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__NAME = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__PARAMETER = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>Parameter Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__BOUND = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Constrained</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__CONSTRAINED = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Design Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__DESIGN_TIME = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Always Incompatible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Filter Flags</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__FILTER_FLAGS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Field Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__FIELD_READ_ONLY = FEATURE_DECORATOR_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Property Editor Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__READ_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__WRITE_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__FIELD = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
-	/**
-	 * The number of structural features of the '<em>Property Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 10;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__EANNOTATIONS = PROPERTY_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__SOURCE = PROPERTY_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__DETAILS = PROPERTY_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT = PROPERTY_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__CONTENTS = PROPERTY_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__REFERENCES = PROPERTY_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME = PROPERTY_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION = PROPERTY_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__CATEGORY = PROPERTY_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__EXPERT = PROPERTY_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__HIDDEN = PROPERTY_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__PREFERRED = PROPERTY_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION = PROPERTY_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS = PROPERTY_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG = PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__ATTRIBUTES = PROPERTY_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__BOUND = PROPERTY_DECORATOR__BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Constrained</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__CONSTRAINED = PROPERTY_DECORATOR__CONSTRAINED;
-
-	/**
-	 * The feature id for the '<em><b>Design Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__DESIGN_TIME = PROPERTY_DECORATOR__DESIGN_TIME;
-
-	/**
-	 * The feature id for the '<em><b>Always Incompatible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE = PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Filter Flags</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS = PROPERTY_DECORATOR__FILTER_FLAGS;
-	/**
-	 * The feature id for the '<em><b>Field Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY = PROPERTY_DECORATOR__FIELD_READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Property Editor Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS = PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS;
-	/**
-	 * The feature id for the '<em><b>Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__READ_METHOD = PROPERTY_DECORATOR__READ_METHOD;
-	/**
-	 * The feature id for the '<em><b>Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__WRITE_METHOD = PROPERTY_DECORATOR__WRITE_METHOD;
-	/**
-	 * The feature id for the '<em><b>Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__FIELD = PROPERTY_DECORATOR__FIELD;
-
-	/**
-	 * The feature id for the '<em><b>Indexed Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD = PROPERTY_DECORATOR_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Indexed Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD = PROPERTY_DECORATOR_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>Indexed Property Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR_FEATURE_COUNT = PROPERTY_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__EANNOTATIONS = EcorePackage.EOPERATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__NAME = EcorePackage.EOPERATION__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__ORDERED = EcorePackage.EOPERATION__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__UNIQUE = EcorePackage.EOPERATION__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__LOWER_BOUND = EcorePackage.EOPERATION__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__UPPER_BOUND = EcorePackage.EOPERATION__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__MANY = EcorePackage.EOPERATION__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__REQUIRED = EcorePackage.EOPERATION__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__ETYPE = EcorePackage.EOPERATION__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__EGENERIC_TYPE = EcorePackage.EOPERATION__EGENERIC_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__ECONTAINING_CLASS = EcorePackage.EOPERATION__ECONTAINING_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__ETYPE_PARAMETERS = EcorePackage.EOPERATION__ETYPE_PARAMETERS;
-
-	/**
-	 * The feature id for the '<em><b>EParameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__EPARAMETERS = EcorePackage.EOPERATION__EPARAMETERS;
-
-	/**
-	 * The feature id for the '<em><b>EExceptions</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__EEXCEPTIONS = EcorePackage.EOPERATION__EEXCEPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>EGeneric Exceptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__EGENERIC_EXCEPTIONS = EcorePackage.EOPERATION__EGENERIC_EXCEPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__METHOD = EcorePackage.EOPERATION_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Method Proxy</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY_FEATURE_COUNT = EcorePackage.EOPERATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__EANNOTATIONS = JavaRefPackage.JAVA_EVENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__NAME = JavaRefPackage.JAVA_EVENT__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__ORDERED = JavaRefPackage.JAVA_EVENT__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__UNIQUE = JavaRefPackage.JAVA_EVENT__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__LOWER_BOUND = JavaRefPackage.JAVA_EVENT__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__UPPER_BOUND = JavaRefPackage.JAVA_EVENT__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__MANY = JavaRefPackage.JAVA_EVENT__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__REQUIRED = JavaRefPackage.JAVA_EVENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__ETYPE = JavaRefPackage.JAVA_EVENT__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__EGENERIC_TYPE = JavaRefPackage.JAVA_EVENT__EGENERIC_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__CHANGEABLE = JavaRefPackage.JAVA_EVENT__CHANGEABLE;
-
-	/**
-	 * The feature id for the '<em><b>Volatile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__VOLATILE = JavaRefPackage.JAVA_EVENT__VOLATILE;
-
-	/**
-	 * The feature id for the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__TRANSIENT = JavaRefPackage.JAVA_EVENT__TRANSIENT;
-
-	/**
-	 * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__DEFAULT_VALUE_LITERAL = JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__DEFAULT_VALUE = JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Unsettable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__UNSETTABLE = JavaRefPackage.JAVA_EVENT__UNSETTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Derived</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__DERIVED = JavaRefPackage.JAVA_EVENT__DERIVED;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__ECONTAINING_CLASS = JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS;
-
-	/**
-	 * The number of structural features of the '<em>Bean Event</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT_FEATURE_COUNT = JavaRefPackage.JAVA_EVENT_FEATURE_COUNT + 0;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl <em>Feature Attribute Map Entry</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeMapEntry()
-	 * @generated
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY = 9;
-
-	/**
-	 * The feature id for the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY__KEY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Feature Attribute Map Entry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY_FEATURE_COUNT = 2;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.ImplicitItem <em>Implicit Item</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getImplicitItem()
-	 * @generated
-	 */
-	int IMPLICIT_ITEM = 10;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator <em>Feature Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator
-	 * @generated
-	 */
-	EClass getFeatureDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_DisplayName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Short Description</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_ShortDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Category</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Category();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Expert</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Expert();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hidden</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Hidden();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Preferred</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Preferred();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Introspection</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_MergeIntrospection();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attributes Explicit Empty</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_AttributesExplicitEmpty();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Implicitly Set Bits</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_ImplicitlySetBits();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Implicit Decorator Flag</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_ImplicitDecoratorFlag();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes <em>Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>Attributes</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EReference getFeatureDecorator_Attributes();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator <em>Event Set Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Event Set Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator
-	 * @generated
-	 */
-	EClass getEventSetDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>In Default Event Set</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EAttribute getEventSetDecorator_InDefaultEventSet();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Unicast</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EAttribute getEventSetDecorator_Unicast();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Listener Methods Explicit Empty</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EAttribute getEventSetDecorator_ListenerMethodsExplicitEmpty();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Add Listener Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_AddListenerMethod();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods <em>Listener Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Listener Methods</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_ListenerMethods();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Listener Type</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_ListenerType();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Remove Listener Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_RemoveListenerMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Event Adapter Class</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_EventAdapterClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd <em>Ser List Mthd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ser List Mthd</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_SerListMthd();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.MethodProxy <em>Method Proxy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Proxy</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodProxy
-	 * @generated
-	 */
-	EClass getMethodProxy();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod()
-	 * @see #getMethodProxy()
-	 * @generated
-	 */
-	EReference getMethodProxy_Method();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator <em>Property Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Property Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator
-	 * @generated
-	 */
-	EClass getPropertyDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Bound</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_Bound();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Constrained</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_Constrained();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Design Time</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_DesignTime();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Always Incompatible</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_AlwaysIncompatible();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags <em>Filter Flags</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Filter Flags</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_FilterFlags();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field Read Only</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_FieldReadOnly();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Property Editor Class</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_PropertyEditorClass();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Read Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_ReadMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Write Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_WriteMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Field</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_Field();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator <em>Indexed Property Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Indexed Property Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator
-	 * @generated
-	 */
-	EClass getIndexedPropertyDecorator();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Indexed Read Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod()
-	 * @see #getIndexedPropertyDecorator()
-	 * @generated
-	 */
-	EReference getIndexedPropertyDecorator_IndexedReadMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Indexed Write Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod()
-	 * @see #getIndexedPropertyDecorator()
-	 * @generated
-	 */
-	EReference getIndexedPropertyDecorator_IndexedWriteMethod();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator <em>Bean Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bean Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator
-	 * @generated
-	 */
-	EClass getBeanDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Super Properties</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_MergeSuperProperties();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Super Methods</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_MergeSuperMethods();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Super Events</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_MergeSuperEvents();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Introspect Properties</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_IntrospectProperties();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Introspect Methods</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_IntrospectMethods();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Introspect Events</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_IntrospectEvents();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Customizer Class</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EReference getBeanDecorator_CustomizerClass();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator <em>Method Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator
-	 * @generated
-	 */
-	EClass getMethodDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Parms Explicit Empty</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty()
-	 * @see #getMethodDecorator()
-	 * @generated
-	 */
-	EAttribute getMethodDecorator_ParmsExplicitEmpty();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors <em>Parameter Descriptors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Parameter Descriptors</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors()
-	 * @see #getMethodDecorator()
-	 * @generated
-	 */
-	EReference getMethodDecorator_ParameterDescriptors();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc <em>Ser Parm Desc</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ser Parm Desc</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc()
-	 * @see #getMethodDecorator()
-	 * @generated
-	 */
-	EReference getMethodDecorator_SerParmDesc();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator <em>Parameter Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Parameter Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.ParameterDecorator
-	 * @generated
-	 */
-	EClass getParameterDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName()
-	 * @see #getParameterDecorator()
-	 * @generated
-	 */
-	EAttribute getParameterDecorator_Name();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue <em>Feature Attribute Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Feature Attribute Value</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue
-	 * @model instanceClass="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue"
-	 * @generated
-	 */
-	EDataType getFeatureAttributeValue();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	BeaninfoFactory getBeaninfoFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl <em>Feature Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureDecorator()
-		 * @generated
-		 */
-		EClass FEATURE_DECORATOR = eINSTANCE.getFeatureDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__DISPLAY_NAME = eINSTANCE.getFeatureDecorator_DisplayName();
-
-		/**
-		 * The meta object literal for the '<em><b>Short Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__SHORT_DESCRIPTION = eINSTANCE.getFeatureDecorator_ShortDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Category</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__CATEGORY = eINSTANCE.getFeatureDecorator_Category();
-
-		/**
-		 * The meta object literal for the '<em><b>Expert</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__EXPERT = eINSTANCE.getFeatureDecorator_Expert();
-
-		/**
-		 * The meta object literal for the '<em><b>Hidden</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__HIDDEN = eINSTANCE.getFeatureDecorator_Hidden();
-
-		/**
-		 * The meta object literal for the '<em><b>Preferred</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__PREFERRED = eINSTANCE.getFeatureDecorator_Preferred();
-
-		/**
-		 * The meta object literal for the '<em><b>Merge Introspection</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__MERGE_INTROSPECTION = eINSTANCE.getFeatureDecorator_MergeIntrospection();
-
-		/**
-		 * The meta object literal for the '<em><b>Attributes Explicit Empty</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = eINSTANCE.getFeatureDecorator_AttributesExplicitEmpty();
-
-		/**
-		 * The meta object literal for the '<em><b>Implicitly Set Bits</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__IMPLICITLY_SET_BITS = eINSTANCE.getFeatureDecorator_ImplicitlySetBits();
-
-		/**
-		 * The meta object literal for the '<em><b>Implicit Decorator Flag</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG = eINSTANCE.getFeatureDecorator_ImplicitDecoratorFlag();
-
-		/**
-		 * The meta object literal for the '<em><b>Attributes</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FEATURE_DECORATOR__ATTRIBUTES = eINSTANCE.getFeatureDecorator_Attributes();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl <em>Bean Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanDecorator()
-		 * @generated
-		 */
-		EClass BEAN_DECORATOR = eINSTANCE.getBeanDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Merge Super Properties</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__MERGE_SUPER_PROPERTIES = eINSTANCE.getBeanDecorator_MergeSuperProperties();
-
-		/**
-		 * The meta object literal for the '<em><b>Merge Super Methods</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__MERGE_SUPER_METHODS = eINSTANCE.getBeanDecorator_MergeSuperMethods();
-
-		/**
-		 * The meta object literal for the '<em><b>Merge Super Events</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__MERGE_SUPER_EVENTS = eINSTANCE.getBeanDecorator_MergeSuperEvents();
-
-		/**
-		 * The meta object literal for the '<em><b>Introspect Properties</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__INTROSPECT_PROPERTIES = eINSTANCE.getBeanDecorator_IntrospectProperties();
-
-		/**
-		 * The meta object literal for the '<em><b>Introspect Methods</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__INTROSPECT_METHODS = eINSTANCE.getBeanDecorator_IntrospectMethods();
-
-		/**
-		 * The meta object literal for the '<em><b>Introspect Events</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__INTROSPECT_EVENTS = eINSTANCE.getBeanDecorator_IntrospectEvents();
-
-		/**
-		 * The meta object literal for the '<em><b>Do Beaninfo</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__DO_BEANINFO = eINSTANCE.getBeanDecorator_DoBeaninfo();
-
-		/**
-		 * The meta object literal for the '<em><b>Not Inherited Property Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES = eINSTANCE.getBeanDecorator_NotInheritedPropertyNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Not Inherited Method Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES = eINSTANCE.getBeanDecorator_NotInheritedMethodNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Not Inherited Event Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES = eINSTANCE.getBeanDecorator_NotInheritedEventNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Customizer Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BEAN_DECORATOR__CUSTOMIZER_CLASS = eINSTANCE.getBeanDecorator_CustomizerClass();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl <em>Event Set Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getEventSetDecorator()
-		 * @generated
-		 */
-		EClass EVENT_SET_DECORATOR = eINSTANCE.getEventSetDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>In Default Event Set</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET = eINSTANCE.getEventSetDecorator_InDefaultEventSet();
-
-		/**
-		 * The meta object literal for the '<em><b>Unicast</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EVENT_SET_DECORATOR__UNICAST = eINSTANCE.getEventSetDecorator_Unicast();
-
-		/**
-		 * The meta object literal for the '<em><b>Listener Methods Explicit Empty</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY = eINSTANCE.getEventSetDecorator_ListenerMethodsExplicitEmpty();
-
-		/**
-		 * The meta object literal for the '<em><b>Add Listener Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__ADD_LISTENER_METHOD = eINSTANCE.getEventSetDecorator_AddListenerMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Listener Methods</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__LISTENER_METHODS = eINSTANCE.getEventSetDecorator_ListenerMethods();
-
-		/**
-		 * The meta object literal for the '<em><b>Listener Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__LISTENER_TYPE = eINSTANCE.getEventSetDecorator_ListenerType();
-
-		/**
-		 * The meta object literal for the '<em><b>Remove Listener Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD = eINSTANCE.getEventSetDecorator_RemoveListenerMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Event Adapter Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS = eINSTANCE.getEventSetDecorator_EventAdapterClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Ser List Mthd</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EVENT_SET_DECORATOR__SER_LIST_MTHD = eINSTANCE.getEventSetDecorator_SerListMthd();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl <em>Method Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodDecorator()
-		 * @generated
-		 */
-		EClass METHOD_DECORATOR = eINSTANCE.getMethodDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Parms Explicit Empty</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY = eINSTANCE.getMethodDecorator_ParmsExplicitEmpty();
-
-		/**
-		 * The meta object literal for the '<em><b>Parameter Descriptors</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_DECORATOR__PARAMETER_DESCRIPTORS = eINSTANCE.getMethodDecorator_ParameterDescriptors();
-
-		/**
-		 * The meta object literal for the '<em><b>Ser Parm Desc</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_DECORATOR__SER_PARM_DESC = eINSTANCE.getMethodDecorator_SerParmDesc();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl <em>Parameter Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getParameterDecorator()
-		 * @generated
-		 */
-		EClass PARAMETER_DECORATOR = eINSTANCE.getParameterDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PARAMETER_DECORATOR__NAME = eINSTANCE.getParameterDecorator_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Parameter</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PARAMETER_DECORATOR__PARAMETER = eINSTANCE.getParameterDecorator_Parameter();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl <em>Property Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getPropertyDecorator()
-		 * @generated
-		 */
-		EClass PROPERTY_DECORATOR = eINSTANCE.getPropertyDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Bound</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__BOUND = eINSTANCE.getPropertyDecorator_Bound();
-
-		/**
-		 * The meta object literal for the '<em><b>Constrained</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__CONSTRAINED = eINSTANCE.getPropertyDecorator_Constrained();
-
-		/**
-		 * The meta object literal for the '<em><b>Design Time</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__DESIGN_TIME = eINSTANCE.getPropertyDecorator_DesignTime();
-
-		/**
-		 * The meta object literal for the '<em><b>Always Incompatible</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE = eINSTANCE.getPropertyDecorator_AlwaysIncompatible();
-
-		/**
-		 * The meta object literal for the '<em><b>Filter Flags</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__FILTER_FLAGS = eINSTANCE.getPropertyDecorator_FilterFlags();
-
-		/**
-		 * The meta object literal for the '<em><b>Field Read Only</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_DECORATOR__FIELD_READ_ONLY = eINSTANCE.getPropertyDecorator_FieldReadOnly();
-
-		/**
-		 * The meta object literal for the '<em><b>Property Editor Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS = eINSTANCE.getPropertyDecorator_PropertyEditorClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Read Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROPERTY_DECORATOR__READ_METHOD = eINSTANCE.getPropertyDecorator_ReadMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Write Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROPERTY_DECORATOR__WRITE_METHOD = eINSTANCE.getPropertyDecorator_WriteMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Field</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROPERTY_DECORATOR__FIELD = eINSTANCE.getPropertyDecorator_Field();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl <em>Indexed Property Decorator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getIndexedPropertyDecorator()
-		 * @generated
-		 */
-		EClass INDEXED_PROPERTY_DECORATOR = eINSTANCE.getIndexedPropertyDecorator();
-
-		/**
-		 * The meta object literal for the '<em><b>Indexed Read Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD = eINSTANCE.getIndexedPropertyDecorator_IndexedReadMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Indexed Write Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD = eINSTANCE.getIndexedPropertyDecorator_IndexedWriteMethod();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl <em>Method Proxy</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodProxy()
-		 * @generated
-		 */
-		EClass METHOD_PROXY = eINSTANCE.getMethodProxy();
-
-		/**
-		 * The meta object literal for the '<em><b>Method</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PROXY__METHOD = eINSTANCE.getMethodProxy_Method();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl <em>Bean Event</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanEvent()
-		 * @generated
-		 */
-		EClass BEAN_EVENT = eINSTANCE.getBeanEvent();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl <em>Feature Attribute Map Entry</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeMapEntry()
-		 * @generated
-		 */
-		EClass FEATURE_ATTRIBUTE_MAP_ENTRY = eINSTANCE.getFeatureAttributeMapEntry();
-
-		/**
-		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_ATTRIBUTE_MAP_ENTRY__KEY = eINSTANCE.getFeatureAttributeMapEntry_Key();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE = eINSTANCE.getFeatureAttributeMapEntry_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.ImplicitItem <em>Implicit Item</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getImplicitItem()
-		 * @generated
-		 */
-		EEnum IMPLICIT_ITEM = eINSTANCE.getImplicitItem();
-
-		/**
-		 * The meta object literal for the '<em>Feature Attribute Value</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue
-		 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeValue()
-		 * @generated
-		 */
-		EDataType FEATURE_ATTRIBUTE_VALUE = eINSTANCE.getFeatureAttributeValue();
-
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Do Beaninfo</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_DoBeaninfo();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Not Inherited Property Names</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_NotInheritedPropertyNames();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Not Inherited Method Names</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_NotInheritedMethodNames();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames <em>Not Inherited Event Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Not Inherited Event Names</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_NotInheritedEventNames();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Parameter</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter()
-	 * @see #getParameterDecorator()
-	 * @generated
-	 */
-	EReference getParameterDecorator_Parameter();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.BeanEvent <em>Bean Event</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bean Event</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanEvent
-	 * @generated
-	 */
-	EClass getBeanEvent();
-
-	/**
-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Feature Attribute Map Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature Attribute Map Entry</em>'.
-	 * @see java.util.Map.Entry
-	 * @model keyType="java.lang.String"
-	 *        valueType="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue" valueDataType="org.eclipse.jem.internal.beaninfo.FeatureAttributeValue"
-	 * @generated
-	 */
-	EClass getFeatureAttributeMapEntry();
-
-	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Key</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getFeatureAttributeMapEntry()
-	 * @generated
-	 */
-	EAttribute getFeatureAttributeMapEntry_Key();
-
-	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getFeatureAttributeMapEntry()
-	 * @generated
-	 */
-	EAttribute getFeatureAttributeMapEntry_Value();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jem.internal.beaninfo.ImplicitItem <em>Implicit Item</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Implicit Item</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @generated
-	 */
-	EEnum getImplicitItem();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java
deleted file mode 100644
index bb889dda5..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java
+++ /dev/null
@@ -1,326 +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.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Event Set Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to EventSetDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods <em>Listener Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd <em>Ser List Mthd</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator()
- * @model
- * @generated
- */
-
-
-public interface EventSetDecorator extends FeatureDecorator{
-	
-	/**
-	 * Returns the value of the '<em><b>In Default Event Set</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>In Default Event Set</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>In Default Event Set</em>' attribute.
-	 * @see #isSetInDefaultEventSet()
-	 * @see #unsetInDefaultEventSet()
-	 * @see #setInDefaultEventSet(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_InDefaultEventSet()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isInDefaultEventSet();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>In Default Event Set</em>' attribute.
-	 * @see #isSetInDefaultEventSet()
-	 * @see #unsetInDefaultEventSet()
-	 * @see #isInDefaultEventSet()
-	 * @generated
-	 */
-	void setInDefaultEventSet(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetInDefaultEventSet()
-	 * @see #isInDefaultEventSet()
-	 * @see #setInDefaultEventSet(boolean)
-	 * @generated
-	 */
-	void unsetInDefaultEventSet();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>In Default Event Set</em>' attribute is set.
-	 * @see #unsetInDefaultEventSet()
-	 * @see #isInDefaultEventSet()
-	 * @see #setInDefaultEventSet(boolean)
-	 * @generated
-	 */
-	boolean isSetInDefaultEventSet();
-
-	/**
-	 * Returns the value of the '<em><b>Unicast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unicast</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unicast</em>' attribute.
-	 * @see #isSetUnicast()
-	 * @see #unsetUnicast()
-	 * @see #setUnicast(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_Unicast()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isUnicast();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unicast</em>' attribute.
-	 * @see #isSetUnicast()
-	 * @see #unsetUnicast()
-	 * @see #isUnicast()
-	 * @generated
-	 */
-	void setUnicast(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetUnicast()
-	 * @see #isUnicast()
-	 * @see #setUnicast(boolean)
-	 * @generated
-	 */
-	void unsetUnicast();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Unicast</em>' attribute is set.
-	 * @see #unsetUnicast()
-	 * @see #isUnicast()
-	 * @see #setUnicast(boolean)
-	 * @generated
-	 */
-	boolean isSetUnicast();
-
-	/**
-	 * Returns the value of the '<em><b>Listener Methods Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Set true if the listenerMethods feature is explicitly set as empty and is not to have listener methods merged in from BeanInfo or reflection.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Listener Methods Explicit Empty</em>' attribute.
-	 * @see #setListenerMethodsExplicitEmpty(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerMethodsExplicitEmpty()
-	 * @model
-	 * @generated
-	 */
-	boolean isListenerMethodsExplicitEmpty();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Listener Methods Explicit Empty</em>' attribute.
-	 * @see #isListenerMethodsExplicitEmpty()
-	 * @generated
-	 */
-	void setListenerMethodsExplicitEmpty(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Add Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Add Listener Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Add Listener Method</em>' reference.
-	 * @see #setAddListenerMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_AddListenerMethod()
-	 * @model required="true"
-	 * @generated
-	 */
-	Method getAddListenerMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Add Listener Method</em>' reference.
-	 * @see #getAddListenerMethod()
-	 * @generated
-	 */
-	void setAddListenerMethod(Method value);
-
-	/**
-	 * Returns the value of the '<em><b>Listener Methods</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.MethodProxy}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Listener Methods</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * listener methods. If it is desired that the list be explicitly empty and not have BeanInfo set it, then set listenerMethodsExplicitEmpty to true.
-	 * <p>
-	 * ListenerMethods will be decorated with MethodDecorators.
-	 * <p>
-	 * Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serListMthd" notifications instead.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Listener Methods</em>' reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerMethods()
-	 * @model type="org.eclipse.jem.internal.beaninfo.MethodProxy" required="true" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	EList getListenerMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Listener Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Listener Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Listener Type</em>' reference.
-	 * @see #setListenerType(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerType()
-	 * @model required="true"
-	 * @generated
-	 */
-	JavaClass getListenerType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Listener Type</em>' reference.
-	 * @see #getListenerType()
-	 * @generated
-	 */
-	void setListenerType(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Remove Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Remove Listener Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Remove Listener Method</em>' reference.
-	 * @see #setRemoveListenerMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_RemoveListenerMethod()
-	 * @model required="true"
-	 * @generated
-	 */
-	Method getRemoveListenerMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remove Listener Method</em>' reference.
-	 * @see #getRemoveListenerMethod()
-	 * @generated
-	 */
-	void setRemoveListenerMethod(Method value);
-
-	/**
-	 * Returns the value of the '<em><b>Event Adapter Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * For some listener interfaces an adapter class is provided that implements default no-op methods, e.g. java.awt.event.FocusEvent which has java.awt.event.FocusAdapter. The Adapter class is provided in a key/value pair on the java.beans.EventSetDescriptor with a key defined in a static final constants EVENTADAPTERCLASS = "eventAdapterClass".
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Event Adapter Class</em>' reference.
-	 * @see #setEventAdapterClass(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_EventAdapterClass()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getEventAdapterClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Event Adapter Class</em>' reference.
-	 * @see #getEventAdapterClass()
-	 * @generated
-	 */
-	void setEventAdapterClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Ser List Mthd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.MethodProxy}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is a private feature. It is used internally only. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ser List Mthd</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_SerListMthd()
-	 * @model type="org.eclipse.jem.internal.beaninfo.MethodProxy" containment="true" required="true"
-	 * @generated
-	 */
-	EList getSerListMthd();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java
deleted file mode 100644
index 298fb38ef..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java
+++ /dev/null
@@ -1,491 +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.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EAnnotation;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Feature Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to FeatureDescriptor in java.
- * <p>
- * Note: If any attribute is explicitly set then the BeanInfo/Reflection will not be merged into the decorator. This provides a way of overriding the BeanInfos. Also for any many-valued attribute, if it is desired to have it explicitly empty and not have BeanInfo fill it in, there will be another attribute named of the form "attibutueExplicitEmpty" If this is true then the BeanInfo will not merge in and will leave it empty.
- * <p>
- * These comments about merging apply to all subclasses of this decorator too. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator()
- * @model
- * @generated
- */
-
-
-public interface FeatureDecorator extends EAnnotation{
-		
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #isSetDisplayName()
-	 * @see #unsetDisplayName()
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_DisplayName()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #isSetDisplayName()
-	 * @see #unsetDisplayName()
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDisplayName()
-	 * @see #getDisplayName()
-	 * @see #setDisplayName(String)
-	 * @generated
-	 */
-	void unsetDisplayName();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Display Name</em>' attribute is set.
-	 * @see #unsetDisplayName()
-	 * @see #getDisplayName()
-	 * @see #setDisplayName(String)
-	 * @generated
-	 */
-	boolean isSetDisplayName();
-
-	/**
-	 * Returns the value of the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Short Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Short Description</em>' attribute.
-	 * @see #isSetShortDescription()
-	 * @see #unsetShortDescription()
-	 * @see #setShortDescription(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ShortDescription()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	String getShortDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Short Description</em>' attribute.
-	 * @see #isSetShortDescription()
-	 * @see #unsetShortDescription()
-	 * @see #getShortDescription()
-	 * @generated
-	 */
-	void setShortDescription(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetShortDescription()
-	 * @see #getShortDescription()
-	 * @see #setShortDescription(String)
-	 * @generated
-	 */
-	void unsetShortDescription();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Short Description</em>' attribute is set.
-	 * @see #unsetShortDescription()
-	 * @see #getShortDescription()
-	 * @see #setShortDescription(String)
-	 * @generated
-	 */
-	boolean isSetShortDescription();
-
-	/**
-	 * Returns the value of the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Category</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Category</em>' attribute.
-	 * @see #setCategory(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Category()
-	 * @model
-	 * @generated
-	 */
-	String getCategory();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Category</em>' attribute.
-	 * @see #getCategory()
-	 * @generated
-	 */
-	void setCategory(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Expert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Expert</em>' attribute.
-	 * @see #isSetExpert()
-	 * @see #unsetExpert()
-	 * @see #setExpert(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Expert()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isExpert();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expert</em>' attribute.
-	 * @see #isSetExpert()
-	 * @see #unsetExpert()
-	 * @see #isExpert()
-	 * @generated
-	 */
-	void setExpert(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetExpert()
-	 * @see #isExpert()
-	 * @see #setExpert(boolean)
-	 * @generated
-	 */
-	void unsetExpert();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Expert</em>' attribute is set.
-	 * @see #unsetExpert()
-	 * @see #isExpert()
-	 * @see #setExpert(boolean)
-	 * @generated
-	 */
-	boolean isSetExpert();
-
-	/**
-	 * Returns the value of the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hidden</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Hidden</em>' attribute.
-	 * @see #isSetHidden()
-	 * @see #unsetHidden()
-	 * @see #setHidden(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Hidden()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isHidden();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hidden</em>' attribute.
-	 * @see #isSetHidden()
-	 * @see #unsetHidden()
-	 * @see #isHidden()
-	 * @generated
-	 */
-	void setHidden(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetHidden()
-	 * @see #isHidden()
-	 * @see #setHidden(boolean)
-	 * @generated
-	 */
-	void unsetHidden();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Hidden</em>' attribute is set.
-	 * @see #unsetHidden()
-	 * @see #isHidden()
-	 * @see #setHidden(boolean)
-	 * @generated
-	 */
-	boolean isSetHidden();
-
-	/**
-	 * Returns the value of the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Preferred</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Preferred</em>' attribute.
-	 * @see #isSetPreferred()
-	 * @see #unsetPreferred()
-	 * @see #setPreferred(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Preferred()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isPreferred();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Preferred</em>' attribute.
-	 * @see #isSetPreferred()
-	 * @see #unsetPreferred()
-	 * @see #isPreferred()
-	 * @generated
-	 */
-	void setPreferred(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetPreferred()
-	 * @see #isPreferred()
-	 * @see #setPreferred(boolean)
-	 * @generated
-	 */
-	void unsetPreferred();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Preferred</em>' attribute is set.
-	 * @see #unsetPreferred()
-	 * @see #isPreferred()
-	 * @see #setPreferred(boolean)
-	 * @generated
-	 */
-	boolean isSetPreferred();
-
-	/**
-	 * Returns the value of the '<em><b>Merge Introspection</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Introspection</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the introspection results be merged into this decorator. If this is set to false, then the introspection results are ignored for this particular decorator. This is an internal feature simply to allow desired override capabilities. Customers would use it to prevent ANY introspection/reflection from occurring.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Introspection</em>' attribute.
-	 * @see #setMergeIntrospection(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_MergeIntrospection()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isMergeIntrospection();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Introspection</em>' attribute.
-	 * @see #isMergeIntrospection()
-	 * @generated
-	 */
-	void setMergeIntrospection(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The attributes are explicitly set as empty and not retrieved from the beaninfo/reflection. Customers should set this if they want the list of attributes to be empty and not merged with the BeanInfo results. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Attributes Explicit Empty</em>' attribute.
-	 * @see #setAttributesExplicitEmpty(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_AttributesExplicitEmpty()
-	 * @model
-	 * @generated
-	 */
-	boolean isAttributesExplicitEmpty();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attributes Explicit Empty</em>' attribute.
-	 * @see #isAttributesExplicitEmpty()
-	 * @generated
-	 */
-	void setAttributesExplicitEmpty(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A bitflag for which attributes have been set by BeanInfo/Reflection.
-	 * <p>
-	 * This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Implicitly Set Bits</em>' attribute.
-	 * @see #setImplicitlySetBits(long)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ImplicitlySetBits()
-	 * @model
-	 * @generated
-	 */
-	long getImplicitlySetBits();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Implicitly Set Bits</em>' attribute.
-	 * @see #getImplicitlySetBits()
-	 * @generated
-	 */
-	void setImplicitlySetBits(long value);
-
-	/**
-	 * Returns the value of the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jem.internal.beaninfo.ImplicitItem}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Is this decorator/feature implicit. This means created by Introspection/Reflection and not by customer.
-	 * <p>
-	 * This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Implicit Decorator Flag</em>' attribute.
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @see #setImplicitDecoratorFlag(ImplicitItem)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ImplicitDecoratorFlag()
-	 * @model
-	 * @generated
-	 */
-	ImplicitItem getImplicitDecoratorFlag();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Implicit Decorator Flag</em>' attribute.
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @see #getImplicitDecoratorFlag()
-	 * @generated
-	 */
-	void setImplicitDecoratorFlag(ImplicitItem value);
-
-	/**
-	 * Returns the value of the '<em><b>Attributes</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attributes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Feature attributes. Key/value pairs. If it is desired that the feature attributes is explicitly empty and not have BeanInfo/reflection set it, set attributesExplicitEmpty to true.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Attributes</em>' map.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Attributes()
-	 * @model mapType="org.eclipse.jem.internal.beaninfo.FeatureAttributeMapEntry" keyType="java.lang.String" valueType="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue"
-	 * @generated
-	 */
-	EMap getAttributes();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	String getName();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java
deleted file mode 100644
index c5e5b4bdb..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java
+++ /dev/null
@@ -1,168 +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.jem.internal.beaninfo;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Implicit Item</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This enum is an internal enum. It is used by BeanInfo for cache maintenance.
- * <p>
- * This enum is not meant to be used by clients.
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getImplicitItem()
- * @model
- * @generated
- */
-public final class ImplicitItem extends AbstractEnumerator {
-	/**
-	 * The '<em><b>NOT IMPLICIT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Means this decorator is not implicit. That is it was created by customer.
-	 * <!-- end-model-doc -->
-	 * @see #NOT_IMPLICIT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOT_IMPLICIT = 0;
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This means that the decorator is implicit. That is it was not created by the customer.
-	 * <!-- end-model-doc -->
-	 * @see #IMPLICIT_DECORATOR_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPLICIT_DECORATOR = 1;
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR AND FEATURE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This means the decorator and the feature where implicit. That is they were not created by the customer.
-	 * <!-- end-model-doc -->
-	 * @see #IMPLICIT_DECORATOR_AND_FEATURE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPLICIT_DECORATOR_AND_FEATURE = 2;
-
-	/**
-	 * The '<em><b>NOT IMPLICIT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NOT_IMPLICIT
-	 * @generated
-	 * @ordered
-	 */
-	public static final ImplicitItem NOT_IMPLICIT_LITERAL = new ImplicitItem(NOT_IMPLICIT, "NOT_IMPLICIT");
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPLICIT_DECORATOR
-	 * @generated
-	 * @ordered
-	 */
-	public static final ImplicitItem IMPLICIT_DECORATOR_LITERAL = new ImplicitItem(IMPLICIT_DECORATOR, "IMPLICIT_DECORATOR");
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR AND FEATURE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPLICIT_DECORATOR_AND_FEATURE
-	 * @generated
-	 * @ordered
-	 */
-	public static final ImplicitItem IMPLICIT_DECORATOR_AND_FEATURE_LITERAL = new ImplicitItem(IMPLICIT_DECORATOR_AND_FEATURE, "IMPLICIT_DECORATOR_AND_FEATURE");
-
-	/**
-	 * An array of all the '<em><b>Implicit Item</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ImplicitItem[] VALUES_ARRAY =
-		new ImplicitItem[] {
-			NOT_IMPLICIT_LITERAL,
-			IMPLICIT_DECORATOR_LITERAL,
-			IMPLICIT_DECORATOR_AND_FEATURE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Implicit Item</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Implicit Item</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ImplicitItem get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ImplicitItem result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Implicit Item</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ImplicitItem get(int value) {
-		switch (value) {
-			case NOT_IMPLICIT: return NOT_IMPLICIT_LITERAL;
-			case IMPLICIT_DECORATOR: return IMPLICIT_DECORATOR_LITERAL;
-			case IMPLICIT_DECORATOR_AND_FEATURE: return IMPLICIT_DECORATOR_AND_FEATURE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ImplicitItem(int value, String name) {
-		super(value, name);
-	}
-
-} //ImplicitItem
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java
deleted file mode 100644
index a45351538..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java
+++ /dev/null
@@ -1,149 +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.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Indexed Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to IndexedPropertyDecorator
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator()
- * @model
- * @generated
- */
-
-
-public interface IndexedPropertyDecorator extends PropertyDecorator{
-	/**
-	 * Returns the value of the '<em><b>Indexed Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Indexed Read Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Indexed Read Method</em>' reference.
-	 * @see #isSetIndexedReadMethod()
-	 * @see #unsetIndexedReadMethod()
-	 * @see #setIndexedReadMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator_IndexedReadMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getIndexedReadMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Indexed Read Method</em>' reference.
-	 * @see #isSetIndexedReadMethod()
-	 * @see #unsetIndexedReadMethod()
-	 * @see #getIndexedReadMethod()
-	 * @generated
-	 */
-	void setIndexedReadMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIndexedReadMethod()
-	 * @see #getIndexedReadMethod()
-	 * @see #setIndexedReadMethod(Method)
-	 * @generated
-	 */
-	void unsetIndexedReadMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Indexed Read Method</em>' reference is set.
-	 * @see #unsetIndexedReadMethod()
-	 * @see #getIndexedReadMethod()
-	 * @see #setIndexedReadMethod(Method)
-	 * @generated
-	 */
-	boolean isSetIndexedReadMethod();
-
-	/**
-	 * Returns the value of the '<em><b>Indexed Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Indexed Write Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Indexed Write Method</em>' reference.
-	 * @see #isSetIndexedWriteMethod()
-	 * @see #unsetIndexedWriteMethod()
-	 * @see #setIndexedWriteMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator_IndexedWriteMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getIndexedWriteMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Indexed Write Method</em>' reference.
-	 * @see #isSetIndexedWriteMethod()
-	 * @see #unsetIndexedWriteMethod()
-	 * @see #getIndexedWriteMethod()
-	 * @generated
-	 */
-	void setIndexedWriteMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIndexedWriteMethod()
-	 * @see #getIndexedWriteMethod()
-	 * @see #setIndexedWriteMethod(Method)
-	 * @generated
-	 */
-	void unsetIndexedWriteMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Indexed Write Method</em>' reference is set.
-	 * @see #unsetIndexedWriteMethod()
-	 * @see #getIndexedWriteMethod()
-	 * @see #setIndexedWriteMethod(Method)
-	 * @generated
-	 */
-	boolean isSetIndexedWriteMethod();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.java
deleted file mode 100644
index 3cd3cb8a6..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.java
+++ /dev/null
@@ -1,109 +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.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to MethodDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors <em>Parameter Descriptors</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc <em>Ser Parm Desc</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator()
- * @model
- * @generated
- */
-
-
-public interface MethodDecorator extends FeatureDecorator{
-	/**
-	 * Returns the value of the '<em><b>Parms Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Set true if the parms feature is explicitly set as empty and is not to have parameters merged in from BeanInfo or reflection.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parms Explicit Empty</em>' attribute.
-	 * @see #setParmsExplicitEmpty(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_ParmsExplicitEmpty()
-	 * @model
-	 * @generated
-	 */
-	boolean isParmsExplicitEmpty();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parms Explicit Empty</em>' attribute.
-	 * @see #isParmsExplicitEmpty()
-	 * @generated
-	 */
-	void setParmsExplicitEmpty(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Parameter Descriptors</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.ParameterDecorator}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameter Descriptors</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the parameter descriptors list.
-	 * <p>
-	 * Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serParmDesc" notifications instead.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parameter Descriptors</em>' reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_ParameterDescriptors()
-	 * @model type="org.eclipse.jem.internal.beaninfo.ParameterDecorator" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	EList getParameterDescriptors();
-
-	/**
-	 * Returns the value of the '<em><b>Ser Parm Desc</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.ParameterDecorator}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ser Parm Desc</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is a private feature. It is used internally only. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ser Parm Desc</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_SerParmDesc()
-	 * @model type="org.eclipse.jem.internal.beaninfo.ParameterDecorator" containment="true"
-	 * @generated
-	 */
-	EList getSerParmDesc();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java
deleted file mode 100644
index 3945a7597..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java
+++ /dev/null
@@ -1,75 +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.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.ecore.EOperation;
-
-import org.eclipse.jem.java.Method;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Proxy</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This is just a wrapper of a java Method. It allows access to the method but doesn't duplicate the interface for it.
- * <p>
- * MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.
- * <p>
- * MethodProxies would also have MethodDecorators.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodProxy()
- * @model
- * @generated
- */
-
-
-public interface MethodProxy extends EOperation{
-	/**
-	 * Returns the value of the '<em><b>Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method</em>' reference.
-	 * @see #setMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodProxy_Method()
-	 * @model required="true"
-	 * @generated
-	 */
-	Method getMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method</em>' reference.
-	 * @see #getMethod()
-	 * @generated
-	 */
-	void setMethod(Method value);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.java
deleted file mode 100644
index 485f9b87e..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.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.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.jem.java.JavaParameter;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parameter Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator()
- * @model
- * @generated
- */
-
-
-public interface ParameterDecorator extends FeatureDecorator{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The name is explicit here because unlike the other feature decorators, the name does not come from the object being decorated.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameter</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The JavaParameter that this ParameterDecorator is decorating. Can't use eDecorates in this.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parameter</em>' reference.
-	 * @see #setParameter(JavaParameter)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator_Parameter()
-	 * @model transient="true"
-	 * @generated
-	 */
-	JavaParameter getParameter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parameter</em>' reference.
-	 * @see #getParameter()
-	 * @generated
-	 */
-	void setParameter(JavaParameter value);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java
deleted file mode 100644
index 6977b4736..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java
+++ /dev/null
@@ -1,513 +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.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClassifier;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to PropertyDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags <em>Filter Flags</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator()
- * @model
- * @generated
- */
-
-
-public interface PropertyDecorator extends FeatureDecorator{
-	/**
-	 * Returns the value of the '<em><b>Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Bound</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Bound</em>' attribute.
-	 * @see #isSetBound()
-	 * @see #unsetBound()
-	 * @see #setBound(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Bound()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isBound();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bound</em>' attribute.
-	 * @see #isSetBound()
-	 * @see #unsetBound()
-	 * @see #isBound()
-	 * @generated
-	 */
-	void setBound(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBound()
-	 * @see #isBound()
-	 * @see #setBound(boolean)
-	 * @generated
-	 */
-	void unsetBound();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Bound</em>' attribute is set.
-	 * @see #unsetBound()
-	 * @see #isBound()
-	 * @see #setBound(boolean)
-	 * @generated
-	 */
-	boolean isSetBound();
-
-	/**
-	 * Returns the value of the '<em><b>Constrained</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Constrained</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Constrained</em>' attribute.
-	 * @see #isSetConstrained()
-	 * @see #unsetConstrained()
-	 * @see #setConstrained(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Constrained()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isConstrained();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constrained</em>' attribute.
-	 * @see #isSetConstrained()
-	 * @see #unsetConstrained()
-	 * @see #isConstrained()
-	 * @generated
-	 */
-	void setConstrained(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetConstrained()
-	 * @see #isConstrained()
-	 * @see #setConstrained(boolean)
-	 * @generated
-	 */
-	void unsetConstrained();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Constrained</em>' attribute is set.
-	 * @see #unsetConstrained()
-	 * @see #isConstrained()
-	 * @see #setConstrained(boolean)
-	 * @generated
-	 */
-	boolean isSetConstrained();
-
-	/**
-	 * Returns the value of the '<em><b>Design Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Design Time</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If not set, then normal default processing.
-	 * 
-	 * If set true, then this property is a design time property. This means it will show up in the property sheet, but it won't be able to be connected to at runtime. It may not even be a true bean property but instead the builder will know how to handle it.
-	 * 
-	 * If set false, then this property will not show up on the property sheet, but will be able to be connected to for runtime.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Design Time</em>' attribute.
-	 * @see #isSetDesignTime()
-	 * @see #unsetDesignTime()
-	 * @see #setDesignTime(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_DesignTime()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isDesignTime();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Design Time</em>' attribute.
-	 * @see #isSetDesignTime()
-	 * @see #unsetDesignTime()
-	 * @see #isDesignTime()
-	 * @generated
-	 */
-	void setDesignTime(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDesignTime()
-	 * @see #isDesignTime()
-	 * @see #setDesignTime(boolean)
-	 * @generated
-	 */
-	void unsetDesignTime();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Design Time</em>' attribute is set.
-	 * @see #unsetDesignTime()
-	 * @see #isDesignTime()
-	 * @see #setDesignTime(boolean)
-	 * @generated
-	 */
-	boolean isSetDesignTime();
-
-	/**
-	 * Returns the value of the '<em><b>Always Incompatible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Always Incompatible</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If set true, then when multiple objects are selected, this property is always incompatible with each other. So in this case the property will not show up on the property sheet if more than one object has been selected.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Always Incompatible</em>' attribute.
-	 * @see #setAlwaysIncompatible(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_AlwaysIncompatible()
-	 * @model
-	 * @generated
-	 */
-	boolean isAlwaysIncompatible();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Always Incompatible</em>' attribute.
-	 * @see #isAlwaysIncompatible()
-	 * @generated
-	 */
-	void setAlwaysIncompatible(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Filter Flags</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Filter Flags</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Filter Flags</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_FilterFlags()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getFilterFlags();
-
-	/**
-	 * Returns the value of the '<em><b>Field Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Is this field read-only (i.e. is a "final" field). This is only referenced if the field reference is set.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field Read Only</em>' attribute.
-	 * @see #setFieldReadOnly(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_FieldReadOnly()
-	 * @model
-	 * @generated
-	 */
-	boolean isFieldReadOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field Read Only</em>' attribute.
-	 * @see #isFieldReadOnly()
-	 * @generated
-	 */
-	void setFieldReadOnly(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Property Editor Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Property Editor Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Property Editor Class</em>' reference.
-	 * @see #setPropertyEditorClass(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_PropertyEditorClass()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getPropertyEditorClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Property Editor Class</em>' reference.
-	 * @see #getPropertyEditorClass()
-	 * @generated
-	 */
-	void setPropertyEditorClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Read Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Read Method</em>' reference.
-	 * @see #isSetReadMethod()
-	 * @see #unsetReadMethod()
-	 * @see #setReadMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_ReadMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getReadMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Method</em>' reference.
-	 * @see #isSetReadMethod()
-	 * @see #unsetReadMethod()
-	 * @see #getReadMethod()
-	 * @generated
-	 */
-	void setReadMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetReadMethod()
-	 * @see #getReadMethod()
-	 * @see #setReadMethod(Method)
-	 * @generated
-	 */
-	void unsetReadMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Read Method</em>' reference is set.
-	 * @see #unsetReadMethod()
-	 * @see #getReadMethod()
-	 * @see #setReadMethod(Method)
-	 * @generated
-	 */
-	boolean isSetReadMethod();
-
-	/**
-	 * Returns the value of the '<em><b>Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Write Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Write Method</em>' reference.
-	 * @see #isSetWriteMethod()
-	 * @see #unsetWriteMethod()
-	 * @see #setWriteMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_WriteMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getWriteMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Write Method</em>' reference.
-	 * @see #isSetWriteMethod()
-	 * @see #unsetWriteMethod()
-	 * @see #getWriteMethod()
-	 * @generated
-	 */
-	void setWriteMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetWriteMethod()
-	 * @see #getWriteMethod()
-	 * @see #setWriteMethod(Method)
-	 * @generated
-	 */
-	void unsetWriteMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Write Method</em>' reference is set.
-	 * @see #unsetWriteMethod()
-	 * @see #getWriteMethod()
-	 * @see #setWriteMethod(Method)
-	 * @generated
-	 */
-	boolean isSetWriteMethod();
-
-	/**
-	 * Returns the value of the '<em><b>Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If this is set, then this property is a field and not a getter/setter property. This is an extension that the Visual Editor uses to the BeanInfo model.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field</em>' reference.
-	 * @see #isSetField()
-	 * @see #unsetField()
-	 * @see #setField(Field)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Field()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Field getField();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field</em>' reference.
-	 * @see #isSetField()
-	 * @see #unsetField()
-	 * @see #getField()
-	 * @generated
-	 */
-	void setField(Field value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetField()
-	 * @see #getField()
-	 * @see #setField(Field)
-	 * @generated
-	 */
-	void unsetField();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Field</em>' reference is set.
-	 * @see #unsetField()
-	 * @see #getField()
-	 * @see #setField(Field)
-	 * @generated
-	 */
-	boolean isSetField();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Get the property type.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EClassifier getPropertyType();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * This property type is not persisted if this class is serialized into an XMI file. Nor is 
-	 * it a property that can be set from an XMI file. It is an operation. It is used by
-	 * clients which want a PropertyDecorator that is not part of a BeanInfo model.
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Set the property type.
-	 * <!-- end-model-doc -->
-	 * @model
-	 * @generated
-	 */
-	void setPropertyType(EClassifier propertyType);
-
-	/**
-	 * @return boolean for whether this property is writeable or not
-	 * It could have a write method or it could have a field (e.g. java.awt.Insets.top)
-	 */
-	boolean isWriteable();
-
-	/**
-	 * @return boolean for whether this property is readable or not
-	 * It could have a read method or it could have a field (e.g. java.awt.Insets.top)
-	 */
-	boolean isReadable();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java
deleted file mode 100644
index 2b49711d4..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java
+++ /dev/null
@@ -1,31 +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.jem.internal.beaninfo.adapters;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class BeanInfoAdapterMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.beaninfo.adapters.messages";//$NON-NLS-1$
-
-	private BeanInfoAdapterMessages() {
-		// Do not instantiate
-	}
-
-	public static String INTROSPECT_FAILED_EXC_;
-	public static String BeaninfoClassAdapter_ClassNotFound;
-	public static String BeaninfoNature_InvalidProject;
-	public static String UICreateRegistryJobHandler_StartBeaninfoRegistry;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, BeanInfoAdapterMessages.class);
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java
deleted file mode 100644
index 85d65f9cc..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java
+++ /dev/null
@@ -1,1457 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.change.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.*;
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
-import org.eclipse.jem.internal.beaninfo.core.Utilities;
-import org.eclipse.jem.internal.beaninfo.impl.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-
-/**
- * This is a utility class for handling the BeanInfo decorators with respect to the overrides (explicit settings) vs. introspected/reflected (implicit
- * settings) It handles the transmission of data from the VM for introspection.
- * @since 1.1.0
- */
-public class BeanInfoDecoratorUtility {
-
-	/**
-	 * Clear out the implicit settings for FeatureDecorator.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(FeatureDecorator decor) {
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT) != 0)
-			decor.unsetDisplayName();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT) != 0)
-			decor.unsetShortDescription();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category());
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT) != 0)
-			decor.unsetExpert();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT) != 0)
-			decor.unsetHidden();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT) != 0)
-			decor.unsetPreferred();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT) != 0) {
-			for (Iterator itr = decor.getAttributes().listIterator(); itr.hasNext();) {
-				FeatureAttributeMapEntryImpl entry = (FeatureAttributeMapEntryImpl)itr.next();
-				if (entry.getTypedValue().isImplicitValue()) {
-					itr.remove();
-				}
-			}
-		}	
-		decor
-				.setImplicitlySetBits(implicitSettings
-						& ~(FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT | FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT
-								| FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT | FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT
-								| FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT | FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT | FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT));
-	}
-
-	/**
-	 * Clear out the implicit settings for BeanDecorator
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(BeanDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass());
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT) != 0)
-			decor.unsetMergeSuperProperties();
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT) != 0)
-			decor.unsetMergeSuperMethods();
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT) != 0)
-			decor.unsetMergeSuperEvents();
-		if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames()))
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames()); // Just clear them. This is our attribute. It should
-																							   // not be set overrides.
-		if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames()))
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames()); // Just clear them. This is our attribute. It should
-																							   // not be set overrides.
-		if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames()))
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames()); // Just clear them. This is our attribute. It should not
-																							// be set overrides.
-
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT | BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT
-						| BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT | BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT));
-	}
-
-	/**
-	 * Clear out the implicit settings of the PropertyDecorator.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(PropertyDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass());
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT) != 0)
-			decor.unsetReadMethod();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT) != 0)
-			decor.unsetWriteMethod();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT) != 0) {
-			decor.unsetField();		
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getPropertyDecorator_Field());
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT) != 0)
-			decor.unsetBound();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT) != 0)
-			decor.unsetConstrained();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT) != 0)
-			decor.unsetDesignTime();
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT | PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT
-						| PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT | PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT
-						| PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT | PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT));
-	}
-
-	/**
-	 * Clear out the implicit settings of the IndexedPropertyDecorator.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(IndexedPropertyDecorator decor) {
-		clear((PropertyDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT) != 0)
-			decor.unsetIndexedReadMethod();
-		if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT) != 0)
-			decor.unsetIndexedWriteMethod();
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT | IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT));
-	}
-
-	/**
-	 * Clear the method decorator of any implicit settings.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(MethodDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & (MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT | MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT)) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc());
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT | MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT));
-	}
-
-	/**
-	 * Clear the event set decorator of any implicit settings.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(EventSetDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod());
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass());
-		if ((implicitSettings & (EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT)) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd());
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod());
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT) != 0)
-			decor.unsetInDefaultEventSet();
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT) != 0)
-			decor.unsetUnicast();
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType());
-
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT | EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT
-						| EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT
-						| EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT | EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT
-						| EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT));
-
-	}
-
-	public static void introspect(IBeanProxy modelBeaninfoProxy, IntrospectCallBack callback) {
-		ProxyIntrospectCallBack cb = new ProxyIntrospectCallBack(callback);
-		modelBeaninfoProxy.getProxyFactoryRegistry().getCallbackRegistry().registerCallback(modelBeaninfoProxy, cb);
-		try {
-			BeaninfoProxyConstants.getConstants(modelBeaninfoProxy.getProxyFactoryRegistry()).getSendBeanInfoProxy()
-					.invokeCatchThrowableExceptions(modelBeaninfoProxy);
-		} finally {
-			modelBeaninfoProxy.getProxyFactoryRegistry().getCallbackRegistry().deregisterCallback(modelBeaninfoProxy);
-		}
-
-	}
-
-	/**
-	 * This call back is for each requested type of record. It allows the callee to process this record.
-	 * 
-	 * @since 1.1.0
-	 */
-	public interface IntrospectCallBack {
-
-		/**
-		 * Process the BeanDecoratorRecord. The callee can decide what needs to be done with this record. It would return the BeandDecorator that needs
-		 * to have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return BeanDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-		public BeanDecorator process(BeanRecord record);
-
-		/**
-		 * Process the PropertyRecord. The callee can decide what needs to be done with this record. It would return the PropertyDecorator that needs
-		 * to have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return PropertyDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-		public PropertyDecorator process(PropertyRecord record);
-
-		/**
-		 * Process the IndexedPropertyRecord. The callee can decide what needs to be done with this record. It would return the
-		 * IndexedPropertyDecorator that needs to have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * 
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return PropertyDecorator to be applied to, or <code>null</code> if record is to be ignored. There is a possibility that a straight
-		 *         PropertyDecorator can be returned instead (in the case that it was explictly set by overrides as a property but beaninfo thinks it
-		 *         is an index. This can be handled by it will only set the PropertyRecord part. It normally should be an IndexedPropertyDecorator
-		 *         returned.
-		 * 
-		 * @since 1.1.0
-		 */
-		public PropertyDecorator process(IndexedPropertyRecord record);
-
-		/**
-		 * Process the MethodRecord. The callee can decide what needs to be done with this record. It would return the MethodDecorator that needs to
-		 * have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * 
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return MethodDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-
-		public MethodDecorator process(MethodRecord record);
-
-		/**
-		 * Process the EventRecord. The callee can decide what needs to be done with this record. It would return the EventSetDecorator that needs to
-		 * have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * 
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return EventSetDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-
-		public EventSetDecorator process(EventSetRecord record);
-	}
-
-	private static class ProxyIntrospectCallBack implements ICallback {
-
-		private IntrospectCallBack introspectCallback;
-
-		public ProxyIntrospectCallBack(IntrospectCallBack introspectCallback) {
-			this.introspectCallback = introspectCallback;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, org.eclipse.jem.internal.proxy.core.IBeanProxy)
-		 */
-		public Object calledBack(int msgID, IBeanProxy parm) {
-			return null; // Not used.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, java.lang.Object)
-		 */
-		public Object calledBack(int msgID, Object parm) {
-			return null; // Not used.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, java.lang.Object[])
-		 */
-		public Object calledBack(int msgID, Object[] parms) {
-			return null; // Not used.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, java.io.InputStream)
-		 */
-		public void calledBackStream(int msgID, InputStream is) {
-			ObjectInputStream ois;
-			try {
-				ois = new ObjectInputStream(is);
-				while (true) {
-					int cmdId = ois.readInt();
-					switch (cmdId) {
-						case IBeanInfoIntrospectionConstants.BEAN_DECORATOR_SENT:
-							try {
-								BeanRecord br = (BeanRecord) ois.readObject();
-								BeanDecorator bd = introspectCallback.process(br);
-								if (bd != null) {
-									clear(bd);
-									applyRecord(bd, br);
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							}
-							break;
-						case IBeanInfoIntrospectionConstants.PROPERTY_DECORATORS_SENT:
-							try {
-								int propCount = ois.readInt();
-								for (int i = 0; i < propCount; i++) {
-									PropertyRecord pr = (PropertyRecord) ois.readObject();
-									if (pr.getClass() == IndexedPropertyRecord.class) {
-										IndexedPropertyRecord ipr = (IndexedPropertyRecord) pr;
-										PropertyDecorator ip = introspectCallback.process(ipr);
-										if (ip != null) {
-											// It actually could be either a property decorator or an indexed property decorator. This could happen
-											// because the overrides file has explicitly declared a PropertyDecorator, so we can't change it to an
-											// Indexed.
-											// So in that case we can only fill the property part.
-											if (ip.eClass().getClassifierID() == BeaninfoPackage.INDEXED_PROPERTY_DECORATOR)
-												applyRecord((IndexedPropertyDecorator) ip, ipr);
-											else
-												applyRecord(ip, pr); // It was forced to be a property and not indexed.
-										}
-									} else {
-										PropertyDecorator p = introspectCallback.process(pr);
-										if (p != null) {
-											// It actually could be either a property decorator or an indexed property decorator. This could happen
-											// because the overrides file has explicitly declared an IndexedPropertyDecorator, so we can't change it
-											// to an
-											// Property.
-											// So in that case we can only fill the property part.
-											applyRecord(p, pr);
-										}
-									}
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								// In case we got bad data sent in.
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} finally {
-							}
-							break;
-
-						case IBeanInfoIntrospectionConstants.METHOD_DECORATORS_SENT:
-							try {
-								int opCount = ois.readInt();
-								for (int i = 0; i < opCount; i++) {
-									MethodRecord mr = (MethodRecord) ois.readObject();
-									MethodDecorator m = introspectCallback.process(mr);
-									if (m != null)
-										applyRecord(m, mr);
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								// In case we got bad data sent in.
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							}
-							break;
-
-						case IBeanInfoIntrospectionConstants.EVENT_DECORATORS_SENT:
-							try {
-								int opCount = ois.readInt();
-								for (int i = 0; i < opCount; i++) {
-									EventSetRecord evr = (EventSetRecord) ois.readObject();
-									EventSetDecorator e = introspectCallback.process(evr);
-									if (e != null)
-										applyRecord(e, evr);
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								// In case we got bad data sent in.
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							}
-							break;
-
-						case IBeanInfoIntrospectionConstants.DONE:
-							return;	// Good. This is a good stop.
-							
-						default:
-							return;	// This is invalid. Should of gotton something.
-					}
-				}
-			} catch (IOException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			}
-		}
-	}
-
-	/**
-	 * Apply the feature record to the feature decorator. This is protected because this is an abstract and should never be called by itself.
-	 * <p>
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void applyRecord(FeatureDecorator decor, FeatureRecord record) {
-		// Subclasses will clear their decor, which will automatically clear the FeatureDecor part for us.
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.displayName != null && !decor.isSetDisplayName()) {
-			decor.setDisplayName(record.displayName);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT;
-		}
-		if (record.shortDescription != null && !decor.isSetShortDescription()) {
-			decor.setShortDescription(record.shortDescription);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT;
-		}
-		if (record.category != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category())) {
-			decor.setCategory(record.category);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT;
-		}
-		if (!decor.isSetExpert()) {
-			if (decor.isExpert() != record.expert)
-				decor.setExpert(record.expert); // Don't want to explicitly set it if it is equal to default (this will put less out to the cache file
-												// and so will parse and apply faster).
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT;
-		}
-		if (!decor.isSetHidden()) {
-			if (decor.isHidden() != record.hidden)
-				decor.setHidden(record.hidden);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT;
-		}
-		if (!decor.isSetPreferred()) {
-			if (decor.isPreferred() != record.preferred)
-				decor.setPreferred(record.preferred);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT;
-		}
-		if (record.attributeNames != null && !decor.isAttributesExplicitEmpty()) {
-			// This is a list, so we need to read an fill in.
-			EMap attrs = decor.getAttributes();
-			for (int i = 0; i < record.attributeNames.length; i++) {
-				FeatureAttributeMapEntryImpl entry = (FeatureAttributeMapEntryImpl) ((BeaninfoFactoryImpl) BeaninfoFactory.eINSTANCE)
-						.createFeatureAttributeMapEntry();
-				entry.setTypedKey(record.attributeNames[i]);
-				FeatureAttributeValue fv = record.attributeValues[i];
-				fv.setImplicitValue(true);
-				entry.setTypedValue(fv);
-				attrs.add(entry);
-			}
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT;
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the bean record to the bean decorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(BeanDecorator decor, BeanRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.customizerClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass())) {
-			decor.setCustomizerClass(createJavaClassProxy(record.customizerClassName));
-			implicitSettings |= BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT;
-		}
-		if (!decor.isSetMergeSuperProperties()) {
-			if (decor.isMergeSuperProperties() != record.mergeInheritedProperties)
-				decor.setMergeSuperProperties(record.mergeInheritedProperties);
-			implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT;
-		}
-		if (!decor.isSetMergeSuperMethods()) {
-			if (decor.isMergeSuperMethods() != record.mergeInheritedOperations)
-				decor.setMergeSuperMethods(record.mergeInheritedOperations);
-			implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT;
-		}
-		if (!decor.isSetMergeSuperEvents()) {
-			if (decor.isMergeSuperEvents() != record.mergeInheritedEvents)
-				decor.setMergeSuperEvents(record.mergeInheritedEvents);
-			implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT;
-		}
-		if (record.notInheritedPropertyNames != null) {
-			// This is always applied. This isn't a client override so we can just slam it.
-			decor.getNotInheritedPropertyNames().addAll(Arrays.asList(record.notInheritedPropertyNames));
-		}
-		if (record.notInheritedOperationNames != null) {
-			// This is always applied. This isn't a client override so we can just slam it.
-			decor.getNotInheritedMethodNames().addAll(Arrays.asList(record.notInheritedOperationNames));
-		}
-		if (record.notInheritedEventNames != null) {
-			// This is always applied. This isn't a client override so we can just slam it.
-			decor.getNotInheritedEventNames().addAll(Arrays.asList(record.notInheritedEventNames));
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the PropertyRecord to the PropertyDecorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(PropertyDecorator decor, PropertyRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		applyOnly(decor, record);
-	}
-
-	/*
-	 * Apply only to property decorator part. Allows IndexedProperty to apply just the Property part and not do duplicate work
-	 */
-	private static void applyOnly(PropertyDecorator decor, PropertyRecord record) {
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.propertyEditorClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass())) {
-			decor.setPropertyEditorClass(createJavaClassProxy(record.propertyEditorClassName));
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT;
-		}
-		if (record.readMethod != null && !decor.isSetReadMethod()) {
-			decor.setReadMethod(createJavaMethodProxy(record.readMethod));
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT;
-		}
-		if (record.writeMethod != null && !decor.isSetWriteMethod()) {
-			decor.setWriteMethod(createJavaMethodProxy(record.writeMethod));
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT;
-		}
-		if (record.field != null && !decor.isSetField()) {
-			decor.setField(createJavaFieldProxy(record.field));
-			if (decor.isFieldReadOnly() != record.field.readOnly)
-				decor.setFieldReadOnly(record.field.readOnly);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT;
-		}		
-		if (!decor.isSetBound()) {
-			if (decor.isBound() != record.bound)
-				decor.setBound(record.bound);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
-		}
-		if (!decor.isSetConstrained()) {
-			if (decor.isConstrained() != record.constrained)
-				decor.setConstrained(record.constrained);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT;
-		}
-		if (record.designTime != null && !decor.isSetDesignTime()) {
-			// Design time is slightly different than the other booleans because
-			// explicitly set to true/false is important versus not explicitly set at all (which is false).
-			decor.setDesignTime(record.designTime.booleanValue());
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT;
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-
-	}
-
-	public static void applyRecord(IndexedPropertyDecorator decor, IndexedPropertyRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-		applyOnly(decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.indexedReadMethod != null && !decor.isSetIndexedReadMethod()) {
-			decor.setIndexedReadMethod(createJavaMethodProxy(record.indexedReadMethod));
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT;
-		}
-		if (record.indexedWriteMethod != null && !decor.isSetIndexedWriteMethod()) {
-			decor.setIndexedWriteMethod(createJavaMethodProxy(record.indexedWriteMethod));
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT;
-		}
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the method record to the method decorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(MethodDecorator decor, MethodRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.parameters != null && !decor.isParmsExplicitEmpty()
-				&& !decor.eIsSet(BeaninfoPackage.eINSTANCE.getMethodDecorator_ParameterDescriptors())) {
-			// This is a list, so we need to read an fill in.
-			List parms = decor.getSerParmDesc(); // So as not to have it implicitly fill it in, which it would if we called getParameterDescriptors.
-			for (int i = 0; i < record.parameters.length; i++) {
-				ParameterDecorator parm = BeaninfoFactory.eINSTANCE.createParameterDecorator();
-				applyRecord(parm, record.parameters[i]);
-				parms.add(parm);
-			}
-			implicitSettings |= MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT;
-			implicitSettings &= ~MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT; // Should of already been cleared, but be safe.
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	public static void applyRecord(ParameterDecorator decor, ParameterRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.name != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getParameterDecorator_Name())) {
-			decor.setName(record.name);
-			implicitSettings |= ParameterDecoratorImpl.PARAMETER_NAME_IMPLICIT;
-		}
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the event set record to the event set decorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(EventSetDecorator decor, EventSetRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.addListenerMethod != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod())) {
-			decor.setAddListenerMethod(createJavaMethodProxy(record.addListenerMethod));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT;
-		}
-		if (record.eventAdapterClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass())) {
-			decor.setEventAdapterClass(createJavaClassProxy(record.eventAdapterClassName));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT;
-		}
-		if (record.listenerMethodDescriptors != null && !decor.isListenerMethodsExplicitEmpty()
-				&& !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerMethods())) {
-			List methods = decor.getSerListMthd(); // So as not to have it implicitly fill it in, which it would if we called getListenerMethods.
-			for (int i = 0; i < record.listenerMethodDescriptors.length; i++) {
-				BeaninfoFactory bfact = BeaninfoFactory.eINSTANCE;
-				MethodRecord mr = record.listenerMethodDescriptors[i];
-				Method method = createJavaMethodProxy(mr.methodForDescriptor);
-				// We need a method proxy, and a method decorator.
-				MethodProxy mproxy = bfact.createMethodProxy();
-				mproxy.setMethod(method);
-				mproxy.setName(mr.name);
-				MethodDecorator md = bfact.createMethodDecorator();
-				applyRecord(md, mr);
-				mproxy.getEAnnotations().add(md);
-				methods.add(mproxy);
-			}
-			implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT;
-			implicitSettings &= ~EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT; // Should of already been cleared, but be safe.
-		}
-		if (record.listenerTypeName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType())) {
-			decor.setListenerType(createJavaClassProxy(record.listenerTypeName));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT;
-		}
-		if (record.removeListenerMethod != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod())) {
-			decor.setRemoveListenerMethod(createJavaMethodProxy(record.removeListenerMethod));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT;
-		}
-		if (!decor.isSetInDefaultEventSet()) {
-			if (record.inDefaultEventSet != decor.isInDefaultEventSet())
-				decor.setInDefaultEventSet(record.inDefaultEventSet);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT;
-		}
-		if (!decor.isSetUnicast()) {
-			if (record.unicast != decor.isUnicast())
-				decor.setUnicast(record.unicast);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT;
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Create a java class proxy for the given name. By being a proxy we don't need to actually have the resource set. Nor do we need to fluff one up
-	 * until someone actually asks for it.
-	 * <p>
-	 * The jniName must refer to a JavaClass or errors could occur later on.
-	 * 
-	 * @param jniName
-	 *            classname in JNI format.
-	 * @return JavaClass proxy or <code>null</code> if not a java class (it may be a type).
-	 * 
-	 * @since 1.1.0
-	 */
-	public static JavaClass createJavaClassProxy(String jniName) {
-		JavaHelpers jh = createJavaTypeProxy(jniName);
-		return jh instanceof JavaClass ? (JavaClass) jh : null;
-	}
-
-	/**
-	 * Create a JavaHelpers proxy for the given name. By being a proxy we don't need to actually have the resource set. Nor do we need to fluff one up
-	 * until someone actually asks for it.
-	 * 
-	 * @param jniName
-	 *            typename in JNI format.
-	 * @return JavaHelper proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static JavaHelpers createJavaTypeProxy(String jniName) {
-		String formalName = MapJNITypes.getFormalTypeName(jniName);
-
-		URI uri = Utilities.getJavaClassURI(formalName);
-		JavaHelpers jh = null;
-		if (MapJNITypes.isFormalTypePrimitive(formalName))
-			jh = JavaRefFactory.eINSTANCE.createJavaDataType();
-		else
-			jh = JavaRefFactory.eINSTANCE.createJavaClass();
-		((InternalEObject) jh).eSetProxyURI(uri);
-		return jh;
-	}
-
-	public static Method createJavaMethodProxy(ReflectMethodRecord method) {
-		String[] parmTypes = method.parameterTypeNames != null ? new String[method.parameterTypeNames.length] : null;
-		if (parmTypes != null)
-			for (int i = 0; i < method.parameterTypeNames.length; i++) {
-				parmTypes[i] = MapJNITypes.getFormalTypeName(method.parameterTypeNames[i]);
-			}
-		URI uri = Utilities.getMethodURI(MapJNITypes.getFormalTypeName(method.className), method.methodName, parmTypes);
-		Method methodEMF = JavaRefFactory.eINSTANCE.createMethod();
-		((InternalEObject) methodEMF).eSetProxyURI(uri);
-		return methodEMF;
-	}
-	
-	public static Field createJavaFieldProxy(ReflectFieldRecord field) {
-		URI uri = Utilities.getFieldURI(MapJNITypes.getFormalTypeName(field.className), field.fieldName);
-		Field fieldEMF = JavaRefFactory.eINSTANCE.createField();
-		((InternalEObject) fieldEMF).eSetProxyURI(uri);
-		return fieldEMF;
-	}	
-
-	/**
-	 * Set the properties on the PropertyDecorator. These come from reflection. Since this is a private interface between BeaninfoClassAdapter and
-	 * this class, not all possible settings need to be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already
-	 * been done so that there are no old implicit settings. It will check if properties are set already before setting so that don't wipe out
-	 * explicit settings.
-	 * 
-	 * @param prop
-	 * @param bound
-	 * @param constrained
-	 * @param getter
-	 * @param setter
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void setProperties(PropertyDecorator prop, boolean bound, boolean constrained, Method getter, Method setter) {
-		long implicitSettings = prop.getImplicitlySetBits();
-		if (getter != null && !prop.isSetReadMethod()) {
-			prop.setReadMethod(getter);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT;
-		}
-		if (setter != null && !prop.isSetWriteMethod()) {
-			prop.setWriteMethod(setter);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT;
-		}
-		if (!prop.isSetBound()) {
-			if (prop.isBound() != bound)
-				prop.setBound(bound);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
-		}
-		if (!prop.isSetConstrained()) {
-			if (prop.isConstrained() != constrained)
-				prop.setConstrained(constrained);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT;
-		}
-		prop.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Set the properties on the IndexedPropertyDecorator. These come from reflection. It is only the indexed portion. The base property portion
-	 * should have already been set. Since this is a private interface between BeaninfoClassAdapter and this class, not all possible settings need to
-	 * be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already been done so that there are no old implicit
-	 * settings. It will check if properties are set already before setting so that don't wipe out explicit settings.
-	 * 
-	 * @param prop
-	 * @param indexedGetter
-	 * @param indexedSetter
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void setProperties(IndexedPropertyDecorator prop, Method indexedGetter, Method indexedSetter) {
-		long implicitSettings = prop.getImplicitlySetBits();
-		if (indexedGetter != null && !prop.isSetIndexedReadMethod()) {
-			prop.setIndexedReadMethod(indexedGetter);
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT;
-		}
-		if (indexedSetter != null && !prop.isSetIndexedWriteMethod()) {
-			prop.setIndexedWriteMethod(indexedSetter);
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT;
-		}
-		prop.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Set the properties on the EventSetDecorator. These come from reflection. Since this is a private interface between BeaninfoClassAdapter and
-	 * this class, not all possible settings need to be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already
-	 * been done so that there are no old implicit settings. It will check if properties are set already before setting so that don't wipe out
-	 * explicit settings.
-	 * 
-	 * @param event
-	 * @param bound
-	 * @param constrained
-	 * @param getter
-	 * @param setter
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void setProperties(EventSetDecorator event, Method addListenerMethod, Method removeListenerMethod, boolean unicast,
-			JavaClass listenerType) {
-		long implicitSettings = event.getImplicitlySetBits();
-		if (addListenerMethod != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod())) {
-			event.setAddListenerMethod(addListenerMethod);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT;
-		}
-		if (removeListenerMethod != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod())) {
-			event.setRemoveListenerMethod(removeListenerMethod);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT;
-		}
-		if (!event.isSetUnicast()) {
-			if (event.isUnicast() != unicast)
-				event.setUnicast(unicast);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
-		}
-		if (listenerType != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType())) {
-			event.setListenerType(listenerType);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT;
-		}
-
-		event.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Build the appropriate change record for the bean decorator. Either it is an add of a new bean decorator or it is the setting of the implicit
-	 * settings on an non-implicit bean decorator.
-	 * @param cd
-	 * @param bd
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, BeanDecorator bd) {
-		// Only do anything if merge introspection. If no merge introspection, then there is no change needed.
-		if (bd.isMergeIntrospection()) {
-			if (bd.getImplicitDecoratorFlag() != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-				// It is implicit, so do an add to end, new value.
-				doAddToEnd(cd, getFeatureChangeList(cd, bd.getEModelElement()), EcorePackage.eINSTANCE.getEModelElement_EAnnotations(), bd, true);
-			} else {
-				// Just do sets on implicit changed ones
-				buildNonImplicitChange(cd, getFeatureChangeList(cd, bd), bd);
-			}
-		}
-
-	}
-
-	/**
-	 * Build the appropriate change record for the property decorator. Either it is an add of a new property decorator or it is the setting of the implicit
-	 * settings on an non-implicit property decorator. The same is true of the feature that it decorates. It may be new or it may be an existing one.
-	 * @param cd
-	 * @param pd
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, PropertyDecorator pd) {
-		// Only do changes if merge introspection. If not merging, then there are no changes.
-		if (pd.isMergeIntrospection()) {
-			boolean indexed = pd.eClass().getClassifierID() == BeaninfoPackage.INDEXED_PROPERTY_DECORATOR;
-			EStructuralFeature feature = (EStructuralFeature) pd.getEModelElement();
-			switch (pd.getImplicitDecoratorFlag().getValue()) {
-				case ImplicitItem.IMPLICIT_DECORATOR:
-					// The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
-					List fcs = getFeatureChangeList(cd, feature);
-					doAddToEnd(cd, fcs, pd.eContainingFeature(), pd, true);
-					buildNonImplicitChange(cd, fcs, feature, indexed);
-					break;
-				case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
-					// The decorator AND feature are implicit. Just clone them and add to the class.
-					doAddToEnd(cd, getFeatureChangeList(cd, feature.eContainer()), feature.eContainingFeature(), feature, true);
-					break;
-				case ImplicitItem.NOT_IMPLICIT:
-					// Neither the feature nor the decorator are implicit. So need to do applies against them.
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, pd), pd, indexed);
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, feature), feature, indexed);
-					break;
-			}
-		}
-	}
-	
-	/**
-	 * Build the appropriate change record for the event set decorator. Either it is an add of a new event set decorator or it is the setting of the implicit
-	 * settings on an non-implicit event set decorator. The same is true of the feature that it decorates. It may be new or it may be an existing one.
-	 * @param cd
-	 * @param ed
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, EventSetDecorator ed) {
-		// Only build changes if merge introspection. If not merge then there are no changes.
-		if (ed.isMergeIntrospection()) {
-			JavaEvent event = (JavaEvent) ed.getEModelElement();
-			switch (ed.getImplicitDecoratorFlag().getValue()) {
-				case ImplicitItem.IMPLICIT_DECORATOR:
-					// The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
-					List fcs = getFeatureChangeList(cd, event);
-					doAddToEnd(cd, fcs, ed.eContainingFeature(), ed, true);
-					buildNonImplicitChange(cd, fcs, event);
-					break;
-				case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
-					// The decorator AND feature are implicit. Just clone them and add to the class.
-					doAddToEnd(cd, getFeatureChangeList(cd, event.eContainer()), event.eContainingFeature(), event, true);
-					break;
-				case ImplicitItem.NOT_IMPLICIT:
-					// Neither the feature nor the decorator are implicit. So need to do applies against them.
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, ed), ed);
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, event), event);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Build the appropriate change record for the method decorator. Either it is an add of a new method decorator or it is the setting of the implicit
-	 * settings on an non-implicit method decorator. The same is true of the operation that it decorates. It may be new or it may be an existing one.
-	 * @param cd
-	 * @param md
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, MethodDecorator md) {
-		// Only do any builds if merge introspection. If not merge introspection then nothing should be changed.
-		if (md.isMergeIntrospection()) {
-			EOperation oper = (EOperation) md.getEModelElement();
-			switch (md.getImplicitDecoratorFlag().getValue()) {
-				case ImplicitItem.IMPLICIT_DECORATOR:
-					// The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
-					List fcs = getFeatureChangeList(cd, oper);
-					doAddToEnd(cd, fcs, md.eContainingFeature(), md, true);
-					buildNonImplicitChange(cd, fcs, oper);
-					break;
-				case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
-					// The decorator AND feature are implicit. Just clone them and add to the class.
-					doAddToEnd(cd, getFeatureChangeList(cd, oper.eContainer()), oper.eContainingFeature(), oper, true);
-					break;
-				case ImplicitItem.NOT_IMPLICIT:
-					// Neither the feature nor the decorator are implicit. So need to do applies against them.
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, md), md);
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, oper), oper);
-					break;
-			}
-		}
-	}
-	
-	private final static Integer ZERO = new Integer(0);
-	private final static Integer ONE = new Integer(1);
-	private final static Integer MINUS_ONE = new Integer(-1);
-	
-	/**
-	 * Build the non-implicit changes into the feature. This creates changes for the implicit settings
-	 * that always occur for a property decorator.
-	 *  
-	 * @param cd
-	 * @param fcs FeatureChanges list for the feature.
-	 * @param feature
-	 * @param indexed <code>true</code> if this is for an indexed feature.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EStructuralFeature feature, boolean indexed) {
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), feature.getName(), false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Transient(), Boolean.FALSE, false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Volatile(), Boolean.FALSE, false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Changeable(), Boolean.valueOf(feature.isChangeable()), false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_EType(), feature.getEType(), false);
-		if (!indexed) {
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_LowerBound(), ZERO, false);
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_UpperBound(), ONE, false);
-		} else {
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_LowerBound(), ZERO, false);
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_UpperBound(), MINUS_ONE, false);
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_Unique(), Boolean.TRUE, false);
-		}
-	}
-
-	/**
-	 * Build the non-implicit changes into the event. This creates changes for the implicit settings
-	 * that always occur for an event set decorator.
-	 *  
-	 * @param cd
-	 * @param fcs FeatureChanges list for the feature.
-	 * @param event
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, JavaEvent event) {
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), event.getName(), false);
-	}
-
-	/**
-	 * Build the non-implicit changes into the operation. This creates changes for the implicit settings
-	 * that always occur for an method decorator.
-	 *  
-	 * @param cd
-	 * @param fcs FeatureChanges list for the feature.
-	 * @param oper
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EOperation oper) {
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), oper.getName(), false);
-		try {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getMethodProxy_Method(), ((MethodProxy) oper).getMethod(), false);	// This is a method that is not in this resource, so no clone.
-		} catch (ClassCastException e) {
-			// It will be a MethodProxy 99.9% of the time, so save by not doing instanceof.
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit feature decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, FeatureDecorator decor) {
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (implicitSettings != 0)
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_ImplicitlySetBits(), new Long(implicitSettings), false);
-		
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_DisplayName(), decor.getDisplayName(), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_ShortDescription(), decor.getShortDescription(), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category(), decor.getCategory(), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT) != 0 && decor.isSetExpert()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Expert(), Boolean.valueOf(decor.isExpert()), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT) != 0 && decor.isSetHidden()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Hidden(), Boolean.valueOf(decor.isHidden()), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT) != 0 && decor.isSetPreferred()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Preferred(), Boolean.valueOf(decor.isPreferred()), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT) != 0) {
-			for (Iterator itr = decor.getAttributes().listIterator(); itr.hasNext();) {
-				FeatureAttributeMapEntryImpl entry = (FeatureAttributeMapEntryImpl)itr.next();
-				if (entry.getTypedValue().isImplicitValue()) {
-					doAddToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Attributes(), entry, true);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit bean decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, BeanDecorator decor) {
-		buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass(), decor.getCustomizerClass(), false); // Customizer class is
-																															 // not in this resource,
-																															 // so we don't clone it.
-		}
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT) != 0 && decor.isSetMergeSuperProperties()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperProperties(), Boolean.valueOf(decor.isMergeSuperProperties()), false);
-		}
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT) != 0 && decor.isSetMergeSuperMethods()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperMethods(), Boolean.valueOf(decor.isMergeSuperMethods()), false);
-		}
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT) != 0 && decor.isSetMergeSuperEvents()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperEvents(), Boolean.valueOf(decor.isMergeSuperEvents()), false);
-		}
-		if (!decor.getNotInheritedPropertyNames().isEmpty()) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames(), decor.getNotInheritedPropertyNames(), false);
-		}
-		if (!decor.getNotInheritedMethodNames().isEmpty()) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames(), decor.getNotInheritedMethodNames(), false);
-		}
-		if (!decor.getNotInheritedEventNames().isEmpty()) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames(), decor.getNotInheritedEventNames(), false);
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit property decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * @param indexed <code>true</code> if this is an indexed property decorator.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, PropertyDecorator decor, boolean indexed) {
-		buildNonImplicitChange(cd, fcs, decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass(), decor.getPropertyEditorClass(), false); // Property Editor class is
-																															 // not in this resource,
-																															 // so we don't clone it.
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_ReadMethod(), decor.getReadMethod(), false); 
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_WriteMethod(), decor.getWriteMethod(), false); 
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Field(), decor.getField(), false); 
-			if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getPropertyDecorator_FieldReadOnly()))
-				doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_FieldReadOnly(), Boolean.valueOf(decor.isFieldReadOnly()), false);
-		}		
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT) != 0 && decor.isSetBound()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Bound(), Boolean.valueOf(decor.isBound()), false);
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT) != 0 && decor.isSetConstrained()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Constrained(), Boolean.valueOf(decor.isConstrained()), false);
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_DesignTime(), Boolean.valueOf(decor.isDesignTime()), false);
-		}
-		
-		if (indexed) {
-			IndexedPropertyDecorator ipd = (IndexedPropertyDecorator) decor;
-			if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT) != 0) {
-				doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator_IndexedReadMethod(), ipd.getIndexedReadMethod(), false); 
-			}
-			if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT) != 0) {
-				doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator_IndexedWriteMethod(), ipd.getIndexedWriteMethod(), false); 
-			}
-		}
-	}
-	
-	/**
-	 * Build up the changes for a non-implicit event set decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EventSetDecorator decor) {
-		buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod(), decor.getAddListenerMethod(), false); // listener method is
-																															 // not in this resource,
-																															 // so we don't clone it.
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass(), decor.getEventAdapterClass(), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT) != 0) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd(), decor.getSerListMthd(), true);	// These need to be cloned because they are contained here.
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType(), decor.getListenerType(), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod(), decor.getRemoveListenerMethod(), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT) != 0 && decor.isSetInDefaultEventSet()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_InDefaultEventSet(), Boolean.valueOf(decor.isInDefaultEventSet()), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT) != 0 && decor.isSetUnicast()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_Unicast(), Boolean.valueOf(decor.isUnicast()), false);
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit method decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, MethodDecorator decor) {
-		buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT) != 0) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc(), decor.getSerParmDesc(), true); 
-		}
-	}
-
-
-	/**
-	 * Get the feature change list for an object. Create it one if necessary.
-	 * 
-	 * @param cd
-	 * @param object
-	 * @return feature change list.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static List getFeatureChangeList(ChangeDescription cd, EObject object) {
-		List fcs = cd.getObjectChanges().get(object); // Get the feature changes if any.
-		if (fcs == null) {
-			Map.Entry entry = ChangeFactory.eINSTANCE.createEObjectToChangesMapEntry(object);
-			cd.getObjectChanges().add(entry);
-			fcs = (List) entry.getValue();
-		}
-		return fcs;
-	}
-
-	/**
-	 * Return the FeatureChange record for a feature wrt/object. Create one if necessary. If it creates it, it will mark it as "set". All of our
-	 * changes here are set kind of changes, not unset kind.
-	 * 
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 * @return feature change
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static FeatureChange getFeatureChange(List fcs, EStructuralFeature feature) {
-		if (!fcs.isEmpty()) {
-			for (int i = 0; i < fcs.size(); i++) {
-				FeatureChange fc = (FeatureChange) fcs.get(i);
-				if (fc.getFeature() == feature)
-					return fc;
-			}
-		}
-
-		// Either new object changes or no feature change found. Create one.
-		FeatureChange fc = ChangeFactory.eINSTANCE.createFeatureChange(feature, null, true);
-		fcs.add(fc);
-		return fc;
-	}
-
-	/**
-	 * Create a change for add to end of the given feature (must be isMany()). If newObject is true, then this means this is not a pointer to an
-	 * existing object and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known
-	 * about.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 *            the feature being added to.
-	 * @param addedValue
-	 *            the value being added.
-	 * @param newValue
-	 *            <code>true</code> if new object in the resource, a clone will be made. <code>false</code> if an existing object. Must be an
-	 *            EObject for cloning. Best if not true for non-eobjects.
-	 * @return the addedValue or the clone if it was cloned.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static Object doAddToEnd(ChangeDescription cd, List fcs, EStructuralFeature feature, Object addedValue, boolean newValue) {
-		FeatureChange fc = getFeatureChange(fcs, feature);
-		if (newValue) {
-			try {
-				addedValue = EcoreUtil.copy((EObject) addedValue);
-				cd.getObjectsToAttach().add((EObject)addedValue);
-			} catch (ClassCastException e) {
-				// Normally should not occur, but if it does, it means we can't clone, so don't clone.
-			}
-		}
-		List lcs = fc.getListChanges();
-		// Find the one with add and -1, i.e. add to end. There should only be one.
-		ListChange lc = null;
-		for (int i = 0; i < lcs.size(); i++) {
-			ListChange lca = (ListChange) lcs.get(i);
-			if (lca.getKind() == ChangeKind.ADD_LITERAL && lca.getIndex() == -1) {
-				lc = lca;
-				break;
-			}
-		}
-		if (lc == null) {
-			lc = ChangeFactory.eINSTANCE.createListChange();
-			lcs.add(lc);
-		}
-
-		lc.getValues().add(addedValue);
-		return addedValue;
-	}
-
-	/**
-	 * Create a change for add all to end of the given feature (must be isMany()). If newValue is true, then this means this is not a pointer to
-	 * existing objects and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known
-	 * about.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 *            the feature being added to.
-	 * @param addedValues
-	 *            the values being added.
-	 * @param newValue
-	 *            <code>true</code> if new objects in the resource, clones will be made. <code>false</code> if an existing object. Must be EObject
-	 *            for cloning. Best if not true for non-eobjects.
-	 * @return the addedValues or the clones if it was cloned.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static Object doAddAllToEnd(ChangeDescription cd, List fcs, EStructuralFeature feature, Collection addedValues, boolean newValue) {
-		FeatureChange fc = getFeatureChange(fcs, feature);
-		if (newValue) {
-			try {
-				addedValues = EcoreUtil.copyAll(addedValues);
-				cd.getObjectsToAttach().addAll(addedValues);
-			} catch (ClassCastException e) {
-				// Normally should not occur, but if it does, it means we can't clone, so don't clone.
-			}
-		}
-		List lcs = fc.getListChanges();
-		// Find the one with add and -1, i.e. add to end. There should only be one.
-		ListChange lc = null;
-		for (int i = 0; i < lcs.size(); i++) {
-			ListChange lca = (ListChange) lcs.get(i);
-			if (lca.getKind() == ChangeKind.ADD_LITERAL && lca.getIndex() == -1) {
-				lc = lca;
-				break;
-			}
-		}
-		if (lc == null) {
-			lc = ChangeFactory.eINSTANCE.createListChange();
-			lcs.add(lc);
-		}
-
-		lc.getValues().addAll(addedValues);
-		return addedValues;
-	}
-
-	/**
-	 * Create a change for set a given feature (must be !isMany()). If newValue is true, then this means this is not a pointer to an existing object
-	 * and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known about.
-	 * <p>
-	 * Any further sets to this feature will result in the previous setting being lost.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 *            the feature being set to.
-	 * @param setValue
-	 *            the value being set.
-	 * @param newValue
-	 *            <code>true</code> if new object in the resource, a clone will be made. <code>false</code> if an existing object. Must be an
-	 *            EObject for cloning. Best if not true for non-eobjects.
-	 * @return the setValue or the clone if it was cloned.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static Object doSet(ChangeDescription cd, List fcs, EStructuralFeature feature, Object setValue, boolean newValue) {
-
-		FeatureChange fc = getFeatureChange(fcs, feature);
-		if (newValue) {
-			try {
-				setValue = EcoreUtil.copy((EObject) setValue);
-				cd.getObjectsToAttach().add((EObject)setValue);
-			} catch (ClassCastException e) {
-				// Normally should not occur, but if it does, it means we can't clone, so don't clone.
-			}
-		}
-
-		if (setValue instanceof EObject)
-			fc.setReferenceValue((EObject) setValue);
-		else
-			fc.setDataValue(EcoreUtil.convertToString((EDataType) feature.getEType(), setValue));
-		return setValue;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java
deleted file mode 100644
index ef87e8fc6..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java
+++ /dev/null
@@ -1,255 +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.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.util.*;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-/**
- * BeaninfoAdapterFactory - the factory for 
- * beaninfo introspection to populate the Java Model.
- * Creation date: (11/1/2000 11:52:55 AM)
- * @author: Administrator
- */
-public class BeaninfoAdapterFactory extends AdapterFactoryImpl {
-	protected IBeaninfoSupplier fInfoSupplier;
-
-	// Maintain a mapping of the source objects to the adaptors which have
-	// introspected from them.  This allows a close operation to force those
-	// adapters to clear out the data. It also allows for marking an adapter as stale
-	// so that next time it introspects it will re-get the data.
-	// 
-	// This is a WeakReference so that we don't hold onto adapters that were
-	// explicitly removed in other ways.
-	private Map fIntrospected = new HashMap();	// NOTE: This is to be accessed only under sync(this)!
-	private ReferenceQueue fRefQ = new ReferenceQueue();
-	private static class WeakValue extends WeakReference {
-		private Object key;
-		public WeakValue(Object aKey, Object value, ReferenceQueue que) {
-			super(value, que);
-			key = aKey;
-		}
-
-		public Object getKey() {
-			return key;
-		}
-	};
-
-	public BeaninfoAdapterFactory(IBeaninfoSupplier supplier) {
-		fInfoSupplier = supplier;
-	}
-	
-	public Adapter createAdapter(Notifier target, Object type) {
-		if (type == IIntrospectionAdapter.ADAPTER_KEY) {
-			return !(target instanceof ArrayType) ? new BeaninfoClassAdapter(this) : null;	// Array types don't have beaninfo adapters.
-		} else
-			return new BeaninfoSuperAdapter();
-	}
-	
-	/**
-	 * @see org.eclipse.emf.common.notify.AdapterFactory#isFactoryForType(Object)
-	 */
-	public boolean isFactoryForType(Object type) {
-		return IIntrospectionAdapter.ADAPTER_KEY == type || BeaninfoSuperAdapter.ADAPTER_KEY == type;
-	}	
-
-	public ProxyFactoryRegistry getRegistry() {
-		return fInfoSupplier.getRegistry();
-	}
-	
-	public boolean isRegistryCreated() {
-		return fInfoSupplier.isRegistryCreated();
-	}
-
-	public ProxyFactoryRegistry recycleRegistry() {
-		markAllStale(); // At this point in time we need to mark them all stale because we are recycling. MarkAllStale also closes the registry.
-		return getRegistry();
-	}
-	
-	public IProject getProject() {
-		return fInfoSupplier.getProject();
-	}
-	
-	public ProjectResourceSet getNewResourceSet() {
-		return fInfoSupplier.getNewResourceSet();
-	}
-	
-	public ResourceSet getProjectResourceSet() {
-		return fInfoSupplier.getProjectResourceSet();
-	}
-
-	/**
-	 * Close ALL adapters. Also remove the adapters so that they
-	 * are not being held onto. This means we are closing the project or removing the nature.
-	 */
-	public void closeAll(boolean clearResults) {
-		processQueue();
-		synchronized (this) {
-			// We are going to be removing all of them, so just set introspected to an empty one
-			// and use the real one. This way we won't get concurrent modifications as we remove
-			// it from the notifier removeAdapter.
-			Map intr = fIntrospected;
-			fIntrospected = Collections.EMPTY_MAP;	// Since we are closing we can keep the unmodifiable one here.
-			Iterator i = intr.values().iterator();
-			while (i.hasNext()) {
-				BeaninfoClassAdapter a = (BeaninfoClassAdapter) ((WeakValue) i.next()).get();
-				if (a != null) {
-					if (clearResults)
-						a.clearIntrospection();
-					Notifier notifier = a.getTarget();
-					if (notifier != null)
-						notifier.eAdapters().remove(a);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Mark all stale, but leave the overrides alone. The overrides aren't stale.
-	 * 
-	 * 
-	 * @since 1.1.0.1
-	 */
-	public void markAllStale() {
-		markAllStale(false);
-	}
-	
-	/**
-	 * Mark the package as stale. The overrides are left alone since they are not stale.
-	 * 
-	 * @param packageName name of package ('.' qualified).
-	 * @since 1.2.1
-	 */
-	public void markPackageStale(String packageName) {
-		processQueue();
-		packageName+='.';	// Include the '.' so that can distinguish package from class. 
-		synchronized (this) {
-			Iterator itr = fIntrospected.entrySet().iterator();
-			while (itr.hasNext()) {
-				Map.Entry entry = (Map.Entry) itr.next();
-				String entryName = (String) entry.getKey();
-				if (entryName.startsWith(packageName)) {
-					// It is the item or one of its inner classes.
-					WeakValue ref = (WeakValue) entry.getValue();
-					BeaninfoClassAdapter a = (BeaninfoClassAdapter) ref.get();					
-					if (a != null) {
-						a.markStaleFactory(isRegistryCreated() ? getRegistry() : null); // Mark it stale with the current registry.
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Mark ALL adapters as stale. This occurs because we've recycled the registry.
-	 * 
-	 * @param clearOverrides clear the overrides too. This is full-fledged stale. The overrides are stale too.
-	 */
-	public void markAllStale(boolean clearOverrides) {
-		ProxyFactoryRegistry fact = isRegistryCreated() ? getRegistry() : null;
-		processQueue();
-		synchronized (this) {
-			Iterator i = fIntrospected.values().iterator();
-			while (i.hasNext()) {
-				BeaninfoClassAdapter a = (BeaninfoClassAdapter) ((WeakValue) i.next()).get();
-				if (a != null)
-					a.markStaleFactory(fact, clearOverrides);
-			}
-			fInfoSupplier.closeRegistry();	// Get rid of the registry now since it is not needed. This way we won't accidentily hold onto it when not needed.
-		}
-	}
-	/**
-	 * Mark the introspection as stale for a source object. Also clear results if told to.
-	 * @param sourceName Fully qualified source name, use type for reflection, i.e. "a.b.c.Class1$InnerClass"
-	 * @param clearResults clear out the results. If false, they will be reused if possible on recycle.
-	 */
-	public void markStaleIntrospection(String sourceName, boolean clearResults) {
-		processQueue();
-		synchronized (this) {
-			WeakValue ref = (WeakValue) fIntrospected.get(sourceName);
-			if (ref != null) {
-				BeaninfoClassAdapter a = (BeaninfoClassAdapter) ref.get();
-				if (a != null) {
-					if (clearResults)
-						a.clearIntrospection();
-					a.markStaleFactory(isRegistryCreated() ? getRegistry() : null); // Mark it stale with the current registry.
-				}
-			}
-		}
-	}
-	
-	public void markStaleIntrospectionPlusInner(String sourceName, boolean clearResults) {
-		processQueue();
-		String sourceNameForInner = sourceName + '$';
-		synchronized (this) {
-			Iterator itr = fIntrospected.entrySet().iterator();
-			while (itr.hasNext()) {
-				Map.Entry entry = (Map.Entry) itr.next();
-				String entryName = (String) entry.getKey();
-				if (entryName.equals(sourceName) || entryName.startsWith(sourceNameForInner)) {
-					// It is the item or one of its inner classes.
-					WeakValue ref = (WeakValue) entry.getValue();
-					BeaninfoClassAdapter a = (BeaninfoClassAdapter) ref.get();					
-					if (a != null) {
-						if (clearResults)
-							a.clearIntrospection();
-						a.markStaleFactory(isRegistryCreated() ? getRegistry() : null); // Mark it stale with the current registry.
-					}
-				}
-			}
-		}
-	}	
-
-	/**
-	 * Register an adapter for introspection.
-	 * @param sourceName Fully qualified source name, use type for reflection, i.e. "a.b.c.Class1$InnerClass"
-	 * @param adapter The adapter to register
-	 */
-	public void registerIntrospection(String sourceName, BeaninfoClassAdapter adapter) {
-		// Create it as a weak reference so that it doesn't hold onto the adapter if it is ever removed
-		// and thrown away (or the MOF resource itself is thrown away).
-		processQueue();
-		synchronized (this) {
-			fIntrospected.put(sourceName, new WeakValue(sourceName, adapter, fRefQ));
-		}
-	}
-	
-	/**
-	 * Remove adapter. This happens in the case that adapter is being removed and
-	 * we want to remove it from our list. This is an internal API only for use by
-	 * the adapter itself.
-	 */
-	public synchronized void removeAdapter(BeaninfoClassAdapter a) {
-		fIntrospected.remove(a.getJavaClass().getQualifiedNameForReflection());
-	}
-
-	private synchronized void processQueue() {
-		WeakValue wv;
-		while ((wv = (WeakValue) fRefQ.poll()) != null) {
-			fIntrospected.remove(wv.getKey());
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java
deleted file mode 100644
index c3ab399c0..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java
+++ /dev/null
@@ -1,2678 +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.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import java.io.FileNotFoundException;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.notify.*;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.change.*;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.ESuperAdapter;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.*;
-import org.eclipse.emf.ecore.xmi.PackageNotFoundException;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.*;
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.beaninfo.core.BeanInfoCacheController.ClassEntry;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-import org.eclipse.jem.util.TimerTests;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * Beaninfo adapter for doing introspection on a Java Model class.
- * <p>
- * The first time a introspect request is made, it will use the ClassEntry from the cache controller to determine if it should load from the
- * cache or do a complete introspection. After that it will always do a complete introspection when it is marked as needing introspection.
- * This is because the cache is useless to us then. At that point in time we already know that we or one of our superclasses or one of 
- * outer classes has changed, thereby requiring us to reintrospect, the cache is invalid at that point. Also once we did an introspection we
- * don't want to do a load from cache but instead do a merge because someone may of been holding onto the features and we don't want to
- * throw them away unnecessarily.
- * <p> 
- * TODO Need to re-look into this to see if we can do a merge with the cache file because if it was an external jar and it has now gone
- * valid, why waste time reintrospecting. But this needs to be carefully thought about. 
- * <p> 
- * The resource change listener
- * will automatically mark any subclasses (both the BeaninfoClassAdapter and the ClassEntry) as being stale for us. That way we don't need
- * to waste time checking the ce and superclasses everytime. We will keep the ClassEntry around simply to make the marking of it as stale easier for the
- * resource listener. Finding the ce everytime would be expensive.
- * <p> 
- * This is the process for determining if introspection required:
- * <ol>
- * <li>If needsIntrospection flag is false, then do nothing. Doesn't need introspection.
- * <li>If class is undefined, then just set up for an undefined class and return. (In this case the CE should be thrown away, it should of been deleted).
- * <li>If never introspected (not RETRIEVED_FULL_DOCUMENT), get the CE, get the modification stamp and call isStaleStamp. This determines if this
- * stamp or any super class stamp is stale wrt to current stamp. If it is not stale, then load from cache because the cache is good. 
- * <li>If no cache or cache is stale or has introspected once, then introspect and replace cache.
- * </ol>
- * 
- */
-
-public class BeaninfoClassAdapter extends AdapterImpl implements IIntrospectionAdapter {
-	
-	public static final String REFLECT_PROPERTIES = "Reflect properties";	// Reflect properties in IDE //$NON-NLS-1$
-	public static final String APPLY_EXTENSIONS = "Apply Overrides";	// Apply override files //$NON-NLS-1$
-	public static final String REMOTE_INTROSPECT = "Remote Introspect";	// Introspect on remote //$NON-NLS-1$
-	public static final String INTROSPECT = "Introspect";	// Straight introspection, whether load from cache or introspect. //$NON-NLS-1$
-	public static final String LOAD_FROM_CACHE = "Load from Cache"; //$NON-NLS-1$
-	
-	
-	public static BeaninfoClassAdapter getBeaninfoClassAdapter(EObject jc) {
-		return (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter(jc, IIntrospectionAdapter.ADAPTER_KEY);
-	}
-	
-	/**
-	 * Clear out the introspection because introspection is being closed or removed from the project.
-	 * Don't want anything hanging around that we had done.
-	 */
-	public void clearIntrospection() {
-		// Clear out the beandecorator if implicitly created.
-		Iterator beanItr = getJavaClass().getEAnnotationsInternal().iterator();
-		while (beanItr.hasNext()) {
-			EAnnotation dec = (EAnnotation) beanItr.next();
-			if (dec instanceof BeanDecorator) {
-				BeanDecorator decor = (BeanDecorator) dec;
-				if (decor.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_LITERAL) {
-					beanItr.remove();
-					((InternalEObject) decor).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-				} else {
-					BeanInfoDecoratorUtility.clear((BeanDecorator) dec);
-				}
-				break;
-			}
-		}
-		// Clear out the features that we implicitly created.
-		Iterator propItr = getJavaClass().getEStructuralFeaturesInternal().iterator();
-		while (propItr.hasNext()) {
-			EStructuralFeature prop = (EStructuralFeature) propItr.next();
-			Iterator pdItr = prop.getEAnnotations().iterator();
-			while (pdItr.hasNext()) {
-				EAnnotation dec = (EAnnotation) pdItr.next();
-				if (dec instanceof PropertyDecorator) {
-					PropertyDecorator pd = (PropertyDecorator) dec;
-					if (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
-						BeanInfoDecoratorUtility.clear(pd);
-					else {
-						pdItr.remove(); // Remove it from the property.
-						((InternalEObject) pd).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					if (pd.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-						propItr.remove(); // Remove the feature itself
-						((InternalEObject) prop).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					break;
-				}
-			}
-		}
-		
-		// Clear out the operations that we implicitly created.
-		Iterator operItr = getJavaClass().getEOperationsInternal().iterator();
-		while (operItr.hasNext()) {
-			EOperation oper = (EOperation) operItr.next();
-			Iterator mdItr = oper.getEAnnotations().iterator();
-			while (mdItr.hasNext()) {
-				EAnnotation dec = (EAnnotation) mdItr.next();
-				if (dec instanceof MethodDecorator) {
-					MethodDecorator md = (MethodDecorator) dec;
-					if (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
-						BeanInfoDecoratorUtility.clear(md);
-					else {
-						mdItr.remove(); // Remove it from the operation.
-						((InternalEObject) md).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					if (md.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-						operItr.remove(); // Remove the oepration itself
-						((InternalEObject) oper).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					break;
-				}
-			}
-			
-			// Clear out the events that we implicitly created.
-			Iterator evtItr = getJavaClass().getEventsGen().iterator();
-			while (evtItr.hasNext()) {
-				JavaEvent evt = (JavaEvent) evtItr.next();
-				Iterator edItr = evt.getEAnnotations().iterator();
-				while (edItr.hasNext()) {
-					EAnnotation dec = (EAnnotation) edItr.next();
-					if (dec instanceof EventSetDecorator) {
-						EventSetDecorator ed = (EventSetDecorator) dec;
-						if (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
-							BeanInfoDecoratorUtility.clear(ed);
-						else {
-							edItr.remove(); // Remove it from the event.
-							((InternalEObject) ed).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-						}
-						if (ed.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							evtItr.remove(); // Remove the event itself
-							((InternalEObject) evt).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-						}
-						break;
-					}
-				}
-			}				
-		}
-
-		synchronized(this) {
-			needsIntrospection = true;
-		}
-	}
-	
-	private void clearAll() {
-		clearIntrospection();	// First get rid of the ones we did so that they are marked as proxies.
-		
-		// Clear out the annotations.
-		getJavaClass().getEAnnotationsInternal().clear();
-		// Clear out the attributes.
-		getJavaClass().getEStructuralFeaturesInternal().clear();	
-		// Clear out the operations.
-		getJavaClass().getEOperationsInternal().clear();
-		// Clear out the events.
-		getJavaClass().getEventsGen().clear();
-		
-		retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT;	// Since we cleared everything, go back to no doc applied.
-	}
-	
-
-	/**
-	 * @version 	1.0
-	 * @author
-	 */
-
-	// A URI that will never resolve. Used to mark an object as no longer valid.
-	protected static final URI BAD_URI = URI.createURI("baduri"); //$NON-NLS-1$
-
-	protected boolean needsIntrospection = true;
-	
-	protected BeanInfoCacheController.ClassEntry classEntry;
-	
-	protected boolean isIntrospecting;
-
-	protected boolean isDoingAllProperties;
-
-	protected boolean isDoingAllOperations;
-
-	protected boolean isDoingAllEvents;
-
-	protected final static int
-		NEVER_RETRIEVED_EXTENSION_DOCUMENT = 0,
-		RETRIEVED_ROOT_ONLY = 1,
-		RETRIEVED_FULL_DOCUMENT = 2,
-		CLEAR_EXTENSIONS = 3;
-	protected int retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT;
-
-	protected BeaninfoAdapterFactory adapterFactory;
-
-	private WeakReference staleFactory; // When reference not null, then this factory is a stale factory and 
-	// a new one is needed when the factory returned == this one.
-	// It is a WeakRef so that if the factory goes away on its own
-	// that we don't hold onto it.
-
-	// A temporary hashset of the local properties. Used when creating a new
-	// property to use the old one. It is cleared out at the end of attribute introspection.
-	// It is only built once during attribute introspection so that we have the snapshot
-	// of before the introspection (i.e. the ones that were specifically added by users
-	// and not through introspection). The ones that we are adding do not need to be checked
-	// against each other because there will not be conflicts.
-	//
-	// Also at the end, we will go through the properties and see if it exists in the fPropertiesMap and
-	// it is not the value Boolean.FALSE in the map, and the entry is implicitly created. This means this
-	// was an implicit entry from the previous introspection and was not re-created in this introspection.
-	private HashMap propertiesMap;
-	private List featuresRealList; // Temp pointer to the real list we are building. It is the true list in java class.
-	
-	// A temporary hashmap of the local operations. Used when creating a new
-	// operation to reuse the old one. It is cleared out at the end of operation introspection.
-	// It is only built once during operation introspection so that we have the snapshot
-	// of before the introspection.
-	private HashMap operationsMap;
-	private EList operationsRealList; // Temp pointer to the real list we are building. It is the true list in java class.
-	// A set of operations as we create them so that we which ones we added/kept and which are no longer in use and can be removed.	
-	// If they aren't in this set at the end, then we know it should be removed if it is one we had created in the past.
-	private HashSet newoperations; 
-
-	// A temporary hashset of the local events. Used when creating a new
-	// event to use the old one. It is cleared out at the end of event introspection.
-	// It is only built once during event introspection so that we have the snapshot
-	// of before the introspection (i.e. the ones that were specifically added by users
-	// and not through introspection). The ones that we are adding do not need to be checked
-	// against each other because there will not be conflicts.
-	//
-	// Also at the end, we will go through the events and see if it exists in the fEventsMap and
-	// it is not the value Boolean.FALSE in the map, and the entry is implicitly created. This means this
-	// was an implicit entry from the previous introspection and was not re-created in this introspection.
-	private HashMap eventsMap;
-	private EList eventsRealList; // Temp pointer to the real list we are building. It is the true list in java class.
-
-	private Boolean defaultBound;
-	// Whether this class is default bound or not (i.e. does this class implement add/remove property change listener. If null, then not yet queried.
-
-	public BeaninfoClassAdapter(BeaninfoAdapterFactory factory) {
-		super();
-		adapterFactory = factory;
-	}
-
-	/*
-	 * Answer whether this java class is still connected to a live resource. It happens during unloading
-	 * that we are no longer connected to a resource (because the javapackage has already been processed and
-	 * unloaded) or the resource is in the process of being unloaded, but the unloading process will still 
-	 * call accessors on this java class, which will come over here. In those cases we should treat as
-	 * introspection completed without doing anything.
-	 */
-	protected boolean isResourceConnected() {
-		Resource res = getJavaClass().eResource();
-		return res != null && res.isLoaded();
-	}
-
-	protected final ProxyFactoryRegistry getRegistry() {
-		ProxyFactoryRegistry factory = adapterFactory.getRegistry();
-		if (staleFactory != null && factory == staleFactory.get()) {
-			// We need to recycle the factory. The returned factory is the same factory when it went stale.
-			factory = adapterFactory.recycleRegistry();
-		}
-		staleFactory = null; // Whether we recycled or not, it is no longer stale.
-		return factory;
-	}
-
-	/**
-	 * Return whether this adapter has been marked as stale. Needed
-	 * by the users so that they can recycle if necessary.
-	 */
-	public boolean isStale() {
-		return staleFactory != null;
-	}
-
-	protected BeaninfoAdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-
-	public boolean isAdapterForType(Object key) {
-		return IIntrospectionAdapter.ADAPTER_KEY.equals(key);
-	}
-
-	/**
-	 * This map is keyed by name. It is a snapshot of the properties at the
-	 * time the introspection/reflection of properties was started. It is used
-	 * for quick lookup.
-	 *
-	 * Once a property is used, the entry is replaced with a Boolean.FALSE. This
-	 * is so we know which have already been used and at the end, which need
-	 * to be deleted since they weren't used (i.e. the ones that aren't FALSE).
-	 */
-	protected HashMap getPropertiesMap() {
-		if (propertiesMap == null) {
-			List localFeatures = getJavaClass().getEStructuralFeaturesInternal();
-			propertiesMap = new HashMap(localFeatures.size());
-			Iterator itr = localFeatures.iterator();
-			while (itr.hasNext()) {
-				EStructuralFeature feature = (EStructuralFeature) itr.next();
-				propertiesMap.put(feature.getName(), feature);
-			}
-		}
-		return propertiesMap;
-	}
-
-	/**
-	 * Get it once so that we don't need to keep getting it over and over.
-	 */
-	protected List getFeaturesList() {
-		if (featuresRealList == null)
-			featuresRealList = getJavaClass().getEStructuralFeaturesInternal();
-		return featuresRealList;
-	}
-
-	/**
-	 * The map is keyed by longName. If a Method is passed in, then the
-	 * id of the method is used (this is in reflection), if an IBeanProxy
-	 * is passed in, then an id is created and looked up (this is in introspection).
-	 * The map is used for a quick lookup of behaviors at the time introspection
-	 * of behaviors started.
-	 */
-	protected HashMap getOperationsMap() {
-		if (operationsMap == null) {
-			List locals = getJavaClass().getEOperationsInternal();
-			int l = locals.size();
-			operationsMap = new HashMap(l);
-			for (int i = 0; i < l; i++) {
-				EOperation op = (EOperation) locals.get(i);
-				operationsMap.put(formLongName(op), op);
-			}
-		}
-		return operationsMap;
-	}
-
-	/**
-	 * Get it once so that we don't need to keep getting it over and over.
-	 */
-	protected EList getOperationsList() {
-		if (operationsRealList == null)
-			operationsRealList = getJavaClass().getEOperationsInternal();
-		return operationsRealList;
-	}
-
-	/**
-	 * The map is keyed by name.
-	 * The map is used for a quick lookup of events at the time introspection
-	 * of events started.
-	 *
-	 * Once an event is used, the entry is replaced with a Boolean.FALSE. This
-	 * is so we know which have already been used and at the end, which need
-	 * to be deleted since they weren't used (i.e. the ones that aren't FALSE).
-	 */
-	protected HashMap getEventsMap() {
-		if (eventsMap == null) {
-			List locals = getJavaClass().getEventsGen();
-			eventsMap = new HashMap(locals.size());
-			Iterator itr = locals.iterator();
-			while (itr.hasNext()) {
-				JavaEvent event = (JavaEvent) itr.next();
-				eventsMap.put(event.getName(), event);
-			}
-		}
-		return eventsMap;
-	}
-
-	/**
-	 * Get it once so that we don't need to keep getting it over and over.
-	 */
-	protected EList getEventsList() {
-		if (eventsRealList == null)
-			eventsRealList = getJavaClass().getEventsGen();
-		return eventsRealList;
-	}
-
-	public void introspectIfNecessary() {
-		introspectIfNecessary(false);
-	}
-	
-	protected void introspectIfNecessary(boolean doOperations) {
-		boolean doIntrospection = false;
-		synchronized (this) {
-			doIntrospection = needsIntrospection && !isIntrospecting; 
-			if (doIntrospection)
-				isIntrospecting = true;
-		}
-		if (doIntrospection) {
-			boolean didIntrospection = false;
-			try {				
-				introspect(doOperations);
-				didIntrospection = true;
-			} catch (Exception e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(
-					new Status(
-						IStatus.WARNING,
-						BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(),
-						0,
-						MessageFormat.format(
-							BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, 
-							new Object[] { getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
-						e));
-			} finally {
-				synchronized (this) {
-					isIntrospecting = false;
-					needsIntrospection = !didIntrospection;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get the class entry. 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public BeanInfoCacheController.ClassEntry getClassEntry() {
-		return classEntry;
-	}
-	
-	private boolean canUseCache() {
-		// We check our level, we assume not stale unless CE says stale.
-		synchronized (this) {
-			// We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
-			if (classEntry == null)
-				classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-			if (classEntry != null) {
-				// We have a cache to check.
-				long modStamp = classEntry.getModificationStamp();
-				// A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
-				if (modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP) {
-					classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-					if (classEntry != null)
-						modStamp = classEntry.getModificationStamp();
-				}
-				if (modStamp == IResource.NULL_STAMP || modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP)
-					return false;	// We are stale.
-			} else
-				return false;	// We don't have a cache entry to check against, which means are deleted, or never cached.
-		}
-		
-		// Now try the supers to see if we are out of date to them.
-		// Note: Only if this is an interface could there be more than one eSuperType.
-		List supers = getJavaClass().getESuperTypes();
-		if (!supers.isEmpty()) {
-			BeaninfoClassAdapter bca = getBeaninfoClassAdapter((EObject) supers.get(0));
-			ClassEntry superCE = bca.getClassEntry();
-			// If super is defined and out of date don't use cache. If super is undefined and super modification stamp is not super_undefined,
-			// then that means it was defined at time of cache and now not defined, so don't use cache.
-			if (superCE != null) {
-				if (superCE.getModificationStamp() != classEntry.getSuperModificationStamp())
-					return false; // Out-of-date wrt/super.
-			} else if (classEntry.getSuperModificationStamp() != ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP)
-				return false;	// was previously defined, and now undefined, so out of date.
-			String[] iNames = classEntry.getInterfaceNames();
-			if (iNames != null) {
-				if (iNames.length != supers.size() - 1)
-					return false; // We have a different number of supers, so stale.
-				// Now the interfaces may not be in the same order, but there shouldn't be too many, so we'll use O(n2) lookup. We'll try starting at
-				// the same index just in case. That way if they are the same order it will be linear instead. Most likely will be same order.
-				long[] iStamp = classEntry.getInterfaceModificationStamps();
-				for (int i = 1; i <= iNames.length; i++) {
-					JavaClass javaClass = (JavaClass) supers.get(i);
-					String intName = (javaClass).getQualifiedNameForReflection();
-					// Find it in the names list.
-					int stop = i-1;
-					int indx = stop;	// Start at the stop, when we hit it again we will be done.
-					boolean found = false;
-					do {
-						if (iNames[indx].equals(intName)) {
-							found = true;
-							break;
-						}
-					} while ((++indx)%iNames.length != stop);
-					if (!found)
-						return false;	// Couldn't find it, so we are stale.]
-					
-					superCE = getBeaninfoClassAdapter(javaClass).getClassEntry();
-					if (superCE != null) {
-						if (superCE.getModificationStamp() != iStamp[indx])
-							return false; // Out-of-date wrt/interface.
-					} else if (iStamp[indx] != ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP)
-						return false;	// was previously defined, and now undefined, so out of date.
-				}
-			}
-		}
-		return true;	// If we got here everything is ok.
-	}
-
-	private boolean canUseOverrideCache() {
-		// We check our config stamp.
-		// TODO in future can we listen for config changes and mark classes stale if the config changes?
-		synchronized (this) {
-			// We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
-			if (classEntry == null)
-				classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-			if (classEntry != null) {
-				// We have a cache to check.
-				// A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
-				if (classEntry.isDeleted()) {
-					classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-					if (classEntry != null)
-						if (classEntry.isDeleted())
-							return false;	// We have been deleted. Probably shouldn't of gotton here in this case.
-				}
-			} else
-				return false;	// We don't have a cache entry to check against, which means are deleted, or never cached.
-			return classEntry.getConfigurationModificationStamp() == Platform.getPlatformAdmin().getState(false).getTimeStamp();
-		}
-		
-	}
-
-	/**
-	 * Check if the cache for this entry is stale compared to the modification stamp, or if the modification stamp itself is stale, meaning
-	 * subclass was stale already.
-	 * 
-	 * @param requestStamp the timestamp to compare against. 
-	 * @return <code>true</code> if we can use the incoming cache stamp.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected boolean canUseCache(long requestStamp) {
-		long modStamp;
-		// Now get the current mod stamp for this class so we can compare it.
-		synchronized (this) {
-			// We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
-			if (classEntry == null)
-				classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-			if (classEntry != null) {
-				// We have a cache to check.
-				modStamp = classEntry.getModificationStamp();
-				// A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
-				if (modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP) {
-					classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-					if (classEntry != null)
-						modStamp = classEntry.getModificationStamp();
-				}
-				if (modStamp == IResource.NULL_STAMP && modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP)
-					return false;	// Since we are stale, child asking question must also be stale and can't use the cache.
-			} else
-				return false;	// We don't have a cache entry to check against, so child must be stale too.
-		}
-		// If the requested stamp is not the same as ours, then it is out of date (it couldn't be newer but it could be older).
-		return requestStamp == modStamp;
-	}
-		
-	/*
-	 * This should only be called through introspectIfNecessary so that flags are set correctly.
-	 */
-	private void introspect(boolean doOperations) {
-		IBeanProxy beaninfo = null;
-		try {
-			if (isResourceConnected()) {
-				// See if are valid kind of class.
-				if (getJavaClass().getKind() == TypeKind.UNDEFINED_LITERAL) {
-					// Not valid, don't let any further introspection occur.
-					// Mark that we've done all introspections so as not to waste time until we get notified that it has been added
-					// back in.
-					synchronized(this) {
-						if (classEntry != null) {
-							classEntry.markDeleted();	// mark it deleted in case still sitting in cache (maybe because it was in an external jar, we can't know if deleted when jar changed).
-							classEntry = null;	// Get rid of it since now deleted.
-						}
-						needsIntrospection = false;
-					}
-					
-					if (retrievedExtensionDocument == RETRIEVED_FULL_DOCUMENT || retrievedExtensionDocument == CLEAR_EXTENSIONS) {
-						// We've been defined at one point. Need to clear everything and step back
-						// to never retrieved so that we now get the root added in. If we had been
-						// previously defined, then we didn't have root. We will have to lose
-						// all other updates too. But they can come back when we're defined.
-						// Or we've been asked to clear all.
-						clearAll();
-						retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT;
-					}
-					if (retrievedExtensionDocument == NEVER_RETRIEVED_EXTENSION_DOCUMENT)
-						applyExtensionDocument(true);	// Add in Root stuff so that it will work correctly even though undefined.
-				} else {
-					// TODO For now cause recycle of vm if any super type is stale so that if registry is stale for the super type it will be
-					// recreated. This is needed because reflection requires superProperties, etc. and recreating the registry
-					// currently re-marks everyone as stale, including this subclass. This would mean that
-					// re-introspection would need to be done, even though we just did it. The stale registry business needs to be re-addressed so that it is
-					// a lot smarter. 
-					List supers = getJavaClass().getEAllSuperTypes();
-					for (int i = 0; i < supers.size(); i++) {
-						BeaninfoClassAdapter bca = (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter((EObject) supers.get(i),
-								IIntrospectionAdapter.ADAPTER_KEY);
-						if (bca != null && bca.isStale())
-							bca.getRegistry();
-					}
-					// Now we need to force introspection, if needed, of all parents because we need them to be up-to-date for the
-					// class entry.
-					// TODO see if we can come up with a better way that we KNOW the CE is correct, even if any supers are stale.
-					supers = getJavaClass().getESuperTypes();
-					for (int i = 0; i < supers.size(); i++) {
-						BeaninfoClassAdapter bca = (BeaninfoClassAdapter) EcoreUtil.getRegisteredAdapter((EObject) supers.get(i),
-								IIntrospectionAdapter.ADAPTER_KEY);
-						bca.introspectIfNecessary();
-					}
-
-					TimerTests.basicTest.startCumulativeStep(INTROSPECT);
-					if (retrievedExtensionDocument == RETRIEVED_ROOT_ONLY || retrievedExtensionDocument == CLEAR_EXTENSIONS) {
-						// We need to clear out EVERYTHING because we are coming from an undefined to a defined.
-						// Nothing previous is now valid. (Particularly the root stuff).
-						// Or we had a Clean requested and need to clear the extensions too.
-						clearAll();
-					}
-					boolean firstTime = false;
-					if (retrievedExtensionDocument != RETRIEVED_FULL_DOCUMENT) {
-						firstTime = true;	// If we need to apply the extension doc, then this is the first time.
-						applyExtensionDocument(false); // Apply the extension doc before we do anything.
-					}
-
-					// Now check to see if we can use the cache.
-					boolean doIntrospection = true;
-					if (firstTime) {
-						// Check if we can use the cache. Use Max value so that first level test (ourself) will always pass and go on to the supers.
-						if (canUseCache()) {
-							TimerTests.basicTest.startCumulativeStep(LOAD_FROM_CACHE);
-							// We can use the cache.
-							Resource cres = BeanInfoCacheController.INSTANCE.getCache(getJavaClass(), classEntry, true);
-							if (cres != null) {
-								try {
-									// Got a cache to use, now apply it.
-									for (Iterator cds = cres.getContents().iterator(); cds.hasNext();) {
-										ChangeDescription cacheCD = (ChangeDescription) cds.next();
-										cacheCD.apply();
-									}
-									// We need to walk through and create the appropriate ID's for events/actions/properties because by
-									// default from the change descriptions these don't get reflected back. And if some one doesn't
-									// use an ID to get them, they won't have an id set.
-									doIDs();
-									doIntrospection = false;
-								} catch (RuntimeException e) {
-									BeaninfoPlugin.getPlugin().getLogger().log(
-										MessageFormat.format(
-												BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, 
-												new Object[] { getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
-										Level.WARNING);
-									BeaninfoPlugin.getPlugin().getLogger().log(e);
-								} finally {
-									// Remove the cres since it is now invalid. The applies cause them to be invalid.
-									cres.getResourceSet().getResources().remove(cres);
-									if (doIntrospection) {
-										// Apply had failed. We don't know how far it went. We need to wipe out and reget EVERYTHING.
-										clearAll();
-										applyExtensionDocument(false); // Re-apply the extension doc before we do anything else.
-									}
-								}
-							}
-							TimerTests.basicTest.stopCumulativeStep(LOAD_FROM_CACHE);
-						}
-					}
-					
-					if (doIntrospection) {
-						// Finally we can get to handling ourselves.
-						TimerTests.basicTest.startCumulativeStep(REMOTE_INTROSPECT);
-						BeanDecorator decor = Utilities.getBeanDecorator(getJavaClass());
-						if (decor == null) {
-							decor = BeaninfoFactory.eINSTANCE.createBeanDecorator();
-							decor.setImplicitDecoratorFlag(ImplicitItem.IMPLICIT_DECORATOR_LITERAL);
-							getJavaClass().getEAnnotations().add(decor);
-						} else
-							BeanInfoDecoratorUtility.clear(decor);	// Clear out previous results.
-						
-						boolean doReflection = true;
-						if (doOperations)
-							newoperations = new HashSet(50);
-						if (decor.isDoBeaninfo()) {
-							int doFlags = 0;
-							if (decor == null || decor.isMergeIntrospection())
-								doFlags |= IBeanInfoIntrospectionConstants.DO_BEAN_DECOR;
-							if (decor == null || decor.isIntrospectEvents())
-								doFlags |= IBeanInfoIntrospectionConstants.DO_EVENTS;
-							if (decor == null || decor.isIntrospectProperties())
-								doFlags |= IBeanInfoIntrospectionConstants.DO_PROPERTIES;
-							if (doOperations && (decor == null || decor.isIntrospectMethods()))
-								doFlags |= IBeanInfoIntrospectionConstants.DO_METHODS;
-							
-							if (doFlags != 0) {
-								// There was something remote to do.
-								IBeanTypeProxy targetType = null;
-								ProxyFactoryRegistry registry = getRegistry();
-								if (registry != null && registry.isValid())
-									targetType = registry.getBeanTypeProxyFactory().getBeanTypeProxy(getJavaClass().getQualifiedNameForReflection());
-								if (targetType != null) {
-									if (targetType.getInitializationError() == null) {
-										// If an exception is thrown, treat this as no proxy, however log it because we
-										// shouldn't have exceptions during introspection, but if we do it should be logged
-										// so it can be corrected.
-										try {
-											BeaninfoProxyConstants proxyConstants = getProxyConstants();
-											if (proxyConstants != null) {
-												beaninfo = proxyConstants.getIntrospectProxy().invoke(
-														null,
-														new IBeanProxy[] { targetType,
-																getRegistry().getBeanProxyFactory().createBeanProxyWith(false),
-																getRegistry().getBeanProxyFactory().createBeanProxyWith(doFlags)});
-											}											
-										} catch (ThrowableProxy e) {
-											BeaninfoPlugin.getPlugin().getLogger().log(
-													new Status(IStatus.WARNING, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0,
-															MessageFormat.format(BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] { //$NON-NLS-1$
-																	getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
-																	e));
-										}
-									} else {
-										// The class itself couldn't be initialized. Just log it, but treat as no proxy.
-										BeaninfoPlugin.getPlugin().getLogger()
-										.log(
-												new Status(IStatus.WARNING, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0,
-														MessageFormat.format(BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] { //$NON-NLS-1$
-																getJavaClass().getJavaName(), targetType.getInitializationError()}), null));
-									}
-								} else {
-									// The class itself could not be found. Just log it, but treat as no proxy.
-									BeaninfoPlugin.getPlugin().getLogger().log(
-											new Status(IStatus.INFO, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0, MessageFormat.format(
-													BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] { 
-															getJavaClass().getJavaName(),
-															BeanInfoAdapterMessages.BeaninfoClassAdapter_ClassNotFound}), 
-															null));
-								}
-								
-								if (beaninfo != null) {
-									doReflection = false;	// We have a beaninfo, so we are doing introspection.
-									final BeanDecorator bdecor = decor;
-									// We have a beaninfo to process.
-									BeanInfoDecoratorUtility.introspect(beaninfo, new BeanInfoDecoratorUtility.IntrospectCallBack() {
-
-										/*; (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.BeanRecord)
-										 */
-										public BeanDecorator process(BeanRecord record) {
-											return bdecor;
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.PropertyRecord)
-										 */
-										public PropertyDecorator process(PropertyRecord record) {
-											return calculateProperty(record, false);
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.IndexedPropertyRecord)
-										 */
-										public PropertyDecorator process(IndexedPropertyRecord record) {
-											return calculateProperty(record, true);
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.MethodRecord)
-										 */
-										public MethodDecorator process(MethodRecord record) {
-											return calculateOperation(record);
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.EventSetRecord)
-										 */
-										public EventSetDecorator process(EventSetRecord record) {
-											return calculateEvent(record);
-										}
-									});
-								} 
-							}
-						}
-						
-						if (doReflection) {
-							// Need to do reflection stuff.
-							if (decor.isIntrospectProperties())
-								reflectProperties();
-							if (doOperations && decor.isIntrospectMethods())
-								reflectOperations();
-							if (decor.isIntrospectEvents())
-								reflectEvents();
-						}
-						ChangeDescription cd = ChangeFactory.eINSTANCE.createChangeDescription();						
-						BeanInfoDecoratorUtility.buildChange(cd, decor);
-						finalizeProperties(cd);
-						if (doOperations)
-							finalizeOperations(cd);
-						finalizeEvents(cd);
-
-						classEntry = BeanInfoCacheController.INSTANCE.newCache(getJavaClass(), cd, doOperations ? BeanInfoCacheController.REFLECTION_OPERATIONS_CACHE : BeanInfoCacheController.REFLECTION_CACHE);
-						TimerTests.basicTest.stopCumulativeStep(REMOTE_INTROSPECT); 
-					}
-					TimerTests.basicTest.stopCumulativeStep(INTROSPECT);
-				}
-				getAdapterFactory().registerIntrospection(getJavaClass().getQualifiedNameForReflection(), this);
-			}
-		} finally {
-			if (beaninfo != null) {
-				beaninfo.getProxyFactoryRegistry().releaseProxy(beaninfo); // Dispose of the beaninfo since we now have everything.
-			}
-			eventsMap = null; // Clear out the temp lists.
-			eventsRealList = null;
-			operationsMap = null; // Clear out the temp lists.
-			operationsRealList = null;
-			newoperations = null;
-			propertiesMap = null; // Get rid of accumulated map.
-			featuresRealList = null; // Release the real list.
-		}
-	}
-
-	private void doIDs() {
-		// Do properties.
-		if (getJavaClass().eIsSet(EcorePackage.eINSTANCE.getEClass_EStructuralFeatures())) {
-			List features = getFeaturesList();
-			int len = features.size();
-			for (int i = 0; i < len; i++) {
-				EStructuralFeature f = (EStructuralFeature) features.get(i);
-				PropertyDecorator pd = Utilities.getPropertyDecorator(f);
-				if (pd == null || !pd.isMergeIntrospection())
-					continue; // Not a property for us to give an ID to.
-				setPropertyID(f.getName(), f);
-			}
-		}
-		
-		// Do events.
-		if (getJavaClass().eIsSet(JavaRefPackage.eINSTANCE.getJavaClass_Events())) {
-			List events = getEventsList();
-			int len = events.size();
-			for (int i = 0; i < len; i++) {
-				BeanEvent e = (BeanEvent) events.get(i);
-				EventSetDecorator ed = Utilities.getEventSetDecorator(e);
-				if (ed == null || !ed.isMergeIntrospection())
-					continue; // Not an event for us to give an ID to.
-				setEventID(e.getName(), e);
-			}
-		}
-
-		// Do Operations.
-		if (getJavaClass().eIsSet(EcorePackage.eINSTANCE.getEClass_EOperations())) {
-			List ops = getOperationsList();
-			int len = ops.size();
-			for (int i = 0; i < len; i++) {
-				EOperation o = (EOperation) ops.get(i);
-				MethodDecorator md = Utilities.getMethodDecorator(o);
-				if (md == null || !md.isMergeIntrospection())
-					continue; // Not an event for us to give an ID to.
-				setMethodID(o.getName(), o);
-			}
-		}
-	}
-
-	private static final String ROOT_OVERRIDE = BeaninfoPlugin.ROOT+'.'+BeaninfoPlugin.OVERRIDE_EXTENSION;	 //$NON-NLS-1$
-	
-	protected void applyExtensionDocument(boolean rootOnly) {
-		try {
-			TimerTests.basicTest.startCumulativeStep(APPLY_EXTENSIONS);
-			boolean canUseCache = !rootOnly && canUseOverrideCache();
-			boolean alreadyRetrievedRoot = retrievedExtensionDocument == RETRIEVED_ROOT_ONLY;
-			retrievedExtensionDocument = rootOnly ? RETRIEVED_ROOT_ONLY : RETRIEVED_FULL_DOCUMENT;
-			JavaClass jc = getJavaClass();
-			Resource mergeIntoResource = jc.eResource();
-			ResourceSet rset = mergeIntoResource.getResourceSet();
-			String className = jc.getName();
-			if (canUseCache) {
-				// We can use the cache, see if we actually have one.
-				if (getClassEntry().overrideCacheExists()) {
-					// Get the cache and apply it before anything else.
-					Resource cacheRes = BeanInfoCacheController.INSTANCE.getCache(jc, getClassEntry(), false);
-					if (cacheRes != null) {
-						try {
-							new ExtensionDocApplies(null, rset, jc, null).run(cacheRes);
-						} catch (WrappedException e) {
-							BeaninfoPlugin.getPlugin().getLogger().log(
-									new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0,
-											"Error processing file\"" + cacheRes.getURI() + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-						} finally {
-							cacheRes.getResourceSet().getResources().remove(cacheRes); // We don't need it around once we do the merge. Normal merge would of gotton rid of it, but in case of error we do it here.
-						}
-					} else
-						canUseCache = false; // Need to rebuild the cache.
-				}
-			}
-			List overrideCache = null;
-			if (!alreadyRetrievedRoot && (rootOnly || jc.getSupertype() == null)) {
-				// It is a root class. Need to merge in root stuff.
-				if (!canUseCache) {
-					overrideCache = createOverrideCache(overrideCache, getAdapterFactory().getProject(), BeaninfoPlugin.ROOT, ROOT_OVERRIDE, rset, jc);
-				}
-				applyExtensionDocTo(rset, jc, ROOT_OVERRIDE, BeaninfoPlugin.ROOT, BeaninfoPlugin.ROOT);
-				if (rootOnly)
-					return;
-			}
-
-			String baseOverridefile = className + '.' + BeaninfoPlugin.OVERRIDE_EXTENSION; // getName() returns inner classes with "$" notation, which is good. //$NON-NLS-1$
-			String packageName = jc.getJavaPackage().getPackageName();
-			if (!canUseCache) {
-				overrideCache = createOverrideCache(overrideCache, getAdapterFactory().getProject(), packageName, baseOverridefile, rset, jc);
-			}
-			applyExtensionDocTo(rset, jc, baseOverridefile, packageName, className);
-			
-			if (!canUseCache) {
-				// We have an override cache to store. If the cache is null, this will flag that there is no override cache for the current configuration. That way we won't bother trying again until config changes.
-				BeanInfoCacheController.INSTANCE.newCache(jc, overrideCache, BeanInfoCacheController.OVERRIDES_CACHE);
-			}
-			
-		} finally {
-			TimerTests.basicTest.stopCumulativeStep(APPLY_EXTENSIONS);	
-		}
-	}
-	
-	/*
-	 * Build up the fixed overrides into the cache, and apply as we gather them.
-	 * Return the cache or null if the cache is empty at the end.
-	 */
-	private List createOverrideCache(List cache, IProject project, String packageName, String overrideFile, ResourceSet rset, JavaClass mergeIntoJavaClass) {
-		// Now get the overrides paths
-		String[] paths = BeaninfoPlugin.getPlugin().getOverridePaths(project, packageName);
-		if (paths.length == 0)
-			return cache;
-		
-		// Now apply the overrides.
-		if (cache == null)
-			cache = new ArrayList();
-		BeaninfoPlugin.IOverrideRunnable runnable = new ExtensionDocApplies(overrideFile, rset, mergeIntoJavaClass, cache);
-		for (int i = 0; i < paths.length; i++) {
-			runnable.run(paths[i]);
-		}
-		return !cache.isEmpty() ? cache : null;
-	}
-	
-	private static final URI ROOT_URI = URI.createGenericURI(BeaninfoPlugin.ROOT_SCHEMA, BeaninfoPlugin.ROOT_OPAQUE, null);
-	private static final String ROOT_FRAGMENT = "//@root"; //$NON-NLS-1$
-	private static final Pattern FRAGMENT_SPLITTER = Pattern.compile("/"); //$NON-NLS-1$
-	
-	// TODO This is to make event util optional. This should be removed entirely with 1.3 when event util goes away.
-	private static boolean RETRIEVED_EVENT_METHODS;
-	private static Object EVENT_FACTORY_INSTANCE;
-	private static java.lang.reflect.Method CREATE_EVENT_UTIL_METHOD;
-	private static java.lang.reflect.Method DO_FORWARD_EVENTS_METHOD;
-	
-	private static boolean isEventUtilLoaded() {
-		if (!RETRIEVED_EVENT_METHODS) {
-			try {
-				Class eventFactoryClass = Class.forName("com.ibm.etools.emf.event.EventFactory");
-				Field eventFactoryField = eventFactoryClass.getField("eINSTANCE");
-				Object eventFactoryInstance = eventFactoryField.get(null);
-				java.lang.reflect.Method createEventMethod = eventFactoryClass.getMethod("createEventUtil", new Class[] {Notifier.class, ResourceSet.class});
-				Class eventUtilClass = createEventMethod.getReturnType();
-				java.lang.reflect.Method doForwardEventsMethod = eventUtilClass.getMethod("doForwardEvents", new Class[] {List.class});
-				EVENT_FACTORY_INSTANCE = eventFactoryInstance;
-				CREATE_EVENT_UTIL_METHOD = createEventMethod;
-				DO_FORWARD_EVENTS_METHOD = doForwardEventsMethod;
-			} catch (ClassNotFoundException e) {
-			} catch (SecurityException e) {
-			} catch (NoSuchFieldException e) {
-			} catch (IllegalArgumentException e) {
-			} catch (IllegalAccessException e) {
-			} catch (NoSuchMethodException e) {
-			}
-			RETRIEVED_EVENT_METHODS = true;
-		} 
-		return EVENT_FACTORY_INSTANCE != null;
-		
-	}
-	private class ExtensionDocApplies implements BeaninfoPlugin.IOverrideRunnable {
-		
-		private final String overrideFile;
-		private final ResourceSet rset;
-		private final JavaClass mergeIntoJavaClass;
-		private final List overridesCache;
-
-		public ExtensionDocApplies(String overrideFile, ResourceSet rset, JavaClass mergeIntoJavaClass, List overridesCache) {
-			this.overrideFile = overrideFile;
-			this.rset = rset;
-			this.mergeIntoJavaClass = mergeIntoJavaClass;
-			this.overridesCache = overridesCache;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IOverrideRunnable#run(java.lang.String)
-		 */
-		public void run(String overridePath) {
-			Resource overrideRes = null;
-			URI uri = URI.createURI(overridePath+overrideFile);
-			try {
-				overrideRes = rset.getResource(uri, true);
-				run(overrideRes);
-			} catch (WrappedException e) {
-				// FileNotFoundException is ok
-				if (!(e.exception() instanceof FileNotFoundException)) {
-					if (e.exception() instanceof CoreException
-						&& ((CoreException) e.exception()).getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND) {
-						// This is ok. Means uri_mapping not set so couldn't find in Workspace, also ok.
-					} else if (e.exception() instanceof PackageNotFoundException && ((PackageNotFoundException) e.exception()).getMessage().indexOf("event.xmi") != -1) {
-						if (!RETRIEVED_EVENT_METHODS) {
-							BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "An old style override file using the com.ibm.event format was found, but com.ibm.event was not installed. The first such file is "+uri, null)); //$NON-NLS-1$
-							RETRIEVED_EVENT_METHODS = true;	// Mark we've retrieved. This is ok because if event is missing here, it will be missing for retrieve too.
-						}
-					} else {
-						BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-					}
-				}
-				// In case it happened after creating resource but during load. Need to get rid of it in the finally.	
-				overrideRes = rset.getResource(uri, false);				
-			} catch (Exception e) {
-				// Couldn't load it for some reason.
-				BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
-				overrideRes = rset.getResource(uri, false); // In case it happened after creating resource but during load so that we can get rid of it.
-			} finally {
-				if (overrideRes != null)
-					rset.getResources().remove(overrideRes); // We don't need it around once we do the merge. Normal merge would of gotton rid of it, but in case of error we do it here.
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IOverrideRunnable#run(org.eclipse.emf.ecore.resource.Resource)
-		 */
-		public void run(Resource overrideRes) {
-			try {
-				EList contents = overrideRes.getContents();
-				if (overridesCache != null) {
-					// TODO Until https://bugs.eclipse.org/bugs/show_bug.cgi?id=109169 is fixed, we need our own Copier.
-					EcoreUtil.Copier copier = new EcoreUtil.Copier() {
-
-						private static final long serialVersionUID = 1L;
-
-						protected void copyReference(EReference eReference, EObject eObject, EObject copyEObject) {
-							if (eObject.eIsSet(eReference)) {
-								if (eReference.isMany()) {
-									List source = (List) eObject.eGet(eReference);
-									InternalEList target = (InternalEList) copyEObject.eGet(getTarget(eReference));
-									if (source.isEmpty()) {
-										target.clear();
-									} else {
-										boolean isBidirectional = eReference.getEOpposite() != null;
-										int index = 0;
-										for (Iterator k = ((EcoreEList) source).basicIterator(); k.hasNext();) {
-											Object referencedEObject = k.next();
-											Object copyReferencedEObject = get(referencedEObject);
-											if (copyReferencedEObject == null) {
-												if (!isBidirectional) {
-													target.addUnique(index, referencedEObject);
-													++index;
-												}
-											} else {
-												if (isBidirectional) {
-													int position = target.indexOf(copyReferencedEObject);
-													if (position == -1) {
-														target.addUnique(index, copyReferencedEObject);
-													} else if (index != position) {
-														target.move(index, copyReferencedEObject);
-													}
-												} else {
-													target.addUnique(index, copyReferencedEObject);
-												}
-												++index;
-											}
-										}
-									}
-								} else {
-									Object referencedEObject = eObject.eGet(eReference, false);
-									if (referencedEObject == null) {
-										copyEObject.eSet(getTarget(eReference), null);
-									} else {
-										Object copyReferencedEObject = get(referencedEObject);
-										if (copyReferencedEObject == null) {
-											if (eReference.getEOpposite() == null) {
-												copyEObject.eSet(getTarget(eReference), referencedEObject);
-											}
-										} else {
-											copyEObject.eSet(getTarget(eReference), copyReferencedEObject);
-										}
-									}
-								}
-							}
-						}
-					};
-					
-					// We fixup the CD first so that when serialized it will be to the correct object already. Simplifies apply later.
-					Iterator itr = contents.iterator();
-					while (itr.hasNext()) {
-						Object o = itr.next();
-						if (o instanceof ChangeDescription) {
-							fixupCD((ChangeDescription) o);
-						}
-					}
-
-				    Collection result = copier.copyAll(contents);
-				    copier.copyReferences();
-					overridesCache.addAll(result);	// Make a copy for the override cache to be used next time needed.
-				}
-				
-				if (!contents.isEmpty()) {
-					// TODO It could be either the old event model or the new ChangeDescription. When we remove Event Model we need to remove
-					// the test. This could be the override cache too, so we must apply the contents in the order they are in the resource.
-					try {
-						List events = null;
-						Object[] eventsParm = null;
-						Iterator itr = contents.iterator();
-						while (itr.hasNext()) {
-							Object o = itr.next();
-							if (o instanceof ChangeDescription) {
-								ChangeDescription cd = (ChangeDescription) o;
-								fixupCD(cd);
-								cd.apply();
-							} else if (isEventUtilLoaded()) {
-								if (events == null) {
-									events = new ArrayList(1);
-									events.add(null); // EventUtil needs a list, but we will be calling one by one. So just reuse this list.
-									eventsParm = new Object[] { events};
-								}								
-								// It is the old format.
-								events.set(0, o);
-								try {
-									Object util = CREATE_EVENT_UTIL_METHOD.invoke(EVENT_FACTORY_INSTANCE, new Object[] {mergeIntoJavaClass, rset});
-									DO_FORWARD_EVENTS_METHOD.invoke(util, eventsParm);
-								} catch (IllegalArgumentException e) {
-								} catch (IllegalAccessException e) {
-								} catch (InvocationTargetException e) {
-									BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error processing file\"" + overrideRes.getURI() + "\"", e.getCause())); //$NON-NLS-1$ //$NON-NLS-2$
-								}
-							}
-						}
-					} finally {
-						uninstallRootResource();
-					}						
-				}
-			} catch (WrappedException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error processing file\"" + overrideRes.getURI() + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-			}
-		}
-		
-		/*
-		 * fix it up so that references to "X:ROOT#//@root" are replaced with reference to the javaclass.
-		 */
-		private void fixupCD(ChangeDescription cd) {
-			EStructuralFeature keyFeature = ChangePackage.eINSTANCE.getEObjectToChangesMapEntry_Key();
-			Iterator changes = cd.getObjectChanges().iterator();
-			while (changes.hasNext()) {
-				EObject entry = (EObject) changes.next();
-				EObject key = (EObject) entry.eGet(keyFeature, false);
-				if (key != null && key.eIsProxy()) {
-					// See if it is our special.
-					URI uri = ((InternalEObject) key).eProxyURI();
-					String rootFrag = uri.fragment();
-					if (BeaninfoPlugin.ROOT_SCHEMA.equals(uri.scheme()) && BeaninfoPlugin.ROOT_OPAQUE.equals(uri.opaquePart()) && (rootFrag != null && rootFrag.startsWith(ROOT_FRAGMENT))) {
-						// It is one of ours. Get the fragment, remove the leading //root and append to the end of the
-						// uri from the java class itself.
-						if (rootFrag.length() <= ROOT_FRAGMENT.length())
-							entry.eSet(keyFeature, mergeIntoJavaClass);	// No sub-path, so just the java class.
-						else {
-							// There is a sub-path below the java class that is needed. Need to walk down the path.
-							String[] path = FRAGMENT_SPLITTER.split(rootFrag.substring(ROOT_FRAGMENT.length()+1));
-							InternalEObject newKey = (InternalEObject) mergeIntoJavaClass;
-							for (int i = 0; newKey != null && i < path.length; i++) {
-								newKey = (InternalEObject) newKey.eObjectForURIFragmentSegment(path[i]);
-							}
-							if (newKey != null)
-								entry.eSet(keyFeature, newKey);
-						}
-					}
-				}
-			}
-		}
-		
-		/*
-		 * Uninstall the fake root resource. This must be called after installRootResource has been called. So must use try/finally. 
-		 * 
-		 * 
-		 * @since 1.2.0
-		 */
-		private void uninstallRootResource() {
-			Resource root = rset.getResource(ROOT_URI, false);
-			if (root != null)
-				rset.getResources().remove(root);
-		}
-	}
-	protected void applyExtensionDocTo(ResourceSet rset, JavaClass mergeIntoJavaClass, String overrideFile, String packageName, String className) {
-		BeaninfoPlugin.getPlugin().applyOverrides(getAdapterFactory().getProject(), packageName, className, mergeIntoJavaClass, rset, 
-			new ExtensionDocApplies(overrideFile, rset, mergeIntoJavaClass, null));
-	}
-
-	/**
-	 * Return the target as a JavaClass 
-	 */
-	protected JavaClassImpl getJavaClass() {
-		return (JavaClassImpl) getTarget();
-	}
-
-	/**
-	 * Answer the beaninfo constants record
-	 */
-	protected BeaninfoProxyConstants getProxyConstants() {
-		return BeaninfoProxyConstants.getConstants(getRegistry());
-	}
-
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEStructuralFeatures()
-	 */
-	public EList getEStructuralFeatures() {
-		introspectIfNecessary();
-		return getJavaClass().getEStructuralFeaturesInternal();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getAllProperties()
-	 */
-	public EList getAllProperties() {
-		return allProperties();
-	}	
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEOperations()
-	 */
-	public EList getEOperations() {
-		if (getClassEntry() != null && getClassEntry().isOperationsStored())
-			introspectIfNecessary();	// Already stored, just do if necessary.
-		else {
-			synchronized (this) {
-				needsIntrospection = true;	// Force reintrospection because we either aren't storing operations, or have never loaded.
-			}
-			introspectIfNecessary(true);	// But force the operations now.
-		}
-		return getJavaClass().getEOperationsInternal();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEAllOperations()
-	 */
-	public BasicEList getEAllOperations() {
-		return allOperations();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEvents()
-	 */
-	public EList getEvents() {
-		introspectIfNecessary();
-		return getJavaClass().getEventsGen();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getAllEvents()
-	 */
-	public EList getAllEvents() {
-		return allEvents();
-	}					
-
-	private void finalizeProperties(ChangeDescription cd) {
-		// Now go through the list and remove those that should be removed, and set the etype for those that don't have it set.
-		Map oldLocals = getPropertiesMap();
-		Iterator itr = getFeaturesList().iterator();
-		while (itr.hasNext()) {
-			EStructuralFeature a = (EStructuralFeature) itr.next();
-			PropertyDecorator p = Utilities.getPropertyDecorator(a);
-			Object aOld = oldLocals.get(a.getName());
-			if (aOld != null && aOld != Boolean.FALSE) {
-				// A candidate for removal. It was in the old list and it was not processed.
-				if (p != null) {
-					ImplicitItem implicit = p.getImplicitDecoratorFlag();
-					if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-						p.setEModelElement(null); // Remove from the feature;
-						((InternalEObject) p).eSetProxyURI(BAD_URI);
-						// Mark it as bad proxy so we know it is no longer any use.
-						p = null;
-						if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							itr.remove(); // Remove it, this was implicitly created and not processed this time.
-							((InternalEObject) a).eSetProxyURI(BAD_URI);	// Mark it as bad proxy so we know it is no longer any use.
-							continue;
-						}
-						// Need to go on because we need to check the eType to make sure it is set. At this point we have no decorator but we still have a feature.
-					}
-				}
-			}
-			
-			// [79083] Also check for eType not set, and if it is, set it to EObject type. That way it will be valid, but not valid as 
-			// a bean setting.
-			if (a.getEType() == null) {
-				// Set it to EObject type. If it becomes valid later (through the class being changed), then the introspect/reflect
-				// will set it to the correct type.
-				a.setEType(EcorePackage.eINSTANCE.getEObject());
-				Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-				if (logger.isLoggingLevel(Level.WARNING))
-					logger.logWarning("Feature \""+getJavaClass().getQualifiedName()+"->"+a.getName()+"\" did not have a type set. Typically due to override file creating feature but property not found on introspection/reflection."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-			
-			if (p != null && cd != null) {
-				// Now create the appropriate cache entry for this property.
-				BeanInfoDecoratorUtility.buildChange(cd, p);
-			}
-		}
-	}
-
-	/**
-	 * merge all  the Properties (i.e. supertypes) (properties)
-	 */
-	protected EList allProperties() {
-		
-		EList jcAllProperties = getJavaClass().getAllPropertiesGen();
-		BeaninfoSuperAdapter superAdapter =
-			(BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
-		if (jcAllProperties != null) {
-			// See if new one required.
-			if (superAdapter == null || !superAdapter.isAllPropertiesCollectionModified())
-				return jcAllProperties;
-			// Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.       		
-		}
-		
-		UniqueEList.FastCompare allProperties = new UniqueEList.FastCompare() {
-			/**
-			 * Comment for <code>serialVersionUID</code>
-			 * 
-			 * @since 1.1.0
-			 */
-			private static final long serialVersionUID = 1L;
-
-			protected Object[] newData(int capacity) {
-				return new EStructuralFeature[capacity];
-			}
-		};
-		boolean doAllProperties = false;
-		synchronized(this) {
-			// If we are introspecting, don't do all properties because it is an invalid list. Just return empty without reseting the all modified flag.
-			doAllProperties = !isDoingAllProperties && !isIntrospecting && isResourceConnected();
-			if (doAllProperties)
-				isDoingAllProperties = true;
-		}
-		if (doAllProperties) {
-			try {
-				EList localProperties = getJavaClass().getProperties();
-				// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-				// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-				// the truth is most people want these. So we will add them in. But since there could be more than one it
-				// gets confusing. We need to look for dups from the super types and still keep order.
-				//
-				// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-				List superTypes = getJavaClass().getESuperTypes();
-				if (!superTypes.isEmpty()) {
-					// Now we need to merge in the supers.
-					BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-					// If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
-					// we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
-					// because IB would contribute IC's too).
-					Collection workingAllProperties = superTypes.size() == 1 ? (Collection) allProperties : new LinkedHashSet(); 
-					// We will now merge as directed.
-					boolean mergeAll = bd == null || bd.isMergeSuperProperties();
-					if (!mergeAll) {
-						// we don't to want to merge super properties, but we still need super non-properties or explict ones.
-						int lenST = superTypes.size();
-						for (int i=0; i<lenST; i++) {
-							List supers = ((JavaClass) superTypes.get(i)).getAllProperties();
-							int len = supers.size();
-							for (int i1 = 0; i1 < len; i1++) {
-								EStructuralFeature p = (EStructuralFeature) supers.get(i1);
-								PropertyDecorator pd = Utilities.getPropertyDecorator(p);
-								if ( pd == null || (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !pd.isMergeIntrospection()))
-									workingAllProperties.add(p);
-							}
-						}
-					} else {
-						// We want to merge all.					
-						// BeanInfo could of given us the not merge list. If the list is empty, then we accept all.
-						if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames())) {
-							// We were given a list of names.
-							// Get the names into a set to create a quick lookup.
-							HashSet superSet = new HashSet(bd.getNotInheritedPropertyNames());
-							
-							// Now walk and add in non-bean properties (and bean properties that were explicitly added and not mergeable (i.e. didn't come thru beaninfo)) 
-							// and add those not specifically called out by BeanInfo in the not inherited list.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								List supers = ((JavaClass) superTypes.get(i)).getAllProperties();
-								int len = supers.size();
-								for (int i1 = 0; i1 < len; i1++) {
-									EStructuralFeature p = (EStructuralFeature) supers.get(i1);
-									PropertyDecorator pd = Utilities.getPropertyDecorator(p);
-									if (pd == null || (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !pd.isMergeIntrospection()) || !superSet.contains(pd.getName()))
-										workingAllProperties.add(p);
-								}
-							}
-						} else {
-							// BeanInfo (or reflection always does this) called out that all super properties are good
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								workingAllProperties.addAll(((JavaClass) superTypes.get(i)).getAllProperties());
-							}
-						}
-					}
-					if (workingAllProperties != allProperties)
-						allProperties.addAll(workingAllProperties);	// Now copy over the ordered super properties.
-				}
-				allProperties.addAll(localProperties);				
-				superAdapter.setAllPropertiesCollectionModified(false); // Now built, so reset to not changed.
-			} finally {
-				synchronized(this) {
-					isDoingAllProperties = false;
-				}
-			}
-		}
-
-		if (!allProperties.isEmpty()) {
-			allProperties.shrink();
-			return new EcoreEList.UnmodifiableEList.FastCompare(
-				getJavaClass(),
-				null,
-				allProperties.size(),
-				allProperties.data());
-		} else
-			return ECollections.EMPTY_ELIST;
-	}
-
-	/*
-	 * Fill in the property using the prop record. If this one that should have merging done, then
-	 * return the PropertyDecorator so that it can have the PropertyRecord merged into it. Else
-	 * return null if no merging.
-	 */
-	protected PropertyDecorator calculateProperty(PropertyRecord pr, boolean indexed) {
-		// If this is an indexed property, then a few fields will not be set in here, but
-		// will instead be set by the calculateIndexedProperty, which will be called.
-		JavaHelpers type = pr.propertyTypeName != null ? Utilities.getJavaType(MapJNITypes.getFormalTypeName(pr.propertyTypeName), getJavaClass().eResource().getResourceSet()) : null;
-
-		if (indexed) {
-			// If no array write method found, then see if there is an indexed write method. If there is, then it is changable.
-			if (type == null) {
-				// If no array type from above, create one from the indexed type proxy. Add '[]' to turn it into an array.
-				type = Utilities.getJavaType(MapJNITypes.getFormalTypeName(((IndexedPropertyRecord) pr).indexedPropertyTypeName)+"[]", getJavaClass().eResource().getResourceSet()); //$NON-NLS-1$
-			}
-		}
-
-		if (type != null)
-			return createProperty(pr.name, indexed, type); // A valid property descriptor.
-		else
-			return null;
-	}
-
-	/**
-	 * Fill in the property and its decorator using the passed in information.
-	 */
-	protected PropertyDecorator createProperty(String name, boolean indexed, EClassifier type) {
-		// First find if there is already a property of this name, and if there is, is the PropertyDecorator
-		// marked to not allow merging in of introspection results.		
-		HashMap existingLocals = getPropertiesMap();
-		EStructuralFeature prop = null;
-		PropertyDecorator pd = null;
-		Object p = existingLocals.get(name);
-		if (Boolean.FALSE == p)
-			return null; // We've already processed this name, can't process it again.
-		if (p != null) {
-			// We've found one of the same name. Whether we modify it or use it as is, we put in a
-			// special dummy in its place. That marks that we've already processed it and accepted it.
-			existingLocals.put(name, Boolean.FALSE);
-
-			// If the decorator for this entry says not to merge then return.
-			// If there is no PropertyDecorator, then we will merge. If they
-			// didn't want to merge then should of created of property decorator and said no merge.
-			pd = Utilities.getPropertyDecorator((EStructuralFeature) p);
-			if (pd != null && !pd.isMergeIntrospection())
-				return null;
-			prop = (EStructuralFeature) p;
-		}
-
-		// Need to test if this is an implicit decorator and it is not of the 
-		// same type (i.e. is indexed now but wasn't or visa-versa, then we need
-		// to get rid of the decorator and recreate it. If it is not implicit, then
-		// we have to use it as is because the user specified, so it won't become
-		// an indexed if the user did not created it as an index, and visa-versa.
-		// Also if it is implicit, then we need to unset certain features that may of
-		// been set by a previous reflection which has now become introspected.
-		// When reflected we set the actual fields instead of the letting proxy determine them.
-		if (pd != null) {
-			if (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL) {
-				// We can't change the type for explicit.
-				indexed = pd instanceof IndexedPropertyDecorator;
-			} else {
-				if ((indexed && !(pd instanceof IndexedPropertyDecorator)) || (!indexed && pd instanceof IndexedPropertyDecorator)) {
-					// It is implicit and of a different type, so just get rid of it and let it be recreated correctly.
-					prop.getEAnnotations().remove(pd);
-					pd = null;
-				}
-			}
-			if (pd != null)
-				if (indexed)
-					BeanInfoDecoratorUtility.clear((IndexedPropertyDecorator) pd);
-				else
-					BeanInfoDecoratorUtility.clear(pd);
-		}
-
-		ImplicitItem implicit = pd == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : pd.getImplicitDecoratorFlag();
-		if (prop == null) {
-			// We will create a new property.
-			// We can't have an implicit feature, but an explicit decorator.
-			getFeaturesList().add(prop = EcoreFactory.eINSTANCE.createEReference());
-			implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL;
-		}
-
-		setPropertyID(name, prop);
-		prop.setName(name);
-		prop.setTransient(false);
-		prop.setVolatile(false);
-
-		// Containment and Unsettable is tricky for EReferences. There is no way to know whether it has been explicitly set to false, or it defaulted to
-		// false because ECore has not made containment/unsettable an unsettable feature. So we need to instead use the algorithm of if we here 
-		// created the feature, then we will by default set it to containment/unsettable. If it was created through diff merge, then
-		// we will leave it alone. It is the responsibility of the merge file writer to set containment/unsettable correctly.
-		if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-			prop.setUnsettable(true);
-		}
-		prop.setEType(type);
-		if (!indexed) {
-			prop.setLowerBound(0);
-			prop.setUpperBound(1);
-		} else {
-			prop.setLowerBound(0);
-			prop.setUpperBound(-1);
-			prop.setUnique(true);
-		}
-
-		// Now create/fill in the property descriptor for it.
-		// If there already is one then we
-		// will use it. This allows merging with beanfinfo.		
-		if (pd == null) {
-			pd =
-				(!indexed)
-					? BeaninfoFactory.eINSTANCE.createPropertyDecorator()
-					: BeaninfoFactory.eINSTANCE.createIndexedPropertyDecorator();
-			pd.setImplicitDecoratorFlag(implicit);
-			prop.getEAnnotations().add(pd);
-		}
-		return pd;
-	}
-
-	/**
-	 * @param name
-	 * @param prop
-	 * 
-	 * @since 1.1.0
-	 */
-	private void setPropertyID(String name, EStructuralFeature prop) {
-		// Now fill it in. Normal id for an attribute is "classname.attributename" but we can't use that
-		// for us because that format is used by Java Core for a field and there would be confusion.
-		// So we will use '/' instead.
-		((XMIResource) prop.eResource()).setID(prop, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.FEATURE + name);
-	}
-
-	/*
-	 * Reflect the properties. This requires going through local methods and matching them up to
-	 * see if they are properties.
-	 */
-	private void reflectProperties() {
-		// If we are set to mergeSuperTypeProperties, then we need to get the super properties.
-		// This is so that duplicate any from super that we find here. When reflecting we don't
-		// allow discovered duplicates unless they are different types.
-		//
-		// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-		// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-		// the truth is most people want these. So we will add them in. But since there could be more than one it
-		// gets confusing. We need to look for dups from the super types.
-		//
-		// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-		TimerTests.basicTest.startCumulativeStep(REFLECT_PROPERTIES);		
-		Set supers = new HashSet(50);
-		BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-		if (bd == null || bd.isMergeSuperProperties()) {
-			List superTypes = getJavaClass().getESuperTypes();
-			if (!superTypes.isEmpty()) {
-				int lenST = superTypes.size();
-				for (int i=0; i<lenST; i++) {
-					List superAll = ((JavaClass) superTypes.get(i)).getAllProperties();
-					int len = superAll.size();
-					for (int i1=0; i1<len; i1++) {
-						EStructuralFeature sf = (EStructuralFeature) superAll.get(i1);
-						supers.add(sf.getName());
-					}
-				}
-			}
-		}
-
-		// If any of the classes in the hierarchy are bound, then all reflected properties are considered bound.
-		boolean isBound = isDefaultBound();
-		if (!isBound) {
-			List superTypes = getJavaClass().getEAllSuperTypes();
-			// Start from end because that will be first class above the this one.
-			for (int i=superTypes.size()-1; !isBound && i>=0; i--) {
-				JavaClass spr = (JavaClass) superTypes.get(i);
-				BeaninfoClassAdapter bi = (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter(spr, IIntrospectionAdapter.ADAPTER_KEY);
-				// They should all be reflected, but be on safe side, check if null.
-				if (bi != null)
-					isBound = bi.isDefaultBound();
-			}
-		}
-
-		HashMap props = new HashMap();
-
-		Iterator itr = getJavaClass().getPublicMethods().iterator();
-		while (itr.hasNext()) {
-			Method mthd = (Method) itr.next();
-			if (mthd.isStatic() || mthd.isConstructor())
-				continue; // Statics/constructors don't participate as properties
-			if (mthd.getName().startsWith("get")) { //$NON-NLS-1$
-				String name = java.beans.Introspector.decapitalize(mthd.getName().substring(3));
-				if (name.length() == 0 || supers.contains(name))
-					continue;	// Had get(...) and not getXXX(...) so not a getter. Or this is the same name as a super, either way ignore it.
-				PropertyInfo propInfo = (PropertyInfo) props.get(name);
-				if (propInfo == null) {
-					propInfo = new PropertyInfo();
-					if (propInfo.setGetter(mthd, false))
-						props.put(name, propInfo);
-				} else
-					propInfo.setGetter(mthd, false);
-			} else if (mthd.getName().startsWith("is")) { //$NON-NLS-1$
-				String name = java.beans.Introspector.decapitalize(mthd.getName().substring(2));
-				if (name.length() == 0 || supers.contains(name))
-					continue;	// Had is(...) and not isXXX(...) so not a getter. Or this is the same name as a super, either way ignore it.
-				PropertyInfo propInfo = (PropertyInfo) props.get(name);
-				if (propInfo == null) {
-					propInfo = new PropertyInfo();
-					if (propInfo.setGetter(mthd, true))
-						props.put(name, propInfo);
-				} else
-					propInfo.setGetter(mthd, true);
-			} else if (mthd.getName().startsWith("set")) { //$NON-NLS-1$
-				String name = java.beans.Introspector.decapitalize(mthd.getName().substring(3));
-				if (name.length() == 0 || supers.contains(name))
-					continue;	// Had set(...) and not setXXX(...) so not a setter. Or this is the same name as a super, either way ignore it.				
-				PropertyInfo propInfo = (PropertyInfo) props.get(name);
-				if (propInfo == null) {
-					propInfo = new PropertyInfo();
-					if (propInfo.setSetter(mthd))
-						props.put(name, propInfo);
-				} else
-					propInfo.setSetter(mthd);
-			}
-		}
-
-		// Now go through the hash map and create the properties.
-		itr = props.entrySet().iterator();
-		while (itr.hasNext()) {
-			Map.Entry entry = (Map.Entry) itr.next();
-			((PropertyInfo) entry.getValue()).createProperty((String) entry.getKey(), isBound);
-		}
-		TimerTests.basicTest.stopCumulativeStep(REFLECT_PROPERTIES);		
-	}
-
-	private class PropertyInfo {
-		
-		public EClassifier type, indexedType;
-		public boolean constrained;
-		public Method getter, setter, indexedGetter, indexedSetter;
-
-		public boolean setGetter(Method get, boolean mustBeBoolean) {
-			List parms = get.getParameters();
-			if (parms.size() > 1)
-				return false; // Invalid - improper number of parms.
-			boolean indexed = parms.size() == 1;
-			if (indexed && !((JavaParameter) parms.get(0)).getEType().getName().equals("int")) //$NON-NLS-1$
-				return false; // Invalid - a parm that is not an int is invalid for indexed.
-			EClassifier retType = get.getReturnType();
-			if (retType == null || retType.getName().equals("void")) //$NON-NLS-1$
-				return false; // Invalid - must have a return type
-			if (mustBeBoolean && !retType.getName().equals("boolean")) //$NON-NLS-1$
-				return false; // Invalid - it must be a boolean.
-			if (indexed) {
-				if (indexedType != null) {
-					if (indexedType != retType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (type != null && !(((JavaHelpers) type).isArray() && ((ArrayType) type).getComponentType() == retType))
-					return false; // Invalid - indexed type doesn't match component type of base type.
-			} else {
-				if (type != null) {
-					if (type != retType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (indexedType != null && !(((JavaHelpers) retType).isArray() && ((ArrayType) retType).getComponentType() == indexedType))
-					if (type == null) {
-						// We had a potential indexed and had not yet found the regular type. We've now found
-						// the regular type, and it is not indexed. So it takes priority and will wipe out
-						// the indexed type.
-						indexedGetter = null;
-						indexedSetter = null;
-						indexedType = null;
-					} else
-						return false; // Invalid - indexed type doesn't match component type of base type we already have
-			}
-
-			if (indexed) {
-				if (indexedGetter != null)
-					return false; // Already have an indexed getter.
-				indexedGetter = get;
-				indexedType = retType;
-			} else {
-				if (getter != null)
-					return false; // Already have a getter
-				getter = get;
-				type = retType;
-			}
-			return true;
-		}
-
-		public boolean setSetter(Method set) {
-			List parms = set.getParameters();
-			if (parms.size() > 2 || parms.size() < 1)
-				return false; // Invalid - improper number of parms.
-			boolean indexed = parms.size() == 2;
-			if (indexed && !((JavaParameter) parms.get(0)).getEType().getName().equals("int")) //$NON-NLS-1$
-				return false; // Invalid - a parm that is not an int is invalid for indexed.
-			EClassifier retType = set.getReturnType();
-			if (retType != null && !retType.getName().equals("void")) //$NON-NLS-1$
-				return false; // Invalid - must not have a return type
-			EClassifier propType = null;
-			if (indexed) {
-				propType = ((JavaParameter) parms.get(1)).getEType();
-				if (indexedType != null) {
-					if (indexedType != propType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (type != null && !(((JavaHelpers) type).isArray() && ((ArrayType) type).getComponentType() == propType))
-					return false; // Invalid - indexed type doesn't match component type of base type, or base type not an array
-			} else {
-				propType = ((JavaParameter) parms.get(0)).getEType();
-				if (type != null) {
-					if (type != propType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (indexedType != null
-					&& !(((JavaHelpers) propType).isArray() && ((ArrayType) propType).getComponentType() == indexedType))
-					if (type == null) {
-						// We had a potential indexed and had not yet found the regular type. We've now found
-						// the regular type, and it is not indexed of the correct type. So it takes priority and will wipe out
-						// the indexed type.
-						indexedGetter = null;
-						indexedSetter = null;
-						indexedType = null;
-					} else
-						return false; // Invalid - indexed type doesn't match component type of base type from this setter.
-			}
-
-			if (indexed) {
-				if (indexedSetter != null)
-					return false; // Already have an indexed getter.
-				indexedSetter = set;
-				indexedType = propType;
-			} else {
-				if (setter != null)
-					return false; // Already have a getter
-				setter = set;
-				type = propType;
-			}
-
-			if (set.getJavaExceptions().contains(Utilities.getJavaClass("java.beans.PropertyVetoException", getJavaClass().eResource().getResourceSet()))) //$NON-NLS-1$
-				constrained = true;
-			return true;
-		}
-
-		public void createProperty(String name, boolean isBound) {
-			boolean indexed = indexedType != null;
-			if (indexed && type == null)
-				return; // A potential indexed, but never found the getter/setter of the regular type.
-
-			PropertyDecorator prop =
-				BeaninfoClassAdapter.this.createProperty(
-					name,
-					indexed,
-					type);
-			if (prop == null)
-				return; // Reflection not wanted.
-
-			indexed = prop instanceof IndexedPropertyDecorator; // It could of been forced back to not indexed if explicitly set.
-
-			// At this point in time all implicit settings have been cleared. This is done back in createProperty() method above.
-			// So now apply reflected settings on the property decorator. 
-			BeanInfoDecoratorUtility.setProperties(prop, isBound, constrained, getter, setter);
-			if (indexed)
-				BeanInfoDecoratorUtility.setProperties((IndexedPropertyDecorator) prop, indexedGetter, indexedSetter);
-
-		}
-	};
-
-	/*
-	 * Should only be called from introspect so that flags are correct.
-	 */
-	private void finalizeOperations(ChangeDescription cd) {
-		// Now go through the list and remove those that should be removed.
-		Iterator itr = getOperationsList().iterator();
-		while (itr.hasNext()) {
-			EOperation a = (EOperation) itr.next();
-			MethodDecorator m = Utilities.getMethodDecorator(a);
-			if (!newoperations.contains(a)) {
-				// A candidate for removal. It is in the list but we didn't add it. Check to see if it one we had created in the past.
-				// If no methoddecorator, then keep it, not one ours.
-				if (m != null) {
-					ImplicitItem implicit = m.getImplicitDecoratorFlag();
-					if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-						m.setEModelElement(null); // Remove it because it was implicit.
-						 ((InternalEObject) m).eSetProxyURI(BAD_URI);
-						if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							itr.remove(); // The operation was implicit too.
-							 ((InternalEObject) a).eSetProxyURI(BAD_URI);
-						}
-						continue;	// At this point we no longer have a method decorator, so go to next.
-					}
-				}
-			}
-			
-			if (m != null && cd != null) {
-				// Now create the appropriate cache entry for this method.
-				BeanInfoDecoratorUtility.buildChange(cd, m);
-			}
-		}
-	}
-
-	/**
-	 * Fill in the behavior and its decorator using the mthdDesc.
-	 */
-	protected MethodDecorator calculateOperation(MethodRecord record) {
-		return createOperation(record.name, formLongName(record), null, record);
-	}
-
-	/**
-	 * Fill in the behavior and its decorator using the passed in information.
-	 */
-	protected MethodDecorator createOperation(String name, String longName, Method method, MethodRecord record) {
-		// First find if there is already a behavior of this name and method signature , and if there is, is the MethodDecorator
-		// marked to not allow merging in of introspection results.
-		HashMap existingLocals = getOperationsMap();
-		EOperation oper = null;
-		MethodDecorator md = null;
-		Object b = null;
-		if (name != null)
-			b = existingLocals.get(longName);
-		else
-			b = existingLocals.get(longName);
-			
-		if (b != null) {
-			// If the decorator for this entry says not to merge then return.
-			// If there is no decorator, then we will merge. If they didn't want to
-			// merge, then they should of created a decorator with no merge on it.
-			md = Utilities.getMethodDecorator((EOperation) b);
-			if (md != null && !md.isMergeIntrospection())
-				return null;
-			oper = (EOperation) b;
-		}
-
-		// Need to find the method and method id.
-		if (method == null) {
-			// No method sent, create a proxy to it from the record.
-			method = BeanInfoDecoratorUtility.createJavaMethodProxy(record.methodForDescriptor);
-		}
-
-		ImplicitItem implicit = md == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : ImplicitItem.NOT_IMPLICIT_LITERAL;
-		if (oper == null) {
-			// We will create a new MethodProxy.
-			oper = BeaninfoFactory.eINSTANCE.createMethodProxy();
-			getOperationsList().add(oper);
-			implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL; 
-		}		
-		if (name == null)
-			name = method.getName();		
-
-		// Now fill it in.
-		if (oper instanceof MethodProxy)
-			 ((MethodProxy) oper).setMethod(method);
-		setMethodID(name, oper);
-		oper.setName(name);
-		newoperations.add(oper);
-
-		// Now create/fill in the method decorator for it.
-		// If there already is one then we
-		// will use it. This allows merging with beaninfo.		
-		if (md == null) {
-			md = BeaninfoFactory.eINSTANCE.createMethodDecorator();
-			md.setImplicitDecoratorFlag(implicit);
-			oper.getEAnnotations().add(md);
-		} else
-			BeanInfoDecoratorUtility.clear(md);
-		return md;
-	}
-
-	/**
-	 * @param name
-	 * @param oper
-	 * 
-	 * @since 1.1.0
-	 */
-	private void setMethodID(String name, EOperation oper) {
-		((XMIResource) oper.eResource()).setID(oper, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.BEHAVIOR + name);
-	}
-
-	private void reflectOperations() {
-		// If we are set to mergeSuperTypeBehaviors, then we need to get the super behaviors.
-		// This is so that duplicate any from super that we find here. When reflecting we don't
-		// allow discovered duplicates unless they are different signatures. So all super operations
-		// will be allowed and we will not override them.
-		//
-		// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-		// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-		// the truth is most people want these. So we will add them in. But since there could be more than one it
-		// gets confusing. We need to look for dups from the super types.
-		//
-		// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-		Set supers = new HashSet(50);
-		BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-		if (bd == null || bd.isMergeSuperMethods()) {
-			List superTypes = getJavaClass().getESuperTypes();
-			if (!superTypes.isEmpty()) {
-				int lenST = superTypes.size();
-				for (int i=0; i<lenST; i++) {
-					List superAll = ((JavaClass) superTypes.get(i)).getEAllOperations();
-					int len = superAll.size();
-					for (int i1=0; i1<len; i1++) {
-						EOperation op = (EOperation) superAll.get(i1);
-						supers.add(formLongName(op));
-					}
-				}
-			}
-		}
-
-		Iterator itr = getJavaClass().getPublicMethods().iterator();
-		while (itr.hasNext()) {
-			Method mthd = (Method) itr.next();
-			if (mthd.isStatic() || mthd.isConstructor())
-				continue; // Statics/constructors don't participate as behaviors	
-			String longName = formLongName(mthd);
-			// Add if super not already contain it.
-			if (!supers.contains(longName))
-				createOperation(null, longName, mthd, null);	// Don't pass a name, try to create it by name, only use ID if there is more than one of the same name.
-		}
-	}
-
-	/*
-	 * merge all  the Behaviors(i.e. supertypes)
-	 */
-	protected BasicEList allOperations() {
-		BasicEList jcAllOperations = (BasicEList) getJavaClass().primGetEAllOperations();
-		BeaninfoSuperAdapter superAdapter =
-			(BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
-		if (jcAllOperations != null) {
-			// See if new one required.
-			if (superAdapter == null || !superAdapter.isAllOperationsCollectionModified())
-				return jcAllOperations;
-			// Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.       		
-		}
-
-		UniqueEList.FastCompare allOperations = new UniqueEList.FastCompare() {
-			/**
-			 * Comment for <code>serialVersionUID</code>
-			 * 
-			 * @since 1.1.0
-			 */
-			private static final long serialVersionUID = 1L;
-
-			protected Object[] newData(int capacity) {
-				return new EOperation[capacity];
-			}
-		};
-		boolean doAllOperations = false;
-		synchronized(this) {
-			// If we are introspecting, don't do all operatoins because it is an invalid list. Just return empty without reseting the all modified flag.
-			doAllOperations = !isDoingAllOperations && !isIntrospecting && isResourceConnected();
-			if (doAllOperations)
-				isDoingAllOperations = true;
-		}
-
-		if (doAllOperations) {
-			try {
-				EList localOperations = getJavaClass().getEOperations();
-				// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-				// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-				// the truth is most people want these. So we will add them in. But since there could be more than one it
-				// gets confusing. We need to look for dups from the super types and still keep order.
-				//
-				// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-				List superTypes = getJavaClass().getESuperTypes();
-				if (!superTypes.isEmpty()) {
-					// Now we need to merge in the supers.
-					BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-					// If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
-					// we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
-					// because IB would contribute IC's too).
-					Collection workingAllOperations = superTypes.size() == 1 ? (Collection) allOperations : new LinkedHashSet(); 
-					// We will now merge as directed.
-					boolean mergeAll = bd == null || bd.isMergeSuperMethods();
-					if (!mergeAll) {
-						// we don't to want to merge super operations, but we still need super non-operations.
-						int lenST = superTypes.size();
-						for (int i=0; i<lenST; i++) {
-							List supers = ((JavaClass) superTypes.get(i)).getEAllOperations();
-							int len = supers.size();
-							for (int i1 = 0; i1 < len; i1++) {
-								EOperation o = (EOperation) supers.get(i1);
-								MethodDecorator md = Utilities.getMethodDecorator(o);
-								if (md == null || (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !md.isMergeIntrospection()))
-									workingAllOperations.add(o);
-							}
-						}
-					} else {
-						// We want to merge all.
-						// BeanInfo could of given us the don't merge list. If the list is empty, then we accept all.
-						if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames())) {
-							// We were given a list of names.
-							// Get the names into a set to create a quick lookup.
-							HashSet superSet = new HashSet(bd.getNotInheritedMethodNames());
-							
-							// Now walk and add in non-bean operations (and bean operations that were explicitly added and not mergeable (i.e. didn't come thru beaninfo)) 
-							// and add those not specifically called out by BeanInfo not merge list.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								List supers = ((JavaClass) superTypes.get(i)).getEAllOperations();
-								int len = supers.size();
-								for (int i1 = 0; i1 < len; i1++) {
-									EOperation o = (EOperation) supers.get(i1);
-									MethodDecorator md = Utilities.getMethodDecorator(o);
-									if (md == null || (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !md.isMergeIntrospection()))
-										workingAllOperations.add(o);
-									else {
-										String longName = formLongName(o);
-										if (longName == null || !superSet.contains(longName))
-											workingAllOperations.add(o);
-									}
-								}
-							}
-						} else {
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								workingAllOperations.addAll(((JavaClass) superTypes.get(i)).getEAllOperations());
-							}
-						}
-					}
-					if (workingAllOperations != allOperations)
-						allOperations.addAll(workingAllOperations);	// Now copy over the ordered super operations.					
-				}
-				allOperations.addAll(localOperations);				
-				ESuperAdapter sa = getJavaClass().getESuperAdapter();
-				sa.setAllOperationsCollectionModified(false); // Now built, so reset to not changed.
-			} finally {
-				synchronized(this) {
-					isDoingAllOperations = false;
-				}
-			}
-		}
-
-		allOperations.shrink();
-		return new EcoreEList.UnmodifiableEList.FastCompare(
-			getJavaClass(),
-			EcorePackage.eINSTANCE.getEClass_EAllOperations(),
-			allOperations.size(),
-			allOperations.data());
-
-	}
-
-	/*
-	 * Should only be called from introspect so that flags are correct.
-	 */
-	private void finalizeEvents(ChangeDescription cd) {
-		// Now go through the list and remove those that should be removed.
-		Map oldLocals = getEventsMap();
-		Iterator itr = getEventsList().iterator();
-		while (itr.hasNext()) {
-			JavaEvent a = (JavaEvent) itr.next();
-			EventSetDecorator e = Utilities.getEventSetDecorator(a);
-			Object aOld = oldLocals.get(a.getName());
-			if (aOld != null && aOld != Boolean.FALSE) {
-				// A candidate for removal. It was in the old list and it was not processed.
-				if (e != null) {
-					ImplicitItem implicit = e.getImplicitDecoratorFlag();
-					if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-						e.setEModelElement(null); // Remove it because it was implicit.
-						((InternalEObject) e).eSetProxyURI(BAD_URI);
-						if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							itr.remove(); // The feature was implicit too.
-							((InternalEObject) a).eSetProxyURI(BAD_URI);
-						}
-						continue;	// At this point we don't have a decorator any more, so don't bother going on.
-					}
-				}
-			}
-			
-			if (e != null && cd != null) {
-				// Now create the appropriate cache entry for this event.
-				BeanInfoDecoratorUtility.buildChange(cd, e);
-			}
-		}
-	}
-
-	/**
-	 * Fill in the event and its decorator using the eventDesc.
-	 */
-	protected EventSetDecorator calculateEvent(EventSetRecord record) {
-		return createEvent(record.name);
-	}
-
-	/**
-	 * Fill in the event and its decorator using the passed in information.
-	 */
-	protected EventSetDecorator createEvent(String name) {
-		// First find if there is already an event of this name, and if there is, is the EventSetDecorator
-		// marked to not allow merging in of introspection results.
-		HashMap existingLocals = getEventsMap();
-		JavaEvent event = null;
-		EventSetDecorator ed = null;
-		Object b = existingLocals.get(name);
-		if (Boolean.FALSE == b)
-			return null; // We've already processed this event, can't process it again.			
-		if (b != null) {
-			// We've found one of the same event. Whether we modify it or use it as is, we put in a
-			// special dummy in its place. That marks that we've already processed it and accepted it.
-			existingLocals.put(name, Boolean.FALSE);
-
-			// If the decorator for this entry says not to merge then return.
-			// If there is no decorator, then we will merge. If they didn't want to
-			// merge, then they should of created a decorator with no merge on it.
-			ed = Utilities.getEventSetDecorator((JavaEvent) b);
-			if (ed != null && !ed.isMergeIntrospection())
-				return null;
-			event = (JavaEvent) b;
-		}
-		
-		ImplicitItem implicit = ed == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : ImplicitItem.NOT_IMPLICIT_LITERAL;
-		if (event == null) {
-			// We will create a new Event.
-			event = BeaninfoFactory.eINSTANCE.createBeanEvent();
-			getEventsList().add(event);
-			implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL; // Can't have an implicit feature but explicit decorator.
-		}
-
-		setEventID(name, event);
-		event.setName(name);
-
-		// Now create in the event decorator for it.
-		// If there already is one then we
-		// will use it. This allows merging with beaninfo.		
-		if (ed == null) {
-			ed = BeaninfoFactory.eINSTANCE.createEventSetDecorator();
-			ed.setImplicitDecoratorFlag(implicit);
-			event.getEAnnotations().add(ed);
-		} else
-			BeanInfoDecoratorUtility.clear(ed);
-		return ed;
-	}
-
-	/**
-	 * @param name
-	 * @param event
-	 * 
-	 * @since 1.1.0
-	 */
-	private void setEventID(String name, JavaEvent event) {
-		// Now fill it in.
-		((XMIResource) event.eResource()).setID(event, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.EVENT + name);
-	}
-
-	/**
-	 * Reflect the events. This requires going through local public methods and creating an 
-	 * event for the discovered events.
-	 */
-	protected void reflectEvents() {
-		// If we are set to mergeSuperTypeEvents, then we need to get the super events.
-		// This is so that duplicate any from super that we find here. When reflecting we don't
-		// allow discovered duplicates.
-		//
-		// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-		// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-		// the truth is most people want these. So we will add them in. But since there could be more than one it
-		// gets confusing. We need to look for dups from the super types.
-		//
-		// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-		Set supers = new HashSet(50);
-		BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-		if (bd == null || bd.isMergeSuperEvents()) {
-			List superTypes = getJavaClass().getESuperTypes();
-			if (!superTypes.isEmpty()) {
-				int lenST = superTypes.size();
-				for (int i=0; i<lenST; i++) {
-					List superAll = ((JavaClass) superTypes.get(i)).getAllEvents();
-					int len = superAll.size();
-					for (int i1=0; i1<len; i1++) {
-						JavaEvent se = (JavaEvent) superAll.get(i1);
-						supers.add(se.getName());
-					}
-				}
-			}
-		}
-
-		HashMap events = new HashMap();
-		eventListenerClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.EventListener", getJavaClass()); // Initialize, needed for building eventinfos. //$NON-NLS-1$
-		tooManyExceptionClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.TooManyListenersException", getJavaClass()); // Initialize, needed for building eventinfos. //$NON-NLS-1$
-		Iterator itr = getJavaClass().getPublicMethods().iterator();
-		while (itr.hasNext()) {
-			Method mthd = (Method) itr.next();
-			if (mthd.isStatic() || mthd.isConstructor())
-				continue; // Statics/constructors don't participate in events.
-			String key = validEventAdder(mthd);
-			if (key != null) {
-				EventInfo eventInfo = (EventInfo) events.get(key);
-				if (eventInfo == null) {
-					eventInfo = new EventInfo();
-					eventInfo.setAdder(mthd);
-					events.put(key, eventInfo);
-				} else
-					eventInfo.setAdder(mthd);
-			} else {
-				key = validEventRemove(mthd);
-				if (key != null) {
-					EventInfo eventInfo = (EventInfo) events.get(key);
-					if (eventInfo == null) {
-						eventInfo = new EventInfo();
-						eventInfo.setRemover(mthd);
-						events.put(key, eventInfo);
-					} else
-						eventInfo.setRemover(mthd);
-				}
-			}
-		}
-
-		eventListenerClass = null; // No longer need it.
-
-		// Now actually create the events.
-		HashSet eventNames = new HashSet(events.size()); // Set of found event names, to prevent duplicates
-		Iterator evtItr = events.entrySet().iterator();
-		while (evtItr.hasNext()) {
-			Map.Entry eventMap = (Map.Entry) evtItr.next();
-			EventInfo ei = (EventInfo) eventMap.getValue();
-			if (ei.isValidInfo()) {
-				String eventName = getEventName((String) eventMap.getKey());
-				if (eventNames.contains(eventName))
-					continue;	// Aleady created it. (Note: Introspector actually takes last one over previous dups, but the order is totally undefined, so choosing first is just as good or bad.
-
-				if (supers.contains(eventName))
-					continue; // Don't override a super event.
-
-				if (ei.createEvent(eventName))
-					eventNames.add(eventName); // It was validly created.
-			}
-		}
-
-		tooManyExceptionClass = null; // No longer need it.
-	}
-
-	/**
-	 * merge all the Events (i.e. supertypes)
-	 */
-	protected EList allEvents() {
-
-		EList jcAllEvents = getJavaClass().getAllEventsGen();
-		BeaninfoSuperAdapter superAdapter =
-			(BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
-		if (jcAllEvents != null) {
-			// See if new one required.
-			if (superAdapter == null || !superAdapter.isAllEventsCollectionModified())
-				return jcAllEvents;
-			// Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.       		
-		}
-
-		UniqueEList.FastCompare allEvents = new UniqueEList.FastCompare() {
-			/**
-			 * Comment for <code>serialVersionUID</code>
-			 * 
-			 * @since 1.1.0
-			 */
-			private static final long serialVersionUID = 1L;
-
-			protected Object[] newData(int capacity) {
-				return new JavaEvent[capacity];
-			}
-		};
-		
-		boolean doAllEvents = false;
-		synchronized(this) {
-			// If we are introspecting, don't do all properties because it is an invalid list. Just return empty without reseting the all modified flag.
-			doAllEvents = !isDoingAllEvents && !isIntrospecting && isResourceConnected();
-			if (doAllEvents)
-				isDoingAllEvents = true;
-		}
-
-		if (doAllEvents) {
-			try {
-				EList localEvents = getJavaClass().getEvents();
-				// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-				// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-				// the truth is most people want these. So we will add them in. But since there could be more than one it
-				// gets confusing. We need to look for dups from the super types and still keep order.
-				//
-				// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-				List superTypes = getJavaClass().getESuperTypes();
-				if (!superTypes.isEmpty()) {
-					// Now we need to merge in the supers.
-					BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-					// If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
-					// we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
-					// because IB would contribute IC's too).
-					Collection workingAllEvents = superTypes.size() == 1 ? (Collection) allEvents : new LinkedHashSet(); 
-					// We will now merge as directed.
-					boolean mergeAll = bd == null || bd.isMergeSuperEvents();
-					if (!mergeAll) {
-						// we don't to want to merge super events, but we still need super non-events or explicit ones.
-						int lenST = superTypes.size();
-						for (int i=0; i<lenST; i++) {
-							List supers = ((JavaClass) superTypes.get(i)).getAllEvents();
-							int len = supers.size();
-							for (int i1 = 0; i1 < len; i1++) {
-								JavaEvent e = (JavaEvent) supers.get(i1);
-								EventSetDecorator ed = Utilities.getEventSetDecorator(e);
-								if (ed == null || (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !ed.isMergeIntrospection()))
-									workingAllEvents.add(e);
-							}
-						}
-					} else {
-						// We want to merge all.					
-						// BeanInfo has given us the not merge list. If the list is empty, then we accept all.
-						if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames())) {
-							// We were given a list of names.
-							// Get the names into a set to create a quick lookup.
-							HashSet superSet = new HashSet(bd.getNotInheritedEventNames());
-							
-							// Now walk and add in non-bean events (and bean events that were explicitly added and not mergeable (i.e. didn't come thru beaninfo)) 
-							// and add those not specifically called out by BeanInfo.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								List supers = ((JavaClass) superTypes.get(i)).getAllEvents();
-								int len = supers.size();
-								for (int i1 = 0; i1 < len; i1++) {
-									JavaEvent e = (JavaEvent) supers.get(i1);
-									EventSetDecorator ed = Utilities.getEventSetDecorator(e);
-									if (ed == null || (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !ed.isMergeIntrospection()) || !superSet.contains(ed.getName()))
-										workingAllEvents.add(e);
-								}
-							}
-						} else {
-							// BeanInfo called out that all super events should be added, or no beaninfo.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								workingAllEvents.addAll(((JavaClass) superTypes.get(i)).getAllEvents());
-							}
-						}
-					}
-					if (workingAllEvents != allEvents)
-						allEvents.addAll(workingAllEvents);	// Now copy over the ordered super events.
-				}
-				allEvents.addAll(localEvents);				
-				superAdapter.setAllEventsCollectionModified(false); // Now built, so reset to not changed.
-			} finally {
-				synchronized (this) {
-					isDoingAllEvents = false;
-				}
-			}
-		}
-
-		if (allEvents.isEmpty())
-			return ECollections.EMPTY_ELIST;
-		else {
-			allEvents.shrink();
-			return new EcoreEList.UnmodifiableEList.FastCompare(
-				getJavaClass(),
-				JavaRefPackage.eINSTANCE.getJavaClass_AllEvents(),
-				allEvents.size(),
-				allEvents.data());
-		}
-
-	}
-
-	private JavaClass eventListenerClass, // Event Listener class. Needed for validation.
-	tooManyExceptionClass; // Too many listeners exception.
-
-	/*
-	 * Pass in the key, it will be used to form the name.
-	 */
-	protected String getEventName(String key) {
-		return key.substring(0, key.indexOf(':'));
-	}
-
-	/*	
-	 * Answers event key if valid, null if not valid.
-	 */
-	protected String validEventAdder(Method method) {
-		String name = method.getName();
-		if (!name.startsWith("add") || !name.endsWith("Listener")) //$NON-NLS-1$ //$NON-NLS-2$
-			return null; // Not valid format for an add listener name.
-		// Note. The Bean specs only state that it should be "add<ListenerType>" but the
-		// introspector implicitly adds an additional constraint in that the listener type
-		// should end with "Listener". If it doesn't the introspector would actually throw
-		// an index out of bounds. We'll just ignore such methods.
-
-		List parms = method.getParameters();
-		if (parms.size() != 1)
-			return null; // Invalid - improper number of parms.
-
-		EClassifier returnType = method.getReturnType();
-		if (returnType == null || !returnType.getName().equals("void")) //$NON-NLS-1$
-			return null; // Invalid - must be void return type.
-
-		EClassifier parmType = ((JavaParameter) parms.get(0)).getEType();
-		if (!BeaninfoClassAdapter.this.eventListenerClass.isAssignableFrom(parmType))
-			return null; // Parm must be inherit from EventListener
-
-		// Beans introspector also requires that the "listener" part of the name be a
-		// suffix of the type name. So if the type name was "ISomeListener" then
-		// the method name must be "addSomeListener" (actually "addomeListener"
-		// would also be valid according to the introspector!).
-		// This allows the type to be an interface using the "I" convention while not
-		// requiring the "I" to be in the name of the event.		
-		if (!parmType.getName().endsWith(name.substring(3)))
-			return null;	// It is not "add{ListenerType}".
-
-		// This is a unique containing event name and listener type
-		// This is so we can have a unique key for two events with the same
-		// name but different listener type. (This matches Introspector so that we aren't
-		// coming up with different results.
-		return java.beans.Introspector.decapitalize(name.substring(3, name.length() - 8))
-			+ ':'
-			+ ((JavaHelpers) parmType).getQualifiedName();
-	}
-
-	/*
-	 * Answers event key if valid, null if not valid.
-	 */
-	protected String validEventRemove(Method method) {
-		String name = method.getName();
-		if (!name.startsWith("remove") || !name.endsWith("Listener")) //$NON-NLS-1$ //$NON-NLS-2$
-			return null; // Not valid format for a remove listener name.
-		// Note. The Bean specs only state that it should be "add<ListenerType>" but the
-		// introspector implicitly adds an additional constraint in that the listener type name
-		// should end with "Listener". If it doesn't the introspector would actually throw
-		// an index out of bounds. We'll just ignore such methods.
-		
-
-		List parms = method.getParameters();
-		if (parms.size() != 1)
-			return null; // Invalid - improper number of parms.
-
-		EClassifier returnType = method.getReturnType();
-		if (returnType == null || !returnType.getName().equals("void")) //$NON-NLS-1$
-			return null; // Invalid - must be void return type.
-
-		EClassifier parmType = ((JavaParameter) parms.get(0)).getEType();
-		if (!BeaninfoClassAdapter.this.eventListenerClass.isAssignableFrom(parmType))
-			return null; // Parm must be inherit from EventListener
-
-		// Beans introspector also requires that the "listener" part of the name be a
-		// suffix of the type name. So if the type name was "ISomeListener" then
-		// the method name must be "removeSomeListener" (actually "removeomeListener"
-		// would also be valid according to the introspector!).
-		// This allows the type to be an interface using the "I" convention while not
-		// requiring the "I" to be in the name of the event.
-		if (!parmType.getName().endsWith(name.substring(6)))
-			return null;	// It is not "add{ListenerType}".
-
-		// This is a unique containing event name and listener type
-		// This is so we can have a unique key for two events with the same
-		// name but different listener type. (This matches Introspector so that we aren't
-		// coming up with different results).
-		return java.beans.Introspector.decapitalize(name.substring(6, name.length() - 8))
-			+ ':'
-			+ ((JavaHelpers) parmType).getQualifiedName();
-	}
-
-	public boolean isDefaultBound() {
-		if (defaultBound == null) {
-			// Haven't yet decided on it.
-			Iterator methods = getJavaClass().getPublicMethods().iterator();
-			boolean foundAdd = false, foundRemove = false;
-			while (methods.hasNext() && (!foundAdd || !foundRemove)) {
-				Method method = (Method) methods.next();
-				if ("addPropertyChangeListener".equals(method.getName())) { //$NON-NLS-1$
-					List parms = method.getParameters();
-					if (parms.size() == 1) {
-						JavaParameter parm = (JavaParameter) parms.get(0);
-						if ("java.beans.PropertyChangeListener".equals(((JavaHelpers) parm.getEType()).getQualifiedName())) { //$NON-NLS-1$
-							foundAdd = true;
-							continue;
-						}
-					}
-				} else if ("removePropertyChangeListener".equals(method.getName())) { //$NON-NLS-1$
-					List parms = method.getParameters();
-					if (parms.size() == 1) {
-						JavaParameter parm = (JavaParameter) parms.get(0);
-						if ("java.beans.PropertyChangeListener".equals(((JavaHelpers) parm.getEType()).getQualifiedName())) { //$NON-NLS-1$
-							foundRemove = true;
-							continue;
-						}
-					}
-				}
-			}
-
-			defaultBound = (foundAdd && foundRemove) ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return defaultBound.booleanValue();
-	}
-
-	private class EventInfo {
-		
-		public Method addListenerMethod;
-		public Method removeListenerMethod;
-
-		public void setAdder(Method addMethod) {
-			addListenerMethod = addMethod;
-		}
-
-		public void setRemover(Method removeMethod) {
-			removeListenerMethod = removeMethod;
-		}
-
-		// Answer whether this is a valid event info.
-		public boolean isValidInfo() {
-			return (addListenerMethod != null && removeListenerMethod != null);
-		}
-
-		public boolean createEvent(String name) {
-			EventSetDecorator ed = BeaninfoClassAdapter.this.createEvent(name);
-			if (ed == null)
-				return false; // Reflection not wanted.
-
-
-			// See if unicast.
-			boolean unicast = false;
-			List exceptions = addListenerMethod.getJavaExceptions();
-			int len = exceptions.size();
-			for(int i=0; i<len; i++) {
-				if (exceptions.get(i) == BeaninfoClassAdapter.this.tooManyExceptionClass) {
-					unicast = true;
-					break;
-				}
-			}
-			// We'll let listener methods get retrieved dynamically when needed.
-			BeanInfoDecoratorUtility.setProperties(ed, addListenerMethod, removeListenerMethod, unicast, (JavaClass) ((JavaParameter) addListenerMethod.getParameters().get(0)).getEType());
-			return true;
-		}
-
-	}
-
-	/**
-	 * Marh the factory as stale, but leave the overrides alone. They are not stale.
-	 * @param stale
-	 * 
-	 * @since 1.1.0.1
-	 */
-	public void markStaleFactory(ProxyFactoryRegistry stale) {
-		markStaleFactory(stale, false);
-	}
-	
-	/**
-	 * Mark this factory as the stale factory.
-	 * 
-	 * @param clearOverriddes clear the overrides too. They are stale.
-	 */
-	public void markStaleFactory(ProxyFactoryRegistry stale, boolean clearOverriddes) {
-		if (staleFactory == null) {
-			// It's not stale so make it stale.
-			// So that next access will re-introspect
-			defaultBound = null; // So query on next request.
-			staleFactory = new WeakReference(stale);
-
-			// Need to mark the esuperadapter that things have changed so that any 
-			// subtype will know to reuse the parent for anything that requires knowing parent info.
-			Adapter a = EcoreUtil.getExistingAdapter(getTarget(), ESuperAdapter.class);
-			// Simulate that this objects super has changed. This will make all subclasses
-			// think about the super has changed and next retrieving anything that involves the
-			// super will cause a rebuild to occur.
-			Notification note =
-				new ENotificationImpl((InternalEObject) getTarget(), Notification.SET, EcorePackage.ECLASS__ESUPER_TYPES, null, null);
-			if (a != null)
-				a.notifyChanged(note);
-			// Do the same with BeaninfoSuperAdapter so that events also will be rebuilt.
-			a = EcoreUtil.getExistingAdapter(getTarget(), BeaninfoSuperAdapter.ADAPTER_KEY);
-			if (a != null)
-				a.notifyChanged(note);
-			synchronized (this) {
-				needsIntrospection = true;
-				if (clearOverriddes) {
-					retrievedExtensionDocument = CLEAR_EXTENSIONS;
-					if (classEntry != null) {
-						classEntry.markDeleted();
-						classEntry = null; // Get a new one next time.
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Form a longname for the addkey function.
-	 */
-	private String formLongName(EOperation feature) {
-		Method mthd = null;
-		if (feature instanceof Method)
-			mthd = (Method) feature;
-		else if (feature instanceof MethodProxy)
-			mthd = ((MethodProxy) feature).getMethod();
-		else
-			return null; // Don't know what it is.
-
-		StringBuffer longName = new StringBuffer(100);
-		longName.append(feature.getName()); // Feature Name
-		longName.append(':');
-		longName.append(mthd.getName()); // Method Name
-		longName.append('(');
-		List p = mthd.getParameters();
-		for (int i = 0; i < p.size(); i++) {
-			JavaParameter parm = (JavaParameter) p.get(i);
-			if (i>0)
-				longName.append(',');
-			longName.append(parm.getJavaType().getQualifiedName());
-		}
-
-		return longName.toString();
-	}
-	
-	/*
-	 * More than one operation can have the same name. To identify them uniquely, the long name is created,
-	 * which is formed from the name and the method signature.
-	 */
-	private String formLongName(MethodRecord record) {
-		StringBuffer longName = new StringBuffer(100);
-		longName.append(record.name); // Feature Name
-		longName.append(':');
-		longName.append(record.methodForDescriptor.methodName); // Method Name
-		longName.append('(');
-		String[] p = record.methodForDescriptor.parameterTypeNames;
-		if (p != null)
-			for (int i = 0; i < p.length; i++) {
-				if (i>0)
-					longName.append(',');
-				longName.append(MapJNITypes.getFormalTypeName(p[i]));
-			}
-
-		return longName.toString();
-	}
-	/**
-	 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(Notification)
-	 */
-	public void notifyChanged(Notification msg) {
-		// In case of removing adapter, make sure we are first removed from the factory so it doesn't know about us anymore.
-		if (msg.getEventType() == Notification.REMOVING_ADAPTER)
-			getAdapterFactory().removeAdapter(this);
-	}
-
-	/**
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return super.toString() + '(' + (getJavaClass() != null ? getJavaClass().getQualifiedName() : "?") + ')'; //$NON-NLS-1$
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java
deleted file mode 100644
index 604306bf1..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.adapters.IJavaReflectionKey;
-import org.eclipse.jem.java.adapters.IJavaReflectionKeyExtension;
-
-/**
- * Java Reflection Key extension to retrieve keys for beaninfo creations.
- * 
- * Handles attributes and behaviors.
- * 
- * @version 	1.0
- * @author R. L. Kulp  
- */
-public class BeaninfoJavaReflectionKeyExtension implements IJavaReflectionKeyExtension {
-	
-	// The format of the keys are:
-	// behaviors:  "classname/behavior/behaviorname"
-	// structural features: "classname/featurename"
-	public static final String 
-		BEHAVIOR = "/operation/",	// Piece in key that indicates this is a behavior. //$NON-NLS-1$
-		EVENT = "/event/",		// Piece in key that indicates this is an event. //$NON-NLS-1$
-		FEATURE = "/";			// Piece in key that indicates this is an attribute. //$NON-NLS-1$
-	
-	/**
-	 * Get the object for this key.
-	 */
-	public Object getObject(String key, IJavaReflectionKey reflectionKey) {
-		if (key != null) {
-			int ibehave = key.indexOf(BEHAVIOR);
-			if (ibehave > -1) {
-				// We have a possible behavior.
-				String classname = key.substring(0, ibehave);
-				int ibehaveName = ibehave+BEHAVIOR.length();
-				if (ibehaveName < key.length()) {
-					JavaClass javaclass = getJavaClass(reflectionKey, classname);
-					if (javaclass != null) {
-						javaclass.getEOperations();	// Get the list introspected and populated if not already.
-						return reflectionKey.primGet(key);	// It should now be there, 
-					}
-				}
-			} else {
-				int ievent = key.indexOf(EVENT);
-				if (ievent > -1) {
-					// We have a possible event.
-					String classname = key.substring(0, ievent);
-					int ieventName = ievent+EVENT.length();
-					if (ieventName < key.length()) {
-						JavaClass javaclass = getJavaClass(reflectionKey, classname);
-						if (javaclass != null) {
-							javaclass.getEvents();	// Get the list introspected and populated if not already.
-							return reflectionKey.primGet(key);	// It should now be there, 
-						}
-					}
-				} else {
-					int ifeature = key.indexOf(FEATURE);
-					if (ifeature > -1) {
-						// We have a possible feature.
-						String classname = key.substring(0, ifeature);
-						int ifeatureName = ifeature+FEATURE.length();
-						if (ifeatureName < key.length()) {
-							String feature = key.substring(ifeatureName);
-							JavaClass javaclass = getJavaClass(reflectionKey, classname);
-							if (javaclass != null) {
-								// This is just a hack until we can get ID situation straightened out.
-								// Need to cause introspection of the attributes and references.
-								javaclass.getEStructuralFeatures();
-								Object result = reflectionKey.primGet(key);	// See if it now got added as an id.
-								if (result == null) {
-									// Well, it could of been added by the diff merge, which as of now can't handle ids.
-									// So we will find it within the attributes/references.
-									result = findFeature(feature, javaclass.getEReferences());
-									if (result == null)
-										result = findFeature(feature, javaclass.getEAttributes());									
-									if (result instanceof EStructuralFeature) {
-										// Need to add it as an id so next time won't come through here.
-										((XMIResource) javaclass.eResource()).setID((EObject) result, key);	// So next time it will find it directly.
-									}
-								}
-								return result;
-							}
-						}
-					}
-				}
-			}
-		}
-						
-		return null;
-	}
-
-	private EStructuralFeature findFeature(String featureName, List featureList) {
-		Iterator itr = featureList.iterator();		
-		while (itr.hasNext()) {
-			EStructuralFeature feature = (EStructuralFeature) itr.next();
-			if (featureName.equals(feature.getName())) {
-				return feature;
-			}
-		}
-		return null;
-	}
-
-	protected JavaClass getJavaClass(IJavaReflectionKey reflectionKey, String classname) {
-		Object eclass = reflectionKey.primGet(classname);
-		if (eclass == null) 
-			eclass = reflectionKey.getJavaType(classname);	// Let it create it.
-		if (eclass instanceof JavaClass)
-			return (JavaClass) eclass;
-		else
-			return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java
deleted file mode 100644
index 9b9013275..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java
+++ /dev/null
@@ -1,198 +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.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.workbench.utility.JavaModelListener;
-/**
- * This class listens for changes to the java model and flushs the
- * appropriate class introspection.
- */
-
-public class BeaninfoModelSynchronizer extends JavaModelListener {
-	protected BeaninfoAdapterFactory fAdapterFactory;
-	protected IJavaProject fProject; // The project this listener is opened on.
-	private static final IPath BEANINFOCONFIG_PATH = new Path(BeaninfoNature.P_BEANINFO_SEARCH_PATH);	//$NON-NLS-1$	
-
-	public BeaninfoModelSynchronizer(BeaninfoAdapterFactory aFactory, IJavaProject aProject) {
-		super(ElementChangedEvent.POST_CHANGE);
-		fAdapterFactory = aFactory;
-		fProject = aProject;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#getJavaProject()
-	 */
-	protected IJavaProject getJavaProject() {
-		return fProject;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#isAlsoClasspathChange(org.eclipse.core.runtime.IPath)
-	 */
-	protected boolean isAlsoClasspathChange(IPath path) {
-		return path.equals(BEANINFOCONFIG_PATH);
-	}
-	
-	/**
-	 * Stop the synchronizer from listening to any more changes.
-	 */
-	public void stopSynchronizer(boolean clearResults) {
-		JavaCore.removeElementChangedListener(this);
-		getAdapterFactory().closeAll(clearResults);
-	}
-
-	public BeaninfoAdapterFactory getAdapterFactory() {
-		return fAdapterFactory;
-	}
-
-	protected void processJavaElementChanged(IJavaProject element, IJavaElementDelta delta) {
-		if (isInClasspath(element)) {
-			if (delta.getKind() == IJavaElementDelta.REMOVED || delta.getKind() == IJavaElementDelta.ADDED) {
-				// Don't need to do anything for delete/close/add/open of main project because there is much more that needs to
-				// be done by BeaninfoNature on project close/delete, so nature listens for this and does the appropriate cleanup.			
-				if (!element.equals(fProject)) {
-					// However, all other projects are required projects and if they are deleted/closed/added/opened when need to do
-					// a full flush because we don't know any of the state, whether they are still there or not.
-					getAdapterFactory().markAllStale();
-				}
-				return;
-			} else if (isClasspathResourceChange(delta)) {
-				getAdapterFactory().markAllStale(); // The .classpath file (or .beaninfoconfig) itself in SOME DEPENDENT PROJECT has changed. 
-				return;
-			}
-			processChildren(element, delta);
-		}
-	}
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 * If a working copy, then ignore it because we don't care about changes until
-	 * they are committed. Else, if the CU has changed content then mark all of the
-	 * types in this CU (such as inner classes) as stale.
-	 * If it is not a content change then process the children.
-	 */
-	protected void processJavaElementChanged(ICompilationUnit element, IJavaElementDelta delta) {
-		switch (delta.getKind()) {
-			case IJavaElementDelta.CHANGED :
-				// A file save had occurred. It doesn't matter if currently working copy or not.
-				// It means something has changed to the file on disk, but don't know what.
-				if ((delta.getFlags() & IJavaElementDelta.F_PRIMARY_RESOURCE) != 0) {
-					getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), false);	// Flush everything, including inner classes.
-				}						
-				
-				break;
-			case IJavaElementDelta.ADDED:
-			case IJavaElementDelta.REMOVED:
-				// Need to know for add because we optimize the beaninfo such that once found as undefined, it won't
-				// introspect again until we mark it stale. So we need to mark it stale to refresh it.
-				
-				// It doesn't matter if totally removed or just moved somewhere else, we will clear out
-				// adapter because there could be a rename which would be a different class.
-				// Currently the element is already deleted or added and there is no way to find the types in the unit to flush.
-				// So instead we ask factory to flush all it any that start with it plus for inner classes.				
-				getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), true);	// Flush everything, including inner classes.
-				break;
-		}
-	}
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-		 */
-	protected void processJavaElementChanged(IClassFile element, IJavaElementDelta delta) {
-		if (delta.getKind() == IJavaElementDelta.REMOVED) {
-			// It doesn't matter if totally removed or just moved somewhere else, we will clear out and remove the
-			// adapter because there could be a rename which would be a different class.
-			// Currently the element is already deleted and there is no way to find the types in the unit to remove.
-			// So instead we ask factory to remove all it any that start with it plus for inner classes.
-			getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), true);
-			return; // Since the classfile was removed we don't need to process the children (actually the children list will be empty
-		}
-		IJavaElementDelta[] children = delta.getAffectedChildren();
-		for (int ii = 0; ii < children.length; ii++) {
-			processDelta(children[ii]);
-		}
-	}
-
-	protected String getFullNameFromElement(IJavaElement element) {
-		String name = element.getElementName();		
-		if (!(element instanceof ICompilationUnit || element instanceof IClassFile))
-			return name;	// Shouldn't be here
-		
-		// remove extension.
-		int periodNdx = name.lastIndexOf('.');
-		if (periodNdx == -1)
-			return name;	// Shouldn't be here. There should be an extension
-					
-		String typeName = null;
-		String parentName = element.getParent().getElementName();
-		if (parentName == null || parentName.length() == 0)
-			typeName = name.substring(0, periodNdx); // In default package
-		else
-			typeName = parentName + "." + name.substring(0, periodNdx); //$NON-NLS-1$
-								
-		return typeName;
-	}
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 * If the classpath has changed, mark all as stale because we don't know what
-	 * has changed. Things that were in the path may no longer be in the path, or
-	 * the order was changed, which could affect the introspection.
-	 */
-	protected void processJavaElementChanged(IPackageFragmentRoot element, IJavaElementDelta delta) {
-		if (isClassPathChange(delta))
-			fAdapterFactory.markAllStale();
-		else
-			super.processJavaElementChanged(element, delta);
-	}
-	
-	protected void processJavaElementChanged(IPackageFragment element, IJavaElementDelta delta) {
-		switch (delta.getKind()) {
-			case IJavaElementDelta.ADDED:
-				// Even though added there is possibility that package exists in other root but this
-				// one may now take priority, so we will clear the package anyway.
-			case IJavaElementDelta.REMOVED:
-				fAdapterFactory.markPackageStale(element.getElementName());
-				break;
-			default :
-				super.processJavaElementChanged(element, delta);
-		}
-	}
-	
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 * Something about the type has changed. If it was removed (not a move), then close the
-	 * adapter too.
-	 */
-	protected void processJavaElementChanged(IType element, IJavaElementDelta delta) {
-		if (delta.getKind() == IJavaElementDelta.REMOVED) {
-			// Close it out. Doesn't matter if moved_to, that would be a rename which requires brand new class.
-			// We can't actually get rid of the beaninfo adapter because it may be asked for again
-			// just to see if not defined. It may also come back later and we want to know about
-			// it to recycle the vm.
-			getAdapterFactory().markStaleIntrospection(element.getFullyQualifiedName(), true);	
-		} else
-			getAdapterFactory().markStaleIntrospection(element.getFullyQualifiedName(), false); // Just mark it stale
-		processChildren(element, delta);
-	}
-
-	public String toString() {
-		return super.toString()+" "+fProject.getElementName(); //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
deleted file mode 100644
index 93590415c..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
+++ /dev/null
@@ -1,1031 +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.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import java.io.*;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.jdt.core.*;
-import org.osgi.framework.Bundle;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.java.init.JavaInit;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo.ContainerPaths;
-import org.eclipse.jem.java.adapters.JavaXMIFactory;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.emf.workbench.ResourceHandler;
-
-
-/**
- * The beaninfo nature. It is created for a project and holds the
- * necessary info for beaninfo to be performed on a project.
- */
-
-public class BeaninfoNature implements IProjectNature {
-
-	public static final String NATURE_ID = BeaninfoPlugin.PI_BEANINFO_PLUGINID + ".BeanInfoNature"; //$NON-NLS-1$
-	public static final String P_BEANINFO_SEARCH_PATH = ".beaninfoConfig"; //$NON-NLS-1$
-	
-	public static final QualifiedName CONFIG_INFO_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "CONFIG_INFO"); //$NON-NLS-1$
-	public static final QualifiedName BEANINFO_CONTRIBUTORS_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "BEANINFO_CONTRIBUTORS"); //$NON-NLS-1$
-
-	private ProxyFactoryRegistry.IRegistryListener registryListener = new ProxyFactoryRegistry.IRegistryListener() {
-		/**
-		 * @see org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry.IRegistryListener#registryTerminated(ProxyFactoryRegistry)
-		 */
-		public void registryTerminated(ProxyFactoryRegistry registry) {
-			prematureRegistryTerminate();
-			markAllStale();
-		};
-	};
-
-	/**
-	 * Get the runtime nature for the project, create it if necessary.
-	 */
-	public static BeaninfoNature getRuntime(IProject project) throws CoreException {
-		JavaEMFNature.createRuntime(project);	// Must force JAVAEMFNature creation first before we try to get ours. There is a chicken/egg problem if we let our nature try to get JavaEMFNature during setProject.
-		if (project.hasNature(NATURE_ID))
-			return (BeaninfoNature) project.getNature(NATURE_ID);
-		else
-			return createRuntime(project);
-	}
-	
-	/**
-	 * Return whether this project has a BeanInfo runtime turned on.
-	 * 
-	 * @param project
-	 * @return <code>true</code> if it has the a BeanInfo runtime.
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static boolean hasRuntime(IProject project) throws CoreException {
-		return project.hasNature(NATURE_ID);
-	}
-
-	/**
-	 * Test if this is a valid project for a Beaninfo Nature. It must be
-	 * a JavaProject.
-	 */
-	public static boolean isValidProject(IProject project) {
-		try {
-			return project.hasNature(JavaCore.NATURE_ID);
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Create the runtime.
-	 */
-	private static BeaninfoNature createRuntime(IProject project) throws CoreException {
-		if (!isValidProject(project))
-			throw new CoreException(
-				new Status(
-					IStatus.ERROR,
-					BeaninfoPlugin.PI_BEANINFO_PLUGINID,
-					0,
-					MessageFormat.format(
-						BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, 
-						new Object[] { project.getName(), BeanInfoAdapterMessages.BeaninfoNature_InvalidProject}), 
-					null));
-
-		addNatureToProject(project, NATURE_ID);
-		return (BeaninfoNature) project.getNature(NATURE_ID);
-	}
-
-	private static void addNatureToProject(IProject proj, String natureId) throws CoreException {
-		IProjectDescription description = proj.getDescription();
-		String[] prevNatures = description.getNatureIds();
-		String[] newNatures = new String[prevNatures.length + 1];
-		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-		newNatures[prevNatures.length] = natureId;
-		description.setNatureIds(newNatures);
-		proj.setDescription(description, null);
-	}
-
-	private IProject fProject;
-	protected ProxyFactoryRegistry fRegistry;
-	protected ResourceSet javaRSet;
-	protected BeaninfoModelSynchronizer fSynchronizer;
-	protected static BeaninfoJavaReflectionKeyExtension fReflectionKeyExtension;
-
-	/** 
-	 * Configures the project with this nature.
-	 * This is called by <code>IProject.getNature</code> and should not
-	 * be called directly by clients.
-	 * The nature extension id is added to the list of natures on the project by
-	 * <code>IProject.getNature</code>, and need not be added here.
-	 *
-	 * @exception CoreException if this method fails.
-	 */
-	public void configure() throws CoreException {
-	}
-
-	/** 
-	 * Removes this nature from the project, performing any required deconfiguration.
-	 * This is called by <code>IProject.removeNature</code> and should not
-	 * be called directly by clients.
-	 * The nature id is removed from the list of natures on the project by
-	 * <code>IProject.removeNature</code>, and need not be removed here.
-	 *
-	 * @exception CoreException if this method fails. 
-	 */
-	public void deconfigure() throws CoreException {
-		removeSharedProperty(P_BEANINFO_SEARCH_PATH, null);
-		cleanup(true, true);
-	}
-	
-	/**
-	 * Shutdown the nature. Called by BeanInfoPlugin to tell the nature that the plugin is being shutdown.
-	 * It needs to cleanup.
-	 * TODO <package-protected> because only BeanInfoPlugin should call it. (public for now but when we make
-	 * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
-	 * 
-	 * @since 1.0.0
-	 */
-	public void shutdown() {
-		cleanup(true, false);
-	}
-
-
-	/**
-	 * Return a new ResourceSet that is linked correctly to this Beaninfo Nature.
-	 * <p>
-	 * This links up a ResourceSet so that it will work correctly with this nature.
-	 * It makes sure that going through the ResourceSet that any "java:/..."
-	 * classes can be found and it makes sure that any new classes are placed into the
-	 * nature's resource set and not resource set doing the calling.
-	 * <p>
-	 * This should be used any time a resource set is needed that is not the
-	 * project wide resource set associated with beaninfos, but will reference
-	 * Java Model classes or instantiate.
-	 * <p>
-	 * An additional change is made too. The ResourceFactoryRegistry's extensionToResourceFactory map is modified
-	 * to have an "java"->XMIResourceFactory entry added to it if EMF Examples is loaded. EMF Examples add
-	 * the "java" extension and sets it to their own special JavaResourceFactory. 
-	 * If EMF Examples is not loaded, then it falls back to the default "*" mapping, which is to XMIResourceFactory.
-	 * This normally causes problems for many
-	 * customers. If users of this resource set really want the EMF examples entry instead, after they retrieve the
-	 * new resource set they can do this:
-	 * <p>
-	 * <pre><code>
-	 * 	rset = beaninfoNature.newResourceSet();
-	 * 	rset.getResourceFactoryRegistry().getExtensionToFactoryMap().remove("java");
-	 * </code></pre>
-	 * 
-	 * @return a ResourceSet that is specially connected to the JEM java model.
-	 * 
-	 * @since 1.0.0
-	 */
-	public ProjectResourceSet newResourceSet() {
-		SpecialResourceSet rset = new SpecialResourceSet();
-		rset.add(new ResourceHandler() {
-			public EObject getEObjectFailed(ResourceSet originatingResourceSet, URI uri, boolean loadOnDemand) {
-				return null; // We don't have any special things we can do in this case.
-			}
-
-			public Resource getResource(ResourceSet originatingResourceSet, URI uri) {
-				// Always try to get it out of the nature's resource set because it may of been loaded there either as 
-				// the "java:..." type or it could of been an override extra file (such as an override EMF package, for
-				// example jcf has a side package containing the definition of the new attribute type. That file
-				// will also be loaded into this resourceset. So to find it we need to go in here and try.
-				//
-				// However, if not found we won't go and try to load the resource. That could load in the wrong place.
-				// Kludge: Because of a bug (feature :-)) in XMLHandler.getPackageFromURI(), it doesn't use getResource(...,true) and it tries instead
-				// to use uri inputstream to load the package when not found. This bypasses our special create resource and so
-				// packages are not automatically created. So we need to do load on demand here instead if it is a java protocol.
-				// EMF will not be fixing this. It is working as designed.
-				return getResourceSet().getResource(uri, JavaXMIFactory.SCHEME.equals(uri.scheme()));
-			}
-
-			public Resource createResource(ResourceSet originatingResourceSet, URI uri) {
-				// This is the one. It has got here because it couldn't find a resource already loaded.
-				// If it is a "java:/..." protocol resource, then we want to make sure it is loaded at the BeaninfoNature context
-				// instead of the lower one.
-				if (JavaXMIFactory.SCHEME.equals(uri.scheme()))
-					return getResourceSet().getResource(uri, true);
-				else
-					return null;
-			}
-		});
-		// [71473] Restore "*.java" to be an XMIResource. If EMF Examples are loaded they overload this and load their special resource for "*.java" which we don't want.
-		// If some user really wants that, they grab the resource resource set and remove our override.
-		if (Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("java")) { //$NON-NLS-1$
-			// Need to add an override to go to XMI instead.
-			rset.getResourceFactoryRegistry().getExtensionToFactoryMap().put("java", new XMIResourceFactoryImpl()); //$NON-NLS-1$
-		}
-		return rset;
-	}
-	/**
-	 * Clean up, this means either the project is being closed, deleted, or it means that
-	 * the nature is being removed from the project. Either way that means to
-	 * terminate the VM and remove what we added to the context if the flag says clear it.
-	 * <p>
-	 * This should be called ONLY when this instance of the nature is no longer needed. It
-	 * will be recreated for any new uses. That is because we will be removing ourselves
-	 * from the list of active natures in the BeanInfoPlugin.
-	 * <p>
-	 * <b>Note:</b> This will be called from the BeanInfoCacheController. It knows when the project is
-	 * being closed or deleted.
-	 * 
-	 * @param clearResults clear the results such that any JEM model objects have no BeanInfo
-	 * adapters attached to them. This allows BeanInfo to be GC'd without being hung onto.
-	 *  
-	 * @param deregister Deregister from the BeanInfoPlugin. Normally this will always be true, but it
-	 * will be called with false when BeanInfoPlugin is calling back to shutdown.
-	 */
-	public synchronized void cleanup(boolean clearResults, boolean deregister) {
-		if (deregister)
-			BeaninfoPlugin.getPlugin().removeBeanInfoNature(this);
-		fSynchronizer.stopSynchronizer(clearResults);
-		Init.cleanup(javaRSet, clearResults);
-		if (fRegistry != null)
-			fRegistry.terminateRegistry(true);
-
-		projectCleaned();
-		javaRSet = null;
-		fRegistry = null;
-		fProject = null;
-		fSynchronizer = null;
-	}
-
-	/** 
-	 * Returns the project to which this project nature applies.
-	 *
-	 * @return the project handle
-	 */
-	public IProject getProject() {
-		return fProject;
-	}
-
-	/**
-	 * Sets the project to which this nature applies.
-	 * Used when instantiating this project nature runtime.
-	 * This is called by <code>IProject.addNature</code>
-	 * and should not be called directly by clients.
-	 *
-	 * @param project the project to which this nature applies
-	 */
-	public void setProject(IProject project) {
-//		BeanInfoCacheController.INSTANCE.getClass();	// Instantiates the controller if not already started.
-		fProject = project;
-		BeaninfoPlugin.getPlugin().addBeanInfoNature(this);
-
-		try {
-			// The nature has been started for this project, need to setup the introspection process now.
-			JavaEMFNature javaNature = JavaEMFNature.createRuntime(fProject);
-			JavaInit.init();
-			if (fReflectionKeyExtension == null) {
-				// Register the reflection key extension.
-				fReflectionKeyExtension = new BeaninfoJavaReflectionKeyExtension();
-				JavaXMIFactory.INSTANCE.registerReflectionKeyExtension(fReflectionKeyExtension);
-			}
-
-			javaRSet = javaNature.getResourceSet();
-			Init.initialize(javaRSet, new IBeaninfoSupplier() {
-				public ProxyFactoryRegistry getRegistry() {
-					return BeaninfoNature.this.getRegistry();
-				}
-
-				public boolean isRegistryCreated() {
-					return BeaninfoNature.this.isRegistryCreated();
-				}
-				
-				public void closeRegistry() {
-					BeaninfoNature.this.closeRegistry();
-				}
-				
-				public IProject getProject() {
-					return BeaninfoNature.this.getProject();
-				}
-
-				public ProjectResourceSet getNewResourceSet() {
-					return BeaninfoNature.this.newResourceSet();
-				}
-
-				public ResourceSet getProjectResourceSet() {
-					return getResourceSet();
-				}
-			});
-			fSynchronizer =
-				new BeaninfoModelSynchronizer(
-					(BeaninfoAdapterFactory) EcoreUtil.getAdapterFactory(javaRSet.getAdapterFactories(), IIntrospectionAdapter.ADAPTER_KEY),
-					JavaCore.create(javaNature.getProject()));
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		}
-	}
-
-	/**
-	 * Close the registry. It needs to be recycled because a class has changed
-	 * and now the new class needs to be accessed.
-	 */
-	protected void closeRegistry() {
-		ProxyFactoryRegistry reg = null;
-		synchronized (this) {
-			reg = fRegistry;
-			fRegistry = null;
-			try {
-				// Wipe out the Session properties so that they are recomputed.
-				getProject().setSessionProperty(CONFIG_INFO_SESSION_KEY, null);
-				getProject().setSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY, null);			
-			} catch (CoreException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
-			}
-		}
-		if (reg != null) {
-			reg.removeRegistryListener(registryListener);
-			reg.terminateRegistry();
-		}
-	}
-
-	private static final String PI_CLASS = "class"; //$NON-NLS-1$
-	
-	/**
-	 * Using the given configuration info, compute the BeanInfo config info needed. This sets the
-	 * session properties BEANINFO_CONTRIBUTORS_SESSION_KEY and CONFIG_INFO_SESSION_KEY.
-	 * 
-	 * @param info
-	 * @throws CoreException
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void computeBeanInfoConfigInfo(IConfigurationContributionInfo info) throws CoreException {
-		// First time for this nature, or first time after registry reset. Need to compute the info.
-		// It is possible for this to be called BEFORE the first usage of BeanInfo. The editor usually
-		// brings up the editor's registry before it gets anything from BeanInfo.
-		List contributorsList = new ArrayList(10);
-		if (!info.getContainerIds().isEmpty()) {
-			// Run through all of the visible container ids that are applicable and get BeanInfo contributors.
-			Iterator containerIdItr = info.getContainerIds().values().iterator();
-			while (containerIdItr.hasNext()) {
-				ContainerPaths containerPaths = (ContainerPaths) containerIdItr.next();
-				IConfigurationElement[] contributors = BeaninfoPlugin.getPlugin().getContainerIdContributors(containerPaths.getContainerId(), containerPaths.getVisibleContainerPaths());
-				for (int i = 0; i < contributors.length; i++) {
-					try {
-						Object contributor = contributors[i].createExecutableExtension(PI_CLASS);
-						if (contributor instanceof IBeanInfoContributor)
-							contributorsList.add(contributor);
-					} catch (CoreException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-					}
-				}
-			}						
-		}
-		
-		if (!info.getPluginIds().isEmpty()) {
-			// Run through all of the visible plugin ids that are applicable and get BeanInfo contributors.
-				Iterator pluginIdItr = info.getPluginIds().entrySet().iterator();
-				while (pluginIdItr.hasNext()) {
-					Map.Entry entry = (Map.Entry) pluginIdItr.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						IConfigurationElement[] contributors = BeaninfoPlugin.getPlugin().getPluginContributors(
-								(String) entry.getKey());
-						if (contributors != null) {
-							for (int i = 0; i < contributors.length; i++) {
-							try {
-								Object contributor = contributors[i].createExecutableExtension(PI_CLASS);
-								if (contributor instanceof IBeanInfoContributor)
-									contributorsList.add(contributor);
-							} catch (CoreException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-							}
-						}
-					}
-				}
-			}
-		}
-			
-			// Save it for all beaninfo processing (and configuration processing if they implement proxy configuration contributor).
-		IBeanInfoContributor[] explicitContributors = (IBeanInfoContributor[]) contributorsList.toArray(new IBeanInfoContributor[contributorsList.size()]);
-		info.getJavaProject().getProject().setSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY, explicitContributors);
-		// Save it for override processing. That happens over and over later after all config processing is done.
-		// Do it last so that if there is a race condition, since this property is a flag to indicate we have data,
-		// we need to make sure the Beaninfo data is already set at the point we set this.
-		// We could actually set it twice because of this, but it is the same data, so, so what.
-		info.getJavaProject().getProject().setSessionProperty(CONFIG_INFO_SESSION_KEY, info);
-	}
-
-	/**
-	 * Get registry, creating it if necessary.
-	 * @return the registry.
-	 * 
-	 * @since 1.0.0
-	 */
-	public ProxyFactoryRegistry getRegistry() {
-		synchronized (this) {
-			if (fRegistry != null)
-				return fRegistry;
-		}
-		// Now need to start the appropriate job. In another class so that it can handle dynamically checking if 
-		// UI is available to even do this (it maybe not in a UI mode, so then just do it.
-		CreateRegistryJobHandler.createRegistry(this);
-		return fRegistry;
-	}
-	
-	private static final long NO_PREMATURE_TERMINATE_TIME = -1;
-	private int registryPrematureTerminateCount;
-	private long registryLastPrematureTerminateTime = NO_PREMATURE_TERMINATE_TIME;
-	
-	/*
-	 * This is <package-protected> so that only the appropriate create job in this
-	 * package can call it. This is because this must be controlled to only be
-	 * done when build not in progress and serial access.
-	 */
-	void createRegistry(IProgressMonitor pm) {
-		pm.beginTask(BeanInfoAdapterMessages.UICreateRegistryJobHandler_StartBeaninfoRegistry, 100); 
-		if (isRegistryCreated()) {
-			pm.done();
-			return; // It had already been created. Could of been because threads were racing to do the creation, and one got there first.
-		}
-
-		// Test to see if we have terminated too many times within the last 10 minutes. If we have then don't try again.
-		synchronized(this) {
-			if (registryLastPrematureTerminateTime != NO_PREMATURE_TERMINATE_TIME) {
-				long lastPrematureTerminateInterval = System.currentTimeMillis() - registryLastPrematureTerminateTime;
-				// Don't try again within 1 sec of last premature terminate. It will still be bad.
-				// Of if there have been more than 3 and it has been 10 mins since the last try.
-				if (lastPrematureTerminateInterval < 3*1000 || (registryPrematureTerminateCount > 3 && lastPrematureTerminateInterval < 10 * 60 * 1000))
-					return;
-			}			
-		}
-		
-		ProxyFactoryRegistry registry = null;
-		try {
-			ConfigurationContributor configurationContributor = (ConfigurationContributor) getConfigurationContributor();
-			configurationContributor.setNature(this);
-			registry = ProxyLaunchSupport.startImplementation(fProject, "Beaninfo", //$NON-NLS-1$
-					new IConfigurationContributor[] { configurationContributor}, false, new SubProgressMonitor(pm, 100));
-			synchronized(this) {
-				if (!isRegistryCreated()) {
-					projectCleaned();
-					registry.addRegistryListener(registryListener);
-					fRegistry = registry;
-				} else {
-					// It was created while we were creating. So use the current one. Terminate the one just created. Not needed.
-					registry.terminateRegistry(false);
-				}
-			}
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		} finally {
-			if (registry == null) {
-				// It didn't create. Treat as premature terminate.
-				prematureRegistryTerminate();
-			}
-			pm.done();
-		}
-	}
-
-	/**
-	 * Called by others in package (BeaninfoCacheController) to let know a clean has occured.
-	 * 
-	 * TODO this should be package-protected but until in same package as cache controller it is public.
-	 * @since 1.2.0
-	 */
-	public synchronized void projectCleaned() {
-		// On a clean we will reset the counters.
-		registryPrematureTerminateCount = 0;
-		registryLastPrematureTerminateTime = NO_PREMATURE_TERMINATE_TIME;
-	}
-	
-	public synchronized boolean isRegistryCreated() {
-		return fRegistry != null;
-	}
-	
-	/**
-	 * Check to see if the nature is still valid. If the project has been
-	 * renamed, the nature is still around, but the project has been closed.
-	 * So the nature is now invalid.
-	 * 
-	 * @return Is this a valid nature. I.e. is the project still open.
-	 */
-	public boolean isValidNature() {
-		return fProject != null;
-	}
-
-	/**
-	 * Set the search path onto the registry.
-	 */
-	protected void setProxySearchPath(ProxyFactoryRegistry registry, List searchPaths) {
-		if (searchPaths != null) {
-			String[] stringSearchPath = (String[]) searchPaths.toArray(new String[searchPaths.size()]);
-			Utilities.setBeanInfoSearchPath(registry, stringSearchPath);
-		} else
-			Utilities.setBeanInfoSearchPath(registry, null);
-	}
-
-	private static final String ENCODING = "UTF-8"; //$NON-NLS-1$
-	static final String sBeaninfos = "beaninfos"; // Root element name //$NON-NLS-1$
-	/**
-	 * Get the persistent search path. It is copy.
-	 */
-	public BeaninfosDoc getSearchPath() {
-		BeaninfosDoc bdoc = null;
-		try {
-			InputStream property = getSharedProperty(P_BEANINFO_SEARCH_PATH);
-			if (property != null) {
-				try {
-					// Need to reconstruct from the XML format.
-					Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new InputStreamReader(property, ENCODING)));
-					Element root = doc.getDocumentElement();
-					if (root != null && root.getNodeName().equalsIgnoreCase(sBeaninfos)) {
-						bdoc = BeaninfosDoc.readEntry(new DOMReader(), root, getProject());
-					}
-				} finally {
-					try {
-						property.close();
-					} catch (IOException e) {
-					}
-				}
-			}
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		} catch (Exception e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "", e)); //$NON-NLS-1$
-		}
-		return bdoc;
-	}
-
-	/**
-	 * Set the persistent search path. No progress monitor.
-	 */
-	public void setSearchPath(BeaninfosDoc searchPath) throws CoreException {
-		setSearchPath(searchPath, null);
-	}
-
-	/**
-	 * Set the persistent search path with a progress monitor
-	 */
-	public void setSearchPath(BeaninfosDoc searchPath, IProgressMonitor monitor) throws CoreException {
-		String property = null;
-		if (searchPath != null && searchPath.getSearchpath().length > 0) {
-			try {
-				Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-				Element root = doc.createElement(sBeaninfos); // Create Root Element
-				IBeaninfosDocEntry[] entries = searchPath.getSearchpath();
-				for (int i = 0; i < entries.length; i++)
-					root.appendChild(entries[i].writeEntry(doc, getProject())); // Add to the search path
-				doc.appendChild(root); // Add Root to Document
-				StringWriter strWriter = new StringWriter();
-
-				Result result = new StreamResult(strWriter);
-				Source source = new DOMSource(doc);
-				Transformer transformer = TransformerFactory.newInstance().newTransformer();
-				transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
-				transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
-				transformer.transform(source, result);
-				property = strWriter.toString();
-			} catch (TransformerConfigurationException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			} catch (TransformerException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			} catch (ParserConfigurationException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			} catch (FactoryConfigurationError e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			}
-		}
-
-		if (property != null) {
-			// If it hasn't changed, don't write it back out. This is so that if the file hasn't
-			// been checked out and it is the same, we don't want to bother the user. This is because
-			// we don't know if the user had simply browsed the search path or had actually changed and
-			// set it back to what it was. In either of those cases it would be a bother to ask the
-			// user to checkout the file.
-			InputStream is = getSharedProperty(P_BEANINFO_SEARCH_PATH);
-			if (is != null) {
-				try {
-					try {
-						InputStreamReader reader = new InputStreamReader(is, ENCODING);
-						char[] chars = new char[1000];
-						StringBuffer oldProperty = new StringBuffer(1000);
-						int read = reader.read(chars);
-						while (read != -1) {
-							oldProperty.append(chars, 0, read);
-							read = reader.read(chars);
-						}
-						if (oldProperty.toString().equals(property))
-							return;
-					} catch (IOException e) {
-					} // Didn't change.
-				} finally {
-					try {
-						is.close();
-					} catch (IOException e) {
-					}
-				}
-			}
-			setSharedProperty(P_BEANINFO_SEARCH_PATH, property, monitor);
-		} else
-			removeSharedProperty(P_BEANINFO_SEARCH_PATH, monitor);
-	}
-
-	/**
-	 * Return the resource set for all java packages in this nature.
-	 */
-	public ResourceSet getResourceSet() {
-		return javaRSet;
-	}
-
-	protected void markAllStale() {
-		// Mark all stale so that the registry will be recycled.
-		if (fRegistry != null) {
-			// We have a registry running, we need to indicate recycle is needed.
-			fSynchronizer.getAdapterFactory().markAllStale();
-			// Mark all stale. Next time we need anything it will be recycled.
-		}
-	}
-
-	/**
-	 * Compute the file name to use for a given shared property
-	 */
-	protected String computeSharedPropertyFileName(QualifiedName qName) {
-		return qName.getLocalName();
-	}
-
-	/**
-	 * Retrieve a shared property on a project. If the property is not defined, answers null.
-	 * Note that it is orthogonal to IResource persistent properties, and client code has to decide
-	 * which form of storage to use appropriately. Shared properties produce real resource files which
-	 * can be shared through a VCM onto a server. Persistent properties are not shareable.
-	 *
-	 */
-	protected InputStream getSharedProperty(String propertyFileName) throws CoreException {
-		IFile rscFile = getProject().getFile(propertyFileName);
-		if (rscFile.exists())
-			return rscFile.getContents(true);
-		else
-			return null;
-	}
-
-	/**
-	 * Record a shared persistent property onto a project.
-	 * Note that it is orthogonal to IResource persistent properties, and client code has to decide
-	 * which form of storage to use appropriately. Shared properties produce real resource files which
-	 * can be shared through a VCM onto a server. Persistent properties are not shareable.
-	 * 
-	 * shared properties end up in resource files, and thus cannot be modified during
-	 * delta notifications (a CoreException would then be thrown).
-	 * 
-	 */
-	protected void setSharedProperty(String propertyName, String value, IProgressMonitor monitor) throws CoreException {
-
-		try {
-			IFile rscFile = getProject().getFile(propertyName);
-			InputStream input = new ByteArrayInputStream(value.getBytes(ENCODING));
-			// update the resource content
-			if (rscFile.exists()) {
-				rscFile.setContents(input, true, false, null);
-			} else {
-				rscFile.create(input, true, monitor);
-			}
-		} catch (UnsupportedEncodingException e) {
-		}
-	}
-
-	/**
-	 * Remove a shared persistent property onto a project.
-	 * Note that it is orthogonal to IResource persistent properties, and client code has to decide
-	 * which form of storage to use appropriately. Shared properties produce real resource files which
-	 * can be shared through a VCM onto a server. Persistent properties are not shareable.
-	 * 
-	 * shared properties end up in resource files, and thus cannot be modified during
-	 * delta notifications (a CoreException would then be thrown).
-	 * 
-	 */
-	protected void removeSharedProperty(String propertyName, IProgressMonitor monitor) throws CoreException {
-
-		IFile rscFile = getProject().getFile(propertyName);
-		rscFile.delete(true, true, monitor);
-	}
-
-	/**
-	 * Return a configuration contributor that sets up a vm to allow
-	 * introspection. This will make sure the appropriate paths
-	 * are in the classpath to allow access to the beaninfos, and
-	 * it will setup the beaninfo search path for this project.
-	 */
-	public IConfigurationContributor getConfigurationContributor() {
-		return new ConfigurationContributor(getSearchPath());
-	}
-
-	private void prematureRegistryTerminate() {
-		synchronized(BeaninfoNature.this) {
-			registryPrematureTerminateCount++;
-			registryLastPrematureTerminateTime = System.currentTimeMillis();
-		}
-	}
-
-	private static class ConfigurationContributor extends ConfigurationContributorAdapter {
-
-		private BeaninfosDoc doc;
-		List computedSearchPath;
-				
-		// The nature. If the nature is not set then this contributor is one
-		// used by some other later proxy registry to get the beaninfo classes into their paths. In that case
-		// we can expect the config info to be in the session variable for our use. Otherwise we will need to
-		// add it here. Also don't set searchpath stuff if not nature because only the beaninfo one will do introspection.
-		private BeaninfoNature nature;	
-		
-		private IConfigurationContributionInfo info;
-		private IBeanInfoContributor[] explicitContributors;
-
-		public ConfigurationContributor(BeaninfosDoc doc) {
-			this.doc = doc;
-		}
-
-		/*
-		 * Set that this is the nature contributor. Not null, means that this is the contributor being
-		 * used to setup the registry for the project's beaninfo nature. null (default) means that this
-		 * is one created to add to some editor's registry.
-		 * 
-		 * Note: This MUST be set before initialize is called or it will not work correctly. If not set, it 
-		 * will be considered not for BeanInfo nature directly.
-		 */
-		public void setNature(BeaninfoNature nature) {
-			this.nature = nature;
-			if (nature != null)
-				computedSearchPath = new ArrayList(3);	// We will be gathering this info.
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#initialize(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
-		 */
-		public void initialize(IConfigurationContributionInfo info) {
-			this.info = info;
-			try {
-				if (info.getJavaProject().getProject().getSessionProperty(CONFIG_INFO_SESSION_KEY) == null) {
-					// TODO For now we will rebuild for each time we open a registry, but it actually is only needed if a classpath
-					// changes for some reason. At that point we can get it out of here.
-					
-					computeBeanInfoConfigInfo(info);					
-				} 
-				explicitContributors = (IBeanInfoContributor[]) info.getJavaProject().getProject().getSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY);
-			} catch (CoreException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			}
-		}
-		
-		public void contributeClasspaths(final IConfigurationContributionController controller) throws CoreException {
-			// Contribute for this project
-			contributeClasspathsForProject(controller, info.getJavaProject().getProject(), doc, true);
-						
-			if (!info.getProjectPaths().isEmpty()) {
-				// Run through all of the visible projects and contribute the classpaths (which come from the BeanInfo docs, if they have any).
-				IWorkspaceRoot root = info.getJavaProject().getProject().getWorkspace().getRoot();
-				Iterator projIter = info.getProjectPaths().entrySet().iterator();
-				while (projIter.hasNext()) {
-					Map.Entry entry = (Map.Entry) projIter.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						IResource res = root.findMember((IPath) entry.getKey());
-						if (res instanceof IProject && ((IProject) res).isOpen() && BeaninfoNature.hasRuntime((IProject) res))
-							contributeClasspathsForProject(controller, (IProject) res, BeaninfoNature.getRuntime((IProject) res)
-									.getSearchPath(), false);
-					}
-				}
-			}			
-			
-			if (!info.getContainerIds().isEmpty()) {
-				// Run through all of the visible container ids that are applicable.
-				Iterator containerIdItr = info.getContainerIds().values().iterator();
-				while (containerIdItr.hasNext()) {
-					ContainerPaths containerPaths = (ContainerPaths) containerIdItr.next();
-					processBeaninfoEntries(BeaninfoPlugin.getPlugin().getContainerIdBeanInfos(containerPaths.getContainerId(), containerPaths.getVisibleContainerPaths()),
-							controller, info.getJavaProject());
-				}
-				
-			}
-			
-			if (!info.getPluginIds().isEmpty()) {
-				// Run through all of the visible plugin ids that are applicable.
-				Iterator pluginIdItr = info.getPluginIds().entrySet().iterator();
-				while (pluginIdItr.hasNext()) {
-					Map.Entry entry = (Map.Entry) pluginIdItr.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						processBeaninfoEntries(BeaninfoPlugin.getPlugin().getPluginBeanInfos((String) entry.getKey()), controller, info.getJavaProject());
-					}
-				}
-				
-			}
-			
-			if (!info.getContainers().isEmpty()) {
-				// Run through all of the visible containers that implement IBeanInfoContributor and ask them for the contributions.
-				Iterator containerItr = info.getContainers().entrySet().iterator();
-				while (containerItr.hasNext()) {
-					Map.Entry entry = (Map.Entry) containerItr.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						if (entry.getKey() instanceof IBeanInfoContributor)
-							processBeaninfoEntries(((IBeanInfoContributor) entry.getKey()).getBeanInfoEntryContributions(info),
-									controller, info.getJavaProject());
-					}
-				}
-				
-			}			
-				
-			// And finally run through the explicit contributors.				
-			for (int i = 0; i < explicitContributors.length; i++) {
-				final IBeanInfoContributor contributor = explicitContributors[i];
-				processBeaninfoEntries(contributor.getBeanInfoEntryContributions(info), controller, info.getJavaProject());
-				if (contributor instanceof IConfigurationContributor) {
-					SafeRunner.run(new ISafeRunnable() {
-						public void handleException(Throwable exception) {
-							// do nothing. by default platform logs.
-						}
-
-						public void run() throws Exception {;
-							if (contributor instanceof IConfigurationContributor)
-								((IConfigurationContributor) contributor).contributeClasspaths(controller);
-						}
-					});
-				}
-			}
-			
-			// Add the common to the end of the classpath. (Since we are now a jarred plugin, the common is not the plugin jar itself).
-			// With bug 256441 we've reverted to putting only the "common.jar" on the classpath, though now it is its own bundle. See
-			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=256441
-			Bundle commonBundle = Platform.getBundle("org.eclipse.jem.beaninfo.vm.common");
-			controller.contributeClasspath(commonBundle, (IPath) null, IConfigurationContributionController.APPEND_USER_CLASSPATH, false); //$NON-NLS-1$
-			
-			// Add the beaninfovm.jar and any nls to the end of the classpath.
-			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=256441
-			Bundle vmBundle = Platform.getBundle("org.eclipse.jem.beaninfo.vm");
-			controller.contributeClasspath(vmBundle, (IPath) null, IConfigurationContributionController.APPEND_USER_CLASSPATH, true); //$NON-NLS-1$
-		}
-
-		private IClasspathEntry get(IClasspathEntry[] array, SearchpathEntry se) {
-			for (int i = 0; i < array.length; i++) {
-				if (array[i].getEntryKind() == se.getKind() && array[i].getPath().equals(se.getPath()))
-					return array[i];
-			}
-			return null;
-		}
-
-		private static final IBeaninfosDocEntry[] EMPTY_ENTRIES = new IBeaninfosDocEntry[0];
-		
-		/*
-		 * Contribute classpaths for the specified project. If doc is passed in, then this is the top level and
-		 * all should be added. If no doc, then this is pre-req'd project, and then we will handle exported entries only.
-		 */
-		protected void contributeClasspathsForProject(
-			IConfigurationContributionController controller,
-			IProject project,
-			BeaninfosDoc doc,
-			boolean toplevelProject)
-			throws CoreException {
-			
-			IJavaProject jProject = JavaCore.create(project);
-			IClasspathEntry[] rawPath = jProject.getRawClasspath();
-
-			// Search path of this project
-			IBeaninfosDocEntry[] entries = (doc != null) ? doc.getSearchpath() : EMPTY_ENTRIES;
-
-			for (int i = 0; i < entries.length; i++) {
-				IBeaninfosDocEntry entry = entries[i];
-				if (entry instanceof BeaninfoEntry) {
-					BeaninfoEntry be = (BeaninfoEntry) entry;
-					if (toplevelProject || be.isExported()) {
-						// First project or this is an exported beaninfo, so we process it.
-						processBeaninfoEntry(be, controller, jProject);
-					}
-				} else if (nature != null){
-					// Just a search path entry. There is no beaninfo jar to pick up.
-					// We have a nature, so we process search path.
-					SearchpathEntry se = (SearchpathEntry) entry;
-					if (!toplevelProject) {
-						// We are in a nested project, find the raw classpath entry to see
-						// if this entry is exported. Only do it if exported. (Note: exported is only used on non-source. Source are always exported).
-						IClasspathEntry cpe = get(rawPath, se);
-						if (cpe == null || (cpe.getEntryKind() != IClasspathEntry.CPE_SOURCE && !cpe.isExported())) {
-							continue; // Not exist or not exported, so we don't want it here either.
-						}
-					}
-
-					String pkg = se.getPackage();
-					if (pkg != null) {
-						// Explicit search path
-						if (!computedSearchPath.contains(pkg))
-							computedSearchPath.add(pkg);
-					} else {
-						// We no longer allow this, but just to be on safe side we test for it.
-					}
-				}
-			}
-		}
-
-		protected void processBeaninfoEntries(
-			BeaninfoEntry[] entries,
-			IConfigurationContributionController controller,
-			IJavaProject javaProject)
-			throws CoreException {
-			if (entries != null) {
-				for (int i = 0; i < entries.length; i++)
-					processBeaninfoEntry(entries[i], controller, javaProject);
-			}
-		}
-
-		protected void processBeaninfoEntry(
-			BeaninfoEntry entry,
-			IConfigurationContributionController controller,
-			IJavaProject javaProject)
-			throws CoreException {
-			Object[] cps = entry.getClasspath(javaProject);
-			for (int j = 0; j < cps.length; j++) {
-				Object cp = cps[j];
-				if (cp instanceof IProject)
-					controller.contributeProject((IProject) cp);
-				else if (cp instanceof String)
-					controller.contributeClasspath(ProxyLaunchSupport.convertStringPathToURL((String) cp), IConfigurationContributionController.APPEND_USER_CLASSPATH);
-				else if (cp instanceof IPath) {
-					IPath path = (IPath) cp;
-					Bundle bundle = Platform.getBundle(path.segment(0));
-					if (bundle != null)
-						controller.contributeClasspath(bundle, path.removeFirstSegments(1), IConfigurationContributionController.APPEND_USER_CLASSPATH, true);
-				}
-			}
-
-			if (nature != null) {
-				// Now add in the package names.
-				SearchpathEntry[] sees = entry.getSearchPaths();
-				for (int j = 0; j < sees.length; j++) {
-					SearchpathEntry searchpathEntry = sees[j];
-					if (!computedSearchPath.contains(searchpathEntry.getPackage()))
-						computedSearchPath.add(searchpathEntry.getPackage());
-				}
-			}
-		}
-
-		public void contributeToConfiguration(final ILaunchConfigurationWorkingCopy config) {
-			for (int i = 0; i < explicitContributors.length; i++) {
-				final int ii = i;
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// do nothing. by default platform logs.
-					}
-
-					public void run() throws Exception {
-						IBeanInfoContributor contributor = explicitContributors[ii];
-						if (contributor instanceof IConfigurationContributor)
-							((IConfigurationContributor) contributor).contributeToConfiguration(config);
-					}
-				});
-			}			
-		}
-
-		public void contributeToRegistry(final ProxyFactoryRegistry registry) {
-			if (nature != null)
-				nature.setProxySearchPath(registry, computedSearchPath);
-			for (int i = 0; i < explicitContributors.length; i++) {
-				final int ii = i;
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// do nothing. by default platform logs.
-					}
-
-					public void run() throws Exception {
-						IBeanInfoContributor contributor = explicitContributors[ii];
-						if (contributor instanceof IConfigurationContributor)
-							((IConfigurationContributor) contributor).contributeToRegistry(registry);
-					}
-				});
-			}			
-		}
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java
deleted file mode 100644
index a9a0b8114..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-
-/**
- * This holds the proxy constants for access in beaninfo. It is created on a per-registry basis and stored in the constants section of the registry so
- * that they can be accessed as needed.
- * <p>
- * To gain access to these constants, use the static accessor method "getConstants()" so that the instance is not created until actually needed.
- * 
- * @since 1.0.0
- */
-public final class BeaninfoProxyConstants {
-
-	private static final Object REGISTRY_KEY = new Object();
-
-	private final IMethodProxy introspectProxy;
-
-	private final IMethodProxy getBeanInfoSearchPathProxy;
-
-	private final IMethodProxy setBeanInfoSearchPathProxy;
-
-	private final IMethodProxy sendBeanInfoProxy;
-
-	/**
-	 * Get the constants instance for the specified registry.
-	 */
-	public static BeaninfoProxyConstants getConstants(ProxyFactoryRegistry registry) {
-		if (registry != null && registry.isValid()) {
-			BeaninfoProxyConstants constants = (BeaninfoProxyConstants) registry.getConstants(REGISTRY_KEY);
-			if (constants == null)
-				registry.registerConstants(REGISTRY_KEY, constants = new BeaninfoProxyConstants(registry));
-			return constants;
-		} else
-			return null;
-	}
-
-	private BeaninfoProxyConstants(ProxyFactoryRegistry registry) {
-
-		IStandardBeanTypeProxyFactory typeFactory = registry.getBeanTypeProxyFactory();
-
-		IBeanTypeProxy introspector = typeFactory.getBeanTypeProxy("java.beans.Introspector"); //$NON-NLS-1$
-		getBeanInfoSearchPathProxy = introspector.getMethodProxy("getBeanInfoSearchPath"); //$NON-NLS-1$
-		setBeanInfoSearchPathProxy = introspector.getMethodProxy("setBeanInfoSearchPath", "[Ljava.lang.String;"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IBeanTypeProxy modelingBeaninfo = typeFactory.getBeanTypeProxy("org.eclipse.jem.internal.beaninfo.vm.ModelingBeanInfo");//$NON-NLS-1$
-		introspectProxy = modelingBeaninfo.getMethodProxy("introspect", new String[] { "java.lang.Class", "boolean", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
-		sendBeanInfoProxy = modelingBeaninfo.getMethodProxy("send"); //$NON-NLS-1$
-
-	}
-
-	/**
-	 * Get the sendBeanDecorator method proxy from ModelingBeanInfo.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy getSendBeanInfoProxy() {
-		return sendBeanInfoProxy;
-	}
-	
-	/**
-	 * Get the getBeanInfoSearchPath method proxy from Introspector.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getGetBeanInfoSearchPathProxy() {
-		return getBeanInfoSearchPathProxy;
-	}
-
-	/**
-	 * Get the setBeanInfoSearchPath method proxy from Introspector.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getSetBeanInfoSearchPathProxy() {
-		return setBeanInfoSearchPathProxy;
-	}
-
-	/**
-	 * Get the introspect method proxy from ModelingBeanInfo.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy getIntrospectProxy() {
-		return introspectProxy;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java
deleted file mode 100644
index 0d0493b6e..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java
+++ /dev/null
@@ -1,118 +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.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.impl.ESuperAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-
-/**
- * Used to know when events or any of the super classes change so
- * that we can re-construct our all events list next time we need it.
- * @version 	1.0
- * @author
- */
-public class BeaninfoSuperAdapter extends AdapterImpl {
-
-	public static final Class ADAPTER_KEY = BeaninfoSuperAdapter.class;
-
-	private boolean allEventsCollectionModified = true;
-	private boolean allPropertiesCollectionModified = true;
-	private boolean allOperationsCollectionModified = true;
-
-	public BeaninfoSuperAdapter() {
-		super();
-	}
-
-	public void notifyChanged(Notification msg) {
-		if (msg.getEventType() != Notification.REMOVING_ADAPTER)
-			setFlags(msg.getFeatureID(JavaClass.class));
-	}
-
-	public boolean isAllEventsCollectionModified() {
-		return allEventsCollectionModified;
-	}
-
-	public void setAllEventsCollectionModified(boolean newEventsModified) {
-		allEventsCollectionModified = newEventsModified;
-	}
-
-	public boolean isAllOperationsCollectionModified() {
-		return allOperationsCollectionModified;
-	}
-
-	public void setAllOperationsCollectionModified(boolean newOperationsModified) {
-		allOperationsCollectionModified = newOperationsModified;
-	}
-	
-	public void setAllPropertiesCollectionModified(boolean allPropertiesCollectionModified) {
-		this.allPropertiesCollectionModified = allPropertiesCollectionModified;
-	}
-
-	public boolean isAllPropertiesCollectionModified() {
-		return allPropertiesCollectionModified;
-	}
-	
-	public Collection getSubclasses() {
-		// Get them from the ESuperAdapter. Easiest to do.
-		ESuperAdapter ea = ((JavaClassImpl) getTarget()).getESuperAdapter();
-		return ea.getSubclasses();
-	}
-
-	public boolean isAdapterForType(Object type) {
-		return ADAPTER_KEY.equals(type);
-	}
-
-	void setFlags(int featureId) {
-		switch (featureId) {
-			case JavaRefPackage.JAVA_CLASS__EVENTS :
-				setAllEventsCollectionModified(true);
-				break;
-				
-			case JavaRefPackage.JAVA_CLASS__EOPERATIONS:
-				setAllOperationsCollectionModified(true);
-				break;
-
-			case JavaRefPackage.JAVA_CLASS__ESUPER_TYPES:
-				setAllEventsCollectionModified(true);
-				setAllPropertiesCollectionModified(true);
-				break;				
-				
-			case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES:
-				setAllPropertiesCollectionModified(true);
-				break;
-				
-			default :
-				break;
-		}
-		Iterator i = getSubclasses().iterator();
-		while (i.hasNext()) {
-			Notifier n = (Notifier) i.next();
-			BeaninfoSuperAdapter a = (BeaninfoSuperAdapter) EcoreUtil.getExistingAdapter(n, ADAPTER_KEY);
-			if (a != null)
-				a.setFlags(featureId);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
deleted file mode 100644
index e7a5c582e..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.*;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
- 
-
-/**
- * This class is used by BeaninfoNature to handle the creation of the registry,
- * This class will be a singleton. It is needed to handle if UI active without
- * requiring UI plugin. (So headless will work too). The subclass <code>UICreateRegistryJobHandler</code>
- * will be instantiated in case of UI active.
- * @since 1.0.0
- */
-class CreateRegistryJobHandler {
-	private static CreateRegistryJobHandler jobHandler = null;
-	
-	public static void createRegistry(BeaninfoNature nature) {
-		synchronized (CreateRegistryJobHandler.class) {
-			if (jobHandler == null) {
-				if (Platform.getBundle("org.eclipse.ui") != null) {	//$NON-NLS-1$
-					try {
-						// There is a UI, it may not be active, but bring in UICreateRegistryJobHandler to do the
-						// actual work since it can reference the UI.
-						jobHandler = (CreateRegistryJobHandler) Class.forName("org.eclipse.jem.internal.beaninfo.adapters.UICreateRegistryJobHandler").newInstance(); //$NON-NLS-1$
-					} catch (InstantiationException e) {
-						jobHandler = new CreateRegistryJobHandler();
-					} catch (IllegalAccessException e) {
-						jobHandler = new CreateRegistryJobHandler();
-					} catch (ClassNotFoundException e) {
-						jobHandler = new CreateRegistryJobHandler();
-					}
-				}
-			}
-		}
-		
-		// See if Autobuild sleeping or waiting. This could be a race condition for us. We can't wait for it
-		// because we may already have the build rule locked by our thread. No way of testing this if beginRule was used.
-		// We can test if we are a build job (not an inline build), and if so, just go on.
-		// Maybe we can figure out in future if we find race condition happens significant amount of time.
-		IJobManager jobManager = Job.getJobManager();
-		Job currentJob = jobManager.currentJob();
-		if (currentJob == null || (!currentJob.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD) && !currentJob.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD))) {
-			// See if autojob is waiting or sleeping.
-			// Give it up to a second at .2 second intervals to try (i.e. 5 tries)
-			int tries = 5;
-			while (isAutoWaiting() && --tries>0) {
-				try {
-					Thread.sleep(200);	// Wait just .2 seconds to give build a chance to start. If it is still not started, then just go on.
-				} catch (InterruptedException e) {
-				}
-			}
-			if (tries==0) {
-				Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-				if (logger.isLoggingLevel(Level.WARNING))
-					logger.log("Build job waiting when trying to start beaninfo registry. Possible race.", Level.WARNING);	// $NON-NLS-1$ //$NON-NLS-1$
-			}
-		}
-		
-		jobHandler.processCreateRegistry(nature);
-	}
-
-	private static boolean isAutoWaiting() {
-		Job[] autojobs = Job.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD);
-		for (int i = 0; i < autojobs.length; i++) {
-			int state = autojobs[i].getState();
-			if (state == Job.WAITING || state == Job.SLEEPING) 
-				return true;
-		}
-		return false;
-	}
-
-	
-	/**
-	 * Process the create of the registry. This should be overridden to
-	 * do what the UI needs. The UI implimentation should call doCreateRegistry at the
-	 * appropriate time.
-	 * 
-	 * @param nature
-	 * 
-	 * @since 1.0.0
-	 */
-	protected void processCreateRegistry(final BeaninfoNature nature) {
-		IJobManager jobManager = Job.getJobManager();
-		ISchedulingRule buildRule = ResourcesPlugin.getWorkspace().getRuleFactory().buildRule();
-		boolean gotRuleLocally = true;
-		try {
-			try {
-				jobManager.beginRule(buildRule, new NullProgressMonitor());
-			} catch (IllegalArgumentException e) {
-				gotRuleLocally = false;	// This thread already had a rule, and it conflicted with the build rule, so we need to spawn off.
-			}
-			if (gotRuleLocally)
-				doCreateRegistry(nature, new NullProgressMonitor());
-		} finally {
-			jobManager.endRule(buildRule);	// Whether we got the rule or not, we must do endrule.
-		}
-		
-		if (!gotRuleLocally) {
-			// Spawn off to a job and wait for it. Hopefully we don't have a deadlock somewhere.
-			Job doCreateJob = new Job(BeanInfoAdapterMessages.UICreateRegistryJobHandler_StartBeaninfoRegistry) { 
-
-				protected IStatus run(IProgressMonitor monitor) {
-					doCreateRegistry(nature, monitor);
-					return Status.OK_STATUS;
-				}
-			};
-			doCreateJob.schedule();
-			while (true) {
-				try {
-					doCreateJob.join();
-					break;
-				} catch (InterruptedException e) {
-				}
-			}
-		}
-	}
-		
-	/*
-	 * Do the creation. It is expected that the build rule has already been given to this thread.
-	 * It is important that the build rule be given to this thread. This is so that a build won't
-	 * start trying to create the same registry (which has happened in the past) at the same time
-	 * a different thread was trying to start the registry. You would either have a deadlock, or 
-	 * a race and get two different registries started.
-	 * 
-	 * The build rule also means that all beaninfo registry creations will be serialized and have
-	 * a race condition. The unfortunate part is that two independent project's registries can't be
-	 * created at same time. But that is the result of the build rule. We can't allow the builds, so
-	 * we need to stop all parallel beaninfo registry creations.
-	 * 
-	 * @param nature
-	 * @param pm
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void doCreateRegistry(BeaninfoNature nature, IProgressMonitor pm) {
-		pm.beginTask("", 100);	//$NON-NLS-1$
-		try {
-			nature.createRegistry(new SubProgressMonitor(pm, 100));	
-		} finally {
-			pm.done();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java
deleted file mode 100644
index aa813c933..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java
+++ /dev/null
@@ -1,73 +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.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-
-/**
- * The internal class for reading dom elements.
- * @version 	1.0
- * @author
- */
-class DOMReader implements IReader {
-	
-	/*
-	 * @see IReader#getChildren(Object)
-	 */
-	public Object getChildren(Object node) {
-		return (node instanceof Node) ? ((Node) node).getChildNodes() : null;
-	}
-	
-	
-	/*
-	 * @see IReader#getLength(Object)
-	 */
-	public int getLength(Object nodeList) {
-		return (nodeList instanceof NodeList) ? ((NodeList) nodeList).getLength() : 0;
-	}
-
-	/*
-	 * @see IReader#getItem(Object, int)
-	 */
-	public Object getItem(Object nodeList, int index) {
-		return (nodeList instanceof NodeList) ? ((NodeList) nodeList).item(index) : null;
-	}
-
-	/*
-	 * @see IReader#isNodeTypeElement(Object)
-	 */
-	public boolean isNodeTypeElement(Object node) {
-		return (node instanceof Node) ? ((Node) node).getNodeType() == Node.ELEMENT_NODE : false;
-	}
-
-	/*
-	 * @see IReader#getNodeName(Object)
-	 */
-	public String getNodeName(Object node) {
-		return (node instanceof Node) ? ((Node) node).getNodeName() : ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * @see IReader#getAttribute(Object, String)
-	 */
-	public String getAttribute(Object element, String attributeName) {
-		return (element instanceof Element) && ((Element) element).hasAttribute(attributeName) ? ((Element) element).getAttribute(attributeName) : null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java
deleted file mode 100644
index d63832048..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java
+++ /dev/null
@@ -1,32 +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.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-/**
- * This is internal interface for reading beaninfoConfig either through IConfigurationElements or
- * w3.dom.Nodes. This is because when reading the .beaninfoConfig we will be using Nodes, but
- * when reading configs from registered extensions they will be IConfigurationElements.
- * @version 	1.0
- * TODO Need to move to core when we make things API.
- */
-public interface IReader {
-	
-	public Object getChildren(Object node);
-	public int getLength(Object nodeList);
-	public Object getItem(Object nodeList, int index);
-	public boolean isNodeTypeElement(Object node);	// Is this an element type node
-	public String getNodeName(Object node);
-	public String getAttribute(Object element, String attributeName);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
deleted file mode 100644
index e00ef522d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
+++ /dev/null
@@ -1,44 +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.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * A Special resource set that is used to link together to the beaninfo
- * nature's resource set and makes sure that any request for a new "java:/..."
- * JavaClass is redirected to the beaninfo nature's resource set. Otherwise
- * the classes will be all over the place and not all gathered in one place.
- * 
- * *package* protected because no one should create one of these. They are
- * returned by the BeaninfoNature.newResourceSet() request.
- * 
- * @version 	1.0
- * @author
- */
-class SpecialResourceSet extends ProjectResourceSetImpl {
-
-	/**
-	 * Constructor for SpecialResourceSet.
-	 * @param aProject
-	 */
-	public SpecialResourceSet() {
-		super(null);
-		JEMUtilPlugin.getSharedCache().stopListening(this);	// We don't care about listening.
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java
deleted file mode 100644
index b41226f12..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.*;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
-
-/**
- * This is the version which can actually reference and use the UI classes. It won't be loaded except if ui plugin is available.
- * 
- * It will check to see if UI is running, and if it is not, then let super class handle. If it is running, then if this is the UI thread, do special
- * but run in ui, else if not then let super handle it normally.
- * 
- * @since 1.0.0
- */
-class UICreateRegistryJobHandler extends CreateRegistryJobHandler {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.beaninfo.adapters.CreateRegistryJobHandler#processCreateRegistry(org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature)
-	 */
-	protected void processCreateRegistry(final BeaninfoNature nature) {
-		if (PlatformUI.isWorkbenchRunning()) {
-			if (Display.getCurrent() == null)
-				super.processCreateRegistry(nature); // We are not in the UI thread. Do normal.
-			else {
-				IProgressService ps = PlatformUI.getWorkbench().getProgressService();
-				final ISchedulingRule buildRule = ResourcesPlugin.getWorkspace().getRuleFactory().buildRule();
-				// First find out if we already have the build rule. If we do, we MUST run in the UI thread. Have no option, can't transfer the
-				// rule to the thread and then back to us when done.
-				// This means a busy cursor instead of a possible progress dialog to keep the UI active. Only possible deadlock
-				// situation is if some other thread has the build rule (other than the build) and is doing an asyncExec or
-				// is waiting on something from the UI thread.
-				final IJobManager jobManager = Job.getJobManager();
-				Job currentJob = jobManager.currentJob();
-				if (currentJob == null || currentJob.getRule() == null || !currentJob.getRule().contains(buildRule)) {
-					// UI is not in a job, or it is and there is no rule, or there is a rule and it is not compatible with the buildRule.
-					// In that case we need to run in another thread. That is so that we can put up a progress dialog if it takes
-					// too long. 
-					// If no rule then we can't run in UI because some other job may have the rule, and there is no way to test
-					// for this. So we don't want to block the UI entirely waiting for the rule, so we can use progress dialog
-					// for this. Also if we have a rule and it conflicts with build rule then we should also go to another thread.
-					// busyCursorWhile will do this. It will run the create in another thread but keep the UI responsive with
-					// progress dialog after a "long operation" timeout.
-					try {
-						ps.busyCursorWhile(new IRunnableWithProgress() {
-	
-							public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-								monitor.beginTask("", 200); //$NON-NLS-1$
-								try {
-									jobManager.beginRule(buildRule, new SubProgressMonitor(monitor, 100));
-									doCreateRegistry(nature, new SubProgressMonitor(monitor, 100));
-								} finally {
-									jobManager.endRule(buildRule);
-									monitor.done();
-								}
-							}
-						});
-					} catch (InterruptedException e1) {
-					} catch (InvocationTargetException e2) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e2.getCause(), Level.WARNING);
-					}
-				} else {
-					// We are a job in the UI and we have or can contain the build rule. Therefor we must run in the UI thread itself. Otherwise
-					// there will be a deadlock because we have the build rule and the other thread won't be able to get it.
-					// Note: There is ProgressService.runInUI() but that guy is complicated with some interactions I'm not sure about. Safer to do this.
-					BusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
-						public void run() {
-							try {
-								jobManager.beginRule(buildRule, new NullProgressMonitor());
-								doCreateRegistry(nature, new NullProgressMonitor());
-							} finally {
-								jobManager.endRule(buildRule);
-							}
-						}
-					});
-				}
-			}
-		} else
-			super.processCreateRegistry(nature); // Workbench not running, do default.
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties
deleted file mode 100644
index 79ff64c3d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties
+++ /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
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties,v $
-# $Revision: 1.6 $  $Date: 2005/08/24 20:31:29 $
-#
-
-INTROSPECT_FAILED_EXC_                           = IWAV0155E Introspection failed on class "{0}." msg="{1}."
-BeaninfoClassAdapter_ClassNotFound               = Class not found
-BeaninfoNature_InvalidProject                    = Invalid project
-UICreateRegistryJobHandler_StartBeaninfoRegistry = Start Beaninfo registry
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java
deleted file mode 100644
index 31904a287..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java
+++ /dev/null
@@ -1,1603 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.core;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.notify.*;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.change.impl.EObjectToChangesMapEntryImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin.CleanResourceChangeListener;
-
-/**
- * Controller of the BeanInfo cache. There is one per workspace (it is a static).
- * 
- * The cache is stored on a per IPackageFragmentRoot basis. Each package fragment root will be:
- * 
- * <pre>
- * 
- *  root{999}/classname.xmi
- *  
- * </pre>
- * 
- * "root{999}" will be a unigue name (root appended with a number}, one for each package fragment root. The "classname.xmi" will be the BeanInfo cache
- * for a class in the root. A root can't have more than one class with the same name, so there shouldn't be any collisions.
- * <p>
- * Now roots can either be in a project, or they can be an external jar (which can be shared between projects).
- * <p>
- * Now all roots for a project will be stored in the project's working location
- * {@link org.eclipse.core.resources.IProject#getWorkingLocation(java.lang.String)}under the ".cache" directory. It will be this format in each
- * project location (under the org.eclipse.jem.beaninfo directory):
- * 
- * <pre>
- * 
- *  .index
- *  root{999}/...
- *  
- * </pre>
- * 
- * The ".index" file will be stored/loaded through an ObjectStream. It will be a {@link BeanInfoCacheController.Index}. It is the index to all of the
- * root's in the directory.
- * <p>
- * All of the external jar roots will be stored in the org.eclipse.jem.beaninfo plugin's state location
- * {@link org.eclipse.core.runtime.Platform#getStateLocation(org.osgi.framework.Bundle)}under the ".cache" directory. The format of this directory
- * will be the same as for each project. And the roots will be for each unique shared external jar (such as the differnt jre's rt.jars).
- * <p>
- * Note: There are so many places where synchronization is needed, so it is decided to synchronize only on BeanInfoCacheController.INSTANCE. It would
- * be too easy to get a dead-lock because the order of synchronizations can't be easily controlled. Since each piece of sync control is very short
- * (except for save of the indices, but that is ok because we don't want them changing while saving) it shouldn't block a lot. There is one place we
- * violate this and that is we do a sync on ClassEntry instance when working with the pending. This is necessary because we don't want the cache write
- * job to hold up everything while writing, so we sync on the entry being written instead. There we must be very careful that we never to
- * BeanInfoCacheControler.INSTANCE sync and then a ClassEntry sync because we could deadlock. The CE access under the covers may do a CE sync and then
- * a BeanInfoCacheController.INSTANCE sync.
- * 
- * @since 1.1.0
- */
-public class BeanInfoCacheController {
-
-	/**
-	 * Singleton cache controller.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final BeanInfoCacheController INSTANCE = new BeanInfoCacheController();
-
-	private BeanInfoCacheController() {
-		// Start up save participent. This only is used for saving indexes and shutdown. Currently the saved state delta
-		// is of no interest. If a project is deleted while we were not up, then the project index would be gone, so
-		// our data will automatically be gone for the project. 
-		// If a class was deleted while the project's beaninfo was not active, the cache will still contain it. If the class ever came back it
-		// would be stale and so recreated. If it never comes back, until a clean is done, it would just hang around.
-		// The problem with delete is it is hard to determine that the file is actually a class of interest. The javamodel
-		// handles that for us but we won't have a javamodel to handle this on start up to tell us the file was a class of interest. So
-		// we'll take the hit of possible cache for non-existant classes. A clean will take care of this.
-		saveParticipant = new SaveParticipant();
-		try {
-			ResourcesPlugin.getWorkspace().addSaveParticipant(BeaninfoPlugin.getPlugin(), saveParticipant);
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		}
-		
-		// Create a cleanup listener to handle clean requests and project deletes. We need to know about project deletes while
-		// active because we may have a project index in memory and that needs to be thrown away.
-		JEMUtilPlugin.addCleanResourceChangeListener(new CleanResourceChangeListener() {
-		
-			protected void cleanProject(IProject project) {
-				// Get rid of the project index and the data for the project.
-				synchronized (BeanInfoCacheController.this) {
-					try {
-						Index projectIndex = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
-						if (projectIndex != null) {
-							project.setSessionProperty(PROJECT_INDEX_KEY, null);
-							projectIndex.markDead();
-							cleanDirectory(getCacheDir(project).toFile(), true);
-						}
-						BeaninfoNature nature = BeaninfoPlugin.getPlugin().getNature(project);
-						if (nature != null) {
-							nature.projectCleaned();
-							BeaninfoAdapterFactory adapterFactory = (BeaninfoAdapterFactory) EcoreUtil.getAdapterFactory(nature.getResourceSet().getAdapterFactories(), IIntrospectionAdapter.ADAPTER_KEY);
-							if (adapterFactory != null) {
-								adapterFactory.markAllStale(true);	// Also clear the overrides.
-							}
-						}						
-					} catch (CoreException e) {
-						// Shouldn't occur. 
-					}
-				}
-			}
-			
-			protected void cleanAll() {
-				synchronized(BeanInfoCacheController.this) {
-					// Get MAIN_INDEX, mark it dead, and then delete everything under it.
-					if (MAIN_INDEX != null) {
-						MAIN_INDEX.markDead();
-						MAIN_INDEX = null;
-						cleanDirectory(getCacheDir(null).toFile(), true);
-					}
-				}
-				super.cleanAll();
-			}
-			
-			public void resourceChanged(IResourceChangeEvent event) {
-				// We don't need to handle PRE_CLOSE because SaveParticipent project save will handle closing.
-				switch (event.getType()) {
-					case IResourceChangeEvent.PRE_DELETE:
-						// Don't need to clear the cache directory because Eclipse will get rid of it.
-						synchronized (BeanInfoCacheController.this) {
-							try {
-								Index projectIndex = (Index) event.getResource().getSessionProperty(PROJECT_INDEX_KEY);
-								if (projectIndex != null) {
-									// No need to remove from the project because the project is going away and will clean itself up.
-									projectIndex.markDead();
-								}
-							} catch (CoreException e) {
-								// Shouldn't occur.
-							}
-						}
-						// Flow into PRE_CLOSE to release the nature.
-					case IResourceChangeEvent.PRE_CLOSE:
-						// About to close or delete, so release the nature, if any.
-						IProject project = (IProject) event.getResource();
-						BeaninfoNature nature = BeaninfoPlugin.getPlugin().getNature(project);
-						if (nature != null) {
-							nature.cleanup(false, true);
-						}
-						break;
-					default:
-						super.resourceChanged(event);
-						break;
-				}
-			}
-		
-		}, IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE);
-	}
-
-	protected SaveParticipant saveParticipant;
-
-	/**
-	 * An index structure for the Main and Project indexes. Access to the index contents and methods should synchronize on the index itself.
-	 * <p>
-	 * Getting to the index instance should only be through the <code>getMainIndex()</code> and <code>getProjectIndex(IProject)</code> accessors
-	 * so that synchronization and serialization is controlled.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static class Index implements Serializable {
-
-		private static final long serialVersionUID = 1106864425567L;
-
-		/*
-		 * Is this a dirty index, i.e. it has been changed and needs to be saved.
-		 */
-		transient private boolean dirty;
-
-		private static final int DEAD = -1;	// Used in highRootNumber to indicate the index is dead.
-		/**
-		 * The highest root number used. It is incremented everytime one is needed. It doesn't ever decrease to recover removed roots.
-		 * 
-		 * @since 1.1.0
-		 */
-		public int highRootNumber;
-
-		/**
-		 * Map of root names to the root Index. The key is a {@link IPath}. The path will be relative to the workspace if a project root, or an
-		 * absolute local path to the archive if it is an external archive. It is the IPath to package fragment root (either a folder or a jar file).
-		 * <p>
-		 * The value will be a {@link BeanInfoCacheController.RootIndex}. This is the index for the contents of that root.
-		 * 
-		 * @since 1.1.0
-		 */
-		transient public Map rootToRootIndex;
-
-		/**
-		 * @param dirty
-		 *            The dirty to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		public void setDirty(boolean dirty) {
-			synchronized (BeanInfoCacheController.INSTANCE) {
-				this.dirty = dirty;
-			}
-		}
-
-		/**
-		 * @return Returns the dirty.
-		 * 
-		 * @since 1.1.0
-		 */
-		public boolean isDirty() {
-			synchronized (BeanInfoCacheController.INSTANCE) {
-				return dirty;
-			}
-		}
-		
-		/**
-		 * Answer if this index is dead. It is dead if a clean has occurred. This is needed because there could be some ClassEntry's still
-		 * around (such as in the pending write queue) that are for cleaned roots. This is used to test if it has been cleaned.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public boolean isDead() {
-			return highRootNumber == DEAD;
-		}
-		
-		/**
-		 * Mark the index as dead.
-		 * 
-		 * 
-		 * @since 1.1.0
-		 */
-		void markDead() {
-			highRootNumber = DEAD;
-		}
-
-		private void writeObject(ObjectOutputStream os) throws IOException {
-			os.defaultWriteObject();
-			// Now write out the root to root index map. We are not serializing the Map directly using normal Map serialization because
-			// the key of the map is an IPath (which is a Path under the covers) and Path is not serializable.
-			os.writeInt(rootToRootIndex.size());
-			for (Iterator mapItr = rootToRootIndex.entrySet().iterator(); mapItr.hasNext();) {
-				Map.Entry entry = (Map.Entry) mapItr.next();
-				os.writeUTF(((IPath) entry.getKey()).toString());
-				os.writeObject(entry.getValue());
-			}
-		}
-
-		private void readObject(ObjectInputStream is) throws IOException, ClassNotFoundException {
-			is.defaultReadObject();
-			int size = is.readInt();
-			rootToRootIndex = new HashMap(size < 100 ? 100 : size);
-			while (size-- > 0) {
-				rootToRootIndex.put(new Path(is.readUTF()), is.readObject());
-			}
-		}
-	}
-
-	/**
-	 * An index for a root. It has an entry for each class in this root. The class cache entry describes the cache, whether it is stale, what the
-	 * current mod stamp is, etc.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static abstract class RootIndex implements Serializable {
-
-		private static final long serialVersionUID = 1106868674101L;
-
-		transient private IPath cachePath; // Absolute local filesystem IPath to the root cache directory. Computed at runtime because it may change
-										   // if workspace relocated.
-
-		protected Map classNameToClassEntry; // Map of class names to class entries.
-
-		private String rootName; // Name of the root directory in the cache (e.g. "root1").
-
-		protected Index index; // Index containing this root index.
-
-		protected RootIndex() {
-		}
-
-		public RootIndex(String rootName, Index index) {
-			this.rootName = rootName;
-			classNameToClassEntry = new HashMap(100); // When created brand new, put in a map. Otherwise object stream will create the map.
-			this.index = index;
-		}
-		
-		/**
-		 * Get the index that points to this root.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		Index getIndex() {
-			return index;
-		}
-
-		/**
-		 * Return the root directory name
-		 * 
-		 * @return rootname
-		 * 
-		 * @since 1.1.0
-		 */
-		public String getRootName() {
-			return rootName;
-		}
-
-		/**
-		 * Set this RootIndex (and the containing Index) as being dirty and in need of saving.
-		 * 
-		 * 
-		 * @since 1.1.0
-		 */
-		public void setDirty() {
-			index.setDirty(true);
-		}
-
-		/*
-		 * Setup for index. It will initialize the path. Once set it won't set it again. This will be called repeatedly by the cache controller
-		 * because there is no way to know if it was lazily created or was brought in from file. When brought in from file the path is not set because
-		 * it should be relocatable and we don't want absolute paths out on the disk caches, and we don't want to waste time creating the path at load
-		 * time because it may not be needed for a while. So it will be lazily created. <p> If the project is set, then the path will be relative to
-		 * the project's working location. If project is <code> null </code> then it will be relative to the BeanInfo plugin's state location. <p>
-		 * This is <package-protected> because only the creator (BeanInfoCacheController class) should set this up.
-		 * 
-		 * @param project
-		 * 
-		 * @since 1.1.0
-		 */
-		void setupIndex(IProject project) {
-			if (getCachePath() == null)
-				cachePath = getCacheDir(project).append(rootName);
-		}
-
-		/**
-		 * @return Returns the path of the cache directory for the root.
-		 * 
-		 * @since 1.1.0
-		 */
-		public IPath getCachePath() {
-			return cachePath;
-		}
-
-		/**
-		 * Return whether this is a root for a archive or a folder.
-		 * 
-		 * @return <code>true</code> if archive for a root. <code>false</code> if archive for a folder.
-		 * 
-		 * @since 1.1.0
-		 */
-		public abstract boolean isArchiveRoot();
-	}
-
-	/**
-	 * A root index that is for an archive, either internal or external. It contains the archive's modification stamp. Each class cache entry will
-	 * have this same modification stamp. If the archive is changed then all of the class cache entries will be removed because they are all possibly
-	 * stale. No way to know which may be stale and which not.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static class ArchiveRootIndex extends RootIndex {
-
-		private static final long serialVersionUID = 110686867444L;
-
-		private long archiveModificationStamp;
-
-		/*
-		 * For serializer to call.
-		 */
-		protected ArchiveRootIndex() {
-		}
-
-		public ArchiveRootIndex(String rootName, long archiveModificationStamp, Index index) {
-			super(rootName, index);
-			this.archiveModificationStamp = archiveModificationStamp;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoCacheController.RootIndex#isArchiveRoot()
-		 */
-		public boolean isArchiveRoot() {
-			return true;
-		}
-
-		/*
-		 * Set the modification stamp. <p> <package-protected> because only the cache controller should change it.
-		 * 
-		 * @param archiveModificationStamp The archiveModificationStamp to set.
-		 * 
-		 * @see BeanInfoCacheController#MODIFICATION_STAMP_STALE
-		 * @since 1.1.0
-		 */
-		void setArchiveModificationStamp(long archiveModificationStamp) {
-			this.archiveModificationStamp = archiveModificationStamp;
-			setDirty();
-		}
-
-		/**
-		 * Returns the modification stamp.
-		 * 
-		 * @return Returns the archiveModificationStamp.
-		 * @see BeanInfoCacheController#MODIFICATION_STAMP_STALE
-		 * @since 1.1.0
-		 */
-		public long getArchiveModificationStamp() {
-			return archiveModificationStamp;
-		}
-	}
-
-	/**
-	 * This is a root index for a folder (which will be in the workspace). Each class cache entry can have a different modification stamp with a
-	 * folder root index.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static class FolderRootIndex extends RootIndex {
-
-		private static final long serialVersionUID = 1106868674922L;
-
-		/*
-		 * For serialization.
-		 */
-		protected FolderRootIndex() {
-		}
-
-		/**
-		 * @param rootName
-		 * 
-		 * @since 1.1.0
-		 */
-		public FolderRootIndex(String rootName, Index index) {
-			super(rootName, index);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoCacheController.RootIndex#isArchiveRoot()
-		 */
-		public boolean isArchiveRoot() {
-			return false;
-		}
-	}
-
-	/**
-	 * An individual class entry from the cache. It has an entry for each class in the root. The class cache entry describes the cache, whether it is
-	 * stale, what the current mod stamp is, etc.
-	 * <p>
-	 * There is a method to call to see if deleted. This should only be called if entry is being held on to because
-	 * <code>getClassEntry(JavaClass)</code> will never return a deleted entry. There is a method to get the modification stamp of the current cache
-	 * entry. This is the time stamp of the cooresponding class resource (or archive file) that the cache file was created from. If the value is
-	 * <code>IResource.NULL_STAMP</code>, then the cache file is known to be stale. Otherwise if the value is less than a modification stamp of a
-	 * super class then the cache file is stale.
-	 * 
-	 * @see ClassEntry#isDeleted()
-	 * @see ClassEntry#getModificationStamp()
-	 * @see BeanInfoCacheController#getClassEntry(JavaClass)
-	 * @since 1.1.0
-	 */
-	public static class ClassEntry implements Serializable {
-
-		private static final long serialVersionUID = 1106868674333L;
-
-		public static final long DELETED_MODIFICATION_STAMP = Long.MIN_VALUE; // This flag won't be seen externally. It is used to indicate the entry
-																			  // has been deleted for those that have been holding a CE.
-		
-		/**
-		 * Check against the super modification stamp and the interface stamps to see if they were set
-		 * by undefined super class or interface at cache creation time. 
-		 * 
-		 * @since 1.1.0
-		 */
-		public static final long SUPER_UNDEFINED_MODIFICATION_STAMP = Long.MIN_VALUE+1;	
-
-		private long modificationStamp;
-		private long superModificationStamp;	// Stamp of superclass, if any, at time of cache creation.
-		private String[] interfaceNames;	// Interfaces names (null if no interfaces)
-		private long[] interfaceModicationStamps;	// Modification stamps of interfaces, if any. (null if no interfaces).
-		private transient Resource pendingResource;	// Resource is waiting to be saved, but the timestamps are for this pending resource so that we know what it will be ahead of time. At this point the class will be introspected. 
-
-		private RootIndex rootIndex; // The root index this class entry is in, so that any changes can mark the entry as dirty.
-
-		private String className; // The classname for this entry.
-		
-		private boolean saveOperations;	// Flag for saving operations. Once this is set, it will continue to save operations in the cache in addition to everything else.
-
-		private long configurationModificationStamp;	// Modification stamp of the Eclipse configuration. Used to determine if the cache of override files is out of date due to a config change.
-		private boolean overrideCacheExists;	// Flag that there is an override cache to load. This is orthogonal to the config mod stamp because it simply means that on the current configuration there is no override cache.
-		private transient Resource pendingOverrideResource;	// Override resource is waiting to be saved.
-		
-		protected ClassEntry() {
-		}
-
-		ClassEntry(RootIndex rootIndex, String className) {
-			this.setRootIndex(rootIndex);
-			this.className = className;
-			modificationStamp = IResource.NULL_STAMP;
-			rootIndex.classNameToClassEntry.put(className, this);
-		}
-
-		/**
-		 * 
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public String getClassName() {
-			return className;
-		}
-
-		/**
-		 * Return whether the entry has been deleted. This will never be seen in an entry that is still in an index. It is used for entries that have
-		 * been removed from the index. It is for classes (such as the BeanInfoClassAdapter) which are holding onto a copy of entry to let them know.
-		 * <p>
-		 * Holders of entries should call isDeleted if they don't need to further check the mod stamp. Else they should call getModificationStamp and
-		 * check of deleted, stale, or mod stamp. That would save extra synchronizations. If entry is deleted then it should throw the entry away.
-		 * 
-		 * @return <code>true</code> if the entry has been deleted, <code>false</code> if still valid.
-		 * 
-		 * @see ClassEntry#getModificationStamp()
-		 * @see ClassEntry#isStale()
-		 * @see ClassEntry#DELETED_MODIFICATION_STAMP
-		 * @since 1.1.0
-		 */
-		public boolean isDeleted() {
-			return getModificationStamp() == DELETED_MODIFICATION_STAMP;
-		}
-
-		/**
-		 * Mark the entry as deleted. It will also be removed from root index in that case.
-		 * <p>
-		 * Note: It is public only so that BeanInfoClassAdapter can access it. It should not be called by anyone else outside of BeanInfo.
-		 */
-		public synchronized void markDeleted() {
-			if (!isDeleted()) {
-				getRootIndex().classNameToClassEntry.remove(className);
-				setModificationStamp(DELETED_MODIFICATION_STAMP); // Also marks index as dirty.
-			}
-		}
-
-		/**
-		 * Return whether the entry is stale or not. This orthoganal to isDeleted. isDeleted will not be true if isStale and isStale will not be true
-		 * if isDeleted. Normally you should use getModificationStamp and check the value for IResource.NULL_STAMP and other values to bring it down
-		 * to only one synchronized call to CE, but if only needing to know if stale, you can use this.
-		 * 
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 * @see IResource#NULL_STAMP
-		 * @see ClassEntry#getModificationStamp()
-		 * @see ClassEntry#isDeleted()
-		 */
-		public boolean isStale() {
-			return getModificationStamp() == IResource.NULL_STAMP;
-		}
-
-		/**
-		 * Return the modification stamp. For those holding onto an entry, and they need to know more than if just deleted, then they should just the
-		 * return value from getModificationStamp. Else they should use isDeleted or isStale.
-		 * 
-		 * @return modification stamp, or {@link IResource#NULL_STAMP}if stale or not yet created, or {@link ClassEntry#DELETED_MODIFICATION_STAMP}
-		 *         if deleted.
-		 * 
-		 * @see ClassEntry#isDeleted()
-		 * @see ClassEntry#isStale()
-		 * @since 1.1.0
-		 */
-		public synchronized long getModificationStamp() {
-			return modificationStamp;
-		}
-		
-		/**
-		 * Return the super modification stamp.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized long getSuperModificationStamp() {
-			return superModificationStamp;
-		}
-		
-		/**
-		 * Return the interface names or <code>null</code> if no interface names.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized String[] getInterfaceNames() {
-			return interfaceNames;
-		}
-
-		/**
-		 * Return the interface modification stamps or <code>null</code> if no interfaces.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized long[] getInterfaceModificationStamps() {
-			return interfaceModicationStamps;
-		}
-		
-		/*
-		 * Set the modification stamp. <p> <package-protected> because only the cache controller should set it. @param modificationStamp
-		 * 
-		 * @since 1.1.0
-		 */
-		void setModificationStamp(long modificationStamp) {
-			if (this.modificationStamp != modificationStamp) {
-				this.modificationStamp = modificationStamp;
-				getRootIndex().setDirty();
-			}
-		}
-
-		/**
-		 * Answer whether operations are also stored in the cache for this class. By default they are not. Once turned on they
-		 * will always be stored for this class until the class is deleted.
-		 * 
-		 * @return <code>true</code> if operations are cached, <code>false</code> if they are not cached.
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized boolean isOperationsStored() {
-			return saveOperations;
-		}
-		
-		/*
-		 * Set the operations stored flag.
-		 * @param storeOperations
-		 * 
-		 * @see BeanInfoCacheController.ClassEntry#isOperationsStored()
-		 * @since 1.1.0
-		 */
-		void setOperationsStored(boolean storeOperations) {
-			saveOperations = storeOperations;
-		}
-		
-		/**
-		 * Get the configuration modification stamp of the last saved override cache.
-		 * 
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized long getConfigurationModificationStamp() {
-			return configurationModificationStamp;
-		}
-
-		/* 
-		 * Set the configuration modification stamp.
-		 * <p> <package-protected> because only the cache controller should access it.
-		 * 
-		 * @param configurationModificationStamp
-		 * 
-		 * @since 1.1.0
-		 */
-		void setConfigurationModificationStamp(long configurationModificationStamp) {
-			this.configurationModificationStamp = configurationModificationStamp;
-			getRootIndex().setDirty();
-		}
-		
-		/**
-		 * Answer whether there is an override cache available.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized boolean overrideCacheExists() {
-			return overrideCacheExists;
-		}
-		
-		/*
-		 * Set the override cache exists flag.
-		 * <p> <package-protected> because only the cache controller should access it.
-		 * @param overrideCacheExists
-		 * 
-		 * @since 1.1.0
-		 */
-		void setOverrideCacheExists(boolean overrideCacheExists) {
-			this.overrideCacheExists = overrideCacheExists;
-		}
-		
-		/**
-		 * Get the pending resource or <code>null</code> if not pending.
-		 * 
-		 * @return the pending resource or <code>null</code> if not pending.
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized Resource getPendingResource() {
-			return pendingResource;
-		}
-		
-		/*
-		 * Set the entry. The sequence get,do something,set must be grouped within a synchronized(ClassEntry). 
-		 * <p> <package-protected> because only the cache controller should access it. 
-		 * @param cacheResource The cacheResource to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setPendingResource(Resource pendingResource) {
-			this.pendingResource = pendingResource;
-		}
-
-		/**
-		 * Get the pending override resource or <code>null</code> if not pending.
-		 * 
-		 * @return the pending override resource or <code>null</code> if not pending.
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized Resource getPendingOverrideResource() {
-			return pendingOverrideResource;
-		}
-		
-		/*
-		 * Set the entry. The sequence get,do something,set must be grouped within a synchronized(ClassEntry). 
-		 * <p> <package-protected> because only the cache controller should access it. 
-		 * @param cacheResource The cacheResource to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setPendingOverrideResource(Resource pendingOverrideResource) {
-			this.pendingOverrideResource = pendingOverrideResource;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it. @param rootIndex The rootIndex to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setRootIndex(RootIndex rootIndex) {
-			this.rootIndex = rootIndex;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it. @return Returns the rootIndex.
-		 * 
-		 * @since 1.1.0
-		 */
-		RootIndex getRootIndex() {
-			return rootIndex;
-		}
-		
-		/*
-		 * <package-protected> because only the cache controller should access it.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setSuperModificationStamp(long superModificationStamp) {
-			this.superModificationStamp = superModificationStamp;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setInterfaceNames(String[] interfaceNames) {
-			this.interfaceNames = interfaceNames;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setInterfaceModificationStamps(long[] interfaceModificationStamps) {
-			this.interfaceModicationStamps = interfaceModificationStamps;
-		}
-		
-	}
-
-	/*
-	 * Main index for the external jars. This variable should not be referenced directly except through the getMainIndex() accessor. That controls
-	 * synchronization and restoration as needed.
-	 */
-	private static Index MAIN_INDEX;
-
-	/*
-	 * Key into the Project's session data for the project index. The Project index is stored in the project's session data. That
-	 * way when the project is closed or deleted it will go away. 
-	 * 
-	 * The project indexes will be read in as needed on a per-project basis. This variable should not be
-	 * referenced directly except through the getProjectIndex(IProject) accessor. That controls synchronization and restoration as needed.
-	 * Only during cleanup and such where we don't want to create one if it doesn't exist you must use sync(this). Be careful to keep 
-	 * the sync small.
-	 */
-	private static final QualifiedName PROJECT_INDEX_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "project_index");	//$NON-NLS-1$
-
-	/*
-	 * Suffix for class cache files.
-	 */
-	private static final String CLASS_CACHE_SUFFIX = ".xmi"; //$NON-NLS-1$
-	/*
-	 * Suffic for class override cache files.
-	 */
-	private static final String OVERRIDE_CACHE_SUFFIX = ".override.xmi"; //$NON-NLS-1$
-
-	/**
-	 * Return the current class entry for the JavaClass, or <code>null</code> if no current entry.
-	 * 
-	 * @param jclass
-	 * @return class entry or <code>null</code> if no current entry.
-	 * 
-	 * @since 1.1.0
-	 */
-	public ClassEntry getClassEntry(JavaClass jclass) {
-		IType type = (IType) jclass.getReflectionType();
-		RootIndex rootIndex = getRootIndex(type);
-		String className = jclass.getQualifiedNameForReflection();
-		return getClassEntry(rootIndex, className, false);
-	}
-
-	/**
-	 * Enumeration for newCache: Signals that this cache is the Reflection Cache with no operations in it.
-	 * @since 1.1.0
-	 */
-	public final static int REFLECTION_CACHE = 1;
-	/**
-	 * Enumeration for newCache: Signals that this cache is the Reflection Cache with operations in it.
-	 * @since 1.1.0
-	 */
-	public final static int REFLECTION_OPERATIONS_CACHE = 2;
-	/**
-	 * Enumeration for newCache: Signals that this cache is the Overrides cache.
-	 * @since 1.1.0
-	 */
-	public final static int OVERRIDES_CACHE = 3;
-	/**
-	 * A new cache entry for the given class has been created. Need to write it out.
-	 * 
-	 * @param jclass
-	 *            the JavaClass the cache is for.
-	 * @param cache
-	 *            the ChangeDescription to put out if cacheType is Reflection types, a List if override cache type.
-	 * @param cacheType
-	 *            {@link BeanInfoCacheController.ClassEntry#REFLECTION_CACHE} for the enum values.
-	 * @return new class entry (or old one if same one). Should always replace one being held by this one. <code>null</code> if cache could not be
-	 *         updated for some reason.
-	 * @since 1.1.0
-	 */
-	public ClassEntry newCache(JavaClass jclass, Object cache, int cacheType) {
-		if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER)) {
-			Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-			String type = cacheType!=OVERRIDES_CACHE?"Class":"Overrides"; //$NON-NLS-1$ //$NON-NLS-2$
-			if (cacheType == OVERRIDES_CACHE && cache == null)
-				type+="  empty"; //$NON-NLS-1$
-			logger.log("Creating cache for class "+jclass.getQualifiedNameForReflection()+" cache type="+type, Level.FINER); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		ChangeDescription cd = null;
-		if (cacheType != OVERRIDES_CACHE) {
-			// First go through the cd and remove any empty changes. This is because we created the feature change before we knew what went into
-			// it, and at times nothing goes into it.
-			cd = (ChangeDescription) cache;
-			for (Iterator iter = cd.getObjectChanges().iterator(); iter.hasNext();) {
-				EObjectToChangesMapEntryImpl fcEntry = (EObjectToChangesMapEntryImpl) iter.next();
-				if (((List) fcEntry.getValue()).isEmpty())
-					iter.remove(); // Empty changes, remove it.
-			}
-		}
-		IType type = (IType) jclass.getReflectionType();
-		RootIndex rootIndex = getRootIndex(type);
-		String className = jclass.getQualifiedNameForReflection();
-		ClassEntry ce = getClassEntry(rootIndex, className, true); // Create it if not existing.
-		// Sync on ce so that only can create a cache for a class at a time and so that writing (if occurring at the same time for the class) can be
-		// held up.
-		// this is a violation of the agreement to only sync on THIS, but it is necessary or else the write job would lock everything out while it is
-		// writing. This way it only locks out one class, if the class is at the same time.
-		// We shouldn't have deadlock because here we lock ce and then THIS (maybe). The write job will lock ce, and then lock THIS. Everywhere else
-		// we must
-		// also do lock ce then THIS. Mustn't do other way around or possibility of deadlock. Be careful that any synchronized methods in this class
-		// do
-		// not lock an existing ce.
-		ResourceSet cacheRset = null;
-		synchronized (ce) {
-			Resource cres;
-			if (cacheType != OVERRIDES_CACHE) {
-				cres = ce.getPendingResource();
-				if (cres != null) {
-					// We have a pending, so clear and reuse the resource.
-					cres.getContents().clear();
-				} else {
-					// Not currently writing or waiting to write, so create a new resource.
-					cres = jclass.eResource().getResourceSet().createResource(
-							URI.createFileURI(rootIndex.getCachePath().append(className + CLASS_CACHE_SUFFIX).toString()));
-				}
-				cacheRset = cres.getResourceSet();
-				ce.setOperationsStored(cacheType == REFLECTION_OPERATIONS_CACHE);
-				ce.setPendingResource(cres);
-				cres.getContents().add(cd);
-				// Archives use same mod as archive (retrieve from rootindex), while non-archive use the underlying resource's mod stamp.
-				if (rootIndex.isArchiveRoot())
-					ce.setModificationStamp(((ArchiveRootIndex) rootIndex).getArchiveModificationStamp());
-				else {
-					try {
-						ce.setModificationStamp(type.getUnderlyingResource().getModificationStamp());
-					} catch (JavaModelException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e);
-						ce.markDeleted(); // Mark as deleted in case this was an existing that someone is holding.
-						return null; // Couldn't do it, throw cache entry away. This actually should never occur.
-					}
-				}
-				// Need to get the supers info. 
-				List supers = jclass.getESuperTypes();
-				if (!supers.isEmpty()) {
-					// We assume that they all have been introspected. This was done back in main introspection. If they are introspected they will have a class entry.
-					BeaninfoClassAdapter bca = BeaninfoClassAdapter.getBeaninfoClassAdapter((EObject) supers.get(0));
-					ClassEntry superCE = bca.getClassEntry();
-					if (superCE != null)
-						ce.setSuperModificationStamp(superCE.getModificationStamp());
-					else
-						ce.setSuperModificationStamp(ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP);	// No classentry means undefined. So put something in so that when it becomes defined we will know.
-					if(supers.size() == 1) {
-						ce.setInterfaceNames(null);
-						ce.setInterfaceModificationStamps(null);
-					} else {
-						String[] interNames = new String[supers.size()-1];
-						long[] interMods = new long[interNames.length];
-						for (int i = 1, indx = 0; indx < interNames.length; i++, indx++) {
-							JavaClass javaClass = (JavaClass) supers.get(i);
-							bca = BeaninfoClassAdapter.getBeaninfoClassAdapter(javaClass);
-							bca.introspectIfNecessary();	// Force introspection to get a valid super mod stamp.
-							superCE = bca.getClassEntry();
-							interNames[indx] = javaClass.getQualifiedNameForReflection();
-							if (superCE != null)
-								interMods[indx] = superCE.getModificationStamp();
-							else
-								interMods[indx] = ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP;	// No classentry means undefined. So put something in so that when it becomes defined we will know.
-						}
-						ce.setInterfaceNames(interNames);
-						ce.setInterfaceModificationStamps(interMods);
-					}
-				} else {
-					ce.setSuperModificationStamp(IResource.NULL_STAMP);
-					ce.setInterfaceNames(null);
-					ce.setInterfaceModificationStamps(null);
-				}
-			} else {
-				// We are an override cache.
-				if (cache != null) { 
-					cres = ce.getPendingOverrideResource();
-					if (cres != null) {
-						// We have a pending, so clear and reuse the resource.
-						cres.getContents().clear();
-					} else {
-						// Not currently writing or waiting to write, so create a new resource.
-						cres = jclass.eResource().getResourceSet().createResource(
-								URI.createFileURI(rootIndex.getCachePath().append(className + OVERRIDE_CACHE_SUFFIX).toString()));
-					}
-					cacheRset = cres.getResourceSet();
-					cres.getContents().addAll((List) cache);
-					ce.setPendingOverrideResource(cres);
-					ce.setOverrideCacheExists(true);
-				} else {
-					ce.setPendingOverrideResource(null);
-					ce.setOverrideCacheExists(false);
-				}
-				ce.setConfigurationModificationStamp(Platform.getPlatformAdmin().getState(false).getTimeStamp());
-			}
-		}
-		queueClassEntry(ce, cacheRset); // Now queue it up.
-		return ce;
-	}
-
-	/**
-	 * Get the cache resource for the given java class.
-	 * <p>
-	 * NOTE: It is the responsibility of the caller to ALWAYS remove the Resource from its resource set when done with it.
-	 * 
-	 * @param jclass
-	 * @param ce the class entry for the jclass
-	 * @param reflectCache <code>true</code> if this the reflection/introspection cache or <code>false</code> if this is the override cache.
-	 * @return the loaded cache resource, or <code>null</code> if not there (for some reason) or an error trying to load it.
-	 * 
-	 * @since 1.1.0
-	 */
-	public Resource getCache(JavaClass jclass, ClassEntry ce, boolean reflectCache) {
-		String className = jclass.getQualifiedNameForReflection();
-		if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER)) {
-			Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-			String type = reflectCache?"Class":"Overrides"; //$NON-NLS-1$ //$NON-NLS-2$
-			logger.log("Loading cache for class "+className+" cache type="+type, Level.FINER); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		if (reflectCache) {
-			boolean waitForJob = false;
-			synchronized (ce) {
-				if (ce.getPendingResource() != null) {
-					// We have one pending. So wait until write cache job is done, and then load it in.
-					// Note: Can't just copy the pending resource because it has references to JavaClasses
-					// and these could be in a different project (since this could be a workspace wide class).
-					// We would get the wrong java classes then when we apply it. 
-					waitForJob = true;
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Using pending class cache.", Level.FINER); //$NON-NLS-1$
-				}
-			}
-			if (waitForJob)
-				waitForCacheSaveJob();	
-
-			try {
-				return jclass.eResource().getResourceSet().getResource(
-						URI.createFileURI(ce.getRootIndex().getCachePath().append(
-								className + CLASS_CACHE_SUFFIX).toString()), true);
-			} catch (Exception e) {
-				// Something happened and couldn't load it.
-				// TODO - need to remove the Level.INFO arg when the beaninfo cache is working dynamically
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
-				return null;
-			}
-		} else {
-			boolean waitForJob = false;
-			synchronized (ce) {
-				if (ce.getPendingOverrideResource() != null) {
-					// We have one pending. So wait until write cache job is done, and then load it in.
-					// Note: Can't just copy the pending resource because it has references to JavaClasses
-					// and these could be in a different project (since this could be a workspace wide class).
-					// We would get the wrong java classes then when we apply it. 
-					waitForJob = true;
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Using pending override cache.", Level.FINER); //$NON-NLS-1$
-				}
-			}
-			if (waitForJob)
-				waitForCacheSaveJob();	
-
-			try {
-				return jclass.eResource().getResourceSet().getResource(
-						URI.createFileURI(ce.getRootIndex().getCachePath().append(
-								className + OVERRIDE_CACHE_SUFFIX).toString()), true);
-			} catch (Exception e) {
-				// Something happened and couldn't load it.
-				// TODO - need to remove the Level.INFO arg when the beaninfo cache is working dynamically
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
-				return null;
-			}
-		}
-	}
-
-	private synchronized ClassEntry getClassEntry(RootIndex rootIndex, String className, boolean createEntry) {
-		ClassEntry ce = (ClassEntry) rootIndex.classNameToClassEntry.get(className);
-		if (createEntry && ce == null) {
-			// Need to create one.
-			ce = new ClassEntry(rootIndex, className);
-			// Don't actually mark the rootIndex dirty until the cache for it is actually saved out.
-		}
-		return ce;
-	}
-
-	private static final String ROOT_PREFIX = "root"; //$NON-NLS-1$
-
-	/*
-	 * Get the root index for the appropriate cache for the given java class.
-	 */
-	private RootIndex getRootIndex(IType type) {
-		IPackageFragmentRoot root = (IPackageFragmentRoot) type.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
-		if (!root.isExternal()) {
-			// So it is in a project. Get the project index.
-			return getRootIndex(root, root.getJavaProject().getProject());
-		} else {
-			// It is an external jar (archive), so needs to come from main index, no project.
-			return getRootIndex(root, null);
-		}
-	}
-
-	/*
-	 * Get the root index for the given root. A Project index if project is not null.
-	 */
-	private synchronized RootIndex getRootIndex(IPackageFragmentRoot root, IProject project) {
-		Index index = project != null ? getProjectIndex(project) : getMainIndex();
-		IPath rootPath = root.getPath();
-		RootIndex rootIndex = (RootIndex) index.rootToRootIndex.get(rootPath);
-		if (rootIndex == null) {
-			// Need to do a new root path.
-			String rootName = ROOT_PREFIX + (++index.highRootNumber);
-			rootIndex = root.isArchive() ? createArchiveRootIndex(root, rootName, index) : new FolderRootIndex(rootName, index);
-			index.rootToRootIndex.put(rootPath, rootIndex);
-			// Don't set index dirty until we actually save a class cache file. Until then it only needs to be in memory.
-		}
-		rootIndex.setupIndex(project); // Set it up, or may already be set, so it will do nothing in that case.
-		return rootIndex;
-	}
-
-	/*
-	 * Create an archive root with the given root number and root.
-	 */
-	private RootIndex createArchiveRootIndex(IPackageFragmentRoot rootArchive, String rootName, Index index) {
-		long modStamp = IResource.NULL_STAMP;
-		if (rootArchive.isExternal()) {
-			modStamp = rootArchive.getPath().toFile().lastModified();
-		} else {
-			try {
-				modStamp = rootArchive.getUnderlyingResource().getModificationStamp();
-			} catch (JavaModelException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			}
-		}
-		return new ArchiveRootIndex(rootName, modStamp, index);
-	}
-
-	private static final String INDEXFILENAME = ".index"; //$NON-NLS-1$
-
-	private static final String CACHEDIR = ".cache"; // Cache directory (so as not to conflict with any future BeanInfo Plugin specific data files. //$NON-NLS-1$
-
-	/*
-	 * Get the cache directory for the project (or if project is null, the main plugin cache directory).
-	 */
-	// TODO: make this one private
-	public static IPath getCacheDir(IProject project) {
-		if (project != null)
-			return project.getWorkingLocation(BeaninfoPlugin.getPlugin().getBundle().getSymbolicName()).append(CACHEDIR);
-		else
-			return BeaninfoPlugin.getPlugin().getStateLocation().append(CACHEDIR);
-	}
-
-	/*
-	 * Get the project index. Synchronized so that we can create it if necessary and not get race conditions.
-	 */
-	private synchronized Index getProjectIndex(IProject project) {
-		try {
-			Index index = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
-			if (index == null) {
-				// Read the index in.
-				File indexDirFile = getCacheDir(project).append(INDEXFILENAME).toFile();
-				if (indexDirFile.canRead()) {
-					ObjectInputStream ois = null;
-					try {
-						ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(indexDirFile)));
-						index = (Index) ois.readObject();
-					} catch (InvalidClassException e) {
-						// This is ok. It simply means the cache index is at a downlevel format and needs to be reconstructed.
-					} catch (IOException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e);
-					} catch (ClassNotFoundException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e);
-					} finally {
-						if (ois != null)
-							try {
-								ois.close();
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							}
-					}
-				}
-
-				if (index == null) {
-					// Doesn't yet exist or it couldn't be read for some reason, or it was downlevel cache in which case we just throw it away and create
-					// new).
-					index = new Index();
-					index.highRootNumber = 0;
-					index.rootToRootIndex = new HashMap();
-				}
-
-				project.setSessionProperty(PROJECT_INDEX_KEY, index); // We either created a new one, or we were able to load it.
-			}
-			return index;
-		} catch (CoreException e) {
-			// Shouldn't occur,
-			return null;
-		}
-	}
-
-	/*
-	 * Get the main index. Synchronized so that we can create it if necessary and not get race conditions.
-	 */
-	private synchronized Index getMainIndex() {
-		if (MAIN_INDEX == null) {
-			// Read the index in.
-			File indexDirFile = getCacheDir(null).append(INDEXFILENAME).toFile();
-			if (indexDirFile.canRead()) {
-				ObjectInputStream ois = null;
-				try {
-					ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(indexDirFile)));
-					MAIN_INDEX = (Index) ois.readObject();
-				} catch (InvalidClassException e) {
-					// This is ok. It just means that the cache index is at a downlevel format and needs to be reconstructed.
-				} catch (IOException e) {
-					BeaninfoPlugin.getPlugin().getLogger().log(e);
-				} catch (ClassNotFoundException e) {
-					BeaninfoPlugin.getPlugin().getLogger().log(e);
-				} finally {
-					if (ois != null)
-						try {
-							ois.close();
-						} catch (IOException e) {
-							BeaninfoPlugin.getPlugin().getLogger().log(e);
-						}
-				}
-			}
-
-			if (MAIN_INDEX == null) {
-				// Doesn't yet exist or it couldn't be read for some reason, or it was downlevel cache in which case we just throw it away and create
-				// new).
-				MAIN_INDEX = new Index();
-				MAIN_INDEX.highRootNumber = 0;
-				MAIN_INDEX.rootToRootIndex = new HashMap();
-			}
-
-		}
-		return MAIN_INDEX;
-	}
-
-	// -------------- Save Participant code -----------------
-
-	protected class SaveParticipant implements ISaveParticipant {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void doneSaving(ISaveContext context) {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void prepareToSave(ISaveContext context) throws CoreException {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#rollback(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void rollback(ISaveContext context) {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#saving(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void saving(ISaveContext context) throws CoreException {
-			boolean fullsave = false;
-			switch (context.getKind()) {
-				case ISaveContext.PROJECT_SAVE:
-					IProject project = context.getProject();
-					synchronized (BeanInfoCacheController.INSTANCE) {
-						// Write the index. The cache save job will eventually run and at that point write out the pending cache files too.
-						// They don't need to be written before the project save is complete.
-						Index projectIndex = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
-						if (projectIndex != null && projectIndex.isDirty())
-							if (reconcileIndexDirectory(project, projectIndex))
-								writeIndex(project, projectIndex);
-							else {
-								// It was empty, just get rid of the index. The directories have already been cleared.
-								projectIndex.markDead();
-								project.setSessionProperty(PROJECT_INDEX_KEY, null);
-							}
-					}
-					break;
-				case ISaveContext.FULL_SAVE:
-					fullsave = true;
-					waitForCacheSaveJob();
-				// Now flow into the snapshot save to complete the fullsave.
-				case ISaveContext.SNAPSHOT:
-					// For a snapshot, just the dirty indexes, no clean up. If fullsave, cleanup the indexes, but only save the dirty.
-					synchronized (BeanInfoCacheController.INSTANCE) {
-						if (MAIN_INDEX != null) {
-							if (fullsave) {
-								if (reconcileIndexDirectory(null, MAIN_INDEX)) {
-									if (MAIN_INDEX.isDirty())
-										writeIndex(null, MAIN_INDEX);
-								} else {
-									// It was empty, just get rid of the index. The directories have already been cleared.
-									MAIN_INDEX.markDead();
-									MAIN_INDEX = null;
-								}
-							} else if (MAIN_INDEX.isDirty())
-								writeIndex(null, MAIN_INDEX);
-						}
-						// Now do the project indexes. We have to walk all open projects to see which have an index. Since we are
-						// doing a major save, the hit will ok
-						IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-						for (int i=0; i<projects.length; i++) {
-							project = projects[i];
-							if (project.isOpen()) {
-								Index index = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
-								if (index != null) {
-									if (fullsave) {
-										if (reconcileIndexDirectory(project, index)) {
-											if (index.isDirty())
-												writeIndex(project, index);
-										} else {
-											// It was empty, just get rid of the index from memory. It has already been deleted from disk.
-											index.markDead();
-											project.setSessionProperty(PROJECT_INDEX_KEY, null);
-										}
-									} else if (index.isDirty())
-										writeIndex(project, index);
-								}
-							}
-						}
-					}
-			}
-		}
-
-		/*
-		 * Write an index. Project if not null indicates a project index.
-		 */
-		private void writeIndex(IProject project, Index index) {
-			ObjectOutputStream oos = null;
-			try {
-				File indexDirFile = getCacheDir(project).toFile();
-				indexDirFile.mkdirs();
-				File indexFile = new File(indexDirFile, INDEXFILENAME);
-				oos = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(indexFile)));
-				oos.writeObject(index);
-				index.setDirty(false);
-			} catch (IOException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			} finally {
-				if (oos != null)
-					try {
-						oos.close();
-					} catch (IOException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e);
-					}
-			}
-		}
-
-		/*
-		 * Reconcile the index directory of unused (empty) root directories. If after reconciling the index is empty, then it will delete the index file too. @return
-		 * true if index not empty, false if index was empty and was erased too.
-		 */
-		private boolean reconcileIndexDirectory(IProject project, Index index) {
-			// clean out unused rootIndexes
-			File indexDir = getCacheDir(project).toFile();
-			if (indexDir.canWrite()) {
-				// Create a set of all root names for quick look up.
-				if (index.rootToRootIndex.isEmpty()) {
-					// It is empty, clear everything, including index file.
-					cleanDirectory(indexDir, false);
-					return false;
-				} else {
-					// Need a set of the valid rootnames for quick lookup of names in the directory list.
-					// And while accumulating this list, clean out the root indexes cache too (i.e. the class cache files).
-					final Set validFiles = new HashSet(index.rootToRootIndex.size());
-					validFiles.add(INDEXFILENAME);
-					for (Iterator itr = index.rootToRootIndex.values().iterator(); itr.hasNext();) {
-						RootIndex rootIndex = (RootIndex) itr.next();
-						if (reconcileClassCacheDirectory(rootIndex, project)) {
-							// The class cache has been reconciled, and there are still some classes left, so keep the root index.
-							validFiles.add(rootIndex.getRootName());
-						} else {
-							itr.remove(); // The root index is empty, so get rid of it. Since not a valid name, it will be deleted in next step.
-							index.setDirty(true); // Also set it dirty in case it wasn't because we need to write out the container Index since it was
-							// changed.
-						}
-					}
-					// Get list of files and delete those that are not a valid name (used root name, or index file)
-					String[] fileNames = indexDir.list();
-					for (int i = 0; i < fileNames.length; i++) {
-						if (!validFiles.contains(fileNames[i])) {
-							File file = new File(indexDir, fileNames[i]);
-							if (file.isDirectory())
-								cleanDirectory(file, true);
-							else
-								file.delete();
-						}
-					}
-					return true;
-				} 
-			} else 
-				return true;	// Can't write, so treat as leave alone.
-		}
-
-		/*
-		 * Reconcile the class cache directory for the root index. Return true if reconciled good but not empty. Return false if the class cache
-		 * directory is now empty. In this case we should actually get rid of the entire root index. This makes sure that the directory matches
-		 * the contents of the index by removing any file not found in the index.
-		 */
-		private boolean reconcileClassCacheDirectory(RootIndex rootIndex, IProject project) {
-			if (rootIndex.classNameToClassEntry.isEmpty())
-				return false; // There are no classes, so get rid the entire root index.
-			else {
-				final Set validFiles = rootIndex.classNameToClassEntry.keySet(); // The keys (classnames) are the filenames (without extension)
-																					// that
-				// should be kept.
-				File indexDir = getCacheDir(project).append(rootIndex.getRootName()).toFile();
-				// Get list of files that are not a valid name (used classname)
-				String[] fileNames = indexDir.list();
-				if (fileNames != null) {
-					for (int i = 0; i < fileNames.length; i++) {
-						String fileName = fileNames[i];
-						if (fileName.endsWith(OVERRIDE_CACHE_SUFFIX)) {
-							// Ends with out class cache extension, see if valid classname.
-							String classname = fileName.substring(0, fileName.length() - OVERRIDE_CACHE_SUFFIX.length());
-							ClassEntry ce = (ClassEntry) rootIndex.classNameToClassEntry.get(classname);
-							if (ce != null && ce.overrideCacheExists())
-								continue; // It is one of ours. Keep it.
-						} else if (fileName.endsWith(CLASS_CACHE_SUFFIX)) {
-							// Ends with out class cache extension, see if valid classname.
-							if (validFiles.contains(fileName.substring(0, fileName.length() - CLASS_CACHE_SUFFIX.length()))) // Strip down to just
-																																// class and see if
-																																// one of ours.
-								continue; // It is one of ours. Keep it.
-						}
-						// Not valid, get rid of it.
-						File file = new File(indexDir, fileName);
-						if (file.isDirectory())
-							cleanDirectory(file, true);
-						else
-							file.delete();
-
-					}
-				}
-				return true;
-			}
-		}
-	}
-	
-	private static void cleanDirectory(File dir, boolean eraseDir) {
-		if (dir.canWrite()) {
-			File[] files = dir.listFiles();
-			for (int i = 0; i < files.length; i++) {
-				if (files[i].isDirectory())
-					cleanDirectory(files[i], true);
-				else
-					files[i].delete();
-			}
-			if (eraseDir)
-				dir.delete();
-		}
-	}	
-
-	//-------------- Save Class Cache Entry Job -------------------
-	// This is write queue for class caches. It is a FIFO queue. It is sychronized so that adds/removes are controlled.
-	// Entries are ClassEntry's. The class entry has the resource that needs to be written out. It will be set to null
-	// by the job when it is written. The job will have a ClassEntry locked while it is retrieving and resetting the resource
-	// field in the entry.
-	//
-	// The process is the new cache will lock, create resource, set resource into the CE and release lock. Then add the CE to the queue
-	// and schedule the job (in case job is not running).
-	//
-	// The job will lock the CE, get resource from the CE, write it out, set it back to null, release the CE). If the resource is null,
-	// then it was already processed (this could happen if the job didn't get a chance to save it before another entry was posted
-	// and this is the second request and it was actually processed by the first request).
-	// IE:
-	// 1) resource created, queue entry added
-	// 2) 2nd req, job not processed yet, resource recreated and put back into CE, new queue entry.
-	// 3) job pulls from queue, locks ce, grabs resource, writes out the resource, sets back to null, release ce.
-	// 4) job pulls from queue. This time the resoure is null so it skips it.
-	//
-	// Need to lock Ce during entire create and write because the resource set is not reentrant so can't be writing it while creating it.
-
-	private List cacheWriteQueue = null;
-
-	void waitForCacheSaveJob() {
-		// For a full save we want to get the class cache files written too, so we need to manipulate the job to get it to finish ASAP.
-		if (cacheWriteJob != null) {
-			if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-				BeaninfoPlugin.getPlugin().getLogger().log("Forcing a cache save job to start early.", Level.FINER); //$NON-NLS-1$
-			switch (cacheWriteJob.getState()) {
-				case Job.SLEEPING:
-					// It could be waiting a long time, so we need to wake it up at a high priority to get it running ASAP.
-					cacheWriteJob.setPriority(Job.INTERACTIVE); // Need to get it going right away
-					cacheWriteJob.wakeUp();
-					// Now drop into the wait.
-				default:
-					// Now wait for it (if not running this will return right away).
-					try {
-						cacheWriteJob.join();
-					} catch (InterruptedException e) {
-					}
-			}
-		}
-	}
-
-	static final Map SAVE_CACHE_OPTIONS;
-	static {
-		SAVE_CACHE_OPTIONS = new HashMap(3);
-		SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, Boolean.TRUE);
-		SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-        SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
-	}
-
-	protected Job cacheWriteJob = null;
-	protected Adapter projectReleaseAdapter = new AdapterImpl() {
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-		 */
-		public boolean isAdapterForType(Object type) {
-			return type == BeanInfoCacheController.this;	// We're making the BeanInfoCacheController.this be the adapter type.
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			if (msg.getEventType() == ProjectResourceSet.SPECIAL_NOTIFICATION_TYPE && msg.getFeatureID(BeanInfoCacheController.class) == ProjectResourceSet.PROJECTRESOURCESET_ABOUT_TO_RELEASE_ID) {
-				// This is an about to be closed. If we have an active write job, bring it up to top priority and wait for it to finish.
-				// This will make sure any resources in the project are written. There may not be any waiting, but this is doing a close
-				// project, which is slow already relatively speaking, that waiting for the cache write job to finish is not bad.
-				waitForCacheSaveJob();
-			}
-		}
-	};
-
-	private void queueClassEntry(ClassEntry ce, ResourceSet rset) {
-		if (cacheWriteQueue == null) {
-			cacheWriteQueue = Collections.synchronizedList(new LinkedList());
-			cacheWriteJob = new Job(BeaninfoCoreMessages.BeanInfoCacheController_Job_WriteBeaninfoCache_Title) { 
-
-				protected IStatus run(IProgressMonitor monitor) {
-					monitor.beginTask("", cacheWriteQueue.size() + 10); // This is actually can change during the run, so we add 10 for the heck of it. //$NON-NLS-1$
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Starting write BeanInfo Cache files.", Level.FINER); //$NON-NLS-1$
-					while (!monitor.isCanceled() && !cacheWriteQueue.isEmpty()) {
-						ClassEntry ce = (ClassEntry) cacheWriteQueue.remove(0); // Get first one.
-						boolean dead = false;
-						synchronized (BeanInfoCacheController.this) {
-							if (ce.getRootIndex().getIndex().isDead()) {
-								dead = true;	// The index is dead, so don't write it. We still need to go through and get the pending resource out of its resource set so that it goes away.
-							}
-						}
-						synchronized (ce) {
-							Resource cres = ce.getPendingResource();
-							if (cres != null) {
-								try {
-									if (!dead)
-										cres.save(SAVE_CACHE_OPTIONS);
-								} catch (IOException e) {
-									BeaninfoPlugin.getPlugin().getLogger().log(e);
-								} finally {
-									// Remove the resource from resource set, clear out the pending.
-									cres.getResourceSet().getResources().remove(cres);
-									ce.setPendingResource(null);
-								}
-							}
-							cres = ce.getPendingOverrideResource();
-							if (cres != null) {
-								try {
-									if (!dead)
-										cres.save(SAVE_CACHE_OPTIONS);
-								} catch (IOException e) {
-									BeaninfoPlugin.getPlugin().getLogger().log(e);
-								} finally {
-									// Remove the resource from resource set, clear out the pending.
-									cres.getResourceSet().getResources().remove(cres);
-									ce.setPendingOverrideResource(null);
-								}
-							}
-							
-							monitor.worked(1);
-						}
-					}
-					monitor.done();
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Finished write BeanInfo Cache files.", Level.FINER); //$NON-NLS-1$
-					return Status.OK_STATUS;
-				}
-			};
-			cacheWriteJob.setPriority(Job.SHORT);
-			cacheWriteJob.setSystem(true);
-		}
-		if (rset != null && EcoreUtil.getExistingAdapter(rset, this) == null) {
-			// If it is a project resource set, then add ourselves as listeners so we know when released.
-			if (rset instanceof ProjectResourceSet)
-				rset.eAdapters().add(projectReleaseAdapter);
-		}
-		cacheWriteQueue.add(ce);
-		cacheWriteJob.schedule(60 * 1000L); // Put off for 1 minute to let other stuff go on. Not important that it happens immediately.
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java
deleted file mode 100644
index b787ff731..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.core;
-
-import java.io.FileNotFoundException;
-
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IContributorOverrideRunnable;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
- 
-/**
- * A default implementation of IBeanInfoContributor for users to subclass. Default does nothing.
- * <p>
- * But this does supply several very useful utility methods.
- * 
- * @since 1.0.0
- */
-public class BeanInfoContributorAdapter implements IBeanInfoContributor {
-	
-	/**
-	 * An empty array of BeaninfoEntry. Available for subclasses to return if they
-	 * decide there is nothing to return.
-	 */
-	public static final BeaninfoEntry[] EMPTY_BEANINFO_ENTRIES = new BeaninfoEntry[0];
-	
-	/**
-	 * Return true if the given fragment is part of the package. Used by subclasses to determine
-	 * if a override associated with a given fragment should be used for the package.
-	 * <p>
-	 * In other words, <code>org.eclipse</code> as a fragment and and <code>org.eclipse.core</code> as
-	 * a packagePath will answer true, but if you swapped them it will answer false.
-	 * 
-	 * @param fragment
-	 * @param packagePath
-	 * @return <code>true</code> if the given fragment is a leading part of the package.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected boolean isFragment(IPath fragment, IPath packagePath) {
-		return fragment.isPrefixOf(packagePath);
-	}
-	
-	/**
-	 * Return the unmatched portion of the package path from a fragment. Used by subclasses
-	 * to get the part of the package path that is after the fragment. This is then used to
-	 * append to the path from the override to get the full path to override files for this
-	 * package.
-	 * <p>
-	 * This will return the part of the packagePath that is not matched by the fragment. 
-	 * <p>
-	 * Note: It is important that the fragment and packagePath have first been tested through
-	 * isFragment. Otherwise an invalid result will be returned.
-	 * 
-	 * @param fragment
-	 * @param packagePath
-	 * @return the part of the package path not matched.
-	 * 
-	 * @see BeanInfoContributorAdapter#isFragment(IPath, IPath)
-	 * @since 1.0.0
-	 */
-	protected String getUnmatchedPath(IPath fragment, IPath packagePath) {
-		return fragment.removeFirstSegments(packagePath.segmentCount()).toString();
-	}
-	
-	/**
-	 * Subclasses can use this helper method to get the override resource from the given (plugin) bundle. 
-	 * 
-	 * @param bundle the bundle to use.
-	 * @param relativePath path of file relative to the plugin.
-	 * @param resource set to load into.
-	 * @param runnable the runnable that is being used for the override. It is used to determine if resource already used once.
-	 * @return the resource or <code>null</code> if couldn't be loaded or if it was already used once.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected Resource loadOverrideResource(Bundle bundle, String relativePath, ResourceSet rset, BeaninfoPlugin.IContributorOverrideRunnable runnable) {
-		URI uri = URI.createURI(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+relativePath); //$NON-NLS-1$
-		if (runnable.resourceContributed(uri))
-			return null;	// Already contributed once.
-		Resource result = null;
-		try {
-			result = rset.getResource(uri, true);
-		} catch (WrappedException e) {
-			// FileNotFoundException is ok
-			if (!(e.exception() instanceof FileNotFoundException)) {
-				if (e.exception() instanceof CoreException
-					&& ((CoreException) e.exception()).getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND) {
-					// This is ok. Means uri_mapping not set so couldn't find in Workspace, also ok.
-				} else {
-					BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-				}
-			}
-			// In case it happened after creating resource but during load. Need to get rid of it in the finally.
-			result = null;
-			Resource res = rset.getResource(uri, false);
-			if (res != null)
-				rset.getResources().remove(res);
-		} catch (Exception e) {
-			// Couldn't load it for some reason.
-			BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
-			// In case it happened after creating resource but during load. Need to get rid of it in the finally.
-			result = null;
-			Resource res = rset.getResource(uri, false);
-			if (res != null)
-				rset.getResources().remove(res);
-		};
-		return result;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor#getBeanInfoEntryContributions(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
-	 */
-	public BeaninfoEntry[] getBeanInfoEntryContributions(IConfigurationContributionInfo info) {
-		return EMPTY_BEANINFO_ENTRIES;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor#runOverrides(org.eclipse.core.runtime.IPath, java.lang.String, org.eclipse.jem.java.JavaClass, org.eclipse.emf.ecore.resource.ResourceSet, org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IContributorOverrideRunnable)
-	 */
-	public void runOverrides(IPath packagePath, String className, JavaClass javaClass, ResourceSet rset, IContributorOverrideRunnable runnable) {
-		// Default is do nothing
-	}
-		
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoCoreMessages.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoCoreMessages.java
deleted file mode 100644
index 2dd5656a6..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoCoreMessages.java
+++ /dev/null
@@ -1,28 +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.jem.internal.beaninfo.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class BeaninfoCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.beaninfo.core.messages";//$NON-NLS-1$
-
-	private BeaninfoCoreMessages() {
-		// Do not instantiate
-	}
-
-	public static String BeanInfoCacheController_Job_WriteBeaninfoCache_Title;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, BeaninfoCoreMessages.class);
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java
deleted file mode 100644
index fbd7fad2d..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java
+++ /dev/null
@@ -1,373 +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.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.w3c.dom.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-
-/**
- * Beaninfo entry. Location of the beaninfos. Much like a standard classpath entry.
- * The BeanInfos are either in a jar or another project. They can be supplied as
- * a local file in the project, or as an external jar, or as external jar through a
- * variable, or an external jar through a plugin.
- * <p>
- * An external jar through containers is not valid because container are attached to
- * projects. they aren't standalone.
- * 
- * @version 	1.0
- * @author
- */
-public class BeaninfoEntry implements IBeaninfosDocEntry {
-
-	final static String sBeaninfo = "beaninfo"; // Beaninfo entry, shared with BeaninfosDoc. //$NON-NLS-1$
-	
-	public static final int BIE_PLUGIN = 100;	// Beaninfo jar can be found in a plugin.
-
-	static int kindFromString(String kindStr) {
-		if (kindStr == null || kindStr.length() == 0)
-			return BIE_PLUGIN;	// Default to plugin. If coming from beaninfoconfig, there should always be kind. But if coming from plugin.xml there shouldn't be one.
-		if (kindStr.equalsIgnoreCase("con")) //$NON-NLS-1$
-			return IClasspathEntry.CPE_CONTAINER;
-		if (kindStr.equalsIgnoreCase("var")) //$NON-NLS-1$
-			return IClasspathEntry.CPE_VARIABLE;
-		if (kindStr.equalsIgnoreCase("src")) //$NON-NLS-1$
-			return IClasspathEntry.CPE_SOURCE;
-		if (kindStr.equalsIgnoreCase("lib")) //$NON-NLS-1$
-			return IClasspathEntry.CPE_LIBRARY;
-		if (kindStr.equalsIgnoreCase("plugin")) //$NON-NLS-1$
-			return BIE_PLUGIN;
-		return -1;
-	}
-
-	static String kindToString(int kind) {
-
-		switch (kind) {
-			case IClasspathEntry.CPE_PROJECT :
-				return "src"; // backward compatibility //$NON-NLS-1$
-			case IClasspathEntry.CPE_SOURCE :
-				return "src"; //$NON-NLS-1$
-			case IClasspathEntry.CPE_LIBRARY :
-				return "lib"; //$NON-NLS-1$
-			case IClasspathEntry.CPE_VARIABLE :
-				return "var"; //$NON-NLS-1$
-			case IClasspathEntry.CPE_CONTAINER:
-				return "con"; //$NON-NLS-1$
-			case BIE_PLUGIN:
-				return "plugin";	//$NON-NLS-1$
-			default :
-				return "unknown"; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Return the appropriate kind of entry when we know it is a classpath entry.
-	 */
-	public static IClasspathEntry createEntry(int kind, IPath path, IProject project, boolean isExported) {
-		switch (kind) {
-
-			case IClasspathEntry.CPE_LIBRARY :
-				if (path.isAbsolute())
-					return JavaCore.newLibraryEntry(path, null, null, isExported);
-				break;
-
-			case IClasspathEntry.CPE_SOURCE :
-				if (path.isAbsolute()) {
-					// must be an entry in this project or specify another project
-					String projSegment = path.segment(0);
-					if (project != null && projSegment != null && projSegment.equals(project.getName())) {
-						// this project
-						return JavaCore.newSourceEntry(path);
-					} else {
-						// another project
-						return JavaCore.newProjectEntry(path, isExported);
-					}
-				}
-				break;
-
-			case IClasspathEntry.CPE_VARIABLE :
-				return JavaCore.newVariableEntry(path, null, null, isExported);
-			
-			case IClasspathEntry.CPE_CONTAINER:
-				return JavaCore.newContainerEntry(path, isExported);
-
-		}
-
-		return null;
-	}
-	/**
-	 * Read the entry in from the element.
-	 */
-	public static BeaninfoEntry readEntry(IReader reader, Object element, IProject project) {
-		String elementKind = reader.getAttribute(element, BeaninfosDoc.sKind);
-		String pathStr = reader.getAttribute(element, BeaninfosDoc.sPath);
-		// ensure path is absolute
-		IPath path = new Path(pathStr);
-		int kind = kindFromString(elementKind);
-		if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER && kind != BIE_PLUGIN && !path.isAbsolute()) {
-			path = project != null ? project.getFullPath().append(path) : path.makeAbsolute(); // Some folder/jar within this project
-		}
-
-		// exported flag
-		String exportedString = reader.getAttribute(element, BeaninfosDoc.sExported);
-		boolean isExported = "true".equalsIgnoreCase(exportedString); //$NON-NLS-1$
-		//$NON-NLS-1$
-
-		// recreate the entry
-		IClasspathEntry cpEntry = null;
-		IPath pluginPath = null;
-		if (kind != BIE_PLUGIN) {
-			cpEntry = createEntry(kind, path, project, isExported);
-		} else {
-			if (path.isAbsolute())
-				pluginPath = path;
-			else {
-				// Kludge This should only be a plugin type if from configuration element. So we will cast to that
-				// and get the plugin id to create an absolute plugin path.
-				if (element instanceof IConfigurationElement) {
-					pluginPath = new Path('/'+((IConfigurationElement) element).getDeclaringExtension().getContributor().getName()).append(path);
-				} else
-					return null;	// Not valid because can't have plugin from .beaninfoconfig file.
-			}
-		}
-
-		ArrayList searchpaths = new ArrayList();
-		Object children = reader.getChildren(element);
-		int childrenLength = reader.getLength(children);
-		for (int i = 0; i < childrenLength; i++) {
-			Object child = reader.getItem(children, i);
-			if (reader.isNodeTypeElement(child)) {
-				Object entry = null;
-				if (reader.getNodeName(child).equalsIgnoreCase(SearchpathEntry.sSearchpath)) {
-					entry = SearchpathEntry.readEntry(reader, child, project, true);
-				}
-				if (entry != null)
-					searchpaths.add(entry);
-			}
-		}
-
-		if (cpEntry != null)
-			return new BeaninfoEntry(
-				cpEntry,
-				(SearchpathEntry[]) searchpaths.toArray(new SearchpathEntry[searchpaths.size()]),
-				isExported);
-		else return new BeaninfoEntry(
-				pluginPath,
-				(SearchpathEntry[]) searchpaths.toArray(new SearchpathEntry[searchpaths.size()]),
-				isExported);
-	}
-
-	protected IClasspathEntry entry; // Store it as a classpath entry for convienence. It is the RAW classpath entry. This is only used when pointing to something other than a plugin.
-	protected IPath pluginPath;	// When stored in a plugin, this will be set instead.
-	protected boolean isExported;
-	protected SearchpathEntry[] searchpaths;
-	
-	/**
-	 * Used when the beaninfo jar is within a plugin. In that case, the first segment
-	 * of the path is the plugin descriptor, and the rest is the path from the plugin
-	 * directory to the jar.
-	 */
-	public BeaninfoEntry(IPath pluginPath, SearchpathEntry[] searchpaths, boolean isExported) {
-		this(searchpaths, isExported);
-		this.pluginPath = pluginPath;
-	}
-
-	/**
-	 * Used when the beaninfo jar/folder is either an external jar/folder or is somewhere else
-	 * in the workspace. In that case the entry is the RAW classpath entry to that code.
-	 */
-	public BeaninfoEntry(IClasspathEntry entry, SearchpathEntry[] searchpaths, boolean isExported) {
-		this(searchpaths, isExported);
-		this.entry = entry;
-	}
-	
-	protected BeaninfoEntry(SearchpathEntry[] searchpaths, boolean isExported) {
-		this.isExported = isExported;
-		this.searchpaths = searchpaths != null ? searchpaths : new SearchpathEntry[0];
-	}
-	
-	public SearchpathEntry[] getSearchPaths() {
-		return searchpaths;
-	}
-	
-	public void setSearchPaths(SearchpathEntry[] searchpaths) {
-		this.searchpaths = searchpaths;
-	}
-	
-	public boolean isExported() {
-		return isExported;
-	}
-	
-	public void setIsExported(boolean isExported) {
-		this.isExported = isExported;
-	}
-
-	public Node writeEntry(Document doc, IProject project) {
-
-		Element element = doc.createElement(sBeaninfo);
-		IPath path = null;
-		if (entry != null) {
-			element.setAttribute(BeaninfosDoc.sKind, kindToString(entry.getEntryKind()));
-			path = entry.getPath();
-			if (entry.getEntryKind() != IClasspathEntry.CPE_VARIABLE && entry.getEntryKind() != IClasspathEntry.CPE_CONTAINER) {
-				// translate to project relative from absolute (unless a device path)
-				if (path.isAbsolute()) {
-					if (path.segment(0).equals(project.getFullPath().segment(0))) {
-						path = path.removeFirstSegments(1);
-						path = path.makeRelative();
-					} else {
-						path = path.makeAbsolute();
-					}
-				}
-			}
-		} else {
-			element.setAttribute(BeaninfosDoc.sKind, kindToString(BIE_PLUGIN));
-			path = pluginPath;
-		}
-
-		element.setAttribute(BeaninfosDoc.sPath, path.toString()); //$NON-NLS-1$
-		if (isExported()) {
-			element.setAttribute(BeaninfosDoc.sExported, "true"); //$NON-NLS-1$
-		}
-
-		for (int i = 0; i < searchpaths.length; i++) {
-			SearchpathEntry spe = searchpaths[i];
-			element.appendChild(spe.writeEntry(doc, project));
-		}
-
-		return element;
-	}
-	
-	/**
-	 * If this is not a plugin info, then return the classpath entry.
-	 */
-	public IClasspathEntry getClasspathEntry() {
-		return entry;
-	}
-
-	/**
-	 * Return the resolved classpaths. Each entry in the array will be either:
-	 * 1) IProject - If it is a project type entry. Want the whole project
-	 * 2) String - an absolute external path to a jar
-	 * 3) IPath - a path to a plugin jar. The first segment is the plugin id, the rest is the path relative to that plugin.
-	 *            
-	 * 
-	 * @param javaProject
-	 * @return The array of paths, or <code>null</code> if no paths.
-	 * 
-	 * @since 1.0.0
-	 */
-	public Object[] getClasspath(IJavaProject javaProject) {
-		if (entry != null) {
-			// It is a standard CPE Entry.
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			List paths = new ArrayList(1);
-			IClasspathEntry resolvedEntry = JavaCore.getResolvedClasspathEntry(entry);
-			resolveEntry(root, paths, resolvedEntry, javaProject);
-			return paths.toArray();
-		} else if (pluginPath != null) 
-			return new Object[] {pluginPath};
-		
-		return null;
-
-	}
-	
-	private void resolveEntry(IWorkspaceRoot root, List paths, IClasspathEntry entry, IJavaProject javaProject) {
-		switch (entry.getEntryKind()) {
-			case IClasspathEntry.CPE_PROJECT :
-				IProject reqProject = (IProject) root.findMember(entry.getPath().lastSegment());
-				// Project entries only have one segment.
-				if (reqProject != null && reqProject.isOpen())
-					paths.add(reqProject);
-				break;
-
-			case IClasspathEntry.CPE_SOURCE :
-				reqProject = (IProject) root.findMember(entry.getPath().segment(0));
-				// Find project from the first segment.
-				IJavaProject jProject = JavaCore.create(reqProject);
-				if (jProject != null) {
-					try {
-						IPath outputLocation = jProject.getOutputLocation();
-						IResource resource = root.findMember(outputLocation);
-						if (resource != null) {
-							paths.add(resource.getLocation().toString());
-						}
-					} catch(JavaModelException e) {
-					}
-				}
-				break;
-
-			case IClasspathEntry.CPE_LIBRARY :
-				IResource library = root.findMember(entry.getPath());
-				// can be external or in workspace
-				paths.add((library != null) ? library.getLocation().toString() : entry.getPath().toString());
-				break;
-				
-			case IClasspathEntry.CPE_CONTAINER:
-				try {
-					IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), javaProject);
-					if (container != null) {
-						IClasspathEntry[] entries = container.getClasspathEntries();
-						for (int i = 0; i < entries.length; i++) {
-							resolveEntry(root, paths, entries[i], javaProject);
-						}
-					}
-				} catch (JavaModelException e) {
-					BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-				}			
-		}
-	}
-
-	public int getKind() {
-		return entry != null ? entry.getEntryKind() : BIE_PLUGIN;
-	}
-	
-	public IPath getPath() {
-		return entry != null ? entry.getPath() : pluginPath;
-	}
-	
-	public boolean equals(Object other) {
-		if (this == other)
-			return true;
-			
-		if (!(other instanceof BeaninfoEntry))
-			return false;
-
-		// Return equal if the classpath entry is the same classpath entry or plugin path entry.
-		// The search path doesn't have any affect on the semantic equality.
-		BeaninfoEntry otherEntry = (BeaninfoEntry) other;
-		if (isExported != otherEntry.isExported)
-			return false;	
-		if (entry != null)
-			return entry.equals(otherEntry.entry);
-		
-		return pluginPath.equals(otherEntry.pluginPath);
-	}
-	
-	public int hashCode() {
-		if (entry != null)
-			return entry.hashCode() ^ (isExported ? Boolean.TRUE : Boolean.FALSE).hashCode();
-		else
-			return pluginPath.hashCode() ^ (isExported ? Boolean.TRUE : Boolean.FALSE).hashCode();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java
deleted file mode 100644
index 55512ec82..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java
+++ /dev/null
@@ -1,752 +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.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.JavaCore;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ContainerPathContributionMapping.ContainerContributionEntry;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo.ContainerPaths;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * The plugin class for the org.eclipse.jem.internal.proxy.core plugin.
- */
-
-public class BeaninfoPlugin extends Plugin {
-	public static final String PI_BEANINFO_PLUGINID = "org.eclipse.jem.beaninfo";	// Plugin ID, used for QualifiedName. //$NON-NLS-1$
-	public static final String PI_BEANINFO_OVERRIDES = "overrides";	// ID of the overrides extension point. //$NON-NLS-1$
-	
-	private static BeaninfoPlugin BEANINFO_PLUGIN = null;
-		
-	public BeaninfoPlugin() {	
-		BEANINFO_PLUGIN = this;
-	}
-	
-	/**
-	 * Accessor method to get the singleton plugin.
-	 */
-	public static BeaninfoPlugin getPlugin() {
-		return BEANINFO_PLUGIN;
-	}
-	
-	/**
-	 * Special Override file name used when need to apply an override to a class that is at the root.
-	 * A root is one that doesn't have a super type. These are <code>java.lang.Object</code>, interfaces, and any
-	 * undefined classes (i.e. classes that don't actually exist).
-	 */
-	public static final String ROOT = "..ROOT.."; //$NON-NLS-1$
-	
-
-	/**
-	 * Special override scheme to refer to the current java class. (As in "X:ROOT#//@root").
-	 * @since 1.2.0
-	 */
-	public static final String ROOT_SCHEMA = "X"; //$NON-NLS-1$
-	
-	/**
-	 * Special override opaque part to refer to the current java class. (As in "X:ROOT#//@root").
-	 * @since 1.2.0
-	 */
-	public static final String ROOT_OPAQUE = "ROOT"; //$NON-NLS-1$
-	
-	/**
-	 * The extension used on any override file when you pass in a path through the method that takes a string.
-	 */
-	public static final String OVERRIDE_EXTENSION = "override";	//$NON-NLS-1$
-		
-	
-	/*
-	 * Map of open natures. This map is needed because on shutdown of beaninfo plugin we need
-	 * to shutdown the natures. If we don't do that there is a slight possibility of an error
-	 * because proxy plugin will shutdown and this can cause a callback into beaninfo which has
-	 * already been shutdown. It calls back through the registry listener that BeaninfoNature
-	 * added to the registry to notify that the registry is being shutdown.
-	 * 
-	 * Also BeanInfoCacheController needs to know so that it can tell it the project is closing or
-	 * being deleted or that it needs to be cleared due to a clear request.
-	 */
-	private Map openNatures;
-	
-	private ContainerPathContributionMapping beaninfoEntryContributionsMapping;
-	private ContainerPathContributionMapping contributorContributionsMapping;
-	private Map pluginToBeaninfoEntryContributions;
-	private Map pluginToContributors;
-	
-	/*
-	 * Override contributions from extension point.
-	 * ocFragments: Array of fragments paths. When a match is found for a path, the index
-	 * 		is the index into the ocContainerIds and ocPluginIds array for the contributions.
-	 * ocContainerIds: The first dimension is the index of the fragment that the list of OverrideContributions is for.
-	 * 		The second dimension is the array of contributions for that fragment, one per container id.
-	 * ocPluginIds: The first dimension is the index of the fragment that the list of OverrideContributions is for.
-	 * 		The second dimension is the array of contributions for that fragment, one per plugin id.
-	 * 
-	 * If a particular fragment doesn't have any entries of container and/or plugin, then EMPTY_OC is used for that
-	 * entry so that we don't need to check for null.
-	 * 
-	 * How this is used is for a particular path requested, the ocFragments will be searched for the fragments that
-	 * are appropriate, then the index of the entry is used to walk through the OC[] array returned from the ocContainerIds
-	 * or ocPluginIds. Each contribution would be checked to see if the container id/plugin id is in the visible classpath (through 
-	 * the info data stored in the persistent property). If it is, then the overrides from that contribution will be used.
-	 */
-	private IPath ocFragments[];
-	private OverrideContribution[][] ocContainerIds;
-	private OverrideContribution[][] ocPluginIds;
-	
-	private static final OverrideContribution[] EMPTY_OC = new OverrideContribution[0];	// Used for an empty contribution list for a fragment.
-
-	public synchronized BeaninfoEntry[] getContainerIdBeanInfos(String containerID, String[] containerPaths) {
-		if (beaninfoEntryContributionsMapping == null)
-			processBeanInfoContributionExtensionPoint();
-		return (BeaninfoEntry[]) beaninfoEntryContributionsMapping.getContributors(containerID, containerPaths);
-	}
-	
-	public synchronized BeaninfoEntry[] getPluginBeanInfos(String pluginid) {
-		if (pluginToBeaninfoEntryContributions == null)
-			processBeanInfoContributionExtensionPoint();
-		return (BeaninfoEntry[]) pluginToBeaninfoEntryContributions.get(pluginid);
-	}
-	
-	public synchronized IConfigurationElement[] getPluginContributors(String pluginid) {
-		if (pluginToContributors == null)
-			processBeanInfoContributionExtensionPoint();
-		return (IConfigurationElement[]) pluginToContributors.get(pluginid);
-	}	
-	
-	public synchronized IConfigurationElement[] getContainerIdContributors(String containerID, String[] containerPaths) {
-		if (contributorContributionsMapping == null)
-			processBeanInfoContributionExtensionPoint();
-		return (IConfigurationElement[]) contributorContributionsMapping.getContributors(containerID, containerPaths);
-	}	
-	
-	public static final String PI_BEANINFO_CONTRIBUTION_EXTENSION_POINT = PI_BEANINFO_PLUGINID+".registrations"; //$NON-NLS-1$
-	public static final String PI_REGISTRATION = "registration"; //$NON-NLS-1$
-	public static final String PI_BEANINFO = "beaninfo";  //$NON-NLS-1$
-	public static final String PI_OVERRIDE = "override"; //$NON-NLS-1$
-	public static final String PI_CONTRIBUTOR = "contributor"; //$NON-NLS-1$
-	public static final String PI_PACKAGE = "package"; //$NON-NLS-1$
-	public static final String PI_PATH = "path"; //$NON-NLS-1$
-	
-	protected synchronized void processBeanInfoContributionExtensionPoint() {
-		ContributorExtensionPointInfo info = ProxyPlugin.processContributionExtensionPoint(PI_BEANINFO_CONTRIBUTION_EXTENSION_POINT);
-		ConfigurationElementReader reader = new ConfigurationElementReader();
-		// Process the container IDs first. We can't use the info directly because the actual configuration elements of interest are
-		// sub-elements of the info. The info contains the container path that we need.
-		beaninfoEntryContributionsMapping = new ContainerPathContributionMapping(BeaninfoEntry.class);
-		contributorContributionsMapping = new ContainerPathContributionMapping(IConfigurationElement.class);
-
-		Map fragmentsToIds = new HashMap();
-		for (Iterator iter = info.containerPathContributions.containerIdToContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry= (Map.Entry) iter.next();
-			String containerid = (String) entry.getKey();
-			ContainerContributionEntry[] contribElements = (ContainerContributionEntry[]) entry.getValue();
-			for (int i = 0; i < contribElements.length; i++) {
-				ContainerContributionEntry contribElement = contribElements[i];
-				IConfigurationElement element = (IConfigurationElement) contribElement.getContribution();
-				if (PI_REGISTRATION.equals(element.getName())) {
-					IConfigurationElement[] children = element.getChildren();
-					for (int j = 0; j < children.length; j++) {
-						IConfigurationElement child = children[j];
-						if (PI_BEANINFO.equals(child.getName())) {
-							// This is a beaninfo entry
-							BeaninfoEntry be = BeaninfoEntry.readEntry(reader, child, null);
-							if (be != null)
-								beaninfoEntryContributionsMapping.addContribution(containerid, contribElement.getContainerPathPattern(), be);
-						} else if (PI_OVERRIDE.equals(child.getName())) {
-							addOverrideEntry(fragmentsToIds, true, containerid, contribElement.getContainerPathPattern(), child);
-						}
-					}
-				} else if (PI_CONTRIBUTOR.equals(element.getName())) {
-					contributorContributionsMapping.addContribution(containerid, contribElement.getContainerPathPattern(), element);
-				}
-			}
-		}
-			
-		beaninfoEntryContributionsMapping.finalizeMapping();
-		contributorContributionsMapping.finalizeMapping();
-		
-		// Now process the plugin IDs.
-		pluginToBeaninfoEntryContributions = new HashMap(info.pluginToContributions.size());		
-		for (Iterator iter = info.pluginToContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry= (Map.Entry) iter.next();
-			String pluginId = (String) entry.getKey();
-			IConfigurationElement[] configElements = (IConfigurationElement[]) entry.getValue();
-			for (int i = 0; i < configElements.length; i++) {
-				IConfigurationElement element = configElements[i];
-				if (PI_REGISTRATION.equals(element.getName())) {
-					IConfigurationElement[] children = element.getChildren();
-					for (int j = 0; j < children.length; j++) {
-						IConfigurationElement child = children[j];
-						if (PI_BEANINFO.equals(child.getName())) {
-							// This is a beaninfo entry
-							BeaninfoEntry be = BeaninfoEntry.readEntry(reader, child, null);
-							if (be != null)
-								addEntry(pluginToBeaninfoEntryContributions, pluginId, be);
-						} else if (PI_OVERRIDE.equals(child.getName())) {
-							addOverrideEntry(fragmentsToIds, false, pluginId, null, child);
-						}
-					}
-				} else if (PI_CONTRIBUTOR.equals(element.getName())) {
-						if (pluginToContributors == null)
-							pluginToContributors = new HashMap(5);	// These are rare, don't create until necessary.
-						addEntry(pluginToContributors, pluginId, element);
-					}
-				}
-			}
-			
-		// Now go through and turn all of the contribution lists into arrays.
-		for (Iterator iter = pluginToBeaninfoEntryContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			entry.setValue(((List) entry.getValue()).toArray(new BeaninfoEntry[((List) entry.getValue()).size()]));
-		}
-		
-		if (pluginToContributors == null)
-				pluginToContributors = Collections.EMPTY_MAP;	// Since we don't have any.
-		else {
-			for (Iterator iter = pluginToContributors.entrySet().iterator(); iter.hasNext();) {
-				Map.Entry entry = (Map.Entry) iter.next();
-				entry.setValue(((List) entry.getValue()).toArray(new IConfigurationElement[((List) entry.getValue()).size()]));
-			}			
-		}
-		
-		// Now handle the entire list of fragments.
-		ocFragments = new IPath[fragmentsToIds.size()];
-		ocContainerIds = new OverrideContribution[ocFragments.length][];
-		ocPluginIds = new OverrideContribution[ocFragments.length][];
-		Iterator iter;
-		int fragIndex;
-		for (iter = fragmentsToIds.entrySet().iterator(), fragIndex=0; iter.hasNext(); fragIndex++) {
-			Map.Entry mapEntry = (Map.Entry) iter.next();
-			ocFragments[fragIndex] = (IPath) mapEntry.getKey();
-			Map[] mapValue = (Map[]) mapEntry.getValue();
-			if (mapValue[0] == null)
-				ocContainerIds[fragIndex] = EMPTY_OC;
-			else {
-				Map containers = mapValue[0];
-				List ocContributions = new ArrayList();
-				for (Iterator ocIterator = containers.entrySet().iterator(); ocIterator.hasNext();) {
-					Map.Entry containerEntry = (Map.Entry) ocIterator.next();
-					String containerID = (String) containerEntry.getKey();
-					for (Iterator patternIterator = ((Map) containerEntry.getValue()).entrySet().iterator(); patternIterator.hasNext();) {
-						Map.Entry patternEntry = (Entry) patternIterator.next();
-						OverrideContribution oc = new OverrideContribution();
-						oc.id = containerID;
-						oc.pattern = (Pattern) patternEntry.getKey();
-						List[] ocLists = (List[]) patternEntry.getValue();
-						oc.pluginIds = (String[]) ocLists[0].toArray(new String[ocLists[0].size()]);
-						oc.paths = (String[]) ocLists[1].toArray(new String[ocLists[1].size()]);
-						ocContributions.add(oc);
-					}
-				}
-				ocContainerIds[fragIndex] = (OverrideContribution[]) ocContributions.toArray(new OverrideContribution[ocContributions.size()]);
-			}
-			if (mapValue[1] == null)
-				ocPluginIds[fragIndex] = EMPTY_OC;
-			else {
-				Map plugins = mapValue[1];
-				OverrideContribution[] ocContribution = ocPluginIds[fragIndex] = new OverrideContribution[plugins.size()];
-				int ocIndex;
-				Iterator ocIterator;
-				for (ocIterator = plugins.entrySet().iterator(), ocIndex=0; ocIterator.hasNext(); ocIndex++) {
-					Map.Entry pluginEntry = (Map.Entry) ocIterator.next();
-					OverrideContribution oc = ocContribution[ocIndex] = new OverrideContribution();
-					oc.id = (String) pluginEntry.getKey();
-					List[] ocLists = (List[]) pluginEntry.getValue();
-					oc.pluginIds = (String[]) ocLists[0].toArray(new String[ocLists[0].size()]);
-					oc.paths = (String[]) ocLists[1].toArray(new String[ocLists[1].size()]);
-				}
-			}			
-		}
-	}
-	
-	/*
-	 * Add an entry to the map. If the key doesn't exist, create an entry as an array. Then add the entry to array.
-	 */
-	private void addEntry(Map map, Object key, Object entry) {
-		List mapEntry = (List) map.get(key);
-		if (mapEntry == null) {
-			mapEntry = new ArrayList(1);
-			map.put(key, mapEntry);
-		}
-		mapEntry.add(entry);
-	}
-	
-	/*
-	 * Add an entry to the map.
-	 * id is the container path pattern/plugin id.
-	 * 
-	 * The structure of the map is:
-	 * 	key: fragment name
-	 * 	value: Map[2], where [0] is for container id, and [1] is for plugin ids.
-	 * 		Map[x]:
-	 * 			key: container/plugin id
-	 * 			value: Map(pattern->List(FinalOverride)) for container, of FinalOverride for plugin. 
-	 * 
-	 * FinalOverride: List[2], where [0] is list of plugin ids for the override, and [1] is list of paths for the override files relative to that plugin id.
-	 * 
-	 * After all done these maps/list will be boiled down to the arrays that will be used for lookup.
-	 */
-	private void addOverrideEntry(Map map, boolean container, Object id, Pattern pattern, IConfigurationElement entry) {
-		
-		String packageName = entry.getAttribute(PI_PACKAGE);
-		String plugin = null;
-		String pathString = entry.getAttribute(PI_PATH);
-		IPath fragment = null; 
-		if (packageName != null && packageName.length() > 0 && pathString != null && pathString.length() > 0) { 
-			fragment = new Path(packageName.replace('.', '/'));
-			if (pathString.charAt(pathString.length()-1) != '/')
-				pathString += '/';
-			if (pathString.charAt(0) != '/')
-				plugin = entry.getDeclaringExtension().getContributor().getName();
-			else {
-				if (pathString.length() > 4) {
-					int pend = pathString.indexOf('/', 1);
-					if (pend == -1 || pend >= pathString.length()-1)
-						return;	// invalid
-					plugin = pathString.substring(1, pend);
-					pathString = pathString.substring(pend+1);
-				} else
-					return;	// invalid
-			}
-		}
-		if (pathString.length() < 2)
-			return;	// invalid
-
-		Map[] mapEntry = (Map[]) map.get(fragment);
-		if (mapEntry == null) {
-			mapEntry = new HashMap[2];
-			map.put(fragment, mapEntry);
-		}
-		List[] idEntry;
-		if (container) {
-			if (mapEntry[0] == null)
-				mapEntry[0] = new HashMap(2);
-			
-			Map patternMap = (Map) mapEntry[0].get(id);
-			if (patternMap == null)
-				mapEntry[0].put(id, patternMap = new HashMap());
-			
-			idEntry = (List[]) patternMap.get(pattern);
-			if (idEntry == null) {
-				patternMap.put(pattern, idEntry = new List[] { new ArrayList(1), new ArrayList(1)});
-			}
-		} else {
-			if (mapEntry[1] == null)
-				mapEntry[1] = new HashMap(2);
-
-			idEntry = (List[]) mapEntry[1].get(id);
-			if (idEntry == null) {
-				mapEntry[1].put(id, idEntry = new List[] { new ArrayList(1), new ArrayList(1)});
-			}
-		}
-		idEntry[0].add(plugin);
-		idEntry[1].add(pathString);
-
-
-	}	
-			
-	/*
-	 * This is an list of overrides that are available as a contribution for a specific fragment.
-	 * <ul>
-	 * <li>The id of this contribution. Either container (Pattern) or plugin id depending on which list it was in..
-	 * <li>The plugins array lists the plugin ids for all of the paths in this contribution.
-	 * <li>The paths array lists the folder path under that corresponding plugin from "pluginIds".
-	 * </ul> 
-	 * <p>
-	 * 
-	 * @since 1.0.0
-	 */
-	private static class OverrideContribution {
-		public String id;
-		public Pattern pattern;	// Used only for containers.
-		public String[] pluginIds;
-		public String[] paths;
-	}
-	
-	/**
-	 * The runnable is to used to apply override. 
-	 * <p>
-	 * This will be called in sequence for each override path found. It is send in on the apply overrides call. This
-	 * interface implementation is private.
-	 * <p>
-	 * Clients (implementers of the IBeanInfoContributor) will be passed in the subinterface <code>IContributorOverrideRunnable</code> which
-	 * inherits from this interface.
-	 * <p>
-	 * This interface is not intended to be implemented by clients. 
-	 * 
-	 * @since 1.0.0
-	 * @see BeaninfoPlugin#applyOverrides(IProject, String, String, ResourceSet, IOverrideRunnable)
-	 */
-	public interface IOverrideRunnable {
-		/**
-		 * This will be called with the directory path to use. It will be called over and over for every
-		 * override path found for a package. The path will be complete, including trailing '/'.
-		 * It will be in a URI format for a directory. The overriderunnable implementation will then append the filename call (i.e. classbeingintrospected.override) to get a complete path.
-		 * <p>
-		 * Clients (IBeanInfoContributor implementers) can call this to apply a specific override file to the current
-		 * class being processed.
-		 * 
-		 * @param overridePath the path will be complete, including trailing '/'. It will be in a URI format for a directory. The override file name (classname.override) will be appended to this and retrieved and applied.
-		 * 
-		 * @since 1.0.0
-		 */
-		public void run(String overridePath);
-		
-		/**
-		 * This will be called with the actual resource to use. This will be called by special contributors that want
-		 * a special explicit override resource to be used.
-		 * <p>
-		 * Contributors should use the ResourceSet that was passed into them. This is so that anything java class that
-		 * the override resource points to will be found.
-		 * <p>
-		 * This resource will be automatically removed by BeanInfo after being applied. It must not be left around because
-		 * in the process of being applied it will be modified, so it could not be reused. 
-		 *  
-		 * @param overrideResource the resource to apply to the current class. NOTE: This resource WILL be removed from
-		 * the resource set it is in automatically by this call. It won't be left around because the action of apply
-		 * will actually modify the resource.
-		 * 
-		 * @since 1.0.0
-		 */
-		public void run(Resource overrideRes);
-	}
-	
-	/**
-	 * IBeanInfoContributor runnable to use to apply overrides.
-	 * <p>
-	 * An implementation of this will be passed in to IBeanInfoContributor's so that they can call back to apply the overrides. They
-	 * should call the appropriate run method once for each override to be applied. The run can be called more than once from each IBeanInfoContributor.
-	 * <p>
-	 * It inherits from <code>IOverrideRunnable</code>, so see that for more methods to call.
-	 * <p>
-	 * This interface is not intended to be implemented by clients.
-	 * 
-	 * @see BeaninfoPlugin.IOverrideRunnable for more methods that can be called.
-	 * @since 1.0.0
-	 */
-	public interface IContributorOverrideRunnable extends IOverrideRunnable {
-		
-		/**
-		 * Tests if path has already been contributed once for the current class.
-		 * <p>
-		 * This can be called by the IBeanInfoContributor for overrides to test if the path (same path as for the IOverrideRunnable.run(String) method)
-		 * has already been contributed once for this class. It can be used to save time. However it is not necessary because
-		 * BeanInfo will not permit it to be contributed more than once for a class.
-		 * 
-		 * @param path
-		 * @return <code>true</code> if used already.
-		 * 
-		 * @see IOverrideRunnable#run(String)
-		 * @since 1.0.0
-		 */
-		public boolean pathContributed(String path);
-		
-		/**
-		 * Tests if the URI has already been contributed once for the current class.
-		 * <p>
-		 * This can be called by an IBeanInfoContributor for overrides to see if the URI (same path as the URI from the IOverrideRunnable.run(Resource) method)
-		 * has already been contributed once for this class. It can be used to save time. However, not necessary because
-		 * BeanInfo will not permit the URI to be contributed more than once for a class.
-		 * 
-		 * @param resourceURI
-		 * @return <code>true</code> if used already.
-		 * 
-		 * @see IOverrideRunnable#run(Resource)
-		 * @since 1.0.0
-		 */
-		public boolean resourceContributed(URI resourceURI);
-	}
-	
-	private static final String[] NO_PATHS = new String[0];
-	
-	/**
-	 * Return just the contributed override paths (through the BeanInfo registrations). Does not include any paths that are contributed from
-	 * IBeanInfoContributor's. This is used by the BeanInfoClassAdapter to load the overrides files into one cache file so that it can
-	 * be done at one time the next time it is needed.
-	 * 
-	 * @param project
-	 * @param packageName
-	 * @return array of path strings to the override. The files may not exist, they is just possible overrides. 
-	 * 
-	 * @since 1.1.0
-	 */
-	public String[] getOverridePaths(IProject project, String packageName) {
-		final IPath packagePath = new Path(packageName.replace('.', '/')+'/');
-		List overridePaths = new ArrayList();
-		try {
-			IConfigurationContributionInfo info = (IConfigurationContributionInfo) project.getSessionProperty(BeaninfoNature.CONFIG_INFO_SESSION_KEY);
-			if (info == null) {
-				// It hasn't been created yet, so we need to create our own internal version here.
-				info = ProxyLaunchSupport.createDefaultConfigurationContributionInfo(JavaCore.create(project));					
-				BeaninfoNature.computeBeanInfoConfigInfo(info);
-			}
-			synchronized (this) {
-				if (ocFragments == null)
-					processBeanInfoContributionExtensionPoint(); // We haven't processed them yet.
-			}
-			
-			// Cache of tested patterns. (Pattern->Boolean). If a pattern has been tested against all visible container paths we don't need to test the
-			// pattern again if it is found again. (Note: This works for efficiency because ProxyPlugin uses the same pattern instance for
-			// same pattern found while processing one extension point). The value is true if the pattern matches a visible container path.
-			Map testedPatterns = new HashMap();	
-			for (int fragmentIndex = 0; fragmentIndex < ocFragments.length; fragmentIndex++) {
-				if (ocFragments[fragmentIndex].isPrefixOf(packagePath)) {
-					String leftOver = null;	// The left over portion of the package. This will be set first time needed. 
-					OverrideContribution[] cntrContributions = ocContainerIds[fragmentIndex];
-					for (int ocindex = 0; ocindex < cntrContributions.length; ocindex++) {
-						OverrideContribution contribution = cntrContributions[ocindex];
-						Boolean tested = (Boolean) testedPatterns.get(contribution.pattern);
-						if (tested == null) {
-							tested = Boolean.FALSE;
-							ContainerPaths containerPaths = (ContainerPaths) info.getContainerIds().get(contribution.id);
-							if (containerPaths != null) {
-								String[] visible = containerPaths.getVisibleContainerPaths();
-								for (int i = 0; i < visible.length; i++) {
-									if (contribution.pattern.matcher(visible[i]).matches()) {
-										tested = Boolean.TRUE;
-										break;
-									}
-								}
-							}
-							testedPatterns.put(contribution.pattern, tested);
-						}
-						
-						if (tested.booleanValue()) {
-							for (int cindex = 0; cindex < contribution.pluginIds.length; cindex++) {
-								// Because of URIConverters and normalization in org.eclipse.jem.util stuff, we
-								// need to have plugin uri's in the form "platform:/plugin/pluginname".
-								// Bundle's don't return this format. They return bundle:/stuff
-								// So we will simple create it of the platform:/plugin format.
-								// To save time, we will first see if we have the bundle.
-								Bundle bundle = Platform.getBundle(contribution.pluginIds[cindex]);
-								if (bundle != null) {
-									if (leftOver == null)
-										leftOver = getLeftOver(ocFragments[fragmentIndex], packagePath);
-									overridePaths.add(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+contribution.paths[cindex]+leftOver); //$NON-NLS-1$
-								}
-							}
-						}
-					}
-					
-					OverrideContribution[] pluginContributions = ocPluginIds[fragmentIndex];
-					for (int ocindex = 0; ocindex < pluginContributions.length; ocindex++) {
-						OverrideContribution contribution = pluginContributions[ocindex];
-						Boolean visible = (Boolean) info.getPluginIds().get(contribution.id);
-						if (visible != null && visible.booleanValue()) {
-							for (int cindex = 0; cindex < contribution.pluginIds.length; cindex++) {
-								Bundle bundle = Platform.getBundle(contribution.pluginIds[cindex]);
-								if (bundle != null) {
-									if (leftOver == null)
-										leftOver = getLeftOver(ocFragments[fragmentIndex], packagePath);
-									overridePaths.add(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+contribution.paths[cindex]+leftOver); //$NON-NLS-1$
-								}
-							}
-						}
-					}
-				}
-			}
-		} catch (CoreException e) {
-			getLogger().log(e, Level.INFO);
-		}
-		return overridePaths.isEmpty() ? NO_PATHS : (String[]) overridePaths.toArray(new String[overridePaths.size()]);
-	}
-	
-	/**
-	 * Apply the runnable to all of the override paths that are applicable to the 
-	 * given package name. It will run through the explicit contributors and the IContainers that implement IBeanInfoContributor.
-	 * <p>
-	 * The package name uses '.' to delineate the fragments of the name,
-	 * i.e. use "<code>java.lang</code>" as a package name.
-	 * <p>
-	 * Note: This is not meant to be called by clients. It is public only because an internal class in another package needs to call it.
-	 * TODO This should be package-protected. Later the other class will be moved into this package.
-	 * 
-	 * @param project the project to run against.
-	 * @param packageName
-	 * @param className class name of the class that is being overridden.
-	 * @param javaClass the java class the overrides will be applied to.
-	 * @param resource set that contributors can use to temporarily load dynamic override files.
-	 * @param runnable use this runnable to actually apply overrides.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void applyOverrides(final IProject project, String packageName, final String className, final JavaClass javaClass, final ResourceSet rset, final IOverrideRunnable runnable) {
-		final IPath packagePath = new Path(packageName.replace('.', '/')+'/');
-		try {
-			IConfigurationContributionInfo info = (IConfigurationContributionInfo) project.getSessionProperty(BeaninfoNature.CONFIG_INFO_SESSION_KEY);
-			if (info == null) {
-				// It hasn't been created yet, so we need to create our own internal version here.
-				info = ProxyLaunchSupport.createDefaultConfigurationContributionInfo(JavaCore.create(project));					
-				BeaninfoNature.computeBeanInfoConfigInfo(info);
-			}
-			final IBeanInfoContributor[] explicitContributors = (IBeanInfoContributor[]) project.getSessionProperty(BeaninfoNature.BEANINFO_CONTRIBUTORS_SESSION_KEY);
-			synchronized (this) {
-				if (ocFragments == null)
-					processBeanInfoContributionExtensionPoint(); // We haven't processed them yet.
-			}
-
-			final Set usedPaths = new HashSet(10);	// Set of used paths. So that the contributors don't supply a path already used. This could cause problems if they did.
-			final IContributorOverrideRunnable contribRunnable = new IContributorOverrideRunnable() {
-				public void run(String overridePath) {
-					if (!usedPaths.contains(overridePath)) {
-						usedPaths.add(overridePath);
-						runnable.run(overridePath);
-					}
-				}
-				
-				public void run(Resource overrideRes) {
-					if (!usedPaths.contains(overrideRes.getURI())) {
-						usedPaths.add(overrideRes.getURI());
-						try {
-							runnable.run(overrideRes);
-						} finally {
-							overrideRes.getResourceSet().getResources().remove(overrideRes);
-						}
-					}
-				}
-				
-				public boolean pathContributed(String path) {
-					return usedPaths.contains(path);
-				}
-				
-				public boolean resourceContributed(URI resourceURI) {
-					return usedPaths.contains(resourceURI);
-				}
-			};
-			
-			// Run through the containers that implement IBeanInfoContributor.
-			for (Iterator iter = info.getContainers().entrySet().iterator(); iter.hasNext();) {
-				Map.Entry mapEntry = (Map.Entry) iter.next();
-				final IClasspathContainer container = (IClasspathContainer) mapEntry.getKey();
-				if (container instanceof IBeanInfoContributor && ((Boolean) mapEntry.getValue()).booleanValue()) {
-					SafeRunner.run(new ISafeRunnable() {
-						public void handleException(Throwable exception) {
-							// Standard run logs to .log
-						}
-						public void run() throws Exception {
-							((IBeanInfoContributor) container).runOverrides(packagePath, className, javaClass, rset, contribRunnable);						
-						}
-					});
-				}
-			}
-			
-			// Run through the explicit contributors.
-			for (int i=0; i<explicitContributors.length; i++) {
-				final int ii = i;
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Standard run logs to .log
-					}
-					public void run() throws Exception {
-						explicitContributors[ii].runOverrides(packagePath, className, javaClass, rset, contribRunnable);						
-					}
-				});
-			}			
-		} catch (CoreException e) {
-			getLogger().log(e, Level.INFO);
-		}
-	}
-	
-	private String getLeftOver(IPath fragment, IPath packagePath) {
-		return packagePath.removeFirstSegments(fragment.segmentCount()).toString();
-	}
-	
-	private Logger logger;
-	public Logger getLogger() {
-		if (logger == null)
-			logger = EclipseLogger.getEclipseLogger(this);
-		return logger;
-	}
-	
-	/**
-	 * Add that a BeanInfo nature is active. This is used to tell it to shutdown when beaninfo shuts down.
-	 * TODO <package-protected> because only BeanInfoNature should call it. (public for now but when we make
-	 * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
-	 * 
-	 * @param nature
-	 * 
-	 * @since 1.0.0
-	 */
-	public void addBeanInfoNature(BeaninfoNature nature) {
-		if (openNatures == null)
-			openNatures = new HashMap();
-		openNatures.put(nature.getProject(), nature);
-	}
-	
-	/**
-	 * Mark that a BeanInfo nature is not active. This is used to tell it to shutdown when beaninfo shuts down.
-	 * TODO <package-protected> because only BeanInfoNature should call it. (public for now but when we make
-	 * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
-	 * 
-	 * @param nature
-	 * 
-	 * @since 1.0.0
-	 */
-	public void removeBeanInfoNature(BeaninfoNature nature) {
-		if (openNatures != null)
-			openNatures.remove(nature.getProject());
-	}
-	
-	/**
-	 * Return the registered nature, if any, for the project. This will not cause the
-	 * nature to be created.
-	 * <p>
-	 * <package-protected> because only BeanInfoCacheController should access it.
-	 * @param project
-	 * @return nature for project or <code>null</code> if not registered.
-	 * 
-	 * @since 1.1.0
-	 */
-	BeaninfoNature getNature(IProject project) {
-		return (BeaninfoNature) openNatures.get(project);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		if (openNatures != null && !openNatures.isEmpty()) {
-			for (Iterator natureItr = openNatures.values().iterator(); natureItr.hasNext();) {
-				BeaninfoNature nature = (BeaninfoNature) natureItr.next();
-				nature.shutdown();
-			}
-		}
-			
-		super.stop(context);
-	}
-}
-
-
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java
deleted file mode 100644
index d8cb816d8..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java
+++ /dev/null
@@ -1,79 +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.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
- * This is the registration information for registered beaninfos in the BeaninfoPlugin.
- * @version 	1.0
- * @author
- */
-public class BeaninfoRegistration {
-	
-	protected BeaninfosDoc doc;
-	protected IConfigurationElement variableElement;	// This is used to get contributor element. If null, then no contributor.
-	
-	public BeaninfoRegistration() {
-	}
-	
-	/**
-	 * Construct with a BeaninfosDoc
-	 */
-	public BeaninfoRegistration(BeaninfosDoc doc) {
-		this.doc = doc;
-	}
-	
-	/**
-	 * Construct with a BeaninfosDoc and variable element.
-	 */
-	public BeaninfoRegistration(BeaninfosDoc doc, IConfigurationElement variableElement) {
-		this.doc = doc;
-		this.variableElement = variableElement;
-	}	
-
-	/**
-	 * Gets the doc.
-	 * @return Returns a BeaninfosDoc
-	 */
-	public BeaninfosDoc getDoc() {
-		return doc;
-	}
-
-	/**
-	 * Sets the doc.
-	 * @param doc The doc to set
-	 */
-	public void setDoc(BeaninfosDoc doc) {
-		this.doc = doc;
-	}
-
-	/**
-	 * Gets the variableElement.
-	 * @return Returns a IConfigurationElement
-	 */
-	public IConfigurationElement getVariableElement() {
-		return variableElement;
-	}
-
-	/**
-	 * Sets the variableElement.
-	 * @param variableElement The variableElement to set
-	 */
-	public void setVariableElement(IConfigurationElement variableElement) {
-		this.variableElement = variableElement;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java
deleted file mode 100644
index 5869c809e..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java
+++ /dev/null
@@ -1,87 +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.jem.internal.beaninfo.core;
-/*
-
-
- */
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.w3c.dom.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-/**
- * Beaninfos document in-memory format.
- */
-
-public class BeaninfosDoc implements IBeaninfosDocEntry {
-
-	protected IBeaninfosDocEntry[] searchpath;
-
-	static final String sExported = "exported"; //$NON-NLS-1$
-
-	static final String sKind = "kind"; //$NON-NLS-1$
-
-	static final String sPath = "path"; //$NON-NLS-1$
-
-	public BeaninfosDoc() {
-	}
-
-	public BeaninfosDoc(IBeaninfosDocEntry[] searchpath) {
-		this.searchpath = searchpath;
-	}
-
-	public int getKind() {
-		return -1;	// N.A.
-	}
-	
-	public IPath getPath() {
-		return null;	// N.A.
-	}
-	
-	public static BeaninfosDoc readEntry(IReader reader, Object root, IProject project) {
-		ArrayList paths = new ArrayList();
-		Object children = reader.getChildren(root);
-		int childrenLength = reader.getLength(children);
-		for (int i = 0; i < childrenLength; i++) {
-			Object child = reader.getItem(children, i);
-			if (reader.isNodeTypeElement(child)) {
-				Object entry = null;
-				if (reader.getNodeName(child).equalsIgnoreCase(BeaninfoEntry.sBeaninfo)) {
-					entry = BeaninfoEntry.readEntry(reader, child, project);
-				} else if (reader.getNodeName(child).equalsIgnoreCase(SearchpathEntry.sSearchpath)) {
-					entry = SearchpathEntry.readEntry(reader, child, project, false);
-				}
-				if (entry != null)
-					paths.add(entry);
-			}
-		}
-		return new BeaninfosDoc((IBeaninfosDocEntry[]) paths.toArray(new IBeaninfosDocEntry[paths.size()]));
-	}
-
-	public IBeaninfosDocEntry[] getSearchpath() {
-		return searchpath;
-	}
-
-	public void setSearchpath(IBeaninfosDocEntry[] searchpath) {
-		this.searchpath = searchpath;
-	}
-
-	public Node writeEntry(Document doc, IProject project) {
-		Element root = doc.createElement(SearchpathEntry.sSearchpath); // Create Root Element
-		for (int i = 0; i < searchpath.length; i++) {
-			root.appendChild(searchpath[i].writeEntry(doc, project)); // Add to the document
-		}
-		return root;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java
deleted file mode 100644
index 896c1d259..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java
+++ /dev/null
@@ -1,73 +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.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-import java.lang.reflect.Array;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-
-
-/**
- * For reading from IConfigurationElements
- * @version 	1.0
- * @author
- */
-class ConfigurationElementReader implements IReader {
-
-	/*
-	 * @see IReader#getChildren(Object)
-	 */
-	public Object getChildren(Object node) {
-		return (node instanceof IConfigurationElement) ? ((IConfigurationElement) node).getChildren() : new IConfigurationElement[0];
-	}
-
-	/*
-	 * @see IReader#getLength(Object)
-	 */
-	public int getLength(Object nodeList) {
-		return (nodeList instanceof IConfigurationElement[]) ? Array.getLength(nodeList) : 0;
-	}
-
-	/*
-	 * @see IReader#getItem(Object, int)
-	 */
-	public Object getItem(Object nodeList, int index) {
-		return (nodeList instanceof IConfigurationElement[]) ? Array.get(nodeList, index) : null;
-	}
-
-	/*
-	 * @see IReader#isNodeTypeElement(Object)
-	 */
-	public boolean isNodeTypeElement(Object node) {
-		return node instanceof IConfigurationElement;
-	}
-
-	/*
-	 * @see IReader#getNodeName(Object)
-	 */
-	public String getNodeName(Object node) {
-		return (node instanceof IConfigurationElement) ? ((IConfigurationElement) node).getName() : ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * @see IReader#getAttribute(Object, String)
-	 */
-	public String getAttribute(Object element, String attributeName) {
-		return (element instanceof IConfigurationElement) ? ((IConfigurationElement) element).getAttribute(attributeName) : null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java
deleted file mode 100644
index 859073802..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.core;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo;
-import org.eclipse.jem.java.JavaClass;
- 
-/**
- * Interface for BeanInfo contributors. Supplied either as additional interface on a IClasspathContainer, or as
- * an explicit contributor for BeanInfos from the manifest files.
- * <p>
- * Implementations of this interface allows a dynamic supply of BeanInfo contributions (beaninfo jars and search paths)
- * and override files. This is used when the default plugin extension mechanism is too static for the requirements. 
- * <p>
- * There is a very useful default implementation (<code>BeanInfoContributorAdapter</code>) that can be subclassed. The
- * default doesn't do anything on its own. But it does have a very useful utility method for loading resources.
- * 
- * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoContributorAdapter
- * @since 1.0.0
- */
-public interface IBeanInfoContributor {
-	
-	/**
-	 * Return the BeanInfoEntry contributions that are needed.
-	 * <p>
-	 * This will be called by BeanInfo when it determines that this contributor is applicable 
-	 * for the current project being processed. BeaninfoEntry's define the BeanInfo jars and search paths to use.
-	 * 
-	 * @param info
-	 * @return BeanInfo contributions or <code>null</code> if none to contribute.
-	 * 
-	 * @since 1.0.0
-	 */
-	public BeaninfoEntry[] getBeanInfoEntryContributions(IConfigurationContributionInfo info);
-	
-	/**
-	 * For the given package path run the override contributions through the runnable.
-	 * <p>
-	 * This will be called by BeanInfo when it determines that this
-	 * contributor is applicable for the current project being processed.
-	 * <p>
-	 * Implementations must call the runnable (the argument <code>runnable</code>) for each override file that is to be applied to the incoming class.
-	 * You can either call the run method that passes in a string pointing to a directory where your override file is
-	 * located (i.e. <code>overrideFileName.override</code> where "overrideFileName" is the name passed. Or you can call the run method that 
-	 * takes a Resource that is already loaded (and maybe modified or created locally).
-	 * 
-	 * @param packagePath
-	 * @param overrideFileName the overrideFileName that the overrides is for. This can be used in very special cases to provide 
-	 * exact override files instead of letting the path be searched. An example would be for providing a file that isn't the same name as the class.
-	 * A very special case is <code>ROOT</code>. This is used when asking to apply root overrides to classes that have no 
-	 * super type. 
-	 * @param javaClass the java class that the overrides will be applied to. Note: Do not call any property, features, events, or operations calls
-	 * or any property, events, or operations Utilities against this class. That is because this class is being introspected at this time
-	 * and those calls will return invalid values if called at this point since introspection is not yet complete. 
-	 * @param resource set that contributors can use to temporarily load dynamic override files.
-	 * @param runnable the runnable that you call to actually apply the override files.
-	 * 
-	 * @see BeaninfoPlugin#ROOT
-	 * @see BeaninfoPlugin#OVERRIDE_EXTENSION
-	 * @since 1.0.0
-	 */
-	public void runOverrides(IPath packagePath, String overrideFileName, JavaClass javaClass, ResourceSet rset, BeaninfoPlugin.IContributorOverrideRunnable runnable);
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.java
deleted file mode 100644
index 37075e7e8..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.java
+++ /dev/null
@@ -1,75 +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.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-/**
- * Interface to supply information for beaninfo to decouple
- * the introspection from the desktop.
- */
-
-public interface IBeaninfoSupplier {
-	
-	/**
-	 * @return Return the registry to use. Initialize it if not already initialized.
-	 */
-	public ProxyFactoryRegistry getRegistry();
-	
-	/**
-	 * Used to know if we currently have a registry created in the supplier.
-	 * 
-	 * @return true if there is a registry currently in the supplier.
-	 */
-	public boolean isRegistryCreated();
-	
-	/**
-	 * Close the registry. This tells the registry to close. This is necessary
-	 * at times because of changes to classes require the registry to be
-	 * reconstructed.
-	 */
-	public void closeRegistry();
-	
-	/**
-	 * Return the project that this supplier is for.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IProject getProject();
-	
-	/**
-	 * Create a new resource set based upon the current project. This resource set is hooked into the
-	 * project's resource set so that any searches for java classes.
-	 * 
-	 * @return a new resource set that is hooked into the project's java resource set.
-	 * 
-	 * @since 1.2.0
-	 */
-	public ProjectResourceSet getNewResourceSet();
-	
-	/**
-	 * The project resource set for this supplier.
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public ResourceSet getProjectResourceSet();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java
deleted file mode 100644
index 5cc90c514..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java
+++ /dev/null
@@ -1,33 +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.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * Interface for DOM Doc writable entries.
- * 
- * @version 	1.0
- * @author
- */
-public interface IBeaninfosDocEntry {
-	public Node writeEntry(Document doc, IProject project);
-	
-	public int getKind();
-	public IPath getPath();
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java
deleted file mode 100644
index ceefae9cc..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java
+++ /dev/null
@@ -1,67 +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.jem.internal.beaninfo.core;
-/*
-
-
- */
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoAdapterFactory;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-
-/**
- * Static initializer class to initialize the beaninfo stuff.
- * It is disconnected from the desktop and so doesn't require it.
- */
-
-public class Init {
-	
-	// So it can't be instantiated.
-	private Init() {
-	};
-
-	/**
-	 * Initialize the context with an IBeaninfoSupplier, used to set up the
-	 * introspection process. 
-	 *
-	 * The beaninfo supplier is responsible for setting up the bean info search path,
-	 * including removing the sun beaninfos, if desired.
-	 */
-	public static void initialize(ResourceSet rset, final IBeaninfoSupplier supplier) {
-		rset.getAdapterFactories().add(new BeaninfoAdapterFactory(supplier));
-	}
-
-	/**
-	 * Initialize the registry now that it is available.
-	 */
-	public static void initialize(ProxyFactoryRegistry registry) {
-		// Remove the "sun.beans.info" from the beaninfo search path because
-		// we completely override the sun bean infos.
-		Utilities.removeBeanInfoPath(registry, "sun.beans.infos"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Cleanup from the context because we are being removed.
-	 * If clearResults is true, then the factory should clear the results of introspection
-	 * from the everything because the context will still be around.
-	 */
-	public static void cleanup(ResourceSet rset, boolean clearResults) {
-		BeaninfoAdapterFactory factory =
-			(BeaninfoAdapterFactory) EcoreUtil.getAdapterFactory(rset.getAdapterFactories(), IIntrospectionAdapter.ADAPTER_KEY);
-		rset.getAdapterFactories().remove(factory);
-		if (factory != null)
-			factory.closeAll(clearResults);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java
deleted file mode 100644
index ce77ecc37..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java
+++ /dev/null
@@ -1,189 +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.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.w3c.dom.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-
-/**
- * Searchpath entry. Beaninfo searchpath entry (i.e. package name). Can include
- * kind/path/exported if not a child of the BeaninfoEntry.
- * 
- * Note: if not a child of a BeanInfoEntry, then the path refers to a package
- * in the classpath, so container is supported here.
- * 
- * @version 	1.0
- * @author
- */
-public class SearchpathEntry implements IBeaninfosDocEntry {
-
-	final static String sSearchpath = "searchpath"; // Searchpath entry, shared with BeaninfosDoc. //$NON-NLS-1$
-	final static String sPackage = "package"; // Package name. //$NON-NLS-1$
-
-	/**
-	 * Read the entry in from the element.
-	 */
-	public static SearchpathEntry readEntry(IReader reader, Object element, IProject project, boolean beaninfoChild) {
-		String packageName = reader.getAttribute(element, sPackage);
-		if (beaninfoChild)
-			return new SearchpathEntry(packageName); // Kind/path aren't valid on beaninfo children.
-
-		String elementKind = reader.getAttribute(element, BeaninfosDoc.sKind);
-		String pathStr = reader.getAttribute(element, BeaninfosDoc.sPath);
-		int kind = BeaninfoEntry.kindFromString(elementKind);		
-		IPath path = null;
-		if (pathStr != null) {
-			// ensure path is absolute
-			path = new Path(pathStr);
-			if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER && !path.isAbsolute()) {
-				path = project != null ? project.getFullPath().append(path) : path.makeAbsolute(); // Some folder/jar within this project
-			}
-		}
-
-		// create the appropriate entry
-		boolean valid = true;
-		switch (kind) {
-
-			case IClasspathEntry.CPE_LIBRARY :
-				valid = path != null && path.isAbsolute();
-				break;
-
-			case IClasspathEntry.CPE_SOURCE :
-				if (path == null)
-					valid = false;
-				else if (path.isAbsolute()) {
-					// must be an entry in this project or specify another project
-					String projSegment = path.segment(0);
-					if (project == null || projSegment == null || !projSegment.equals(project.getName())) {
-						// another project
-						kind = IClasspathEntry.CPE_PROJECT;
-					}
-				}
-				break;
-
-			case IClasspathEntry.CPE_VARIABLE :
-			case IClasspathEntry.CPE_CONTAINER:				
-				break;
-
-			default :
-				valid = false;
-				break;
-		}
-
-		if (valid)
-			return new SearchpathEntry(kind, path, packageName);
-		else
-			return null;
-
-	}
-
-	protected int kind = -1; // Under Beaninfo entry, these don't have kind/path's.
-	protected IPath path;	// Path can be null if under beaninfo entry
-	protected String packageName;	// Packagename can be null if kind/path refer to a project or registered variable.
-	protected boolean isExported;
-
-	public SearchpathEntry(int kind, IPath path, String packageName) {
-		this.kind = kind;
-		this.path = path;
-		this.packageName = packageName;
-	}
-
-	public SearchpathEntry(String packageName) {
-		this.packageName = packageName;
-	}
-
-	public int getKind() {
-		return kind;
-	}
-	
-	public IPath getPath() {
-		return path;
-	}
-
-	public String getPackage() {
-		return packageName;
-	}
-
-	public Node writeEntry(Document doc, IProject project) {
-
-		Element element = doc.createElement(sSearchpath);
-		if (kind != -1) {
-			// A non-beaninfo child
-			element.setAttribute(BeaninfosDoc.sKind, BeaninfoEntry.kindToString(kind));
-			IPath tPath = path;
-			if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER) {
-				// translate to project relative from absolute (unless a device path)
-				if (tPath.isAbsolute()) {
-					if (tPath.segment(0).equals(project.getFullPath().segment(0))) {
-						tPath = tPath.removeFirstSegments(1);
-						tPath = tPath.makeRelative();
-					} else {
-						tPath = tPath.makeAbsolute();
-					}
-				}
-			}
-
-			element.setAttribute(BeaninfosDoc.sPath, tPath.toString());
-		}
-		if (packageName != null)
-			element.setAttribute(sPackage, packageName);
-		return element;
-	}
-	
-	public boolean equals(Object other) {
-		if (this == other)
-			return true;
-			
-		if (!(other instanceof SearchpathEntry))
-			return false;
-	
-		SearchpathEntry otherEntry = (SearchpathEntry) other;
-		if (kind != otherEntry.kind)
-			return false;
-			
-		if (path == null)
-			if (otherEntry.path != null)
-				return false;
-			else
-				;
-		else if (!path.equals(otherEntry.path))
-			return false;
-			
-		if (packageName == null)
-			if (otherEntry.packageName != null)
-				return false;
-			else
-				;
-		else if (!packageName.equals(otherEntry.packageName))
-			return false;
-			
-		return true;
-	}
-	
-	public int hashCode() {
-		int hashCode = kind;
-		if (path != null)
-			hashCode ^= path.hashCode();
-		if (packageName != null)
-			hashCode ^= packageName.hashCode();
-		return hashCode;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java
deleted file mode 100644
index b001299f8..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java
+++ /dev/null
@@ -1,501 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoProxyConstants;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-
-/**
- * Beaninfo (introspection) utilities methods
- */
-
-public final class Utilities {
-	
-	private Utilities() {
-	}
-
-	/**
-	 * Utility to return the class as a JavaClass. If it actually is a JavaType this will
-	 * fail with a ClassCastException.
-	 * @param className
-	 * @param rset
-	 * @return java class
-	 * 
-	 * @throws ClassCastException if not a java class, but instead a java primitive.
-	 * @since 1.1.0
-	 */
-	public static JavaClass getJavaClass(String className, ResourceSet rset) {
-		return (JavaClass) getJavaType(className, rset);
-	}
-	
-	/**
-	 * Utility to return the class as a JavaHelpers.
-	 * 
-	 * @param className
-	 * @param rset
-	 * @return java helpers.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static JavaHelpers getJavaType(String className, ResourceSet rset) {
-		return (JavaHelpers) rset.getEObject(getJavaClassURI(className), true);
-	}
-	
-	/**
-	 * Create a URI to the given classname.
-	 * <p>
-	 * Note: It must be in normal form, i.e. fully-qualified, if primitive spelled out (e.g. "int" not I), and if
-	 * arrays it must readable form (e.g. "java.lang.String[]" and not "[Ljava.lang.String;").
-	 * 
-	 * @param className
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static URI getJavaClassURI(String className) {
-		return JavaRefFactory.eINSTANCE.createTypeURI(className);
-	}
-
-	/** 
-	 * Utility to return the EClassifier from the given IBeanTypeProxy.
-	 */
-	public static EClassifier getJavaClass(IBeanTypeProxy type, ResourceSet rset) {
-		if (type != null) {
-			return getJavaType(type.getFormalTypeName(), rset);
-		} else
-			return null;
-	}
-
-	/**
-	 * Utility to return the Method from the given IMethodProxy.
-	 */
-	public static Method getMethod(IMethodProxy method, ResourceSet rset) {
-		return method != null ? (Method) rset.getEObject(URI.createURI(getMethodURL(method)), true) : null;
-	}
-
-	/**
-	 * Answer the URL String for Method from the given IMethodProxy
-	 */
-	public static String getMethodURL(IMethodProxy method) {
-		String className = method.getClassType().getTypeName();
-		IBeanTypeProxy[] parms = method.getParameterTypes();
-		String[] parmTypes = parms.length > 0 ? new String[parms.length] : null;
-		for (int i = 0; i < parms.length; i++) {
-			parmTypes[i] = parms[i].getFormalTypeName();
-		}
-		return computeMethodURL(className, method.getName(), parmTypes);
-	}
-	
-	protected static String computeMethodURL(String fullyQualifiedClassName, String methodName, String[] parmTypes) {
-		int classStart = fullyQualifiedClassName.lastIndexOf('.');
-		StringBuffer url = new StringBuffer(50);
-		url.append("java:/"); //$NON-NLS-1$
-		if (classStart > -1)
-			url.append(fullyQualifiedClassName.substring(0, classStart));
-		url.append('#');
-		url.append(computeMethodID(fullyQualifiedClassName.substring(classStart + 1), methodName, parmTypes));
-		return url.toString();
-	}
-	
-	protected static String computeFieldURL(String fullyQualifiedClassName, String fieldName) {
-		int classStart = fullyQualifiedClassName.lastIndexOf('.');
-		StringBuffer url = new StringBuffer(50);
-		url.append("java:/"); //$NON-NLS-1$
-		if (classStart > -1)
-			url.append(fullyQualifiedClassName.substring(0, classStart));
-		url.append('#');
-		url.append(fullyQualifiedClassName.substring(classStart + 1));
-		url.append(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
-		url.append(fieldName);
-		return url.toString();
-	}
-	
-	/**
-	 * Return the field uri for the given classname, fieldname.
-	 * @param fullyQualifiedClassName
-	 * @param fieldName
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static URI getFieldURI(String fullyQualifiedClassName, String fieldName) {
-		return URI.createURI(computeFieldURL(fullyQualifiedClassName, fieldName));
-	}
-	/**
-	 * Return the method uri for the given classname, methodname, parm types.
-	 * @param fullyQualifiedClassName
-	 * @param methodName
-	 * @param parmTypes <code>null</code> if there are no parms.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static URI getMethodURI(String fullyQualifiedClassName, String methodName, String[] parmTypes) {
-		return URI.createURI(computeMethodURL(fullyQualifiedClassName, methodName, parmTypes));
-	}
-
-	/**
-	 * Turn it into an URI.
-	 */
-	public static URI getMethodURI(IMethodProxy method) {
-		return URI.createURI(getMethodURL(method));
-	}
-
-	/**
-	 * Utility to compute the Java Modeling METHODID from method declaring class name,
-	 * method name, and parameter class names.
-	 */
-	public static String computeMethodID(String className, String methodName, String[] parameterTypes) {
-		StringBuffer out = new StringBuffer(50);
-		out.append(className);
-		out.append(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
-		out.append(methodName);
-		out.append(ReflectionAdaptor.C_METHOD_PARM_DELIMITER);
-		if (parameterTypes != null)
-			for (int i = 0; i < parameterTypes.length; i++) {
-				out.append(parameterTypes[i]);
-				if (i < parameterTypes.length - 1)
-					out.append(ReflectionAdaptor.C_PARM_PARM_DELIMITER);
-			}
-		if (className.equals(methodName))
-			out.append(ReflectionAdaptor.S_CONSTRUCTOR_TOKEN); //It's a constructor
-		return out.toString();
-	}
-
-	/**
-	 * Utility to retrieve the BeanDecorator.
-	 */
-	public static BeanDecorator getBeanDecorator(EModelElement model) {
-		return (BeanDecorator) getDecorator(model, BeanDecorator.class);
-	}
-	/**
-	 * Utility to retrieve a decorator of the specified class.
-	 */
-	public static EAnnotation getDecorator(EModelElement model, Class decoratorClass) {
-		Iterator itr = model.getEAnnotations().iterator();
-		while (itr.hasNext()) {
-			EAnnotation decr = (EAnnotation) itr.next();
-			if (decoratorClass.isInstance(decr))
-				return decr;
-		}
-		return null;
-	}
-
-	/**
-	 * Utility to retrieve the EventSetDecorator.
-	 */
-	public static EventSetDecorator getEventSetDecorator(EModelElement model) {
-		return (EventSetDecorator) getDecorator(model, EventSetDecorator.class);
-	}
-
-	/**
-	 * Utility to retrieve the MethodDecorator.
-	 */
-	public static MethodDecorator getMethodDecorator(EModelElement model) {
-		return (MethodDecorator) getDecorator(model, MethodDecorator.class);
-	}
-
-	/**
-	 * Utility to retrieve the PropertyDecorator.
-	 */
-	public static PropertyDecorator getPropertyDecorator(EModelElement model) {
-		return (PropertyDecorator) getDecorator(model, PropertyDecorator.class);
-	}
-
-	/**
-	 * Utility to return an iterator on the list which will return the property decorators
-	 * of only the properties in the EList passed in. If the property does not have a
-	 * property decorator, then it is not a beaninfo property.
-	 */
-	public static Iterator getPropertiesIterator(final EList properties) {
-		return new Iterator() {
-			private Iterator itr = properties.iterator();
-			private boolean hasNext = true;
-			private PropertyDecorator next;
-			{
-				findNext();
-			}
-			public boolean hasNext() {
-				return hasNext;
-			}
-
-			public Object next() {
-				PropertyDecorator temp = next;
-				findNext();
-				return temp;
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-
-			private void findNext() {
-				while (itr.hasNext()) {
-					EModelElement nextOne = (EModelElement) itr.next();
-					next = getPropertyDecorator(nextOne);
-					if (next != null) {
-						return;
-					}
-				}
-				hasNext = false;
-			}
-		};
-	}
-
-	/**
-	 * Utility to return an iterator on the list which will return the EventSet decorators
-	 * of only the BeanEvents in the EList passed in.
-	 */
-	public static Iterator getEventSetsIterator(final EList events) {
-		return new Iterator() {
-			private Iterator itr = events.iterator();
-			private boolean hasNext = true;
-			private EventSetDecorator next;
-			{
-				findNext();
-			}
-			public boolean hasNext() {
-				return hasNext;
-			}
-
-			public Object next() {
-				EventSetDecorator temp = next;
-				findNext();
-				return temp;
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-
-			private void findNext() {
-				while (itr.hasNext()) {
-					EModelElement nextOne = (EModelElement) itr.next();
-					next = getEventSetDecorator(nextOne);
-					if (next != null) {
-						return;
-					}
-				}
-				hasNext = false;
-			}
-		};
-	}
-
-	/**
-	 * Utility to return an iterator on the list which will return the Method decorators
-	 * of only the Methods in the EList passed in.
-	 */
-	public static Iterator getMethodsIterator(final EList methods) {
-		return new Iterator() {
-			private Iterator itr = methods.iterator();
-			private boolean hasNext = true;
-			private MethodDecorator next;
-			{
-				findNext();
-			}
-			public boolean hasNext() {
-				return hasNext;
-			}
-
-			public Object next() {
-				MethodDecorator temp = next;
-				findNext();
-				return temp;
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-
-			private void findNext() {
-				while (itr.hasNext()) {
-					EModelElement nextOne = (EModelElement) itr.next();
-					next = getMethodDecorator(nextOne);
-					if (next != null) {
-						return;
-					}
-				}
-				hasNext = false;
-			}
-		};
-	}
-
-	/**
-	 * Get the search path from the remote vm. 
-	 * 
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).
-	 */
-	public static IArrayBeanProxy getBeanInfoSearchPath(ProxyFactoryRegistry registry) {
-		BeaninfoProxyConstants biconstants = BeaninfoProxyConstants.getConstants(registry);
-		if (biconstants != null)
-			return (IArrayBeanProxy) biconstants
-				.getGetBeanInfoSearchPathProxy()
-				.invokeCatchThrowableExceptions(
-				null);
-		else
-			return null;
-	}
-
-	/**
-	 * Set the search path to the array of strings passed in on the remote vm.
-	 *
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).	 
-	 */
-	public static void setBeanInfoSearchPath(ProxyFactoryRegistry registry, String[] paths) {
-
-		try {
-			BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
-			if (biConstants != null) {
-				JavaStandardBeanProxyConstants jConstants = JavaStandardBeanProxyConstants.getConstants(registry);
-				IStandardBeanProxyFactory proxyFactory = registry.getBeanProxyFactory();
-				IArrayBeanProxy newPath = proxyFactory.createBeanProxyWith(jConstants.getStringType(), paths != null ? paths.length : 0);
-				if (paths != null)
-					for (int i = 0; i < paths.length; i++)
-						newPath.set(proxyFactory.createBeanProxyWith(paths[i]), i);
-				biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
-			}			
-		} catch (ThrowableProxy e) {
-		}
-	}
-
-	/**
-	 * From the Beaninfo Nature, insert a path to the beaninfo path at the given index, -1 means at the end.
-	 * If index is larger than the current path, it will also add at the end.
-	 */
-	public static void insertBeanInfoSearchPath(BeaninfoNature nature, IBeaninfosDocEntry path, int index) throws CoreException {
-		BeaninfosDoc infoPath = nature.getSearchPath();
-		IBeaninfosDocEntry[] oldPath = infoPath.getSearchpath();
-
-		IBeaninfosDocEntry[] newPath = new IBeaninfosDocEntry[oldPath.length + 1];
-
-		if (index == -1 || index >= oldPath.length) {
-			// At the end or past end
-			System.arraycopy(oldPath, 0, newPath, 0, oldPath.length);
-			newPath[oldPath.length] = path;
-		} else {
-			// In the middle
-			System.arraycopy(oldPath, 0, newPath, 0, index);
-			newPath[index] = path;
-			System.arraycopy(oldPath, index, newPath, index + 1, oldPath.length - index);
-		}
-
-		infoPath.setSearchpath(newPath);
-		nature.setSearchPath(infoPath);
-	}
-
-	/**
-	 * Insert a path to the beaninfo path at the given index, -1 means at the end.
-	 * If index is larger than the current path, it will also add at the end.
-	 *
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).	 
-	 */
-	public static void insertBeanInfoSearchPath(ProxyFactoryRegistry registry, String path, int index) {
-		try {
-			BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
-			if (biConstants != null) {
-				IArrayBeanProxy infoPath = (IArrayBeanProxy) biConstants.getGetBeanInfoSearchPathProxy().invoke(null);
-				int pathLength = infoPath.getLength();
-				IStandardBeanProxyFactory proxyFactory = registry.getBeanProxyFactory();
-				IArrayBeanProxy newPath = proxyFactory.createBeanProxyWith(infoPath.getTypeProxy(), pathLength + 1);
-				IBeanProxy stringProxy = proxyFactory.createBeanProxyWith(path);
-				JavaStandardBeanProxyConstants constants = JavaStandardBeanProxyConstants.getConstants(registry);
-				if (index == -1 || index >= pathLength) {
-					// At the end or past end
-					constants.arraycopy(infoPath, 0, newPath, 0, infoPath.getLength());
-					newPath.set(stringProxy, pathLength);
-				} else {
-					// In the middle
-					constants.arraycopy(infoPath, 0, newPath, 0, index);
-					newPath.set(stringProxy, index);
-					constants.arraycopy(infoPath, index, newPath, index + 1, pathLength - index);
-				}
-				biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
-			}			
-		} catch (ThrowableProxy e) {
-		}
-	}
-
-	/**
-	 * From the Beaninfo Nature, remove the specified path from the beaninfo search path.
-	 * Not an error if not found.
-	 */
-	public static void removeBeanInfoPath(BeaninfoNature nature, IBeaninfosDocEntry path) throws CoreException {
-		BeaninfosDoc infoPath = nature.getSearchPath();
-		IBeaninfosDocEntry[] oldPath = infoPath.getSearchpath();
-
-		for (int i = 0; i < oldPath.length; i++) {
-			if (path.equals(oldPath[i])) {
-				// We found it, so remove it.
-				IBeaninfosDocEntry[] newPath = new IBeaninfosDocEntry[oldPath.length - 1];
-				System.arraycopy(oldPath, 0, newPath, 0, i);
-				if (i < oldPath.length - 1)
-					System.arraycopy(oldPath, i + 1, newPath, i, oldPath.length - i - 1);
-				infoPath.setSearchpath(newPath);
-				nature.setSearchPath(infoPath);
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Remove the specified path from the beaninfo search path.
-	 * Not an error if not found.
-	 *
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).	 	 
-	 */
-	public static void removeBeanInfoPath(ProxyFactoryRegistry registry, String path) {
-		try {
-			BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
-			if (biConstants != null) {
-				IArrayBeanProxy infoPath = (IArrayBeanProxy) biConstants.getGetBeanInfoSearchPathProxy().invoke(null);
-				int pathLength = infoPath.getLength();
-				for (int i = 0; i < pathLength; i++) {
-					IStringBeanProxy aPath = (IStringBeanProxy) infoPath.get(i);
-					if (path.equals(aPath.stringValue())) {
-						// We found it, so remove it.
-						IArrayBeanProxy newPath = registry.getBeanProxyFactory().createBeanProxyWith(infoPath.getTypeProxy(), pathLength - 1);
-						JavaStandardBeanProxyConstants constants = JavaStandardBeanProxyConstants.getConstants(registry);
-						constants.arraycopy(infoPath, 0, newPath, 0, i);
-						if (i < pathLength - 1)
-							constants.arraycopy(infoPath, i + 1, newPath, i, pathLength - i - 1);
-						biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
-						return;
-					}
-				}
-			}			
-		} catch (ThrowableProxy e) {
-		}
-	};
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties
deleted file mode 100644
index a6341164c..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties
+++ /dev/null
@@ -1,12 +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
-###############################################################################
-#
-BeanInfoCacheController_Job_WriteBeaninfoCache_Title=Write BeanInfo cache files
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java
deleted file mode 100644
index f4e9370d9..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java
+++ /dev/null
@@ -1,1072 +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.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.logging.Level;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.beaninfo.common.IBaseBeanInfoConstants;
-import org.eclipse.jem.internal.beaninfo.BeanDecorator;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bean Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperProperties <em>Merge Super Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperMethods <em>Merge Super Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperEvents <em>Merge Super Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectProperties <em>Introspect Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectMethods <em>Introspect Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectEvents <em>Introspect Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isDoBeaninfo <em>Do Beaninfo</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedEventNames <em>Not Inherited Event Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getCustomizerClass <em>Customizer Class</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class BeanDecoratorImpl extends FeatureDecoratorImpl implements BeanDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long BEAN_CUSTOMIZER_IMPLICIT = 0x1L;
-	public static final long BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT = 0x2L;
-	public static final long BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT = 0x4L;
-	public static final long BEAN_MERGE_INHERITED_EVENTS_IMPLICIT = 0x8L;
-
-	/**
-	 * The default value of the '{@link #isMergeSuperProperties() <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_SUPER_PROPERTIES_EDEFAULT = true;
-	
-	/**
-	 * The flag representing the value of the '{@link #isMergeSuperProperties() <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_PROPERTIES_EFLAG = 1 << 18;
-
-	/**
-	 * The flag representing whether the Merge Super Properties attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_PROPERTIES_ESETFLAG = 1 << 19;
-
-	/**
-	 * The default value of the '{@link #isMergeSuperMethods() <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_SUPER_METHODS_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isMergeSuperMethods() <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_METHODS_EFLAG = 1 << 20;
-
-	/**
-	 * The flag representing whether the Merge Super Methods attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_METHODS_ESETFLAG = 1 << 21;
-
-	/**
-	 * The default value of the '{@link #isMergeSuperEvents() <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_SUPER_EVENTS_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isMergeSuperEvents() <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_EVENTS_EFLAG = 1 << 22;
-
-	/**
-	 * The flag representing whether the Merge Super Events attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_SUPER_EVENTS_ESETFLAG = 1 << 23;
-
-	/**
-	 * The default value of the '{@link #isIntrospectProperties() <em>Introspect Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INTROSPECT_PROPERTIES_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isIntrospectProperties() <em>Introspect Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int INTROSPECT_PROPERTIES_EFLAG = 1 << 24;
-
-	/**
-	 * The default value of the '{@link #isIntrospectMethods() <em>Introspect Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INTROSPECT_METHODS_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isIntrospectMethods() <em>Introspect Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int INTROSPECT_METHODS_EFLAG = 1 << 25;
-
-	/**
-	 * The default value of the '{@link #isIntrospectEvents() <em>Introspect Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INTROSPECT_EVENTS_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isIntrospectEvents() <em>Introspect Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int INTROSPECT_EVENTS_EFLAG = 1 << 26;
-
-	/**
-	 * The default value of the '{@link #isDoBeaninfo() <em>Do Beaninfo</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDoBeaninfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DO_BEANINFO_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isDoBeaninfo() <em>Do Beaninfo</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDoBeaninfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int DO_BEANINFO_EFLAG = 1 << 27;
-
-	/**
-	 * The cached value of the '{@link #getNotInheritedPropertyNames() <em>Not Inherited Property Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotInheritedPropertyNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList notInheritedPropertyNames = null;
-
-	/**
-	 * The cached value of the '{@link #getNotInheritedMethodNames() <em>Not Inherited Method Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotInheritedMethodNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList notInheritedMethodNames = null;
-
-	/**
-	 * The cached value of the '{@link #getNotInheritedEventNames() <em>Not Inherited Event Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotInheritedEventNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList notInheritedEventNames = null;
-
-	/**
-	 * The cached value of the '{@link #getCustomizerClass() <em>Customizer Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomizerClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass customizerClass = null;
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected BeanDecoratorImpl() {
-		super();
-		eFlags |= MERGE_SUPER_PROPERTIES_EFLAG;
-		eFlags |= MERGE_SUPER_METHODS_EFLAG;
-		eFlags |= MERGE_SUPER_EVENTS_EFLAG;
-		eFlags |= INTROSPECT_PROPERTIES_EFLAG;
-		eFlags |= INTROSPECT_METHODS_EFLAG;
-		eFlags |= INTROSPECT_EVENTS_EFLAG;
-		eFlags |= DO_BEANINFO_EFLAG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getBeanDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeSuperProperties() {
-		return (eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeSuperProperties(boolean newMergeSuperProperties) {
-		boolean oldMergeSuperProperties = (eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0;
-		if (newMergeSuperProperties) eFlags |= MERGE_SUPER_PROPERTIES_EFLAG; else eFlags &= ~MERGE_SUPER_PROPERTIES_EFLAG;
-		boolean oldMergeSuperPropertiesESet = (eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0;
-		eFlags |= MERGE_SUPER_PROPERTIES_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES, oldMergeSuperProperties, newMergeSuperProperties, !oldMergeSuperPropertiesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMergeSuperProperties() {
-		boolean oldMergeSuperProperties = (eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0;
-		boolean oldMergeSuperPropertiesESet = (eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0;
-		if (MERGE_SUPER_PROPERTIES_EDEFAULT) eFlags |= MERGE_SUPER_PROPERTIES_EFLAG; else eFlags &= ~MERGE_SUPER_PROPERTIES_EFLAG;
-		eFlags &= ~MERGE_SUPER_PROPERTIES_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES, oldMergeSuperProperties, MERGE_SUPER_PROPERTIES_EDEFAULT, oldMergeSuperPropertiesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMergeSuperProperties() {
-		return (eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeSuperMethods() {
-		return (eFlags & MERGE_SUPER_METHODS_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeSuperMethods(boolean newMergeSuperMethods) {
-		boolean oldMergeSuperMethods = (eFlags & MERGE_SUPER_METHODS_EFLAG) != 0;
-		if (newMergeSuperMethods) eFlags |= MERGE_SUPER_METHODS_EFLAG; else eFlags &= ~MERGE_SUPER_METHODS_EFLAG;
-		boolean oldMergeSuperMethodsESet = (eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0;
-		eFlags |= MERGE_SUPER_METHODS_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS, oldMergeSuperMethods, newMergeSuperMethods, !oldMergeSuperMethodsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMergeSuperMethods() {
-		boolean oldMergeSuperMethods = (eFlags & MERGE_SUPER_METHODS_EFLAG) != 0;
-		boolean oldMergeSuperMethodsESet = (eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0;
-		if (MERGE_SUPER_METHODS_EDEFAULT) eFlags |= MERGE_SUPER_METHODS_EFLAG; else eFlags &= ~MERGE_SUPER_METHODS_EFLAG;
-		eFlags &= ~MERGE_SUPER_METHODS_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS, oldMergeSuperMethods, MERGE_SUPER_METHODS_EDEFAULT, oldMergeSuperMethodsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMergeSuperMethods() {
-		return (eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeSuperEvents() {
-		return (eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeSuperEvents(boolean newMergeSuperEvents) {
-		boolean oldMergeSuperEvents = (eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0;
-		if (newMergeSuperEvents) eFlags |= MERGE_SUPER_EVENTS_EFLAG; else eFlags &= ~MERGE_SUPER_EVENTS_EFLAG;
-		boolean oldMergeSuperEventsESet = (eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0;
-		eFlags |= MERGE_SUPER_EVENTS_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS, oldMergeSuperEvents, newMergeSuperEvents, !oldMergeSuperEventsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMergeSuperEvents() {
-		boolean oldMergeSuperEvents = (eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0;
-		boolean oldMergeSuperEventsESet = (eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0;
-		if (MERGE_SUPER_EVENTS_EDEFAULT) eFlags |= MERGE_SUPER_EVENTS_EFLAG; else eFlags &= ~MERGE_SUPER_EVENTS_EFLAG;
-		eFlags &= ~MERGE_SUPER_EVENTS_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS, oldMergeSuperEvents, MERGE_SUPER_EVENTS_EDEFAULT, oldMergeSuperEventsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMergeSuperEvents() {
-		return (eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIntrospectProperties() {
-		return (eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIntrospectProperties(boolean newIntrospectProperties) {
-		boolean oldIntrospectProperties = (eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0;
-		if (newIntrospectProperties) eFlags |= INTROSPECT_PROPERTIES_EFLAG; else eFlags &= ~INTROSPECT_PROPERTIES_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES, oldIntrospectProperties, newIntrospectProperties));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIntrospectMethods() {
-		return (eFlags & INTROSPECT_METHODS_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIntrospectMethods(boolean newIntrospectMethods) {
-		boolean oldIntrospectMethods = (eFlags & INTROSPECT_METHODS_EFLAG) != 0;
-		if (newIntrospectMethods) eFlags |= INTROSPECT_METHODS_EFLAG; else eFlags &= ~INTROSPECT_METHODS_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS, oldIntrospectMethods, newIntrospectMethods));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIntrospectEvents() {
-		return (eFlags & INTROSPECT_EVENTS_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIntrospectEvents(boolean newIntrospectEvents) {
-		boolean oldIntrospectEvents = (eFlags & INTROSPECT_EVENTS_EFLAG) != 0;
-		if (newIntrospectEvents) eFlags |= INTROSPECT_EVENTS_EFLAG; else eFlags &= ~INTROSPECT_EVENTS_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS, oldIntrospectEvents, newIntrospectEvents));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCustomizerClass(JavaClass newCustomizerClass) {
-		JavaClass oldCustomizerClass = customizerClass;
-		customizerClass = newCustomizerClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS, oldCustomizerClass, customizerClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID() >= 0) {
-			switch (eContainerFeatureID()) {
-				case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				return isMergeSuperProperties() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				return isMergeSuperMethods() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				return isMergeSuperEvents() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				return isIntrospectProperties() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				return isIntrospectMethods() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				return isIntrospectEvents() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				return isDoBeaninfo() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				return getNotInheritedPropertyNames();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				return getNotInheritedMethodNames();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				return getNotInheritedEventNames();
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				if (resolve) return getCustomizerClass();
-				return basicGetCustomizerClass();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				setMergeSuperProperties(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				setMergeSuperMethods(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				setMergeSuperEvents(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				setIntrospectProperties(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				setIntrospectMethods(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				setIntrospectEvents(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				setDoBeaninfo(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				getNotInheritedPropertyNames().clear();
-				getNotInheritedPropertyNames().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				getNotInheritedMethodNames().clear();
-				getNotInheritedMethodNames().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				getNotInheritedEventNames().clear();
-				getNotInheritedEventNames().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				setCustomizerClass((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				unsetMergeSuperProperties();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				unsetMergeSuperMethods();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				unsetMergeSuperEvents();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				setIntrospectProperties(INTROSPECT_PROPERTIES_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				setIntrospectMethods(INTROSPECT_METHODS_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				setIntrospectEvents(INTROSPECT_EVENTS_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				setDoBeaninfo(DO_BEANINFO_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				getNotInheritedPropertyNames().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				getNotInheritedMethodNames().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				getNotInheritedEventNames().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				setCustomizerClass((JavaClass)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				return isSetMergeSuperProperties();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				return isSetMergeSuperMethods();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				return isSetMergeSuperEvents();
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				return ((eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0) != INTROSPECT_PROPERTIES_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				return ((eFlags & INTROSPECT_METHODS_EFLAG) != 0) != INTROSPECT_METHODS_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				return ((eFlags & INTROSPECT_EVENTS_EFLAG) != 0) != INTROSPECT_EVENTS_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				return ((eFlags & DO_BEANINFO_EFLAG) != 0) != DO_BEANINFO_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				return notInheritedPropertyNames != null && !notInheritedPropertyNames.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				return notInheritedMethodNames != null && !notInheritedMethodNames.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				return notInheritedEventNames != null && !notInheritedEventNames.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				return customizerClass != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mergeSuperProperties: ");
-		if ((eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0) result.append((eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0); else result.append("<unset>");
-		result.append(", mergeSuperMethods: ");
-		if ((eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0) result.append((eFlags & MERGE_SUPER_METHODS_EFLAG) != 0); else result.append("<unset>");
-		result.append(", mergeSuperEvents: ");
-		if ((eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0) result.append((eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0); else result.append("<unset>");
-		result.append(", introspectProperties: ");
-		result.append((eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0);
-		result.append(", introspectMethods: ");
-		result.append((eFlags & INTROSPECT_METHODS_EFLAG) != 0);
-		result.append(", introspectEvents: ");
-		result.append((eFlags & INTROSPECT_EVENTS_EFLAG) != 0);
-		result.append(", doBeaninfo: ");
-		result.append((eFlags & DO_BEANINFO_EFLAG) != 0);
-		result.append(", notInheritedPropertyNames: ");
-		result.append(notInheritedPropertyNames);
-		result.append(", notInheritedMethodNames: ");
-		result.append(notInheritedMethodNames);
-		result.append(", notInheritedEventNames: ");
-		result.append(notInheritedEventNames);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetCustomizerClass() {
-		return customizerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDoBeaninfo() {
-		return (eFlags & DO_BEANINFO_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDoBeaninfo(boolean newDoBeaninfo) {
-		boolean oldDoBeaninfo = (eFlags & DO_BEANINFO_EFLAG) != 0;
-		if (newDoBeaninfo) eFlags |= DO_BEANINFO_EFLAG; else eFlags &= ~DO_BEANINFO_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO, oldDoBeaninfo, newDoBeaninfo));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNotInheritedPropertyNames() {
-		if (notInheritedPropertyNames == null) {
-			notInheritedPropertyNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES);
-		}
-		return notInheritedPropertyNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNotInheritedMethodNames() {
-		if (notInheritedMethodNames == null) {
-			notInheritedMethodNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES);
-		}
-		return notInheritedMethodNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNotInheritedEventNames() {
-		if (notInheritedEventNames == null) {
-			notInheritedEventNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES);
-		}
-		return notInheritedEventNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getCustomizerClass() {
-		if (customizerClass != null && customizerClass.eIsProxy()) {
-			JavaClass oldCustomizerClass = customizerClass;
-			customizerClass = (JavaClass)eResolveProxy((InternalEObject)customizerClass);
-			if (customizerClass != oldCustomizerClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS, oldCustomizerClass, customizerClass));
-			}
-		}
-		return customizerClass;
-	}
-
-	private URL iconURL;
-	private boolean hasQueriedIconURL;
-	
-	public URL getIconURL(){
-		if (!hasQueriedIconURL){
-			FeatureAttributeValue value = (FeatureAttributeValue) getAttributes().get(IBaseBeanInfoConstants.ICONCOLOR16X16URL);
-			if (value != null) { 
-				// Get the value
-				Object attr = value.getValue();
-				if (attr instanceof String) {
-					try {
-						hasQueriedIconURL = true;
-						iconURL = new URL((String) attr);
-					} catch ( MalformedURLException exc ) {
-						BeaninfoPlugin.getPlugin().getLogger().log(exc, Level.INFO);
-					}
-				}
-			}			
-		}
-		return iconURL;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java
deleted file mode 100644
index 3b7e5f6c4..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jem.internal.beaninfo.BeanEvent;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.java.internal.impl.JavaEventImpl;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bean Event</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-
-public class BeanEventImpl extends JavaEventImpl implements BeanEvent{
-
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BeanEventImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.Literals.BEAN_EVENT;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java
deleted file mode 100644
index 1d73e696a..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java
+++ /dev/null
@@ -1,277 +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.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-import java.util.Map;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-
-
-public class BeaninfoFactoryImpl extends EFactoryImpl implements BeaninfoFactory{
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BeaninfoFactory init() {
-		try {
-			BeaninfoFactory theBeaninfoFactory = (BeaninfoFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore"); 
-			if (theBeaninfoFactory != null) {
-				return theBeaninfoFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new BeaninfoFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	public BeaninfoFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case BeaninfoPackage.FEATURE_DECORATOR: return createFeatureDecorator();
-			case BeaninfoPackage.BEAN_DECORATOR: return createBeanDecorator();
-			case BeaninfoPackage.EVENT_SET_DECORATOR: return createEventSetDecorator();
-			case BeaninfoPackage.METHOD_DECORATOR: return createMethodDecorator();
-			case BeaninfoPackage.PARAMETER_DECORATOR: return createParameterDecorator();
-			case BeaninfoPackage.PROPERTY_DECORATOR: return createPropertyDecorator();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR: return createIndexedPropertyDecorator();
-			case BeaninfoPackage.METHOD_PROXY: return createMethodProxy();
-			case BeaninfoPackage.BEAN_EVENT: return createBeanEvent();
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY: return (EObject)createFeatureAttributeMapEntry();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case BeaninfoPackage.IMPLICIT_ITEM:
-				return createImplicitItemFromString(eDataType, initialValue);
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_VALUE:
-				return createFeatureAttributeValueFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case BeaninfoPackage.IMPLICIT_ITEM:
-				return convertImplicitItemToString(eDataType, instanceValue);
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_VALUE:
-				return convertFeatureAttributeValueToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public FeatureDecorator createFeatureDecorator() {
-		FeatureDecoratorImpl featureDecorator = new FeatureDecoratorImpl();
-		featureDecorator.setSource(FeatureDecorator.class.getName());
-		return featureDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public EventSetDecorator createEventSetDecorator() {
-		EventSetDecoratorImpl eventSetDecorator = new EventSetDecoratorImpl();
-		eventSetDecorator.setSource(EventSetDecorator.class.getName());
-		return eventSetDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodProxy createMethodProxy() {
-		MethodProxyImpl methodProxy = new MethodProxyImpl();
-		return methodProxy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public PropertyDecorator createPropertyDecorator() {
-		PropertyDecoratorImpl propertyDecorator = new PropertyDecoratorImpl();
-		propertyDecorator.setSource(PropertyDecorator.class.getName());
-		return propertyDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public IndexedPropertyDecorator createIndexedPropertyDecorator() {
-		IndexedPropertyDecoratorImpl indexedPropertyDecorator = new IndexedPropertyDecoratorImpl();
-		indexedPropertyDecorator.setSource(IndexedPropertyDecorator.class.getName());
-		return indexedPropertyDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public BeanDecorator createBeanDecorator() {
-		BeanDecoratorImpl beanDecorator = new BeanDecoratorImpl();
-		beanDecorator.setSource(BeanDecorator.class.getName());
-		return beanDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public MethodDecorator createMethodDecorator() {
-		MethodDecoratorImpl methodDecorator = new MethodDecoratorImpl();
-		methodDecorator.setSource(MethodDecorator.class.getName());
-		return methodDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public ParameterDecorator createParameterDecorator() {
-		ParameterDecoratorImpl parameterDecorator = new ParameterDecoratorImpl();
-		parameterDecorator.setSource(ParameterDecorator.class.getName());
-		return parameterDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeaninfoPackage getBeaninfoPackage() {
-		return (BeaninfoPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static BeaninfoPackage getPackage() {
-		return BeaninfoPackage.eINSTANCE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeanEvent createBeanEvent() {
-		BeanEventImpl beanEvent = new BeanEventImpl();
-		return beanEvent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map.Entry createFeatureAttributeMapEntry() {
-		FeatureAttributeMapEntryImpl featureAttributeMapEntry = new FeatureAttributeMapEntryImpl();
-		return featureAttributeMapEntry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ImplicitItem createImplicitItemFromString(EDataType eDataType, String initialValue) {
-		ImplicitItem result = ImplicitItem.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertImplicitItemToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public FeatureAttributeValue createFeatureAttributeValueFromString(EDataType eDataType, String initialValue) {
-		return new FeatureAttributeValue(initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public String convertFeatureAttributeValueToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java
deleted file mode 100644
index 2e4df756f..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java
+++ /dev/null
@@ -1,992 +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.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-import org.eclipse.jem.java.JavaRefPackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-
-public class BeaninfoPackageImpl extends EPackageImpl implements BeaninfoPackage{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass featureDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass beanDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass eventSetDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass parameterDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass propertyDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass indexedPropertyDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodProxyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass beanEventEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass featureAttributeMapEntryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum implicitItemEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType featureAttributeValueEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private BeaninfoPackageImpl() {
-		super(eNS_URI, BeaninfoFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static BeaninfoPackage init() {
-		if (isInited) return (BeaninfoPackage)EPackage.Registry.INSTANCE.getEPackage(BeaninfoPackage.eNS_URI);
-
-		// Obtain or create and register package
-		BeaninfoPackageImpl theBeaninfoPackage = (BeaninfoPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof BeaninfoPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new BeaninfoPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theBeaninfoPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theBeaninfoPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theBeaninfoPackage.freeze();
-
-		return theBeaninfoPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFeatureDecorator() {
-		return featureDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_DisplayName() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_ShortDescription() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Category() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Expert() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Hidden() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Preferred() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_MergeIntrospection() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_AttributesExplicitEmpty() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_ImplicitlySetBits() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_ImplicitDecoratorFlag() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFeatureDecorator_Attributes() {
-		return (EReference)featureDecoratorEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEventSetDecorator() {
-		return eventSetDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEventSetDecorator_InDefaultEventSet() {
-		return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEventSetDecorator_Unicast() {
-		return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEventSetDecorator_ListenerMethodsExplicitEmpty() {
-		return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_AddListenerMethod() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_ListenerMethods() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_ListenerType() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_RemoveListenerMethod() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_EventAdapterClass() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_SerListMthd() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodProxy() {
-		return methodProxyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodProxy_Method() {
-		return (EReference)methodProxyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPropertyDecorator() {
-		return propertyDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_Bound() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_Constrained() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_DesignTime() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_AlwaysIncompatible() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_FilterFlags() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_FieldReadOnly() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_PropertyEditorClass() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_ReadMethod() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_WriteMethod() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_Field() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIndexedPropertyDecorator() {
-		return indexedPropertyDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIndexedPropertyDecorator_IndexedReadMethod() {
-		return (EReference)indexedPropertyDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIndexedPropertyDecorator_IndexedWriteMethod() {
-		return (EReference)indexedPropertyDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBeanDecorator() {
-		return beanDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_MergeSuperProperties() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_MergeSuperMethods() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_MergeSuperEvents() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_IntrospectProperties() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_IntrospectMethods() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_IntrospectEvents() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBeanDecorator_CustomizerClass() {
-		return (EReference)beanDecoratorEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodDecorator() {
-		return methodDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodDecorator_ParmsExplicitEmpty() {
-		return (EAttribute)methodDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodDecorator_ParameterDescriptors() {
-		return (EReference)methodDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodDecorator_SerParmDesc() {
-		return (EReference)methodDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getParameterDecorator() {
-		return parameterDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParameterDecorator_Name() {
-		return (EAttribute)parameterDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getFeatureAttributeValue() {
-		return featureAttributeValueEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeaninfoFactory getBeaninfoFactory() {
-		return (BeaninfoFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		featureDecoratorEClass = createEClass(FEATURE_DECORATOR);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__DISPLAY_NAME);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__SHORT_DESCRIPTION);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__CATEGORY);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__EXPERT);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__HIDDEN);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__PREFERRED);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__MERGE_INTROSPECTION);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__IMPLICITLY_SET_BITS);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG);
-		createEReference(featureDecoratorEClass, FEATURE_DECORATOR__ATTRIBUTES);
-
-		beanDecoratorEClass = createEClass(BEAN_DECORATOR);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_PROPERTIES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_METHODS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_EVENTS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_PROPERTIES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_METHODS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_EVENTS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__DO_BEANINFO);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES);
-		createEReference(beanDecoratorEClass, BEAN_DECORATOR__CUSTOMIZER_CLASS);
-
-		eventSetDecoratorEClass = createEClass(EVENT_SET_DECORATOR);
-		createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET);
-		createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__UNICAST);
-		createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__ADD_LISTENER_METHOD);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_METHODS);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_TYPE);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__SER_LIST_MTHD);
-
-		methodDecoratorEClass = createEClass(METHOD_DECORATOR);
-		createEAttribute(methodDecoratorEClass, METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY);
-		createEReference(methodDecoratorEClass, METHOD_DECORATOR__PARAMETER_DESCRIPTORS);
-		createEReference(methodDecoratorEClass, METHOD_DECORATOR__SER_PARM_DESC);
-
-		parameterDecoratorEClass = createEClass(PARAMETER_DECORATOR);
-		createEAttribute(parameterDecoratorEClass, PARAMETER_DECORATOR__NAME);
-		createEReference(parameterDecoratorEClass, PARAMETER_DECORATOR__PARAMETER);
-
-		propertyDecoratorEClass = createEClass(PROPERTY_DECORATOR);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__BOUND);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__CONSTRAINED);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__DESIGN_TIME);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__FILTER_FLAGS);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__FIELD_READ_ONLY);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__READ_METHOD);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__WRITE_METHOD);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__FIELD);
-
-		indexedPropertyDecoratorEClass = createEClass(INDEXED_PROPERTY_DECORATOR);
-		createEReference(indexedPropertyDecoratorEClass, INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD);
-		createEReference(indexedPropertyDecoratorEClass, INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD);
-
-		methodProxyEClass = createEClass(METHOD_PROXY);
-		createEReference(methodProxyEClass, METHOD_PROXY__METHOD);
-
-		beanEventEClass = createEClass(BEAN_EVENT);
-
-		featureAttributeMapEntryEClass = createEClass(FEATURE_ATTRIBUTE_MAP_ENTRY);
-		createEAttribute(featureAttributeMapEntryEClass, FEATURE_ATTRIBUTE_MAP_ENTRY__KEY);
-		createEAttribute(featureAttributeMapEntryEClass, FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE);
-
-		// Create enums
-		implicitItemEEnum = createEEnum(IMPLICIT_ITEM);
-
-		// Create data types
-		featureAttributeValueEDataType = createEDataType(FEATURE_ATTRIBUTE_VALUE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-		JavaRefPackage theJavaRefPackage = (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
-		// Add supertypes to classes
-		featureDecoratorEClass.getESuperTypes().add(theEcorePackage.getEAnnotation());
-		beanDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		eventSetDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		methodDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		parameterDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		propertyDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		indexedPropertyDecoratorEClass.getESuperTypes().add(this.getPropertyDecorator());
-		methodProxyEClass.getESuperTypes().add(theEcorePackage.getEOperation());
-		beanEventEClass.getESuperTypes().add(theJavaRefPackage.getJavaEvent());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(featureDecoratorEClass, FeatureDecorator.class, "FeatureDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFeatureDecorator_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_ShortDescription(), ecorePackage.getEString(), "shortDescription", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Category(), ecorePackage.getEString(), "category", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Expert(), ecorePackage.getEBoolean(), "expert", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Hidden(), ecorePackage.getEBoolean(), "hidden", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Preferred(), ecorePackage.getEBoolean(), "preferred", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_MergeIntrospection(), ecorePackage.getEBoolean(), "mergeIntrospection", "true", 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_AttributesExplicitEmpty(), ecorePackage.getEBoolean(), "attributesExplicitEmpty", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_ImplicitlySetBits(), ecorePackage.getELong(), "implicitlySetBits", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_ImplicitDecoratorFlag(), this.getImplicitItem(), "implicitDecoratorFlag", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFeatureDecorator_Attributes(), this.getFeatureAttributeMapEntry(), null, "attributes", null, 0, -1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		EOperation op = addEOperation(featureDecoratorEClass, ecorePackage.getEString(), "getName", 0, 1);
-
-		initEClass(beanDecoratorEClass, BeanDecorator.class, "BeanDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBeanDecorator_MergeSuperProperties(), ecorePackage.getEBoolean(), "mergeSuperProperties", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_MergeSuperMethods(), ecorePackage.getEBoolean(), "mergeSuperMethods", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_MergeSuperEvents(), ecorePackage.getEBoolean(), "mergeSuperEvents", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_IntrospectProperties(), ecorePackage.getEBoolean(), "introspectProperties", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_IntrospectMethods(), ecorePackage.getEBoolean(), "introspectMethods", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_IntrospectEvents(), ecorePackage.getEBoolean(), "introspectEvents", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_DoBeaninfo(), ecorePackage.getEBoolean(), "doBeaninfo", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_NotInheritedPropertyNames(), ecorePackage.getEString(), "notInheritedPropertyNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_NotInheritedMethodNames(), ecorePackage.getEString(), "notInheritedMethodNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_NotInheritedEventNames(), ecorePackage.getEString(), "notInheritedEventNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBeanDecorator_CustomizerClass(), theJavaRefPackage.getJavaClass(), null, "customizerClass", null, 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(eventSetDecoratorEClass, EventSetDecorator.class, "EventSetDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEventSetDecorator_InDefaultEventSet(), ecorePackage.getEBoolean(), "inDefaultEventSet", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEventSetDecorator_Unicast(), ecorePackage.getEBoolean(), "unicast", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEventSetDecorator_ListenerMethodsExplicitEmpty(), ecorePackage.getEBoolean(), "listenerMethodsExplicitEmpty", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_AddListenerMethod(), theJavaRefPackage.getMethod(), null, "addListenerMethod", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_ListenerMethods(), this.getMethodProxy(), null, "listenerMethods", null, 1, -1, EventSetDecorator.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_ListenerType(), theJavaRefPackage.getJavaClass(), null, "listenerType", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_RemoveListenerMethod(), theJavaRefPackage.getMethod(), null, "removeListenerMethod", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_EventAdapterClass(), theJavaRefPackage.getJavaClass(), null, "eventAdapterClass", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_SerListMthd(), this.getMethodProxy(), null, "serListMthd", null, 1, -1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodDecoratorEClass, MethodDecorator.class, "MethodDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodDecorator_ParmsExplicitEmpty(), ecorePackage.getEBoolean(), "parmsExplicitEmpty", null, 0, 1, MethodDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodDecorator_ParameterDescriptors(), this.getParameterDecorator(), null, "parameterDescriptors", null, 0, -1, MethodDecorator.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodDecorator_SerParmDesc(), this.getParameterDecorator(), null, "serParmDesc", null, 0, -1, MethodDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(parameterDecoratorEClass, ParameterDecorator.class, "ParameterDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getParameterDecorator_Name(), ecorePackage.getEString(), "name", null, 0, 1, ParameterDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getParameterDecorator_Parameter(), theJavaRefPackage.getJavaParameter(), null, "parameter", null, 0, 1, ParameterDecorator.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(propertyDecoratorEClass, PropertyDecorator.class, "PropertyDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPropertyDecorator_Bound(), ecorePackage.getEBoolean(), "bound", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_Constrained(), ecorePackage.getEBoolean(), "constrained", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_DesignTime(), ecorePackage.getEBoolean(), "designTime", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_AlwaysIncompatible(), ecorePackage.getEBoolean(), "alwaysIncompatible", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_FilterFlags(), ecorePackage.getEString(), "filterFlags", null, 0, -1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_FieldReadOnly(), ecorePackage.getEBoolean(), "fieldReadOnly", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_PropertyEditorClass(), theJavaRefPackage.getJavaClass(), null, "propertyEditorClass", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_ReadMethod(), theJavaRefPackage.getMethod(), null, "readMethod", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_WriteMethod(), theJavaRefPackage.getMethod(), null, "writeMethod", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_Field(), theJavaRefPackage.getField(), null, "field", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		op = addEOperation(propertyDecoratorEClass, theEcorePackage.getEClassifier(), "getPropertyType", 0, 1);
-
-		op = addEOperation(propertyDecoratorEClass, null, "setPropertyType");
-		addEParameter(op, theEcorePackage.getEClassifier(), "propertyType", 0, 1);
-
-		initEClass(indexedPropertyDecoratorEClass, IndexedPropertyDecorator.class, "IndexedPropertyDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getIndexedPropertyDecorator_IndexedReadMethod(), theJavaRefPackage.getMethod(), null, "indexedReadMethod", null, 0, 1, IndexedPropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getIndexedPropertyDecorator_IndexedWriteMethod(), theJavaRefPackage.getMethod(), null, "indexedWriteMethod", null, 0, 1, IndexedPropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodProxyEClass, MethodProxy.class, "MethodProxy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMethodProxy_Method(), theJavaRefPackage.getMethod(), null, "method", null, 1, 1, MethodProxy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(beanEventEClass, BeanEvent.class, "BeanEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(featureAttributeMapEntryEClass, Map.Entry.class, "FeatureAttributeMapEntry", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFeatureAttributeMapEntry_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureAttributeMapEntry_Value(), this.getFeatureAttributeValue(), "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(implicitItemEEnum, ImplicitItem.class, "ImplicitItem");
-		addEEnumLiteral(implicitItemEEnum, ImplicitItem.NOT_IMPLICIT_LITERAL);
-		addEEnumLiteral(implicitItemEEnum, ImplicitItem.IMPLICIT_DECORATOR_LITERAL);
-		addEEnumLiteral(implicitItemEEnum, ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL);
-
-		// Initialize data types
-		initEDataType(featureAttributeValueEDataType, FeatureAttributeValue.class, "FeatureAttributeValue", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_DoBeaninfo() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_NotInheritedPropertyNames() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_NotInheritedMethodNames() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_NotInheritedEventNames() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getParameterDecorator_Parameter() {
-		return (EReference)parameterDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBeanEvent() {
-		return beanEventEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFeatureAttributeMapEntry() {
-		return featureAttributeMapEntryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureAttributeMapEntry_Key() {
-		return (EAttribute)featureAttributeMapEntryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureAttributeMapEntry_Value() {
-		return (EAttribute)featureAttributeMapEntryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getImplicitItem() {
-		return implicitItemEEnum;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java
deleted file mode 100644
index a9ce81332..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java
+++ /dev/null
@@ -1,991 +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.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.EventSetDecorator;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.java.*;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Event Set Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isInDefaultEventSet <em>In Default Event Set</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isUnicast <em>Unicast</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getAddListenerMethod <em>Add Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getListenerMethods <em>Listener Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getListenerType <em>Listener Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getRemoveListenerMethod <em>Remove Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getEventAdapterClass <em>Event Adapter Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getSerListMthd <em>Ser List Mthd</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class EventSetDecoratorImpl extends FeatureDecoratorImpl implements EventSetDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long EVENT_ADDLISTENERMETHOD_IMPLICIT = 0x1L;
-	public static final long EVENT_ADAPTERCLASS_IMPLICIT = 0x2L;
-	public static final long EVENT_LISTENERMETHODS_IMPLICIT = 0x4L;
-	public static final long EVENT_LISTENERTYPE_IMPLICIT = 0x8L;
-	public static final long EVENT_REMOVELISTENERMETHOD_IMPLICIT = 0x10L;
-	public static final long EVENT_DEFAULTEVENTSET_IMPLICIT = 0x20L;
-	public static final long EVENT_UNICAST_IMPLICIT = 0x40L;
-	public static final long EVENT_LISTENERMETHODS_DEFAULT = 0x80L;
-
-
-	/**
-	 * The default value of the '{@link #isInDefaultEventSet() <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInDefaultEventSet()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IN_DEFAULT_EVENT_SET_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isInDefaultEventSet() <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInDefaultEventSet()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int IN_DEFAULT_EVENT_SET_EFLAG = 1 << 18;
-
-	/**
-	 * The flag representing whether the In Default Event Set attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int IN_DEFAULT_EVENT_SET_ESETFLAG = 1 << 19;
-
-	/**
-	 * The default value of the '{@link #isUnicast() <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUnicast()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean UNICAST_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isUnicast() <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUnicast()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int UNICAST_EFLAG = 1 << 20;
-
-	/**
-	 * The flag representing whether the Unicast attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int UNICAST_ESETFLAG = 1 << 21;
-
-	/**
-	 * The default value of the '{@link #isListenerMethodsExplicitEmpty() <em>Listener Methods Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isListenerMethodsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isListenerMethodsExplicitEmpty() <em>Listener Methods Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isListenerMethodsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG = 1 << 22;
-
-	/**
-	 * The cached value of the '{@link #getAddListenerMethod() <em>Add Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAddListenerMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method addListenerMethod = null;
-	
-	/**
-	 * The cached value of the '{@link #getListenerType() <em>Listener Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getListenerType()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass listenerType = null;
-	/**
-	 * The cached value of the '{@link #getRemoveListenerMethod() <em>Remove Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemoveListenerMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method removeListenerMethod = null;
-	
-	/**
-	 * The cached value of the '{@link #getEventAdapterClass() <em>Event Adapter Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEventAdapterClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass eventAdapterClass = null;
-
-	/**
-	 * The cached value of the '{@link #getSerListMthd() <em>Ser List Mthd</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSerListMthd()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serListMthd = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected EventSetDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getEventSetDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isInDefaultEventSet() {
-		return (eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInDefaultEventSet(boolean newInDefaultEventSet) {
-		boolean oldInDefaultEventSet = (eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0;
-		if (newInDefaultEventSet) eFlags |= IN_DEFAULT_EVENT_SET_EFLAG; else eFlags &= ~IN_DEFAULT_EVENT_SET_EFLAG;
-		boolean oldInDefaultEventSetESet = (eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0;
-		eFlags |= IN_DEFAULT_EVENT_SET_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET, oldInDefaultEventSet, newInDefaultEventSet, !oldInDefaultEventSetESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetInDefaultEventSet() {
-		boolean oldInDefaultEventSet = (eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0;
-		boolean oldInDefaultEventSetESet = (eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0;
-		if (IN_DEFAULT_EVENT_SET_EDEFAULT) eFlags |= IN_DEFAULT_EVENT_SET_EFLAG; else eFlags &= ~IN_DEFAULT_EVENT_SET_EFLAG;
-		eFlags &= ~IN_DEFAULT_EVENT_SET_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET, oldInDefaultEventSet, IN_DEFAULT_EVENT_SET_EDEFAULT, oldInDefaultEventSetESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetInDefaultEventSet() {
-		return (eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isUnicast() {
-		return (eFlags & UNICAST_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUnicast(boolean newUnicast) {
-		boolean oldUnicast = (eFlags & UNICAST_EFLAG) != 0;
-		if (newUnicast) eFlags |= UNICAST_EFLAG; else eFlags &= ~UNICAST_EFLAG;
-		boolean oldUnicastESet = (eFlags & UNICAST_ESETFLAG) != 0;
-		eFlags |= UNICAST_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST, oldUnicast, newUnicast, !oldUnicastESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetUnicast() {
-		boolean oldUnicast = (eFlags & UNICAST_EFLAG) != 0;
-		boolean oldUnicastESet = (eFlags & UNICAST_ESETFLAG) != 0;
-		if (UNICAST_EDEFAULT) eFlags |= UNICAST_EFLAG; else eFlags &= ~UNICAST_EFLAG;
-		eFlags &= ~UNICAST_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST, oldUnicast, UNICAST_EDEFAULT, oldUnicastESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetUnicast() {
-		return (eFlags & UNICAST_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isListenerMethodsExplicitEmpty() {
-		return (eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setListenerMethodsExplicitEmpty(boolean newListenerMethodsExplicitEmpty) {
-		boolean oldListenerMethodsExplicitEmpty = (eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0;
-		if (newListenerMethodsExplicitEmpty) eFlags |= LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG; else eFlags &= ~LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY, oldListenerMethodsExplicitEmpty, newListenerMethodsExplicitEmpty));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getAddListenerMethod() {
-		if (addListenerMethod != null && addListenerMethod.eIsProxy()) {
-			Method oldAddListenerMethod = addListenerMethod;
-			addListenerMethod = (Method)eResolveProxy((InternalEObject)addListenerMethod);
-			if (addListenerMethod != oldAddListenerMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD, oldAddListenerMethod, addListenerMethod));
-			}
-		}
-		return addListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetAddListenerMethod() {
-		return addListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAddListenerMethod(Method newAddListenerMethod) {
-		Method oldAddListenerMethod = addListenerMethod;
-		addListenerMethod = newAddListenerMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD, oldAddListenerMethod, addListenerMethod));
-	}
-
-	public EList getListenerMethods() {
-		if (!isListenerMethodsExplicitEmpty() && getSerListMthd().isEmpty() && (getImplicitlySetBits()&(EVENT_LISTENERMETHODS_IMPLICIT | EVENT_LISTENERMETHODS_DEFAULT)) == 0) {
-			// Not explicitly empty, it is empty, and we have not implicitly or by defaults made it empty, then create the defaults.
-			createDefaultListenerMethodsList();
-		}
-		return getSerListMthd();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getListenerMethodsGen() {
-		// TODO: implement this method to return the 'Listener Methods' reference list
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getListenerType() {
-		if (listenerType != null && listenerType.eIsProxy()) {
-			JavaClass oldListenerType = listenerType;
-			listenerType = (JavaClass)eResolveProxy((InternalEObject)listenerType);
-			if (listenerType != oldListenerType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE, oldListenerType, listenerType));
-			}
-		}
-		return listenerType;
-	}
-
-	/**
-	 * This is called if method listeners list not explicitly set and there is no feature proxy or
-	 * there is a feature proxy and the proxy has nothing defined.
-	 * <p>
-	 * This is an internal method used by BeanInfo classes. It is not to be used by clients.
-	 */
-	public EList createDefaultListenerMethodsList() {
-		if (!eIsSet(EcorePackage.eINSTANCE.getEAnnotation_EModelElement()))
-			return this.getSerListMthd();	// We are not attached, can't determine the list yet.
-		EList mthdsList = this.getSerListMthd();		
-			
-		JavaClass eventObjectClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.EventObject", getEModelElement().eResource().getResourceSet()); //$NON-NLS-1$
-		
-		mthdsList.clear();
-		
-		// This is a little tricky. Need to get the methods for the listener type, and
-		// then go through the methods and filter out the non-event ones.
-		JavaClass lt = getListenerType();
-		if (lt == null)
-			return mthdsList;	// Couldn't get the listener type for some reason, so leave as is.
-		setImplicitlySetBits(getImplicitlySetBits()|EVENT_LISTENERMETHODS_DEFAULT);	// Mark as we implicitly filled it in.
-		
-		BeaninfoFactory bfact = BeaninfoFactory.eINSTANCE;
-		List ms = lt.getPublicMethodsExtended();
-		int msize = ms.size();
-		for (int i=0; i<msize; i++) {
-			Method method = (Method) ms.get(i);
-			List parms = method.getParameters();
-			if (parms.size() != 1)
-				continue;	// Must have only one parm.
-			if (!eventObjectClass.isAssignableFrom(((JavaParameter) parms.get(0)).getEType()))
-				continue;	// Parm does not inherit from java.util.EventObject
-				
-			// We need a method proxy, and a method decorator.
-			MethodProxy mproxy = bfact.createMethodProxy();
-			mproxy.setMethod(method);
-			mproxy.setName(method.getName());			
-			MethodDecorator md = bfact.createMethodDecorator();
-			md.setImplicitDecoratorFlag(ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL);
-			md.setEModelElement(mproxy);			
-			mthdsList.add(mproxy);
-		}
-		return mthdsList;
-	}	
-	
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetListenerType() {
-		return listenerType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setListenerType(JavaClass newListenerType) {
-		JavaClass oldListenerType = listenerType;
-		listenerType = newListenerType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE, oldListenerType, listenerType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getRemoveListenerMethod() {
-		if (removeListenerMethod != null && removeListenerMethod.eIsProxy()) {
-			Method oldRemoveListenerMethod = removeListenerMethod;
-			removeListenerMethod = (Method)eResolveProxy((InternalEObject)removeListenerMethod);
-			if (removeListenerMethod != oldRemoveListenerMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD, oldRemoveListenerMethod, removeListenerMethod));
-			}
-		}
-		return removeListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetRemoveListenerMethod() {
-		return removeListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemoveListenerMethod(Method newRemoveListenerMethod) {
-		Method oldRemoveListenerMethod = removeListenerMethod;
-		removeListenerMethod = newRemoveListenerMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD, oldRemoveListenerMethod, removeListenerMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getEventAdapterClass() {
-		if (eventAdapterClass != null && eventAdapterClass.eIsProxy()) {
-			JavaClass oldEventAdapterClass = eventAdapterClass;
-			eventAdapterClass = (JavaClass)eResolveProxy((InternalEObject)eventAdapterClass);
-			if (eventAdapterClass != oldEventAdapterClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS, oldEventAdapterClass, eventAdapterClass));
-			}
-		}
-		return eventAdapterClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetEventAdapterClass() {
-		return eventAdapterClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEventAdapterClass(JavaClass newEventAdapterClass) {
-		JavaClass oldEventAdapterClass = eventAdapterClass;
-		eventAdapterClass = newEventAdapterClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS, oldEventAdapterClass, eventAdapterClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSerListMthd() {
-		if (serListMthd == null) {
-			serListMthd = new EObjectContainmentEList(MethodProxy.class, this, BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD);
-		}
-		return serListMthd;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-					return ((InternalEList)getSerListMthd()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID() >= 0) {
-			switch (eContainerFeatureID()) {
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				return isInDefaultEventSet() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				return isUnicast() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				return isListenerMethodsExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				if (resolve) return getAddListenerMethod();
-				return basicGetAddListenerMethod();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				return getListenerMethods();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				if (resolve) return getListenerType();
-				return basicGetListenerType();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				if (resolve) return getRemoveListenerMethod();
-				return basicGetRemoveListenerMethod();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				if (resolve) return getEventAdapterClass();
-				return basicGetEventAdapterClass();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				return getSerListMthd();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				setInDefaultEventSet(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				setUnicast(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				setListenerMethodsExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				setAddListenerMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				getListenerMethods().clear();
-				getListenerMethods().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				setListenerType((JavaClass)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				setRemoveListenerMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				setEventAdapterClass((JavaClass)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				getSerListMthd().clear();
-				getSerListMthd().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				unsetInDefaultEventSet();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				unsetUnicast();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				setListenerMethodsExplicitEmpty(LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				setAddListenerMethod((Method)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				getListenerMethods().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				setListenerType((JavaClass)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				setRemoveListenerMethod((Method)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				setEventAdapterClass((JavaClass)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				getSerListMthd().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/*
-	 * This is overridden so that we can do special is set tests:
-	 * 1) parameter descriptors: check if serParmDesc exists and not empty, since parameter descriptors is derived.
-	 * 2) serParmDesc: if flag set to default parm desc, then answer not set, else do normal isSet test. That way if set by default it won't serialize
-	 *    out the unneeded default parms. They can be reconstructed quickly when needed.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				return eIsSetGen(BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd());	// Let default serListMthd is set work.
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				if ((getImplicitlySetBits() & EVENT_LISTENERMETHODS_DEFAULT) != 0)
-					return false;	// Not considered set if initialized by default.
-				else
-					return eIsSetGen(eFeature);	// Not set by default, so check true setting.
-			default:
-				return eIsSetGen(eFeature);	// Everything else use the gen method.
-		}
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				return isSetInDefaultEventSet();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				return isSetUnicast();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				return ((eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0) != LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				return addListenerMethod != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				return !getListenerMethods().isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				return listenerType != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				return removeListenerMethod != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				return eventAdapterClass != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				return serListMthd != null && !serListMthd.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (inDefaultEventSet: ");
-		if ((eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0) result.append((eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0); else result.append("<unset>");
-		result.append(", unicast: ");
-		if ((eFlags & UNICAST_ESETFLAG) != 0) result.append((eFlags & UNICAST_EFLAG) != 0); else result.append("<unset>");
-		result.append(", listenerMethodsExplicitEmpty: ");
-		result.append((eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0);
-		result.append(')');
-		return result.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java
deleted file mode 100644
index 0b8f067cb..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java
+++ /dev/null
@@ -1,308 +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.jem.internal.beaninfo.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.BasicEMap;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Attribute Map Entry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl#getTypedKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl#getTypedValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureAttributeMapEntryImpl extends EObjectImpl implements BasicEMap.Entry {
-	
-	/**
-	 * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String KEY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected String key = KEY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final FeatureAttributeValue VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureAttributeValue value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureAttributeMapEntryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getFeatureAttributeMapEntry();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTypedKey() {
-		return key;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedKey(String newKey) {
-		String oldKey = key;
-		key = newKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY, oldKey, key));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureAttributeValue getTypedValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedValue(FeatureAttributeValue newValue) {
-		FeatureAttributeValue oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				return getTypedKey();
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				return getTypedValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				setTypedKey((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				setTypedValue((FeatureAttributeValue)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				setTypedKey(KEY_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				setTypedValue(VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (key: ");
-		result.append(key);
-		result.append(", value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int hash = -1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHash() {
-		if (hash == -1) {
-			Object theKey = getKey();
-			hash = (theKey == null ? 0 : theKey.hashCode());
-		}
-		return hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHash(int hash) {
-		this.hash = hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getKey() {
-		return getTypedKey();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKey(Object key) {
-		setTypedKey((String)key);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getValue() {
-		return getTypedValue();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object setValue(Object value) {
-		Object oldValue = getValue();
-		setTypedValue((FeatureAttributeValue)value);
-		return oldValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getEMap() {
-		EObject container = eContainer();
-		return container == null ? null : (EMap)container.eGet(eContainmentFeature());
-	}
-
-} //FeatureAttributeMapEntryImpl
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java
deleted file mode 100644
index d40175933..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java
+++ /dev/null
@@ -1,1058 +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.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EAnnotationImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.FeatureDecorator;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getShortDescription <em>Short Description</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isExpert <em>Expert</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isHidden <em>Hidden</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isPreferred <em>Preferred</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isMergeIntrospection <em>Merge Introspection</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getImplicitlySetBits <em>Implicitly Set Bits</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureDecoratorImpl extends EAnnotationImpl implements FeatureDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 * Note: To make it easier to make changes Feature goes from high bits down, while the
-	 * subclasses go from low-bits up. That way if a change is made to add something of
-	 * interest to Feature, all of the subclasses don't need to have their bits re-ordered.
-	 * Since these are bits, it doesn't matter which ones to use.
-	 */
-	public static final long FEATURE_DISPLAYNAME_IMPLICIT = 0x8000000000000000L;
-	public static final long FEATURE_SHORTDESC_IMPLICIT = 0x4000000000000000L;
-	public static final long FEATURE_CATEGORY_IMPLICIT = 0x2000000000000000L;
-	public static final long FEATURE_EXPERT_IMPLICIT = 0x1000000000000000L;
-	public static final long FEATURE_HIDDEN_IMPLICIT = 0x800000000000000L;
-	public static final long FEATURE_PREFERRED_IMPLICIT = 0x400000000000000L;
-	public static final long FEATURE_ATTRIBUTES_IMPLICIT = 0x200000000000000L; 
-	
-	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	 
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-	/**
-	 * The flag representing whether the Display Name attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int DISPLAY_NAME_ESETFLAG = 1 << 8;
-
-	/**
-	 * The default value of the '{@link #getShortDescription() <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShortDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SHORT_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getShortDescription() <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShortDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String shortDescription = SHORT_DESCRIPTION_EDEFAULT;
-	/**
-	 * The flag representing whether the Short Description attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int SHORT_DESCRIPTION_ESETFLAG = 1 << 9;
-
-	/**
-	 * The default value of the '{@link #getCategory() <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CATEGORY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCategory() <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected String category = CATEGORY_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isExpert() <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExpert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXPERT_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isExpert() <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExpert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int EXPERT_EFLAG = 1 << 10;
-
-	/**
-	 * The flag representing whether the Expert attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int EXPERT_ESETFLAG = 1 << 11;
-
-	/**
-	 * The default value of the '{@link #isHidden() <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHidden()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HIDDEN_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isHidden() <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHidden()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int HIDDEN_EFLAG = 1 << 12;
-
-	/**
-	 * The flag representing whether the Hidden attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int HIDDEN_ESETFLAG = 1 << 13;
-
-	/**
-	 * The default value of the '{@link #isPreferred() <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPreferred()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PREFERRED_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isPreferred() <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPreferred()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PREFERRED_EFLAG = 1 << 14;
-
-	/**
-	 * The flag representing whether the Preferred attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PREFERRED_ESETFLAG = 1 << 15;
-
-	/**
-	 * The default value of the '{@link #isMergeIntrospection() <em>Merge Introspection</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeIntrospection()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_INTROSPECTION_EDEFAULT = true;
-
-	/**
-	 * The flag representing the value of the '{@link #isMergeIntrospection() <em>Merge Introspection</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeIntrospection()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MERGE_INTROSPECTION_EFLAG = 1 << 16;
-
-	/**
-	 * The default value of the '{@link #isAttributesExplicitEmpty() <em>Attributes Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAttributesExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isAttributesExplicitEmpty() <em>Attributes Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAttributesExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ATTRIBUTES_EXPLICIT_EMPTY_EFLAG = 1 << 17;
-
-	/**
-	 * The default value of the '{@link #getImplicitlySetBits() <em>Implicitly Set Bits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitlySetBits()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final long IMPLICITLY_SET_BITS_EDEFAULT = 0L;
-
-	/**
-	 * The cached value of the '{@link #getImplicitlySetBits() <em>Implicitly Set Bits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitlySetBits()
-	 * @generated
-	 * @ordered
-	 */
-	protected long implicitlySetBits = IMPLICITLY_SET_BITS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getImplicitDecoratorFlag() <em>Implicit Decorator Flag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitDecoratorFlag()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ImplicitItem IMPLICIT_DECORATOR_FLAG_EDEFAULT = ImplicitItem.NOT_IMPLICIT_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getImplicitDecoratorFlag() <em>Implicit Decorator Flag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitDecoratorFlag()
-	 * @generated
-	 * @ordered
-	 */
-	protected ImplicitItem implicitDecoratorFlag = IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap attributes = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureDecoratorImpl() {
-		super();
-		eFlags |= MERGE_INTROSPECTION_EFLAG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getFeatureDecorator();
-	}
-
-	public String getDisplayName() {
-		return isSetDisplayName() ? getDisplayNameGen() : getName();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDisplayNameGen() {
-		return displayName;
-	}
-
-	public String getName() {
-		ENamedElement ne = (ENamedElement) getEModelElement();
-		if (ne != null)
-			return ne.getName();	// The name from the owner of the feature has to be the name of feature.
-		else
-			return "?";	// Don't know what it is. //$NON-NLS-1$
-	}
-	
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		boolean oldDisplayNameESet = (eFlags & DISPLAY_NAME_ESETFLAG) != 0;
-		eFlags |= DISPLAY_NAME_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME, oldDisplayName, displayName, !oldDisplayNameESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDisplayName() {
-		String oldDisplayName = displayName;
-		boolean oldDisplayNameESet = (eFlags & DISPLAY_NAME_ESETFLAG) != 0;
-		displayName = DISPLAY_NAME_EDEFAULT;
-		eFlags &= ~DISPLAY_NAME_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME, oldDisplayName, DISPLAY_NAME_EDEFAULT, oldDisplayNameESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDisplayName() {
-		return (eFlags & DISPLAY_NAME_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getShortDescription() {
-		return shortDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setShortDescription(String newShortDescription) {
-		String oldShortDescription = shortDescription;
-		shortDescription = newShortDescription;
-		boolean oldShortDescriptionESet = (eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0;
-		eFlags |= SHORT_DESCRIPTION_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION, oldShortDescription, shortDescription, !oldShortDescriptionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetShortDescription() {
-		String oldShortDescription = shortDescription;
-		boolean oldShortDescriptionESet = (eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0;
-		shortDescription = SHORT_DESCRIPTION_EDEFAULT;
-		eFlags &= ~SHORT_DESCRIPTION_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION, oldShortDescription, SHORT_DESCRIPTION_EDEFAULT, oldShortDescriptionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetShortDescription() {
-		return (eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCategory() {
-		return category;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCategory(String newCategory) {
-		String oldCategory = category;
-		category = newCategory;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__CATEGORY, oldCategory, category));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isExpert() {
-		return (eFlags & EXPERT_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpert(boolean newExpert) {
-		boolean oldExpert = (eFlags & EXPERT_EFLAG) != 0;
-		if (newExpert) eFlags |= EXPERT_EFLAG; else eFlags &= ~EXPERT_EFLAG;
-		boolean oldExpertESet = (eFlags & EXPERT_ESETFLAG) != 0;
-		eFlags |= EXPERT_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__EXPERT, oldExpert, newExpert, !oldExpertESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetExpert() {
-		boolean oldExpert = (eFlags & EXPERT_EFLAG) != 0;
-		boolean oldExpertESet = (eFlags & EXPERT_ESETFLAG) != 0;
-		if (EXPERT_EDEFAULT) eFlags |= EXPERT_EFLAG; else eFlags &= ~EXPERT_EFLAG;
-		eFlags &= ~EXPERT_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__EXPERT, oldExpert, EXPERT_EDEFAULT, oldExpertESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetExpert() {
-		return (eFlags & EXPERT_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHidden() {
-		return (eFlags & HIDDEN_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHidden(boolean newHidden) {
-		boolean oldHidden = (eFlags & HIDDEN_EFLAG) != 0;
-		if (newHidden) eFlags |= HIDDEN_EFLAG; else eFlags &= ~HIDDEN_EFLAG;
-		boolean oldHiddenESet = (eFlags & HIDDEN_ESETFLAG) != 0;
-		eFlags |= HIDDEN_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__HIDDEN, oldHidden, newHidden, !oldHiddenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetHidden() {
-		boolean oldHidden = (eFlags & HIDDEN_EFLAG) != 0;
-		boolean oldHiddenESet = (eFlags & HIDDEN_ESETFLAG) != 0;
-		if (HIDDEN_EDEFAULT) eFlags |= HIDDEN_EFLAG; else eFlags &= ~HIDDEN_EFLAG;
-		eFlags &= ~HIDDEN_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__HIDDEN, oldHidden, HIDDEN_EDEFAULT, oldHiddenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetHidden() {
-		return (eFlags & HIDDEN_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isPreferred() {
-		return (eFlags & PREFERRED_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPreferred(boolean newPreferred) {
-		boolean oldPreferred = (eFlags & PREFERRED_EFLAG) != 0;
-		if (newPreferred) eFlags |= PREFERRED_EFLAG; else eFlags &= ~PREFERRED_EFLAG;
-		boolean oldPreferredESet = (eFlags & PREFERRED_ESETFLAG) != 0;
-		eFlags |= PREFERRED_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__PREFERRED, oldPreferred, newPreferred, !oldPreferredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetPreferred() {
-		boolean oldPreferred = (eFlags & PREFERRED_EFLAG) != 0;
-		boolean oldPreferredESet = (eFlags & PREFERRED_ESETFLAG) != 0;
-		if (PREFERRED_EDEFAULT) eFlags |= PREFERRED_EFLAG; else eFlags &= ~PREFERRED_EFLAG;
-		eFlags &= ~PREFERRED_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__PREFERRED, oldPreferred, PREFERRED_EDEFAULT, oldPreferredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetPreferred() {
-		return (eFlags & PREFERRED_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeIntrospection() {
-		return (eFlags & MERGE_INTROSPECTION_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeIntrospection(boolean newMergeIntrospection) {
-		boolean oldMergeIntrospection = (eFlags & MERGE_INTROSPECTION_EFLAG) != 0;
-		if (newMergeIntrospection) eFlags |= MERGE_INTROSPECTION_EFLAG; else eFlags &= ~MERGE_INTROSPECTION_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION, oldMergeIntrospection, newMergeIntrospection));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isAttributesExplicitEmpty() {
-		return (eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAttributesExplicitEmpty(boolean newAttributesExplicitEmpty) {
-		boolean oldAttributesExplicitEmpty = (eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0;
-		if (newAttributesExplicitEmpty) eFlags |= ATTRIBUTES_EXPLICIT_EMPTY_EFLAG; else eFlags &= ~ATTRIBUTES_EXPLICIT_EMPTY_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY, oldAttributesExplicitEmpty, newAttributesExplicitEmpty));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public long getImplicitlySetBits() {
-		return implicitlySetBits;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicitlySetBits(long newImplicitlySetBits) {
-		long oldImplicitlySetBits = implicitlySetBits;
-		implicitlySetBits = newImplicitlySetBits;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS, oldImplicitlySetBits, implicitlySetBits));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ImplicitItem getImplicitDecoratorFlag() {
-		return implicitDecoratorFlag;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicitDecoratorFlag(ImplicitItem newImplicitDecoratorFlag) {
-		ImplicitItem oldImplicitDecoratorFlag = implicitDecoratorFlag;
-		implicitDecoratorFlag = newImplicitDecoratorFlag == null ? IMPLICIT_DECORATOR_FLAG_EDEFAULT : newImplicitDecoratorFlag;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG, oldImplicitDecoratorFlag, implicitDecoratorFlag));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getAttributes() {
-		if (attributes == null) {
-			attributes = new EcoreEMap(BeaninfoPackage.eINSTANCE.getFeatureAttributeMapEntry(), FeatureAttributeMapEntryImpl.class, this, BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES);
-		}
-		return attributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (displayName: ");
-		if ((eFlags & DISPLAY_NAME_ESETFLAG) != 0) result.append(displayName); else result.append("<unset>");
-		result.append(", shortDescription: ");
-		if ((eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0) result.append(shortDescription); else result.append("<unset>");
-		result.append(", category: ");
-		result.append(category);
-		result.append(", expert: ");
-		if ((eFlags & EXPERT_ESETFLAG) != 0) result.append((eFlags & EXPERT_EFLAG) != 0); else result.append("<unset>");
-		result.append(", hidden: ");
-		if ((eFlags & HIDDEN_ESETFLAG) != 0) result.append((eFlags & HIDDEN_EFLAG) != 0); else result.append("<unset>");
-		result.append(", preferred: ");
-		if ((eFlags & PREFERRED_ESETFLAG) != 0) result.append((eFlags & PREFERRED_EFLAG) != 0); else result.append("<unset>");
-		result.append(", mergeIntrospection: ");
-		result.append((eFlags & MERGE_INTROSPECTION_EFLAG) != 0);
-		result.append(", attributesExplicitEmpty: ");
-		result.append((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0);
-		result.append(", implicitlySetBits: ");
-		result.append(implicitlySetBits);
-		result.append(", implicitDecoratorFlag: ");
-		result.append(implicitDecoratorFlag);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID() >= 0) {
-			switch (eContainerFeatureID()) {
-				case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-	
-	/**
-	 * Called by overrides to eIsSet to test if source is set. This is because for the 
-	 * FeatureDecorator and subclasses, setting source to the classname is considered
-	 * to be not set since that is the new default for each class level. By doing this
-	 * when serializing it won't waste space and time adding a copy of the source string
-	 * to the serialized output and then creating a NEW copy on each decorator loaded
-	 * from an XMI file. 
-	 * 
-	 * @return <code>true</code> if source is not null and not equal to class name (less the "Impl" at the end).
-	 * 
-	 * @since 1.1.0
-	 */
-	protected boolean isSourceSet() {
-		return source != null && !eClass().getInstanceClassName().equals(source);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java
deleted file mode 100644
index 12dc9b1b4..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java
+++ /dev/null
@@ -1,664 +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.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Indexed Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl#getIndexedReadMethod <em>Indexed Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl#getIndexedWriteMethod <em>Indexed Write Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class IndexedPropertyDecoratorImpl extends PropertyDecoratorImpl implements IndexedPropertyDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long INDEXED_READMETHOD_IMPLICIT = 0x100000L;	// Start kind of high so as to allow PropertyDecorator to increase without conflig.
-	public static final long INDEXED_WRITEMETHOD_IMPLICIT = 0x200000L;
-	
-	/**
-	 * The cached value of the '{@link #getIndexedReadMethod() <em>Indexed Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndexedReadMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method indexedReadMethod = null;
-	/**
-	 * The flag representing whether the Indexed Read Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int INDEXED_READ_METHOD_ESETFLAG = 1 << 29;
-
-	/**
-	 * The cached value of the '{@link #getIndexedWriteMethod() <em>Indexed Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndexedWriteMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method indexedWriteMethod = null;
-	
-	/**
-	 * The flag representing whether the Indexed Write Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int INDEXED_WRITE_METHOD_ESETFLAG = 1 << 30;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected IndexedPropertyDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getIndexedReadMethod() {
-		if (indexedReadMethod != null && indexedReadMethod.eIsProxy()) {
-			Method oldIndexedReadMethod = indexedReadMethod;
-			indexedReadMethod = (Method)eResolveProxy((InternalEObject)indexedReadMethod);
-			if (indexedReadMethod != oldIndexedReadMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, indexedReadMethod));
-			}
-		}
-		return indexedReadMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIndexedReadMethod(Method newIndexedReadMethod) {
-		Method oldIndexedReadMethod = indexedReadMethod;
-		indexedReadMethod = newIndexedReadMethod;
-		boolean oldIndexedReadMethodESet = (eFlags & INDEXED_READ_METHOD_ESETFLAG) != 0;
-		eFlags |= INDEXED_READ_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, indexedReadMethod, !oldIndexedReadMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIndexedReadMethod() {
-		Method oldIndexedReadMethod = indexedReadMethod;
-		boolean oldIndexedReadMethodESet = (eFlags & INDEXED_READ_METHOD_ESETFLAG) != 0;
-		indexedReadMethod = null;
-		eFlags &= ~INDEXED_READ_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, null, oldIndexedReadMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIndexedReadMethod() {
-		return (eFlags & INDEXED_READ_METHOD_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getIndexedWriteMethod() {
-		if (indexedWriteMethod != null && indexedWriteMethod.eIsProxy()) {
-			Method oldIndexedWriteMethod = indexedWriteMethod;
-			indexedWriteMethod = (Method)eResolveProxy((InternalEObject)indexedWriteMethod);
-			if (indexedWriteMethod != oldIndexedWriteMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, indexedWriteMethod));
-			}
-		}
-		return indexedWriteMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIndexedWriteMethod(Method newIndexedWriteMethod) {
-		Method oldIndexedWriteMethod = indexedWriteMethod;
-		indexedWriteMethod = newIndexedWriteMethod;
-		boolean oldIndexedWriteMethodESet = (eFlags & INDEXED_WRITE_METHOD_ESETFLAG) != 0;
-		eFlags |= INDEXED_WRITE_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, indexedWriteMethod, !oldIndexedWriteMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIndexedWriteMethod() {
-		Method oldIndexedWriteMethod = indexedWriteMethod;
-		boolean oldIndexedWriteMethodESet = (eFlags & INDEXED_WRITE_METHOD_ESETFLAG) != 0;
-		indexedWriteMethod = null;
-		eFlags &= ~INDEXED_WRITE_METHOD_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, null, oldIndexedWriteMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIndexedWriteMethod() {
-		return (eFlags & INDEXED_WRITE_METHOD_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID() >= 0) {
-			switch (eContainerFeatureID()) {
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				return isBound() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				return isConstrained() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				return isDesignTime() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				return isAlwaysIncompatible() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				return getFilterFlags();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				return isFieldReadOnly() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				if (resolve) return getPropertyEditorClass();
-				return basicGetPropertyEditorClass();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				if (resolve) return getReadMethod();
-				return basicGetReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				if (resolve) return getWriteMethod();
-				return basicGetWriteMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				if (resolve) return getField();
-				return basicGetField();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				if (resolve) return getIndexedReadMethod();
-				return basicGetIndexedReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				if (resolve) return getIndexedWriteMethod();
-				return basicGetIndexedWriteMethod();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				setBound(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				setConstrained(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				setDesignTime(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				setAlwaysIncompatible(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				getFilterFlags().clear();
-				getFilterFlags().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				setFieldReadOnly(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				setPropertyEditorClass((JavaClass)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				setReadMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				setWriteMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				setField((Field)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				setIndexedReadMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				setIndexedWriteMethod((Method)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				unsetBound();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				unsetConstrained();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				unsetDesignTime();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				setAlwaysIncompatible(ALWAYS_INCOMPATIBLE_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				getFilterFlags().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				setFieldReadOnly(FIELD_READ_ONLY_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				setPropertyEditorClass((JavaClass)null);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				unsetReadMethod();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				unsetWriteMethod();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				unsetField();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				unsetIndexedReadMethod();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				unsetIndexedWriteMethod();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				return isSetBound();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				return isSetConstrained();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				return isSetDesignTime();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				return ((eFlags & ALWAYS_INCOMPATIBLE_EFLAG) != 0) != ALWAYS_INCOMPATIBLE_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				return filterFlags != null && !filterFlags.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				return ((eFlags & FIELD_READ_ONLY_EFLAG) != 0) != FIELD_READ_ONLY_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				return propertyEditorClass != null;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				return isSetReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				return isSetWriteMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				return isSetField();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				return isSetIndexedReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				return isSetIndexedWriteMethod();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetIndexedReadMethod() {
-		return indexedReadMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetIndexedWriteMethod() {
-		return indexedWriteMethod;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java
deleted file mode 100644
index 6678cac32..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java
+++ /dev/null
@@ -1,592 +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.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import java.util.*;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoFactory;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.MethodDecorator;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-import org.eclipse.jem.internal.beaninfo.ParameterDecorator;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#getParameterDescriptors <em>Parameter Descriptors</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#getSerParmDesc <em>Ser Parm Desc</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class MethodDecoratorImpl extends FeatureDecoratorImpl implements MethodDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long METHOD_PARAMETERS_IMPLICIT = 0x1L;
-	public static final long METHOD_PARAMETERS_DEFAULT = 02L;	// Special, means were created by default and not by implicit (from beaninfo).
-
-	/**
-	 * The default value of the '{@link #isParmsExplicitEmpty() <em>Parms Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isParmsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PARMS_EXPLICIT_EMPTY_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isParmsExplicitEmpty() <em>Parms Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isParmsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PARMS_EXPLICIT_EMPTY_EFLAG = 1 << 18;
-
-	/**
-	 * The cached value of the '{@link #getSerParmDesc() <em>Ser Parm Desc</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSerParmDesc()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serParmDesc = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected MethodDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getMethodDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isParmsExplicitEmpty() {
-		return (eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParmsExplicitEmpty(boolean newParmsExplicitEmpty) {
-		boolean oldParmsExplicitEmpty = (eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0;
-		if (newParmsExplicitEmpty) eFlags |= PARMS_EXPLICIT_EMPTY_EFLAG; else eFlags &= ~PARMS_EXPLICIT_EMPTY_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY, oldParmsExplicitEmpty, newParmsExplicitEmpty));
-	}
-
-	/*
-	 * This is called if parms list not explicitly set and it was empty from BeanInfo or
-	 * this is from reflection. This becomes the default list based upon the method
-	 * we are attached to.
-	 */
-	private EList createDefaultParmsList() {
-		EList parmsList = this.getSerParmDesc();
-		parmsList.clear();
-		
-		setImplicitlySetBits(getImplicitlySetBits()|METHOD_PARAMETERS_DEFAULT);	// Mark as we implicitly filled it in.
-		List p = getMethodParameters();
-		if (p == null)
-			return parmsList;	// Couldn't get the list for some reason, so leave as is.
-		int psize = p.size();
-		for (int i=0; i<psize; i++) {
-			ParameterDecorator pd = BeaninfoFactory.eINSTANCE.createParameterDecorator();
-			JavaParameter jp = (JavaParameter) p.get(i);
-			pd.setName(jp.getName());
-			pd.setImplicitlySetBits(ParameterDecoratorImpl.PARAMETER_NAME_IMPLICIT);
-			pd.setParameter(jp);
-			parmsList.add(pd);
-		}
-		return parmsList;
-	}
-	
-	/*
-	 * Initialize the ParameterDecorators to hook up the JavaParameter they are describing.
-	 * This is called from ParameterDecorator when it finds that its JavaParameter has not been set.
-	 * This means that it was explicitly added and we need to setup the parms.
-	 * <p>
-	 * Note this an internal method for BeanInfo. It is not meant to be called by clients.
-	 */
-	void initializeParameters() {
-		if (this.serParmDesc == null)
-			return;
-		List mp = getMethodParameters();
-		if (mp.isEmpty())
-			return;	// Nothing that can be described.
-		int psize = Math.min(this.serParmDesc.size(), mp.size());
-		for (int i=0; i < psize; i++)
-			((ParameterDecorator) this.serParmDesc.get(i)).setParameter((JavaParameter) mp.get(i));
-	}
-
-
-	/*
-	 * Get the jem parameters from the method (jem method)
-	 */
-	private List getMethodParameters() {
-		// Get the method
-		Method m = null;
-		Object d = getEModelElement();
-		if (d instanceof Method)
-			m = (Method) d;
-		else 
-			if (d instanceof MethodProxy)
-				m = ((MethodProxy) d).getMethod();
-			else
-				return Collections.EMPTY_LIST;	// Not decorating correct object.
-		if (m == null)
-			return Collections.EMPTY_LIST;	// Couldn't find the method.
-		List p = m.getParameters();
-		return p;
-	}
-			
-			
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (parmsExplicitEmpty: ");
-		result.append((eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0);
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors()
-	 */
-	public EList getParameterDescriptors() {
-		if (!isParmsExplicitEmpty() && getSerParmDesc().isEmpty() && (getImplicitlySetBits()&(METHOD_PARAMETERS_IMPLICIT | METHOD_PARAMETERS_DEFAULT)) == 0) {
-			// Not explicitly empty, it is empty, and we have not implicitly or by defaults made it empty, then create the defaults.
-			createDefaultParmsList();
-		}
-		return getSerParmDesc();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getParameterDescriptorsGen() {
-		// TODO: implement this method to return the 'Parameter Descriptors' reference list
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSerParmDesc() {
-		if (serParmDesc == null) {
-			serParmDesc = new EObjectContainmentEList(ParameterDecorator.class, this, BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC);
-		}
-		return serParmDesc;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-					return ((InternalEList)getSerParmDesc()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID() >= 0) {
-			switch (eContainerFeatureID()) {
-				case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				return isParmsExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				return getParameterDescriptors();
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				return getSerParmDesc();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				setParmsExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				getParameterDescriptors().clear();
-				getParameterDescriptors().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				getSerParmDesc().clear();
-				getSerParmDesc().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				setParmsExplicitEmpty(PARMS_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				getParameterDescriptors().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				getSerParmDesc().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/*
-	 * This is overridden so that we can do special is set tests:
-	 * 1) parameter descriptors: check if serParmDesc exists and not empty, since parameter descriptors is derived.
-	 * 2) serParmDesc: if flag set to default parm desc, then answer not set, else do normal isSet test. That way if set by default it won't serialize
-	 *    out the unneeded default parms. They can be reconstructed quickly when needed.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-					return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				return eIsSetGen(BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc());	// Let default serParmDesc is set work.
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				if ((getImplicitlySetBits() & METHOD_PARAMETERS_DEFAULT) != 0)
-					return false;	// Not considered set if initialized by default.
-				else
-					return eIsSetGen(eFeature);	// Not set by default, so check true setting.
-			default:
-				return eIsSetGen(eFeature);	// Everything else use the gen method.
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				return ((eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0) != PARMS_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				return !getParameterDescriptors().isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				return serParmDesc != null && !serParmDesc.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java
deleted file mode 100644
index 192994a3c..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java
+++ /dev/null
@@ -1,166 +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.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EOperationImpl;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-import org.eclipse.jem.java.Method;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Proxy</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl#getMethod <em>Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class MethodProxyImpl extends EOperationImpl implements MethodProxy {
-	/**
-	 * The cached value of the '{@link #getMethod() <em>Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method method = null;
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected MethodProxyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.Literals.METHOD_PROXY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getMethod() {
-		if (method != null && method.eIsProxy()) {
-			InternalEObject oldMethod = (InternalEObject)method;
-			method = (Method)eResolveProxy(oldMethod);
-			if (method != oldMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.METHOD_PROXY__METHOD, oldMethod, method));
-			}
-		}
-		return method;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetMethod() {
-		return method;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethod(Method newMethod) {
-		Method oldMethod = method;
-		method = newMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.METHOD_PROXY__METHOD, oldMethod, method));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				if (resolve) return getMethod();
-				return basicGetMethod();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				setMethod((Method)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				setMethod((Method)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				return method != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java
deleted file mode 100644
index f75dbe0c3..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java
+++ /dev/null
@@ -1,522 +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.jem.internal.beaninfo.impl;
-
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.ParameterDecorator;
-import org.eclipse.jem.java.JavaParameter;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl#getParameter <em>Parameter</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-public class ParameterDecoratorImpl extends FeatureDecoratorImpl implements ParameterDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long PARAMETER_NAME_IMPLICIT = 0x1L;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ParameterDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getParameterDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getParameter() <em>Parameter</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParameter()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaParameter parameter = null;
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PARAMETER_DECORATOR__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 * Flag for if we tried to link up this parameter to java parm.
-	 */
-	private boolean triedOnce;
-	
-	/**
-	 * The JavaParameter that this ParameterDecorator is decorating.
-	 */
-	public JavaParameter getParameter() {
-		if (!eIsSet(BeaninfoPackage.eINSTANCE.getParameterDecorator_Parameter()) && !triedOnce) {
-			// Need to try to fill in the parameter setting.
-			triedOnce = true;
-			EObject container = eContainer();	// See if we are in a MethodDecorator.
-			if (container instanceof MethodDecoratorImpl)
-				((MethodDecoratorImpl) container).initializeParameters();
-		}
-		
-		return getParameterGen();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaParameter getParameterGen() {
-		if (parameter != null && parameter.eIsProxy()) {
-			JavaParameter oldParameter = parameter;
-			parameter = (JavaParameter)eResolveProxy((InternalEObject)parameter);
-			if (parameter != oldParameter) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER, oldParameter, parameter));
-			}
-		}
-		return parameter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaParameter basicGetParameter() {
-		return parameter;
-	}
-
-	public void setParameter(JavaParameter newParameter) {
-		if (newParameter == null)
-			triedOnce = false;
-		setParameterGen(newParameter);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParameterGen(JavaParameter newParameter) {
-		JavaParameter oldParameter = parameter;
-		parameter = newParameter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER, oldParameter, parameter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID() >= 0) {
-			switch (eContainerFeatureID()) {
-				case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				return getName();
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				if (resolve) return getParameter();
-				return basicGetParameter();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				setName((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				setParameter((JavaParameter)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				setParameter((JavaParameter)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				return parameter != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java
deleted file mode 100644
index ec6a40603..000000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java
+++ /dev/null
@@ -1,1177 +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.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.PropertyDecorator;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isBound <em>Bound</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isConstrained <em>Constrained</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isDesignTime <em>Design Time</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isAlwaysIncompatible <em>Always Incompatible</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getFilterFlags <em>Filter Flags</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isFieldReadOnly <em>Field Read Only</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getPropertyEditorClass <em>Property Editor Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getReadMethod <em>Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getWriteMethod <em>Write Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class PropertyDecoratorImpl extends FeatureDecoratorImpl implements PropertyDecorator{
-
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long PROPERTY_EDITOR_CLASS_IMPLICIT = 0x1L;
-	public static final long PROPERTY_TYPE_IMPLICIT = 0x2L;
-	public static final long PROPERTY_READMETHOD_IMPLICIT = 0x4L;
-	public static final long PROPERTY_WRITEMETHOD_IMPLICIT = 0x8L;
-	public static final long PROPERTY_BOUND_IMPLICIT = 0x10L;
-	public static final long PROPERTY_CONSTRAINED_IMPLICIT = 0x20L;
-	public static final long PROPERTY_DESIGNTIME_IMPLICIT = 0x40L;
-	public static final long PROPERTY_FIELD_IMPLICIT = 0x80L;
-	
-	
-	/**
-	 * The default value of the '{@link #isBound() <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isBound()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean BOUND_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isBound() <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isBound()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int BOUND_EFLAG = 1 << 18;
-
-	/**
-	 * The flag representing whether the Bound attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int BOUND_ESETFLAG = 1 << 19;
-
-	/**
-	 * The default value of the '{@link #isConstrained() <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isConstrained()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CONSTRAINED_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isConstrained() <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isConstrained()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int CONSTRAINED_EFLAG = 1 << 20;
-
-	/**
-	 * The flag representing whether the Constrained attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int CONSTRAINED_ESETFLAG = 1 << 21;
-
-	/**
-	 * The default value of the '{@link #isDesignTime() <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDesignTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DESIGN_TIME_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isDesignTime() <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDesignTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int DESIGN_TIME_EFLAG = 1 << 22;
-
-	/**
-	 * The flag representing whether the Design Time attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int DESIGN_TIME_ESETFLAG = 1 << 23;
-
-	/**
-	 * The default value of the '{@link #isAlwaysIncompatible() <em>Always Incompatible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAlwaysIncompatible()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ALWAYS_INCOMPATIBLE_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isAlwaysIncompatible() <em>Always Incompatible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAlwaysIncompatible()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ALWAYS_INCOMPATIBLE_EFLAG = 1 << 24;
-
-	/**
-	 * The cached value of the '{@link #getFilterFlags() <em>Filter Flags</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFilterFlags()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList filterFlags = null;
-	/**
-	 * The default value of the '{@link #isFieldReadOnly() <em>Field Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFieldReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FIELD_READ_ONLY_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isFieldReadOnly() <em>Field Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFieldReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int FIELD_READ_ONLY_EFLAG = 1 << 25;
-
-	/**
-	 * The cached value of the '{@link #getPropertyEditorClass() <em>Property Editor Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPropertyEditorClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass propertyEditorClass = null;
-	/**
-	 * The cached value of the '{@link #getReadMethod() <em>Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReadMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method readMethod = null;
-	/**
-	 * The flag representing whether the Read Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int READ_METHOD_ESETFLAG = 1 << 26;
-
-	/**
-	 * The cached value of the '{@link #getWriteMethod() <em>Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWriteMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method writeMethod = null;
-	
-	/**
-	 * The flag representing whether the Write Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int WRITE_METHOD_ESETFLAG = 1 << 27;
-
-	/**
-	 * The cached value of the '{@link #getField() <em>Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getField()
-	 * @generated
-	 * @ordered
-	 */
-	protected Field field = null;
-
-	/**
-	 * The flag representing whether the Field reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int FIELD_ESETFLAG = 1 << 28;
-
-	/**
-	 * This it the property type. If null, then it will
-	 * query against model element owner.
-	 * 
-	 * @since 1.2.0
-	 */
-	protected EClassifier propertyType;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected PropertyDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getPropertyDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isBound() {
-		return (eFlags & BOUND_EFLAG) != 0;
-	}
-
-	public EClassifier getPropertyType() {
-		if (propertyType == null) {
-			EStructuralFeature feature = (EStructuralFeature) getEModelElement();
-			return (feature != null) ? feature.getEType() : null;
-		} else
-			return propertyType;
-	}
-
-	public void setPropertyType(EClassifier propertyType) {
-		this.propertyType = propertyType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBound(boolean newBound) {
-		boolean oldBound = (eFlags & BOUND_EFLAG) != 0;
-		if (newBound) eFlags |= BOUND_EFLAG; else eFlags &= ~BOUND_EFLAG;
-		boolean oldBoundESet = (eFlags & BOUND_ESETFLAG) != 0;
-		eFlags |= BOUND_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__BOUND, oldBound, newBound, !oldBoundESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBound() {
-		boolean oldBound = (eFlags & BOUND_EFLAG) != 0;
-		boolean oldBoundESet = (eFlags & BOUND_ESETFLAG) != 0;
-		if (BOUND_EDEFAULT) eFlags |= BOUND_EFLAG; else eFlags &= ~BOUND_EFLAG;
-		eFlags &= ~BOUND_ESETFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__BOUND, oldBound, BOUND_EDEFAULT, oldBoundESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBound() {
-		return (eFlags & BOUND_ESETFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Binding[] bindings = createMethodBindings(
-			new String[] {
-				"/P/p1/X.js",
-				"package p1;\n" +
-				"public class X {\n" +
-				"  void foo() {\n" +
-				"  }\n" +
-				"}",
-				"/P/p1/Y.js",
-				"package p1;\n" +
-				"public class Y extends X {\n" +
-				"  void bar() {\n" +
-				"  }\n" +
-				"}",
-			},
-			new String[] {
-				"Lp1/Y;.bar()V",
-				"Lp1/X;.foo()V"
-			});	
-		assertTrue("Y#bar() should not override X#foo()", !bindings[0].overrides(bindings[1]));
-	}
-
-	/*
-	 * Ensures that a method in a subtype overrides a method in the super parameterized type.
-	 * (regression test for bug 99608 IFunctionBinding#overrides returns false on overridden method)
-	 */
-	public void test030() throws JavaScriptModelException {
-		IFunctionBinding[] bindings = createMethodBindings(
-			new String[] {
-				"/P/p1/X.js",
-				"package p1;\n" +
-				"public class X<T> {\n" +
-				"  void foo(T t) {\n" +
-				"  }\n" +
-				"}",
-				"/P/p1/Y.js",
-				"package p1;\n" +
-				"public class Y extends X<String> {\n" +
-				"  void foo(String s) {\n" +
-				"  }\n" +
-				"}",
-			},
-			new String[] {
-				"Lp1/Y;.foo(Ljava/lang/String;)V",
-				"Lp1/X;.foo(TT;)V"
-			});	
-		assertTrue("Y#foo(String) should override X#foo(T)", bindings[0].overrides(bindings[1]));
-	}
-	
-	/*
-	 * Ensures that a method with the same parameter types but with different type parameters is not a subsignature of its super method.
-	 * (regression test for bug 107110 IFunctionBinding.isSubsignature not yet correctly implemented)
-	 */
-	public void test031() throws JavaScriptModelException {
-		IFunctionBinding[] bindings = createMethodBindings(
-			new String[] {
-				"/P/p1/X.js",
-				"package p1;\n" +
-				"public class X {\n" +
-				"  void foo() {\n" +
-				"  }\n" +
-				"}\n" +
-				"class Y extends X {\n" +
-				"  <T> void foo() {\n" +
-				"  }\n" +
-				"}",
-			},
-			new String[] {
-				"Lp1/X;.foo()V",
-				"Lp1/Y;.foo<T:Ljava/lang/Object;>()V"
-			});	
-		assertFalse("Y#foo() should not be a subsignature of X#foo()", bindings[1].isSubsignature(bindings[0]));
-	}
-	
-	/*
-	 * Ensures that a method in a subtype overrides the corresponding method in the super type
-	 * even if the two methods have different return types.
-	 * (regression test for bug 105808 [1.5][dom] FunctionBinding#overrides(..) should not consider return types)
-	 */
-	public void test032() throws CoreException {
-		try {
-			IJavaScriptProject project = createJavaProject("P2", new String[] {""}, new String[] {"JCL_LIB"}, "", "1.4");
-			IFunctionBinding[] bindings = createMethodBindings(
-				new String[] {
-					"/P/p1/X.js",
-					"package p1;\n" +
-					"public class X {\n" +
-					"  Object foo() {\n" +
-					"  }\n" +
-					"}",
-					"/P/p1/Y.js",
-					"package p1;\n" +
-					"public class Y extends X {\n" +
-					"  String foo() {\n" +
-					"  }\n" +
-					"}",
-				},
-				new String[] {
-					"Lp1/Y;.foo()Ljava/lang/String;",
-					"Lp1/X;.foo()Ljava/lang/Object;"
-				},
-				project);	
-			assertTrue("Y#foo() should override X#foo()", bindings[0].overrides(bindings[1]));
-		} finally {
-			deleteProject("P2");
-		}
-	}
-	
-	/*
-	 * Ensures that a method in a subtype doesn't override the corresponding private method in the super type.
-	 * (regression test for bug 132191 IFunctionBinding.overrides(IFunctionBinding) returns true even if the given argument is private.)
-	 */
-	public void test033() throws JavaScriptModelException {
-		IFunctionBinding[] bindings = createMethodBindings(
-			new String[] {
-				"/P/p1/X.js",
-				"package p1;\n" +
-				"public class X {\n" +
-				"  private void foo() {\n" +
-				"  }\n" +
-				"}",
-				"/P/p1/Y.js",
-				"package p1;\n" +
-				"public class Y extends X {\n" +
-				"  void foo() {\n" +
-				"  }\n" +
-				"}",
-			},
-			new String[] {
-				"Lp1/Y;.foo()V",
-				"Lp1/X;.foo()V"
-			});	
-		assertTrue("Y#foo() should not override X#foo()", !bindings[0].overrides(bindings[1]));
-	}
-	
-	/*
-	 * Ensures that a method in a subtype doesn't override the corresponding default method in the super type in a different package.
-	 * (regression test for bug 132191 IFunctionBinding.overrides(IFunctionBinding) returns true even if the given argument is private.)
-	 */
-	public void test034() throws JavaScriptModelException {
-		IFunctionBinding[] bindings = createMethodBindings(
-			new String[] {
-				"/P/p1/X.js",
-				"package p1;\n" +
-				"public class X {\n" +
-				"  void foo() {\n" +
-				"  }\n" +
-				"}",
-				"/P/p2/Y.js",
-				"package p2;\n" +
-				"public class Y extends p1.X {\n" +
-				"  void foo() {\n" +
-				"  }\n" +
-				"}",
-			},
-			new String[] {
-				"Lp2/Y;.foo()V",
-				"Lp1/X;.foo()V"
-			});	
-		assertTrue("Y#foo() should not override X#foo()", !bindings[0].overrides(bindings[1]));
-	}
-	
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ConverterTestSetup.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ConverterTestSetup.java
deleted file mode 100644
index 34650fd..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ConverterTestSetup.java
+++ /dev/null
@@ -1,564 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.dom;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.core.IClassFile;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.compiler.IProblem;
-import org.eclipse.wst.jsdt.core.compiler.libraries.SystemLibraryLocation;
-import org.eclipse.wst.jsdt.core.dom.AST;
-import org.eclipse.wst.jsdt.core.dom.ASTNode;
-import org.eclipse.wst.jsdt.core.dom.ASTParser;
-import org.eclipse.wst.jsdt.core.dom.ASTVisitor;
-import org.eclipse.wst.jsdt.core.dom.AnonymousClassDeclaration;
-import org.eclipse.wst.jsdt.core.dom.ArrayAccess;
-import org.eclipse.wst.jsdt.core.dom.ArrayCreation;
-import org.eclipse.wst.jsdt.core.dom.ArrayInitializer;
-import org.eclipse.wst.jsdt.core.dom.ArrayType;
-import org.eclipse.wst.jsdt.core.dom.Assignment;
-import org.eclipse.wst.jsdt.core.dom.Block;
-import org.eclipse.wst.jsdt.core.dom.BodyDeclaration;
-import org.eclipse.wst.jsdt.core.dom.BooleanLiteral;
-import org.eclipse.wst.jsdt.core.dom.CharacterLiteral;
-import org.eclipse.wst.jsdt.core.dom.ClassInstanceCreation;
-import org.eclipse.wst.jsdt.core.dom.ConditionalExpression;
-import org.eclipse.wst.jsdt.core.dom.ExpressionStatement;
-import org.eclipse.wst.jsdt.core.dom.FieldAccess;
-import org.eclipse.wst.jsdt.core.dom.FunctionDeclaration;
-import org.eclipse.wst.jsdt.core.dom.FunctionInvocation;
-import org.eclipse.wst.jsdt.core.dom.FunctionRef;
-import org.eclipse.wst.jsdt.core.dom.ImportDeclaration;
-import org.eclipse.wst.jsdt.core.dom.InfixExpression;
-import org.eclipse.wst.jsdt.core.dom.Initializer;
-import org.eclipse.wst.jsdt.core.dom.InstanceofExpression;
-import org.eclipse.wst.jsdt.core.dom.JavaScriptUnit;
-import org.eclipse.wst.jsdt.core.dom.MemberRef;
-import org.eclipse.wst.jsdt.core.dom.NullLiteral;
-import org.eclipse.wst.jsdt.core.dom.NumberLiteral;
-import org.eclipse.wst.jsdt.core.dom.PackageDeclaration;
-import org.eclipse.wst.jsdt.core.dom.ParenthesizedExpression;
-import org.eclipse.wst.jsdt.core.dom.PostfixExpression;
-import org.eclipse.wst.jsdt.core.dom.PrefixExpression;
-import org.eclipse.wst.jsdt.core.dom.PrimitiveType;
-import org.eclipse.wst.jsdt.core.dom.QualifiedName;
-import org.eclipse.wst.jsdt.core.dom.QualifiedType;
-import org.eclipse.wst.jsdt.core.dom.SimpleName;
-import org.eclipse.wst.jsdt.core.dom.SimpleType;
-import org.eclipse.wst.jsdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.wst.jsdt.core.dom.StringLiteral;
-import org.eclipse.wst.jsdt.core.dom.SuperFieldAccess;
-import org.eclipse.wst.jsdt.core.dom.SuperMethodInvocation;
-import org.eclipse.wst.jsdt.core.dom.ThisExpression;
-import org.eclipse.wst.jsdt.core.dom.TypeDeclaration;
-import org.eclipse.wst.jsdt.core.dom.TypeDeclarationStatement;
-import org.eclipse.wst.jsdt.core.dom.TypeLiteral;
-import org.eclipse.wst.jsdt.core.dom.VariableDeclarationExpression;
-import org.eclipse.wst.jsdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.wst.jsdt.core.tests.util.Util;
-
-public abstract class ConverterTestSetup extends AbstractASTTests {
-
-	/** @deprecated Using deprecated code */
-	public static final int AST_INTERNAL_JLS2 = AST.JLS2;
-	
-	protected AST ast;
-	static List TEST_SUITES = null;
-	static boolean PROJECT_SETUP = false;
-
-	protected ConverterTestSetup(String name) {
-		super(name);
-	}
-
-	protected IPath getConverterJCLPath() {
-		return getConverterJCLPath(""); //$NON-NLS-1$
-	}
-
-	protected IPath getConverterJCLPath(String compliance) {
-		return new Path(new SystemLibraryLocation().getLibraryPath("system.js"));
-	}
-
-	protected IPath getConverterJCLRootSourcePath() {
-		return new Path(""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Reset the jar placeholder and delete project.
-	 */
-	public void tearDownSuite() throws Exception {
-		ast = null;
-		if (TEST_SUITES == null) {
-			this.deleteProject("Converter"); //$NON-NLS-1$
-		} else {
-			TEST_SUITES.remove(getClass());
-			if (TEST_SUITES.size() == 0) {
-				this.deleteProject("Converter"); //$NON-NLS-1$
-			}
-		}
-		super.tearDown();
-	}	
-
-	public void setUpJCLClasspathVariables() throws JavaScriptModelException, IOException {
-		if (JavaScriptCore.getIncludepathVariable("CONVERTER_JCL_LIB") == null) {
-			JavaScriptCore.setIncludepathVariables(
-				new String[] {"CONVERTER_JCL_LIB", "CONVERTER_JCL_SRCROOT"},
-				new IPath[] {getConverterJCLPath(), getConverterJCLRootSourcePath()},
-				null);
-		} 		
-	}
-	
-	/**
-	 * Create project and set the jar placeholder.
-	 */
-	public void setUpSuite() throws Exception {
-		super.setUpSuite();
-
-		if (!PROJECT_SETUP) {
-			setUpJavaProject("Converter"); //$NON-NLS-1$
-			waitUntilIndexesReady(); // needed to find secondary types
-			PROJECT_SETUP = true;
-		}
-	}
-
-	public ASTNode runConversion(IJavaScriptUnit unit, boolean resolveBindings) {
-		return runConversion(AST_INTERNAL_JLS2, unit, resolveBindings);
-	}
-
-	public ASTNode runConversion(IJavaScriptUnit unit, int position, boolean resolveBindings) {
-		return runConversion(AST_INTERNAL_JLS2, unit, position, resolveBindings);
-	}
-
-	public ASTNode runConversion(IClassFile classFile, int position, boolean resolveBindings) {
-		return runConversion(AST_INTERNAL_JLS2, classFile, position, resolveBindings);
-	}
-	
-	public ASTNode runConversion(char[] source, String unitName, IJavaScriptProject project) {
-		return runConversion(AST_INTERNAL_JLS2, source, unitName, project);
-	}
-
-	public ASTNode runConversion(char[] source, String unitName, IJavaScriptProject project, boolean resolveBindings) {
-		return runConversion(AST_INTERNAL_JLS2, source, unitName, project, resolveBindings);
-	}
-	
-	public ASTNode runConversion(int astLevel, IJavaScriptUnit unit, boolean resolveBindings) {
-		return runConversion(astLevel, unit, resolveBindings, false);
-	}
-	
-	public ASTNode runConversion(int astLevel, IJavaScriptUnit unit, boolean resolveBindings, boolean statementsRecovery) {
-		ASTParser parser = ASTParser.newParser(astLevel);
-		parser.setSource(unit);
-		parser.setResolveBindings(resolveBindings);
-		parser.setStatementsRecovery(statementsRecovery);
-		return parser.createAST(null);
-	}
-
-	class NullBindingVerifier extends ASTVisitor {
-
-		public void endVisit(ArrayAccess node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(ArrayCreation node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(ArrayInitializer node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(Assignment node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(BooleanLiteral node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(CharacterLiteral node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(ClassInstanceCreation node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(ConditionalExpression node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(FieldAccess node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(InfixExpression node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(InstanceofExpression node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(FunctionInvocation node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(NullLiteral node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(NumberLiteral node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(ParenthesizedExpression node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(PostfixExpression node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(PrefixExpression node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(StringLiteral node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(SuperFieldAccess node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(SuperMethodInvocation node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(ThisExpression node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(TypeLiteral node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(VariableDeclarationExpression node) {
-			assertNotNull(node+" should have a binding", node.resolveTypeBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(AnonymousClassDeclaration node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(ArrayType node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(ImportDeclaration node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(MemberRef node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(FunctionDeclaration node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(FunctionRef node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(PackageDeclaration node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(PrimitiveType node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(QualifiedName node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(QualifiedType node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(SimpleName node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(SimpleType node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(SingleVariableDeclaration node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(TypeDeclaration node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(TypeDeclarationStatement node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-		public void endVisit(VariableDeclarationFragment node) {
-			assertNotNull(node+" should have a binding", node.resolveBinding());
-			super.endVisit(node);
-		}
-
-	}
-	public ASTNode runJLS3Conversion(IJavaScriptUnit unit, boolean resolveBindings, boolean checkJLS2) {
-
-		// Create parser
-		ASTParser parser;
-		if (checkJLS2) {
-			parser = ASTParser.newParser(AST_INTERNAL_JLS2);
-			parser.setSource(unit);
-			parser.setResolveBindings(resolveBindings);
-			parser.createAST(null);
-		}
-		
-		parser = ASTParser.newParser(AST.JLS3);
-		parser.setSource(unit);
-		parser.setResolveBindings(resolveBindings);
-		
-		// Parse compilation unit
-		ASTNode result = parser.createAST(null);
-		
-		// Verify we get a compilation unit node and that binding are correct
-		assertTrue("Not a compilation unit", result.getNodeType() == ASTNode.JAVASCRIPT_UNIT);
-		JavaScriptUnit compilationUnit = (JavaScriptUnit) result;
-		if (resolveBindings && compilationUnit.getProblems().length == 0) {
-			compilationUnit.accept(new NullBindingVerifier());
-		}
-		return result;
-	}
-	
-	public ASTNode runConversion(int astLevel, IJavaScriptUnit unit, int position, boolean resolveBindings) {
-
-		// Create parser
-		ASTParser parser = ASTParser.newParser(astLevel);
-		parser.setSource(unit);
-		parser.setFocalPosition(position);
-		parser.setResolveBindings(resolveBindings);
-
-		// Parse compilation unit
-		ASTNode result = parser.createAST(null);
-		
-		// Verify we get a compilation unit node and that binding are correct
-		assertTrue("Not a compilation unit", result.getNodeType() == ASTNode.JAVASCRIPT_UNIT);
-		JavaScriptUnit compilationUnit = (JavaScriptUnit) result;
-		if (resolveBindings && compilationUnit.getProblems().length == 0) {
-			compilationUnit.accept(new NullBindingVerifier());
-		}
-		return result;
-	}
-
-	public ASTNode runConversion(int astLevel, IClassFile classFile, int position, boolean resolveBindings) {
-
-		// Create parser
-		ASTParser parser = ASTParser.newParser(astLevel);
-		parser.setSource(classFile);
-		parser.setFocalPosition(position);
-		parser.setResolveBindings(resolveBindings);
-
-		// Parse compilation unit
-		ASTNode result = parser.createAST(null);
-		
-		// Verify we get a compilation unit node and that binding are correct
-		assertTrue("Not a compilation unit", result.getNodeType() == ASTNode.JAVASCRIPT_UNIT);
-		JavaScriptUnit compilationUnit = (JavaScriptUnit) result;
-		if (resolveBindings && compilationUnit.getProblems().length == 0) {
-			compilationUnit.accept(new NullBindingVerifier());
-		}
-		return result;
-	}
-	
-	public ASTNode runConversion(int astLevel, char[] source, String unitName, IJavaScriptProject project) {
-		return runConversion(astLevel, source, unitName, project, false);
-	}
-	
-	public ASTNode runConversion(int astLevel, char[] source, String unitName, IJavaScriptProject project, boolean resolveBindings) {
-		return runConversion(astLevel, source, unitName, project, null, resolveBindings);
-	}
-
-	public ASTNode runConversion(int astLevel, char[] source, String unitName, IJavaScriptProject project, Map options, boolean resolveBindings) {
-		ASTParser parser = ASTParser.newParser(astLevel);
-		parser.setSource(source);
-		parser.setUnitName(unitName);
-		parser.setProject(project);
-		if (options != null) {
-			parser.setCompilerOptions(options);
-		}
-		parser.setResolveBindings(resolveBindings);
-		return parser.createAST(null);
-	}
-	
-	public ASTNode runConversion(int astLevel, char[] source, String unitName, IJavaScriptProject project, Map options) {
-		return runConversion(astLevel, source, unitName, project, options, false);
-	}
-	
-	public ASTNode runConversion(char[] source, String unitName, IJavaScriptProject project, Map options, boolean resolveBindings) {
-		return runConversion(AST_INTERNAL_JLS2, source, unitName, project, options, resolveBindings);
-	}
-	public ASTNode runConversion(char[] source, String unitName, IJavaScriptProject project, Map options) {
-		return runConversion(AST_INTERNAL_JLS2, source, unitName, project, options);
-	}	
-
-	protected ASTNode getASTNodeToCompare(org.eclipse.wst.jsdt.core.dom.JavaScriptUnit unit) {
-		ExpressionStatement statement = (ExpressionStatement) getASTNode(unit, 0, 0, 0);
-		return (ASTNode) ((FunctionInvocation) statement.getExpression()).arguments().get(0);
-	}
-
-	protected ASTNode getASTNode(org.eclipse.wst.jsdt.core.dom.JavaScriptUnit unit, int typeIndex, int bodyIndex, int statementIndex) {
-		BodyDeclaration bodyDeclaration = (BodyDeclaration) getASTNode(unit, typeIndex, bodyIndex);
-		if (bodyDeclaration instanceof FunctionDeclaration) {
-			FunctionDeclaration methodDeclaration = (FunctionDeclaration) bodyDeclaration;
-			Block block = methodDeclaration.getBody();
-			return (ASTNode) block.statements().get(statementIndex);
-		} else if (bodyDeclaration instanceof TypeDeclaration) {
-			TypeDeclaration typeDeclaration = (TypeDeclaration) bodyDeclaration;
-			return (ASTNode) typeDeclaration.bodyDeclarations().get(statementIndex);
-		} else if (bodyDeclaration instanceof Initializer) {
-			Initializer initializer = (Initializer) bodyDeclaration;
-			Block block = initializer.getBody();
-			return (ASTNode) block.statements().get(statementIndex);
-		}
-		return null;
-	}
-
-	protected ASTNode getASTNode(org.eclipse.wst.jsdt.core.dom.JavaScriptUnit unit, int typeIndex, int bodyIndex) {
-		return (ASTNode) unit.statements().get(bodyIndex);
-	}
-
-	protected ASTNode getASTNode(org.eclipse.wst.jsdt.core.dom.JavaScriptUnit unit, int typeIndex) {
-		return (ASTNode) unit.types().get(typeIndex);
-	}
-		
-	protected void checkSourceRange(ASTNode node, String expectedContents, String source) {
-		assertNotNull("The node is null", node); //$NON-NLS-1$
-		assertTrue("The node(" + node.getClass() + ").getLength() == 0", node.getLength() != 0); //$NON-NLS-1$ //$NON-NLS-2$
-		assertTrue("The node.getStartPosition() == -1", node.getStartPosition() != -1); //$NON-NLS-1$
-		int length = node.getLength();
-		int start = node.getStartPosition();
-		String actualContentsString = source.substring(start, start + length);
-		assertSourceEquals("Unexpected source", Util.convertToIndependantLineDelimiter(expectedContents), Util.convertToIndependantLineDelimiter(actualContentsString));
-	}
-
-	protected void checkSourceRange(ASTNode node, String expectedContents, char[] source) {
-		assertNotNull("The node is null", node); //$NON-NLS-1$
-		assertTrue("The node(" + node.getClass() + ").getLength() == 0", node.getLength() != 0); //$NON-NLS-1$ //$NON-NLS-2$
-		assertTrue("The node.getStartPosition() == -1", node.getStartPosition() != -1); //$NON-NLS-1$
-		int length = node.getLength();
-		int start = node.getStartPosition();
-		char[] actualContents = new char[length];
-		System.arraycopy(source, start, actualContents, 0, length);
-		String actualContentsString = new String(actualContents);
-		assertSourceEquals("Unexpected source", Util.convertToIndependantLineDelimiter(expectedContents), Util.convertToIndependantLineDelimiter(actualContentsString));
-	}
-		
-	protected boolean isMalformed(ASTNode node) {
-		return (node.getFlags() & ASTNode.MALFORMED) != 0;
-	}
-	
-	protected boolean isRecovered(ASTNode node) {
-		return (node.getFlags() & ASTNode.RECOVERED) != 0;
-	}
-
-	protected boolean isOriginal(ASTNode node) {
-		return (node.getFlags() & ASTNode.ORIGINAL) != 0;
-	}
-	
-	protected void assertProblemsSize(JavaScriptUnit compilationUnit, int expectedSize) {
-		assertProblemsSize(compilationUnit, expectedSize, "");
-	}
-	protected void assertProblemsSize(JavaScriptUnit compilationUnit, int expectedSize, String expectedOutput) {
-		final IProblem[] problems = compilationUnit.getProblems();
-		final int length = problems.length;
-		if (length != expectedSize) {
-			checkProblemMessages(expectedOutput, problems, length);
-			assertEquals("Wrong size", expectedSize, length);
-		}
-		checkProblemMessages(expectedOutput, problems, length);
-	}
-
-	private void checkProblemMessages(String expectedOutput, final IProblem[] problems, final int length) {
-		if (length != 0) {
-			if (expectedOutput != null) {
-				StringBuffer buffer = new StringBuffer();
-				for (int i = 0; i < length; i++) {
-					buffer.append(problems[i].getMessage());
-					if (i < length - 1) {
-						buffer.append('\n');
-					}
-				}
-				String actualOutput = String.valueOf(buffer);
-				expectedOutput = Util.convertToIndependantLineDelimiter(expectedOutput);
-				actualOutput = Util.convertToIndependantLineDelimiter(actualOutput);
-				if (!expectedOutput.equals(actualOutput)) {
-					System.out.println(Util.displayString(actualOutput));
-					assertEquals("different output", expectedOutput, actualOutput);
-				}
-			}
-		}
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/GetKeyVisitor.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/GetKeyVisitor.java
deleted file mode 100644
index 650a0d7..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/GetKeyVisitor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.dom;
-
-import junit.framework.Assert;
-import org.eclipse.wst.jsdt.core.dom.ASTVisitor;
-import org.eclipse.wst.jsdt.core.dom.ClassInstanceCreation;
-import org.eclipse.wst.jsdt.core.dom.IFunctionBinding;
-
-class GetKeyVisitor extends ASTVisitor {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.core.dom.ASTVisitor#visit(org.eclipse.wst.jsdt.core.dom.SimpleName)
-	 */
-	public boolean visit(ClassInstanceCreation node) {
-		IFunctionBinding constructorBinding = node.resolveConstructorBinding();
-		Assert.assertNotNull(constructorBinding);
-		Assert.assertNotNull(constructorBinding.getKey());
-		return super.visit(node);
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ProfilingASTConvertionTest.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ProfilingASTConvertionTest.java
deleted file mode 100644
index 00ecd2b..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ProfilingASTConvertionTest.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.dom;
-
-import java.io.File;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.dom.AST;
-import org.eclipse.wst.jsdt.core.dom.ASTNode;
-import org.eclipse.wst.jsdt.core.dom.ASTParser;
-import org.eclipse.wst.jsdt.core.dom.JavaScriptUnit;
-import org.eclipse.wst.jsdt.core.dom.TypeDeclaration;
-import org.eclipse.wst.jsdt.core.tests.model.AbstractJavaModelTests;
-
-public class ProfilingASTConvertionTest extends AbstractJavaModelTests {
-	
-	static class Result implements Comparable {
-		long length;
-		long time;
-		String unitName;
-		Result(String unitName, long time, long length) {
-			this.time = time;
-			this.unitName = unitName;
-			this.length = length / 1024;
-		}
-		/* (non-Javadoc)
-		 * @see java.lang.Comparable#compareTo(java.lang.Object)
-		 */
-		public int compareTo(Object o) {
-			Result result = (Result) o;
-			if (this.time < result.time) {
-				return -1;
-			} else if (this.time == result.time) {
-				return 0;
-			}
-			return 1;
-		}
-	}
-	private static final int INCREMENTS = 100;
-	
-	private static boolean RESOLVE_BINDINGS = false;
-
-	public static Test suite() {
-		return buildModelTestSuite(ProfilingASTConvertionTest.class);
-	}
-
-	IJavaScriptUnit[] compilationUnits;
-
-	public ProfilingASTConvertionTest(String name) {
-		super(name);
-	}
-	
-	public String display(int value, int numberOfFiguresForRange) {
-		int numberOfFigures = value == 0 ? 1 : (int) (Math.log(value)/ Math.log(10));
-		if ((value % 10) == 0) {
-			numberOfFigures = (int) (Math.log(value + 1)/ Math.log(10));
-		}
-		StringBuffer buffer = new StringBuffer();
-		while(numberOfFigures < numberOfFiguresForRange) {
-			buffer.append(" ");
-			numberOfFigures++;
-		}
-		buffer.append(value);
-		return String.valueOf(buffer);
-	}
-
-	/**
-	 * @param array
-	 * @param increment
-	 */
-	private void printDistribution(long[] array, int increment) {
-		int bound = increment;
-		int counter = 0;
-		int totalCounter = 0;
-		int length = array.length;
-		long max = array[length - 1];
-		int numberOfFiguresForRange = (int) (Math.log(max)/ Math.log(10));
-		if ((max % increment) == 0) {
-			numberOfFiguresForRange = (int) (Math.log(max + 1)/ Math.log(10));
-		}
-		int numberOfFiguresForCounter = (int) (Math.log(length)/ Math.log(10));
-		if ((length % increment) == 0) {
-			numberOfFiguresForCounter = (int) (Math.log(length + 1)/ Math.log(10));
-		}
-		for (int i = 0; i < length; i++) {
-			if (array[i] < bound) {
-				counter++;
-			} else {
-				i--;
-				totalCounter += counter;
-				printRange(counter, bound, increment, totalCounter, length, numberOfFiguresForRange, numberOfFiguresForCounter);
-				counter = 0;
-				bound += increment;
-			}
-		}
-		totalCounter += counter;
-		printRange(counter, bound, increment, totalCounter, length, numberOfFiguresForRange, numberOfFiguresForCounter);
-	}
-		
-	/**
-	 * @param counter
-	 * @param bound
-	 */
-	private void printRange(int counter, int bound, int increment, int totalCounter, int length, int numberOfFiguresForRange, int numberOfFiguresForCounters) {
-		if (counter != 0) {
-			StringBuffer buffer = new StringBuffer();
-			int low = bound - increment;
-			if (low != 0) {
-				low++;
-			}
-			DecimalFormat format = new DecimalFormat("###.##");
-			buffer
-				.append(display(low, numberOfFiguresForRange))
-				.append(" - ")
-				.append(display(bound, numberOfFiguresForRange))
-				.append(" : ")
-				.append(display(counter, numberOfFiguresForCounters))
-				.append("\t\t")
-				.append(format.format(100.0 * ((double) totalCounter / length)));
-			System.out.println(String.valueOf(buffer));
-		}
-	}
-	
-	/**
-	 * @param totalTime
-	 * @param length
-	 * @param times
-	 * @param arrayList
-	 * @deprecated using deprecated code 
-	 */
-	private void reportResults(int apiLevel, long totalTime, int length, long[] times, ArrayList arrayList) {
-		System.out.println("===============================================================================");
-		System.out.print("================================ ");
-		switch(apiLevel) {
-			case AST.JLS2 :
-				System.out.print("JLS2");
-				break;
-			case AST.JLS3 :
-				System.out.print("JLS3");
-				break;
-		}
-		System.out.print(" BINDING IS ");
-		System.out.print(RESOLVE_BINDINGS ? "ON  " : "OFF ");
-		System.out.println("==========================");
-		System.out.println("===============================================================================");
-		Arrays.sort(times);
-		System.out.println("===================================== TIMES ===================================");
-		System.out.println("Fastest = " + times[0] + "ms");
-		long maxTime = times[length - 1];
-		System.out.println("Slowest = " + maxTime + "ms");
-		System.out.println("Total = " + totalTime + "ms");
-		System.out.println("================================== DISTRIBUTION ===============================");
-		printDistribution(times, INCREMENTS);
-		System.out.println("================================= SORTED BY TIME ==============================");
-		Collections.sort(arrayList);
-		for (Iterator iterator = arrayList.iterator(); iterator.hasNext(); ) {
-			final Result next = (Result) iterator.next();
-			System.out.println(next.unitName + "(" + next.length + "KB) - " + next.time + "ms");
-		}
-		System.out.println("================================ SORTED BY LENGTH =============================");
-		Collections.sort(arrayList, new Comparator() {
-			/* (non-Javadoc)
-			 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-			 */
-			public int compare(Object o1, Object o2) {
-				Result r1 = (Result) o1;
-				Result r2 = (Result) o2;
-				if (r1.length < r2.length) {
-					return -1;
-				} else if (r1.length == r2.length) {
-					return 0;
-				}
-				return 1;
-			}
-		});
-		for (Iterator iterator = arrayList.iterator(); iterator.hasNext(); ) {
-			final Result next = (Result) iterator.next();
-			System.out.println(next.unitName + "(" + next.length + "KB) - " + next.time + "ms");
-		}
-	}
-
-	public void setUpSuite() throws Exception {
-		super.setUpSuite();
-
-		// ensure variables are set
-		if (JavaScriptCore.getIncludepathVariable("CONVERTER_JCL_LIB") == null) { //$NON-NLS-1$
-			setupExternalJCL("converterJclMin");
-			JavaScriptCore.setIncludepathVariables(
-				new String[] {"CONVERTER_JCL_LIB", "CONVERTER_JCL_SRC", "CONVERTER_JCL_SRCROOT"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				new Path[] {new Path(getExternalPath() + "converterJclMin.jar"), new Path(getExternalPath() + "converterJclMinsrc.zip"), new Path("")},
-				null);
-		}		
-		
-		IJavaScriptProject javaProject = setUpJavaProject("Compiler", "1.4"); //$NON-NLS-1$ //$NON-NLS-2$
-		assertNotNull("No java project", javaProject);
-		IPackageFragment[] packageFragments = javaProject.getPackageFragments();
-		assertNotNull("No package fragments", packageFragments);
-		ArrayList collector = new ArrayList();
-		for (int i = 0, max = packageFragments.length; i < max; i++) {
-			IJavaScriptUnit[] units = packageFragments[i].getJavaScriptUnits();
-			if (units != null) {
-				for (int j = 0, max2 = units.length; j < max2; j++) {
-					collector.add(units[j]);
-				}
-			}
-		}
-		this.compilationUnits = new IJavaScriptUnit[collector.size()];
-		collector.toArray(this.compilationUnits);
-	}
-
-	public void test0000() throws JavaScriptModelException {
-		try {
-			RESOLVE_BINDINGS = true;
-			final int apiLevel = AST.JLS3;
-			ASTParser parser = ASTParser.newParser(apiLevel);
-			parser.setResolveBindings(RESOLVE_BINDINGS);
-			long totalTime = 0;
-			int length = this.compilationUnits.length;
-			long[] times = new long[length];
-			ArrayList arrayList = new ArrayList(length);
-			for (int i = 0; i < length; i++) {
-				parser.setSource(this.compilationUnits[i]);
-				parser.setResolveBindings(RESOLVE_BINDINGS);
-				long time = System.currentTimeMillis();
-				ASTNode node = parser.createAST(null);
-				times[i] = System.currentTimeMillis() - time;
-				totalTime += times[i];
-				assertNotNull("No node", node);
-				assertEquals("Wrong type", ASTNode.JAVASCRIPT_UNIT, node.getNodeType());
-				JavaScriptUnit unit = (JavaScriptUnit) node;
-				assertEquals("Has problem", 0, unit.getProblems().length);
-				TypeDeclaration typeDeclaration = (TypeDeclaration) unit.types().get(0);
-				StringBuffer buffer = new StringBuffer();
-				buffer.append(unit.getPackage().getName()).append(".").append(typeDeclaration.getName());
-				IResource resource = this.compilationUnits[i].getResource();
-				if (resource instanceof IFile) {
-					IFile file = (IFile) resource;
-					File f = new File(file.getLocation().toOSString());
-					if (f.exists()) {
-						arrayList.add(new Result(String.valueOf(buffer), times[i], f.length()));
-					}
-				}
-			}
-		} finally {
-			RESOLVE_BINDINGS = false;
-		}
-	}
-	
-	public void test0001() throws JavaScriptModelException {
-		try {
-			RESOLVE_BINDINGS = true;
-			final int apiLevel = AST.JLS3;
-			ASTParser parser = ASTParser.newParser(apiLevel);
-			parser.setResolveBindings(RESOLVE_BINDINGS);
-			long totalTime = 0;
-			int length = this.compilationUnits.length;
-			long[] times = new long[length];
-			ArrayList arrayList = new ArrayList(length);
-			for (int i = 0; i < length; i++) {
-				parser.setSource(this.compilationUnits[i]);
-				parser.setResolveBindings(RESOLVE_BINDINGS);
-				long time = System.currentTimeMillis();
-				ASTNode node = parser.createAST(null);
-				times[i] = System.currentTimeMillis() - time;
-				totalTime += times[i];
-				assertNotNull("No node", node);
-				assertEquals("Wrong type", ASTNode.JAVASCRIPT_UNIT, node.getNodeType());
-				JavaScriptUnit unit = (JavaScriptUnit) node;
-				assertEquals("Has problem", 0, unit.getProblems().length);
-				TypeDeclaration typeDeclaration = (TypeDeclaration) unit.types().get(0);
-				StringBuffer buffer = new StringBuffer();
-				buffer.append(unit.getPackage().getName()).append(".").append(typeDeclaration.getName());
-				IResource resource = this.compilationUnits[i].getResource();
-				if (resource instanceof IFile) {
-					IFile file = (IFile) resource;
-					File f = new File(file.getLocation().toOSString());
-					if (f.exists()) {
-						arrayList.add(new Result(String.valueOf(buffer), times[i], f.length()));
-					}
-				}
-			}
-			reportResults(apiLevel, totalTime, length, times, arrayList);
-		} finally {
-			RESOLVE_BINDINGS = false;
-		}
-	}
-
-	public void test0002() throws JavaScriptModelException {
-		try {
-			RESOLVE_BINDINGS = false;
-			final int apiLevel = AST.JLS3;
-			ASTParser parser = ASTParser.newParser(apiLevel);
-			parser.setResolveBindings(RESOLVE_BINDINGS);
-			long totalTime = 0;
-			int length = this.compilationUnits.length;
-			long[] times = new long[length];
-			ArrayList arrayList = new ArrayList(length);
-			for (int i = 0; i < length; i++) {
-				parser.setSource(this.compilationUnits[i]);
-				parser.setResolveBindings(RESOLVE_BINDINGS);
-				long time = System.currentTimeMillis();
-				ASTNode node = parser.createAST(null);
-				times[i] = System.currentTimeMillis() - time;
-				totalTime += times[i];
-				assertNotNull("No node", node);
-				assertEquals("Wrong type", ASTNode.JAVASCRIPT_UNIT, node.getNodeType());
-				JavaScriptUnit unit = (JavaScriptUnit) node;
-				assertEquals("Has problem", 0, unit.getProblems().length);
-				TypeDeclaration typeDeclaration = (TypeDeclaration) unit.types().get(0);
-				StringBuffer buffer = new StringBuffer();
-				buffer.append(unit.getPackage().getName()).append(".").append(typeDeclaration.getName());
-				IResource resource = this.compilationUnits[i].getResource();
-				if (resource instanceof IFile) {
-					IFile file = (IFile) resource;
-					File f = new File(file.getLocation().toOSString());
-					if (f.exists()) {
-						arrayList.add(new Result(String.valueOf(buffer), times[i], f.length()));
-					}
-				}
-			}
-			reportResults(apiLevel, totalTime, length, times, arrayList);
-		} finally {
-			RESOLVE_BINDINGS = false;
-		}
-	}
-}
-
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/RunAllTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/RunAllTests.java
deleted file mode 100644
index 2d7e91f..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/RunAllTests.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.dom;
-
-import java.lang.reflect.*;
-
-import org.eclipse.wst.jsdt.core.tests.junit.extension.TestCase;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class RunAllTests extends junit.framework.TestCase {
-public RunAllTests(String name) {
-	super(name);
-}
-public static Class[] getAllTestClasses() {
-	return new Class[] {
-		//org.eclipse.wst.jsdt.core.tests.dom.RunConverterTests.class,
-		org.eclipse.wst.jsdt.core.tests.dom.ASTTest.class,
-		org.eclipse.wst.jsdt.core.tests.dom.ASTVisitorTest.class,
-		//org.eclipse.wst.jsdt.core.tests.dom.ASTMatcherTest.class,
-		//org.eclipse.wst.jsdt.core.tests.dom.ASTStructuralPropertyTest.class,
-		org.eclipse.wst.jsdt.core.tests.dom.ASTParserTest.class,
-		//org.eclipse.wst.jsdt.core.tests.dom.ASTModelBridgeTests.class,
-		// org.eclipse.wst.jsdt.core.tests.dom.BatchASTCreationTests.class,
-		//org.eclipse.wst.jsdt.core.tests.dom.CompatibilityRulesTests.class,
-		org.eclipse.wst.jsdt.core.tests.rewrite.describing.ASTRewritingTest.class,
-		org.eclipse.wst.jsdt.core.tests.rewrite.modifying.ASTRewritingModifyingTest.class,
-		org.eclipse.wst.jsdt.core.tests.dom.ASTPositionsTest.class,
-	};
-}
-public static Test suite() {
-	TestSuite ts = new TestSuite(RunAllTests.class.getName());
-
-	Class[] testClasses = getAllTestClasses();
-	// Reset forgotten subsets of tests
-	TestCase.TESTS_PREFIX = null;
-	TestCase.TESTS_NAMES = null;
-	TestCase.TESTS_NUMBERS = null;
-	TestCase.TESTS_RANGE = null;
-	TestCase.RUN_ONLY_ID = null;
-
-	for (int i = 0; i < testClasses.length; i++) {
-		Class testClass = testClasses[i];
-
-		// call the suite() method and add the resulting suite to the suite
-		try {
-			Method suiteMethod = testClass.getDeclaredMethod("suite", new Class[0]); //$NON-NLS-1$
-			Test suite = (Test)suiteMethod.invoke(null, new Object[0]);
-			ts.addTest(suite);
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-		} catch (InvocationTargetException e) {
-			e.getTargetException().printStackTrace();
-		} catch (NoSuchMethodException e) {
-			e.printStackTrace();
-		}
-	}
-	return ts;
-}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/RunConverterTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/RunConverterTests.java
deleted file mode 100644
index af8f0ec..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/RunConverterTests.java
+++ /dev/null
@@ -1,66 +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.jsdt.core.tests.dom;
-
-import java.lang.reflect.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.wst.jsdt.core.tests.junit.extension.TestCase;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class RunConverterTests extends junit.framework.TestCase {
-public RunConverterTests(String name) {
-	super(name);
-}
-public static Class[] getAllTestClasses() {
-	return new Class[] {
-		ASTConverterTest.class,		
-		ASTConverterTest2.class,
-		ASTConverterJavadocTest.class,
-		ASTConverterAST3Test.class,
-		ASTConverterTestAST3_2.class,
-		ASTConverterBindingsTest.class,
-		ASTConverterRecoveryTest.class
-	};
-}
-public static Test suite() {
-	TestSuite ts = new TestSuite(RunConverterTests.class.getName());
-
-	ConverterTestSetup.TEST_SUITES = new ArrayList(Arrays.asList(getAllTestClasses()));
-	// Reset forgotten subsets of tests
-	TestCase.TESTS_PREFIX = null;
-	TestCase.TESTS_NAMES = null;
-	TestCase.TESTS_NUMBERS = null;
-	TestCase.TESTS_RANGE = null;
-	TestCase.RUN_ONLY_ID = null;
-
-	for (int i = 0, l=ConverterTestSetup.TEST_SUITES.size(); i < l; i++) {
-		Class testClass = (Class) ConverterTestSetup.TEST_SUITES.get(i);
-
-		// call the suite() method and add the resulting suite to the suite
-		try {
-			Method suiteMethod = testClass.getDeclaredMethod("suite", new Class[0]); //$NON-NLS-1$
-			Test suite = (Test)suiteMethod.invoke(null, new Object[0]);
-			ts.addTest(suite);
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-		} catch (InvocationTargetException e) {
-			e.getTargetException().printStackTrace();
-		} catch (NoSuchMethodException e) {
-			e.printStackTrace();
-		}
-	}
-	return ts;
-}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/SampleASTs.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/SampleASTs.java
deleted file mode 100644
index 63e7bea..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/SampleASTs.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.dom;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.jsdt.core.dom.AST;
-import org.eclipse.wst.jsdt.core.dom.ASTNode;
-import org.eclipse.wst.jsdt.core.dom.AnonymousClassDeclaration;
-import org.eclipse.wst.jsdt.core.dom.ArrayAccess;
-import org.eclipse.wst.jsdt.core.dom.ArrayCreation;
-import org.eclipse.wst.jsdt.core.dom.ArrayInitializer;
-import org.eclipse.wst.jsdt.core.dom.ArrayType;
-import org.eclipse.wst.jsdt.core.dom.Assignment;
-import org.eclipse.wst.jsdt.core.dom.Block;
-import org.eclipse.wst.jsdt.core.dom.BooleanLiteral;
-import org.eclipse.wst.jsdt.core.dom.BreakStatement;
-import org.eclipse.wst.jsdt.core.dom.CatchClause;
-import org.eclipse.wst.jsdt.core.dom.CharacterLiteral;
-import org.eclipse.wst.jsdt.core.dom.ClassInstanceCreation;
-import org.eclipse.wst.jsdt.core.dom.ConditionalExpression;
-import org.eclipse.wst.jsdt.core.dom.ConstructorInvocation;
-import org.eclipse.wst.jsdt.core.dom.ContinueStatement;
-import org.eclipse.wst.jsdt.core.dom.DoStatement;
-import org.eclipse.wst.jsdt.core.dom.EmptyStatement;
-import org.eclipse.wst.jsdt.core.dom.EnhancedForStatement;
-import org.eclipse.wst.jsdt.core.dom.ExpressionStatement;
-import org.eclipse.wst.jsdt.core.dom.FieldAccess;
-import org.eclipse.wst.jsdt.core.dom.FieldDeclaration;
-import org.eclipse.wst.jsdt.core.dom.ForStatement;
-import org.eclipse.wst.jsdt.core.dom.FunctionDeclaration;
-import org.eclipse.wst.jsdt.core.dom.FunctionInvocation;
-import org.eclipse.wst.jsdt.core.dom.FunctionRef;
-import org.eclipse.wst.jsdt.core.dom.IfStatement;
-import org.eclipse.wst.jsdt.core.dom.ImportDeclaration;
-import org.eclipse.wst.jsdt.core.dom.InfixExpression;
-import org.eclipse.wst.jsdt.core.dom.Initializer;
-import org.eclipse.wst.jsdt.core.dom.InstanceofExpression;
-import org.eclipse.wst.jsdt.core.dom.JSdoc;
-import org.eclipse.wst.jsdt.core.dom.JavaScriptUnit;
-import org.eclipse.wst.jsdt.core.dom.LabeledStatement;
-import org.eclipse.wst.jsdt.core.dom.Name;
-import org.eclipse.wst.jsdt.core.dom.NullLiteral;
-import org.eclipse.wst.jsdt.core.dom.NumberLiteral;
-import org.eclipse.wst.jsdt.core.dom.PackageDeclaration;
-import org.eclipse.wst.jsdt.core.dom.ParenthesizedExpression;
-import org.eclipse.wst.jsdt.core.dom.PostfixExpression;
-import org.eclipse.wst.jsdt.core.dom.PrefixExpression;
-import org.eclipse.wst.jsdt.core.dom.PrimitiveType;
-import org.eclipse.wst.jsdt.core.dom.QualifiedName;
-import org.eclipse.wst.jsdt.core.dom.QualifiedType;
-import org.eclipse.wst.jsdt.core.dom.ReturnStatement;
-import org.eclipse.wst.jsdt.core.dom.SimpleName;
-import org.eclipse.wst.jsdt.core.dom.SimpleType;
-import org.eclipse.wst.jsdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.wst.jsdt.core.dom.StringLiteral;
-import org.eclipse.wst.jsdt.core.dom.SuperConstructorInvocation;
-import org.eclipse.wst.jsdt.core.dom.SuperFieldAccess;
-import org.eclipse.wst.jsdt.core.dom.SuperMethodInvocation;
-import org.eclipse.wst.jsdt.core.dom.SwitchCase;
-import org.eclipse.wst.jsdt.core.dom.SwitchStatement;
-import org.eclipse.wst.jsdt.core.dom.TagElement;
-import org.eclipse.wst.jsdt.core.dom.ThisExpression;
-import org.eclipse.wst.jsdt.core.dom.ThrowStatement;
-import org.eclipse.wst.jsdt.core.dom.TryStatement;
-import org.eclipse.wst.jsdt.core.dom.TypeDeclaration;
-import org.eclipse.wst.jsdt.core.dom.TypeDeclarationStatement;
-import org.eclipse.wst.jsdt.core.dom.TypeLiteral;
-import org.eclipse.wst.jsdt.core.dom.VariableDeclarationExpression;
-import org.eclipse.wst.jsdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.wst.jsdt.core.dom.VariableDeclarationStatement;
-import org.eclipse.wst.jsdt.core.dom.WhileStatement;
-
-public class SampleASTs {
-	/**
-	 * Returns a subtree of sample of AST nodes. The sample includes
-	 * one of each kind (except for BlockComment and LineComment,
-     * which cannot be connected directly to a JavaScriptUnit),
-     * but otherwise does not make sense.
-	 */
-	public static ASTNode oneOfEach(AST target) {
-		JavaScriptUnit cu = target.newJavaScriptUnit();
-		PackageDeclaration pd = target.newPackageDeclaration();
-		cu.setPackage(pd);
-		
-		ImportDeclaration im = target.newImportDeclaration();
-		cu.imports().add(im);
-		
-		TypeDeclaration td = target.newTypeDeclaration();
-		cu.types().add(td);
-		JSdoc javadoc = target.newJSdoc();
-		td.setJavadoc(javadoc);
-		TagElement tg = target.newTagElement();
-		javadoc.tags().add(tg);
-		tg.fragments().add(target.newTextElement());
-		tg.fragments().add(target.newMemberRef());
-		FunctionRef mr = target.newFunctionRef();
-		tg.fragments().add(mr);
-		mr.parameters().add(target.newFunctionRefParameter());
-				
-		VariableDeclarationFragment variableDeclarationFragment = target.newVariableDeclarationFragment();
-		FieldDeclaration fd = 
-			target.newFieldDeclaration(variableDeclarationFragment);
-		td.bodyDeclarations().add(fd);	
-		
-		Initializer in = target.newInitializer();
-		td.bodyDeclarations().add(in);	
-
-		
-		FunctionDeclaration md = target.newFunctionDeclaration();
-		SingleVariableDeclaration singleVariableDeclaration = target.newSingleVariableDeclaration();
-		md.parameters().add(singleVariableDeclaration);
-		td.bodyDeclarations().add(md);
-		
-		SimpleName sn1 = target.newSimpleName("one"); //$NON-NLS-1$
-		SimpleName sn2 =target.newSimpleName("two"); //$NON-NLS-1$
-		QualifiedName qn = target.newQualifiedName(sn1, sn2);
-		
-		PrimitiveType pt = target.newPrimitiveType(PrimitiveType.INT);
-		ArrayType at = target.newArrayType(pt);
-		fd.setType(at);
-
-		if (target.apiLevel() >= AST.JLS3) {
-			SimpleType st = target.newSimpleType(qn);
-			QualifiedType qt = target.newQualifiedType(st, target.newSimpleName("x")); //$NON-NLS-1$
-		}
-		
-		Block b = target.newBlock();
-		md.setBody(b);
-		
-		// all statements (in alphabetic order of statement type)
-		Block block = target.newBlock();
-		b.statements().add(block);
-		BreakStatement breakStatement = target.newBreakStatement();
-		b.statements().add(breakStatement);
-		ContinueStatement continueStatement = target.newContinueStatement();
-		b.statements().add(continueStatement);
-		ConstructorInvocation constructorInvocation = target.newConstructorInvocation();
-		b.statements().add(constructorInvocation);
-		DoStatement doStatement = target.newDoStatement();
-		b.statements().add(doStatement);
-		EmptyStatement emptyStatement = target.newEmptyStatement();
-		b.statements().add(emptyStatement);
-		NullLiteral nullLiteral = target.newNullLiteral();
-		ExpressionStatement expressionStatement = target.newExpressionStatement(nullLiteral);
-		b.statements().add(expressionStatement);
-		ForStatement forStatement = target.newForStatement();
-		b.statements().add(forStatement);
-		if (target.apiLevel() >= AST.JLS3) {
-			EnhancedForStatement foreachStatement = target.newEnhancedForStatement();
-			b.statements().add(foreachStatement);
-		}
-		IfStatement ifStatement = target.newIfStatement();
-		b.statements().add(ifStatement);
-		LabeledStatement labeledStatement = target.newLabeledStatement();
-		b.statements().add(labeledStatement);
-		ReturnStatement returnStatement = target.newReturnStatement();
-		b.statements().add(returnStatement);
-		SuperConstructorInvocation superConstructorInvocation = target.newSuperConstructorInvocation();
-		b.statements().add(superConstructorInvocation);
-		SwitchStatement ss = target.newSwitchStatement();
-		SwitchCase switchCase = target.newSwitchCase();
-		ss.statements().add(switchCase);
-		b.statements().add(ss);
-		SwitchStatement switchStatement = target.newSwitchStatement();
-		b.statements().add(switchStatement);
-		SwitchCase switchCase2 = target.newSwitchCase();
-		b.statements().add(switchCase2);
-		ThrowStatement throwStatement = target.newThrowStatement();
-		b.statements().add(throwStatement);
-		TryStatement tr = target.newTryStatement();
-		CatchClause catchClause = target.newCatchClause();
-		tr.catchClauses().add(catchClause);
-		b.statements().add(tr);
-		
-		TypeDeclaration typeDeclaration = target.newTypeDeclaration();
-		TypeDeclarationStatement typeDeclarationStatement = target.newTypeDeclarationStatement(typeDeclaration);
-		b.statements().add(typeDeclarationStatement);
-		VariableDeclarationFragment variableDeclarationFragment2 = target.newVariableDeclarationFragment();
-		VariableDeclarationStatement variableDeclarationStatement = target.newVariableDeclarationStatement(variableDeclarationFragment2);
-		b.statements().add(variableDeclarationStatement);
-		WhileStatement whileStatement = target.newWhileStatement();
-		b.statements().add(whileStatement);
-
-		// all expressions (in alphabetic order of expressions type)
-		FunctionInvocation inv = target.newFunctionInvocation();
-		ExpressionStatement expressionStatement2 = target.newExpressionStatement(inv);
-		b.statements().add(expressionStatement2);
-		List z = inv.arguments();
-		ArrayAccess arrayAccess = target.newArrayAccess();
-		z.add(arrayAccess);
-		ArrayCreation arrayCreation = target.newArrayCreation();
-		z.add(arrayCreation);
-		ArrayInitializer arrayInitializer = target.newArrayInitializer();
-		z.add(arrayInitializer);
-		Assignment assignment = target.newAssignment();
-		z.add(assignment);
-		BooleanLiteral booleanLiteral = target.newBooleanLiteral(true);
-		z.add(booleanLiteral);
-		CharacterLiteral characterLiteral = target.newCharacterLiteral();
-		z.add(characterLiteral);
-		ClassInstanceCreation cic = target.newClassInstanceCreation();
-		AnonymousClassDeclaration anonymousClassDeclaration = target.newAnonymousClassDeclaration();
-		cic.setAnonymousClassDeclaration(anonymousClassDeclaration);
-		z.add(cic);
-		ConditionalExpression conditionalExpression = target.newConditionalExpression();
-		z.add(conditionalExpression);
-		FieldAccess fieldAccess = target.newFieldAccess();
-		z.add(fieldAccess);
-		InfixExpression infixExpression = target.newInfixExpression();
-		z.add(infixExpression);
-		InstanceofExpression instanceofExpression = target.newInstanceofExpression();
-		z.add(instanceofExpression);
-		FunctionInvocation methodInvocation = target.newFunctionInvocation();
-		z.add(methodInvocation);
-		Name name = target.newName(new String[]{"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
-		z.add(name);
-		NullLiteral nullLiteral2 = target.newNullLiteral();
-		z.add(nullLiteral2);
-		NumberLiteral numberLiteral = target.newNumberLiteral("1024"); //$NON-NLS-1$
-		z.add(numberLiteral);
-		ParenthesizedExpression parenthesizedExpression = target.newParenthesizedExpression();
-		z.add(parenthesizedExpression);
-		PostfixExpression postfixExpression = target.newPostfixExpression();
-		z.add(postfixExpression);
-		PrefixExpression prefixExpression = target.newPrefixExpression();
-		z.add(prefixExpression);
-		StringLiteral stringLiteral = target.newStringLiteral();
-		z.add(stringLiteral);
-		SuperFieldAccess superFieldAccess = target.newSuperFieldAccess();
-		z.add(superFieldAccess);
-		SuperMethodInvocation superMethodInvocation = target.newSuperMethodInvocation();
-		z.add(superMethodInvocation);
-		ThisExpression thisExpression = target.newThisExpression();
-		z.add(thisExpression);
-		TypeLiteral typeLiteral = target.newTypeLiteral();
-		z.add(typeLiteral);
-		VariableDeclarationFragment variableDeclarationFragment3 = target.newVariableDeclarationFragment();
-		VariableDeclarationExpression variableDeclarationExpression = target.newVariableDeclarationExpression(variableDeclarationFragment3);
-		z.add(variableDeclarationExpression);
-		
-
-		return cu;
-	}
-	
-	/**
-	 * Returns a flat list of sample nodes of each type.
-	 * The sample includes one of each kind, including
-	 * BlockComment and LineComment.
-	 */
-	public static List oneOfEachList(AST target) {
-		List result = new ArrayList(100);
-		for (int nodeType = 0; nodeType < 100; nodeType++) {
-			Class nodeClass = null;
-			try {
-				nodeClass = ASTNode.nodeClassForType(nodeType);
-			} catch (RuntimeException e) {
-				// oops - guess that's not valid
-			}
-			if (nodeClass != null) {
-				result.add(target.createInstance(nodeClass));
-			}
-		}
-		return result;
-	}
-
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/DecodeCodeFormatterPreferences.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/DecodeCodeFormatterPreferences.java
deleted file mode 100644
index a4bec45..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/DecodeCodeFormatterPreferences.java
+++ /dev/null
@@ -1,154 +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.jsdt.core.tests.formatter;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class DecodeCodeFormatterPreferences extends DefaultHandler {
-	
-	private boolean record;
-	private Map entries;
-	private String profileName;
-
-	public static Map decodeCodeFormatterOptions(String fileName) {
-		try {
-			LineNumberReader reader = new LineNumberReader(new FileReader(fileName));
-			Map options = new HashMap();
-			String line;
-			while ((line = reader.readLine()) != null) {
-				if (line.startsWith("#")) {
-					continue;
-				}
-				StringTokenizer stringTokenizer = new StringTokenizer(line, "=");
-				options.put(stringTokenizer.nextElement(), stringTokenizer.nextElement());
-			}
-			reader.close();
-			return options;
-		} catch (IOException e) {
-			// ignore
-		}
-		return null;
-	}
-
-	public static Map decodeCodeFormatterOptions(String fileName, String profileName) {
-		try {
-			SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
-			final DecodeCodeFormatterPreferences preferences = new DecodeCodeFormatterPreferences(profileName);
-			saxParser.parse(new File(fileName), preferences);
-			return preferences.getEntries();
-		} catch (ParserConfigurationException e) {
-			e.printStackTrace();
-		} catch (SAXException e) {
-			e.printStackTrace();
-		} catch (FactoryConfigurationError e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	public static Map decodeCodeFormatterOptions(String zipFileName, String zipEntryName, String profileName) {
-		ZipFile zipFile = null;
-		BufferedInputStream inputStream = null;
-		try {
-			zipFile = new ZipFile(zipFileName);
-			ZipEntry zipEntry = zipFile.getEntry(zipEntryName);
-			if (zipEntry == null) {
-				return null;
-			}
-			inputStream = new BufferedInputStream(zipFile.getInputStream(zipEntry));
-			SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
-			final DecodeCodeFormatterPreferences preferences = new DecodeCodeFormatterPreferences(profileName);
-			saxParser.parse(inputStream, preferences);
-			return preferences.getEntries();
-		} catch (ParserConfigurationException e) {
-			e.printStackTrace();
-		} catch (SAXException e) {
-			e.printStackTrace();
-		} catch (FactoryConfigurationError e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-				if (zipFile != null) {
-					zipFile.close();
-				}
-			} catch (IOException e1) {
-				// Do nothing
-			}
-		}
-		return null;
-	}
-	
-	DecodeCodeFormatterPreferences(String profileName) {
-		this.profileName = profileName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
-	public void startElement(String uri, String localName, String qName,
-			Attributes attributes) throws SAXException {
-		
-		int attributesLength = attributes.getLength();
-		if ("profile".equals(qName)) {
-			for (int i = 0; i < attributesLength; i++) {
-				if ("name".equals(attributes.getQName(i)) && profileName.equals(attributes.getValue(i))) {
-					record = true;
-					entries = new HashMap();
-					break;
-				}
-			}
-		} else if ("setting".equals(qName) && record) {
-			if (attributesLength == 2) {
-				entries.put(attributes.getValue(0), attributes.getValue(1));
-			}
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public void endElement(String uri, String localName, String qName)
-			throws SAXException {
-		if ("profile".equals(qName) && record) {
-			record = false;
-		}
-	}
-	/**
-	 * @return Returns the entries.
-	 */
-	public Map getEntries() {
-		return entries;
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/FormatterRegressionTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/FormatterRegressionTests.java
deleted file mode 100644
index 8bc4a4f..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/FormatterRegressionTests.java
+++ /dev/null
@@ -1,9164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.formatter;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.jsdt.core.compiler.CharOperation;
-import org.eclipse.wst.jsdt.core.dom.ASTNode;
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-import org.eclipse.wst.jsdt.core.formatter.DefaultCodeFormatterConstants;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.ToolFactory;
-import org.eclipse.wst.jsdt.core.tests.model.AbstractJavaModelTests;
-import org.eclipse.wst.jsdt.core.tests.util.Util;
-import org.eclipse.wst.jsdt.internal.compiler.impl.CompilerOptions;
-import org.eclipse.wst.jsdt.internal.formatter.DefaultCodeFormatter;
-import org.eclipse.wst.jsdt.internal.formatter.DefaultCodeFormatterOptions;
-import org.eclipse.text.edits.TextEdit;
-
-public class FormatterRegressionTests extends AbstractJavaModelTests {
-		
-	public static final int UNKNOWN_KIND = 0;
-	public static final String IN = "_in";
-	public static final String OUT = "_out";
-	public static final boolean DEBUG = false;
-	private static final String LINE_SEPARATOR = System.getProperty("line.separator");
-	private long time;
-	
-	static {
-//		TESTS_NUMBERS = new int[] { 650 };
-//		TESTS_RANGE = new int[] { 650, -1 };
-	}
-	public static Test suite() {
-		return buildModelTestSuite(FormatterRegressionTests.class);
-	}
-
-	public FormatterRegressionTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Returns the OS path to the directory that contains this plugin.
-	 */
-	protected String getPluginDirectoryPath() {
-		try {
-			URL platformURL = Platform.getBundle("org.eclipse.wst.jsdt.core.tests.model").getEntry("/");
-			return new File(FileLocator.toFileURL(platformURL).getFile()).getAbsolutePath();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	private String getResource(String packageName, String resourceName) {
-		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-		IResource resource = workspaceRoot.findMember(new Path("/Formatter/" + packageName + "/" + resourceName));
-		assertNotNull("No resource found", resource);
-		return resource.getLocation().toOSString();
-	}
-	
-	private String getZipEntryContents(String fileName, String zipEntryName) {
-		ZipFile zipFile = null;
-		BufferedInputStream inputStream  = null;
-		try {
-			zipFile = new ZipFile(fileName);
-			ZipEntry zipEntry = zipFile.getEntry(zipEntryName);
-			inputStream = new BufferedInputStream(zipFile.getInputStream(zipEntry));
-			return new String(org.eclipse.wst.jsdt.internal.compiler.util.Util.getInputStreamAsCharArray(inputStream, -1, null));
-		} catch (IOException e) {
-		} finally {
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-				if (zipFile != null) {
-					zipFile.close();
-				}
-			} catch (IOException e1) {
-				// Do nothing
-			}
-		}
-		return null;
-	}
-	
-	public String getSourceWorkspacePath() {
-		return getPluginDirectoryPath() +  java.io.File.separator + "workspace";
-	}
-	
-	private String runFormatter(CodeFormatter codeFormatter, String source, int kind, int indentationLevel, int offset, int length, String lineSeparator) {
-//		long time = System.currentTimeMillis();
-		TextEdit edit = codeFormatter.format(kind, source, offset, length, indentationLevel, lineSeparator);//$NON-NLS-1$
-//		System.out.println((System.currentTimeMillis() - time) + " ms");
-		if (edit == null) return null;
-//		System.out.println(edit.getChildrenSize() + " edits");
-		String result = org.eclipse.wst.jsdt.internal.core.util.Util.editedString(source, edit);
-
-		if (length == source.length()) {
-//			time = System.currentTimeMillis();
-			edit = codeFormatter.format(kind, result, 0, result.length(), indentationLevel, lineSeparator);//$NON-NLS-1$
-//			System.out.println((System.currentTimeMillis() - time) + " ms");
-			if (edit == null) return null;
-//			assertEquals("Should not have edits", 0, edit.getChildren().length);
-			final String result2 = org.eclipse.wst.jsdt.internal.core.util.Util.editedString(result, edit);
-			if (!result.equals(result2)) {
-				assertSourceEquals("Different reformatting", Util.convertToIndependantLineDelimiter(result), Util.convertToIndependantLineDelimiter(result2));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Create project and set the jar placeholder.
-	 */
-	public void setUpSuite() throws Exception {
-		// ensure autobuilding is turned off
-		IWorkspaceDescription description = getWorkspace().getDescription();
-		if (description.isAutoBuilding()) {
-			description.setAutoBuilding(false);
-			getWorkspace().setDescription(description);
-		}
-		setUpJavaProject("Formatter"); //$NON-NLS-1$
-		if (DEBUG) {
-			this.time = System.currentTimeMillis();
-		}
-	}	
-
-	/**
-	 * Reset the jar placeholder and delete project.
-	 */
-	public void tearDownSuite() throws Exception {
-		this.deleteProject("Formatter"); //$NON-NLS-1$
-		if (DEBUG) {
-			System.out.println("Time spent = " + (System.currentTimeMillis() - this.time));//$NON-NLS-1$
-		}
-		super.tearDown();
-	}	
-
-	private String getIn(String compilationUnitName) {
-		assertNotNull(compilationUnitName);
-		int dotIndex = compilationUnitName.indexOf('.');
-		assertTrue(dotIndex != -1);
-		return compilationUnitName.substring(0, dotIndex) + IN + compilationUnitName.substring(dotIndex);
-	}
-	
-	private String getOut(String compilationUnitName) {
-		assertNotNull(compilationUnitName);
-		int dotIndex = compilationUnitName.indexOf('.');
-		assertTrue(dotIndex != -1);
-		return compilationUnitName.substring(0, dotIndex) + OUT + compilationUnitName.substring(dotIndex);
-	}
-
-	private void assertLineEquals(String actualContents, String originalSource, String expectedContents, boolean checkNull) {
-		if (actualContents == null) {
-			assertTrue("actualContents is null", checkNull);
-			assertEquals(expectedContents, originalSource);
-			return;
-		}
-		assertSourceEquals("Different number of length", Util.convertToIndependantLineDelimiter(expectedContents), actualContents);
-	}
-
-	private void runTest(String packageName, String compilationUnitName) {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, packageName, compilationUnitName, CodeFormatter.K_JAVASCRIPT_UNIT, 0);
-	}
-	
-	private void runTest(CodeFormatter codeFormatter, String packageName, String compilationUnitName) {
-		runTest(codeFormatter, packageName, compilationUnitName, CodeFormatter.K_JAVASCRIPT_UNIT, 0);
-	}
-
-	private void runTest(String packageName, String compilationUnitName, int kind) {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, packageName, compilationUnitName, kind, 0);
-	}
-
-	private void runTest(CodeFormatter codeFormatter, String packageName, String compilationUnitName, int kind) {
-		runTest(codeFormatter, packageName, compilationUnitName, kind, 0, false, 0, -1);
-	}
-
-	private void runTest(CodeFormatter codeFormatter, String packageName, String compilationUnitName, int kind, boolean checkNull) {
-		runTest(codeFormatter, packageName, compilationUnitName, kind, 0, checkNull, 0, -1);
-	}
-
-	private void runTest(CodeFormatter codeFormatter, String packageName, String compilationUnitName, int kind, int indentationLevel) {
-		runTest(codeFormatter, packageName, compilationUnitName, kind, indentationLevel, false, 0, -1);
-	}
-	private void runTest(CodeFormatter codeFormatter, String packageName, String compilationUnitName, int kind, int indentationLevel, boolean checkNull, int offset, int length) {
-		runTest(codeFormatter, packageName, compilationUnitName, kind, indentationLevel, checkNull, offset, length, null);
-	}
-	
-	private void runTest(String input, String output, CodeFormatter codeFormatter, int kind, int indentationLevel, boolean checkNull, int offset, int length, String lineSeparator) {
-		String result;
-		if (length == -1) {
-			result = runFormatter(codeFormatter, input, kind, indentationLevel, offset, input.length(), lineSeparator);
-		} else {
-			result = runFormatter(codeFormatter, input, kind, indentationLevel, offset, length, lineSeparator);
-		}
-		assertLineEquals(result, input, output, checkNull);
-	}
-
-	private void runTest(String source, String expectedResult, CodeFormatter codeFormatter, int kind, int indentationLevel, boolean checkNull, int offset, int length) {
-		String result;
-		if (length == -1) {
-			result = runFormatter(codeFormatter, source, kind, indentationLevel, offset, source.length(), null);
-		} else {
-			result = runFormatter(codeFormatter, source, kind, indentationLevel, offset, length, null);
-		}
-		assertLineEquals(result, source, expectedResult, checkNull);
-	}
-	
-	private void runTest(CodeFormatter codeFormatter, String packageName, String compilationUnitName, int kind, int indentationLevel, boolean checkNull, int offset, int length, String lineSeparator) {
-		try {
-			IJavaScriptUnit sourceUnit = getCompilationUnit("Formatter" , "", packageName, getIn(compilationUnitName)); //$NON-NLS-1$ //$NON-NLS-2$
-			String s = sourceUnit.getSource();
-			assertNotNull(s);
-			IJavaScriptUnit outputUnit = getCompilationUnit("Formatter" , "", packageName, getOut(compilationUnitName)); //$NON-NLS-1$ //$NON-NLS-2$
-			assertNotNull(outputUnit);
-			String result;
-			if (length == -1) {
-				result = runFormatter(codeFormatter, s, kind, indentationLevel, offset, s.length(), lineSeparator);
-			} else {
-				result = runFormatter(codeFormatter, s, kind, indentationLevel, offset, length, lineSeparator);
-			}
-			assertLineEquals(result, s, outputUnit.getSource(), checkNull);
-		} catch (JavaScriptModelException e) {
-			e.printStackTrace();
-			assertTrue(false);
-		}
-	}
-
-	String getSource(ASTNode astNode, char[] source) {
-		String result = new String(CharOperation.subarray(source, astNode.getStartPosition() + 1, astNode.getStartPosition() + astNode.getLength() - 1));
-		if (result.endsWith("\\n")) {
-			return result.substring(0, result.length() - 2) + LINE_SEPARATOR;
-		}
-		return result;
-	}
-
-	public void test000() {
-		runTest("test002", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	   }
-
-	
-	public void test001() {
-		runTest("test001", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	public void test002() {
-		runTest("test002", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-//	public void test003() {
-//		runTest("test003", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-//	}
-//
-//	public void test004() {
-//		runTest("test004", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-//	}
-//	public void test005() {
-//		runTest("test005", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-//	}
-//
-//	public void test006() {
-//		runTest("test006", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-//	}
-//
-//	public void test007() {
-//		runTest("test007", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-//	}
-//	
-//	public void test008() {
-//		runTest("test008", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-//	}
-
-	public void test009() {
-		runTest("test009", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test010() {
-		runTest("test010", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test011() {
-		runTest("test011", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test012() {
-		runTest("test012", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test013() {
-		runTest("test013", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test014() {
-		runTest("test014", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test015() {
-		runTest("test015", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test016() {
-		runTest("test016", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test017() {
-		runTest("test017", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test018() {
-		runTest("test018", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test019() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test019", "A_1.js");//$NON-NLS-1$ //$NON-NLS-2$
-
-		preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test019", "A_2.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test020() {
-		runTest("test020", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test021() {
-		runTest("test021", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test022() {
-		runTest("test022", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test023() {
-		runTest("test023", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test024() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_then_statement_on_same_line = true;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test024", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test025() {
-		runTest("test025", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test026() {
-		runTest("test026", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test027() {
-		runTest("test027", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test028() {
-		runTest("test028", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test029() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_then_statement_on_same_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.compact_else_if = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter,"test029", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test030() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_then_statement_on_same_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test030", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test031() {
-		runTest("test031", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test032() {
-		runTest("test032", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test033() {
-		runTest("test033", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test034() {
-		runTest("test034", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test035() {
-		runTest("test035", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test036() {
-		runTest("test036", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test037() {
-		runTest("test037", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test038() {
-		runTest("test038", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test039() {
-		runTest("test039", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test040() {
-		runTest("test040", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test041() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test041", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test042() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_space_before_opening_brace_in_block = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test042", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test043() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test043", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test044() {
-		runTest("test044", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test045() {
-		runTest("test045", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test046() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_assignment_operator = false;
-		preferences.insert_space_before_assignment_operator = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test046", "A.js", CodeFormatter.K_EXPRESSION);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test047() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_assignment_operator = true;
-		preferences.insert_space_before_assignment_operator = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test047", "A.js", CodeFormatter.K_STATEMENTS, 2);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test048() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_assignment_operator = true;
-		preferences.insert_space_before_assignment_operator = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test048", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test049() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_assignment_operator = true;
-		preferences.insert_space_before_assignment_operator = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test049", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test050() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_binary_operator = false;
-		preferences.insert_space_before_unary_operator = false;
-		preferences.insert_space_after_unary_operator = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test050", "A.js", CodeFormatter.K_EXPRESSION);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test051() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_assignment_operator = true;
-		preferences.insert_space_before_assignment_operator = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test051", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test052() {
-		runTest("test052", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test053() {
-		runTest("test053", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test054() {
-		runTest("test054", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test055() {
-		runTest("test055", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test056() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_then_statement_on_same_line = true;
-		preferences.keep_else_statement_on_same_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test056", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test057() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		assertEquals(false, DefaultCodeFormatterConstants.getForceWrapping((String)options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER)));
-		assertEquals(DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.getWrappingStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER)));
-		assertEquals(DefaultCodeFormatterConstants.INDENT_DEFAULT, DefaultCodeFormatterConstants.getIndentStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER)));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.align_type_members_on_columns = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test057", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test058() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		assertEquals(false, DefaultCodeFormatterConstants.getForceWrapping((String)options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER)));
-		assertEquals(DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.getWrappingStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER)));
-		assertEquals(DefaultCodeFormatterConstants.INDENT_DEFAULT, DefaultCodeFormatterConstants.getIndentStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER)));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.align_type_members_on_columns = true;
-		preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.blank_lines_between_import_groups = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test058", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test059() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.align_type_members_on_columns = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test059", "Parser.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test060() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.align_type_members_on_columns = false;
-		preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.blank_lines_between_import_groups = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		//long time = System.currentTimeMillis();
-		runTest(codeFormatter, "test060", "Parser.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}		
-
-	public void test061() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.blank_lines_between_import_groups = 0;
-		preferences.align_type_members_on_columns = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test061", "Parser.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test062() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_assignment_operator = true;
-		preferences.insert_space_before_assignment_operator = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test062", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test063() {
-		runTest("test063", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test064() {
-		runTest("test064", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// Line break inside an array initializer (line comment)	
-	public void test065() {
-		runTest("test065", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test066() {
-		runTest("test066", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test067() {
-		runTest("test067", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	// bug 3181
-	public void test068() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_ALLOCATION_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test068", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 3327
-	public void test069() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-		preferences.blank_lines_before_method = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test069", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// 5691
-	public void test070() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test070", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test071() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.indent_body_declarations_compare_to_type_header = false;
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.align_type_members_on_columns = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test071", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// bug 7224
-	public void test072() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test072", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 7439
-	public void test073() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_then_statement_on_same_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test073", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 12321
-	public void test074() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.insert_new_line_before_catch_in_try_statement = true;
-		preferences.insert_new_line_before_else_in_if_statement = true;
-		preferences.insert_new_line_before_finally_in_try_statement = true;
-		preferences.insert_new_line_before_while_in_do_statement = true;
-		preferences.keep_simple_if_on_one_line = false;
-		preferences.keep_then_statement_on_same_line = false;
-		preferences.keep_else_statement_on_same_line = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test074", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 14659
-	public void test075() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.page_width = 57;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test075", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 16231
-	public void test076() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test076", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 16233
-	public void test077() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test077", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 17349
-	public void test078() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test078", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 19811
-	public void test079() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test079", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 19811
-	public void test080() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.continuation_indentation = 2;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test080", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 19811
-	public void test081() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test081", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 19999
-	public void test082() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 2;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test082", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// bug 20721
-	public void test083() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test083", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 21943
-	public void test084() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.insert_space_before_opening_paren_in_if = false;
-		preferences.insert_space_before_opening_paren_in_for = false;
-		preferences.insert_space_before_opening_paren_in_while = false;
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_then_statement_on_same_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test084", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 21943
-	public void test085() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.insert_space_before_opening_paren_in_if = true;
-		preferences.insert_space_before_opening_paren_in_for = true;
-		preferences.insert_space_before_opening_paren_in_while = true;
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_then_statement_on_same_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test085", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 22313
-	public void test086() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_before_catch_in_try_statement = true;
-		preferences.insert_new_line_before_else_in_if_statement = true;
-		preferences.insert_new_line_before_finally_in_try_statement = true;
-		preferences.insert_new_line_before_while_in_do_statement = true;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.insert_space_before_binary_operator = false;
-		preferences.insert_space_after_binary_operator = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test086", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 23144
-	public void test087() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.keep_simple_if_on_one_line = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test087", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 23144
-	public void test088() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.keep_simple_if_on_one_line = false;
-		preferences.keep_guardian_clause_on_one_line = false;
-		preferences.keep_then_statement_on_same_line = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test088", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// bug 24200
-	public void test089() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_opening_paren_in_parenthesized_expression = true;
-		preferences.insert_space_before_closing_paren_in_parenthesized_expression = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test089", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 24200
-	public void test090() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_opening_bracket_in_array_reference = true;
-		preferences.insert_space_before_closing_bracket_in_array_reference = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test090", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 25559
-	public void test091() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_assignment_operator = false;
-		preferences.insert_space_before_assignment_operator = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test091", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 25559
-	public void test092() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_binary_operator = false;
-		preferences.insert_space_before_binary_operator = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test092", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 25559
-	public void test093() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_closing_paren_in_cast = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test093", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 25559
-	public void test094() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_assignment_operator = false;
-		preferences.insert_space_before_assignment_operator = false;
-		preferences.insert_space_after_comma_in_method_invocation_arguments = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test094", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// bug 27196
-	public void test095() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED;
-		preferences.indent_statements_compare_to_block = false;
-		preferences.indent_statements_compare_to_body = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test095", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 28098
-	public void test096() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test096", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 34897
-	public void test097() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_opening_paren_in_method_invocation = true;
-		preferences.insert_space_before_closing_paren_in_method_invocation = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test097", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 35173
-	public void test098() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.brace_position_for_anonymous_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test098", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 35433
-	public void test099() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_before_opening_paren_in_method_declaration = true;
-		preferences.insert_space_before_opening_paren_in_for = true;
-		preferences.insert_space_after_semicolon_in_for = false;
-		preferences.put_empty_statement_on_new_line = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test099", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test100() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_before_opening_brace_in_array_initializer = true;
-		preferences.insert_space_after_opening_brace_in_array_initializer = true;
-		preferences.insert_space_before_closing_brace_in_array_initializer = true;
-		preferences.number_of_empty_lines_to_preserve = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test100", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// bug 36832
-	public void test101() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test101", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 37057
-	public void test102() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 1;
-		preferences.line_separator = "\n";//$NON-NLS-1$
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test102", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 37106
-	public void test103() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test103", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 37657
-	public void test104() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_opening_paren_in_if = true;
-		preferences.insert_space_before_closing_paren_in_if = true;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED;
-		preferences.insert_new_line_before_catch_in_try_statement = true;
-		preferences.insert_new_line_before_else_in_if_statement = true;
-		preferences.insert_new_line_before_finally_in_try_statement = true;
-		preferences.insert_new_line_before_while_in_do_statement = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test104", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 38151
-	public void test105() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test105", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 39603
-	public void test106() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test106", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// bug 39607
-	public void test107() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.keep_then_statement_on_same_line = false;
-		preferences.keep_simple_if_on_one_line = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test107", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// bug 40777
-	public void test108() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test108", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test109() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.blank_lines_before_package = 2;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test109", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test110() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.blank_lines_before_package = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test110", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test111() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.blank_lines_after_package = 1;
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-		preferences.blank_lines_before_new_chunk = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test111", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test112() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.blank_lines_after_package = 1;
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-		preferences.blank_lines_before_new_chunk = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test112", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test113() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test113", "A.js");//$NON-NLS-1$ //$NON-NLS-2
-	}
-
-	// bug 14659
-	public void test114() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		assertEquals(false, DefaultCodeFormatterConstants.getForceWrapping((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION)));
-		assertEquals(DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.getWrappingStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION)));
-		assertEquals(DefaultCodeFormatterConstants.INDENT_ON_COLUMN, DefaultCodeFormatterConstants.getIndentStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION)));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.page_width = 57;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test114", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 14659
-	public void test115() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.page_width = 57;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test115", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// bug 14659
-	public void test116() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.page_width = 57;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test116", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// JDT/UI tests
-	public void test117() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test117", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// JDT/UI tests
-	public void test118() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test118", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// JDT/UI tests
-	public void test119() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test119", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// JDT/UI tests
-	public void test120() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test120", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// JDT/UI tests
-	public void test121() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test121", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// probing statements
-	public void test122() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test122", "A.js", CodeFormatter.K_UNKNOWN);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// probing compilation unit
-	public void test123() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test123", "A.js", CodeFormatter.K_UNKNOWN);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	// probing class body declarations
-	public void test124() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.page_width = 57;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test124", "A.js", CodeFormatter.K_UNKNOWN);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// probing expression
-	public void test125() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_binary_operator = false;
-		preferences.insert_space_before_unary_operator = false;
-		preferences.insert_space_after_unary_operator = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test125", "A.js", CodeFormatter.K_UNKNOWN);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// probing unrecognized source
-	public void test126() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test126", "A.js", CodeFormatter.K_UNKNOWN, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// probing unrecognized source
-	public void test127() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test127", "A.js", CodeFormatter.K_UNKNOWN);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// probing unrecognized source
-	public void test128() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test128", "A.js", CodeFormatter.K_UNKNOWN, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test129() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test129", "A.js", CodeFormatter.K_STATEMENTS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test130() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test130", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test131() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test131", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test132() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test132", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test133() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.blank_lines_between_import_groups = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test133", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test134() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test134", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test135() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test135", "A.js", CodeFormatter.K_STATEMENTS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test136() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test136", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test137() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test137", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test138() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test138", "A.js", CodeFormatter.K_STATEMENTS, 2, true, 8, 37);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test139() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test139", "A.js", CodeFormatter.K_STATEMENTS, 0, true, 0, 5);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test140() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test140", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test141() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.indent_switchstatements_compare_to_cases = false;
-		preferences.indent_switchstatements_compare_to_switch = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test141", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test142() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test142", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, 1);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test143() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test143", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, 1);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test144() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test144", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test145() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test145", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test146() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test146", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test147() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_before_assignment_operator = false;
-		preferences.number_of_empty_lines_to_preserve = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test147", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test148() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test148", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test149() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test149", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test150() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test150", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test151() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test151", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test152() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test152", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test153() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.align_type_members_on_columns = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test153", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test154() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test154", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	public void test155() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getJavaConventionsSettings());
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test155", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=44036
-	public void test156() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getJavaConventionsSettings());
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test156", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test157() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test157", "A.js", CodeFormatter.K_STATEMENTS, 0, true, 11, 7);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test158() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test158", "A.js", CodeFormatter.K_STATEMENTS, 0, true, 11, 8);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test159() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test159", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/*
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44481
-	 */
-	public void test160() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.insert_new_line_before_catch_in_try_statement = false;
-		preferences.insert_new_line_before_else_in_if_statement = false;
-		preferences.insert_new_line_before_finally_in_try_statement = false;
-		preferences.insert_new_line_before_while_in_do_statement = false;
-		preferences.compact_else_if = true;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test160", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/*
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44481
-	 */
-	public void test161() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.insert_new_line_before_catch_in_try_statement = false;
-		preferences.insert_new_line_before_else_in_if_statement = false;
-		preferences.insert_new_line_before_finally_in_try_statement = false;
-		preferences.insert_new_line_before_while_in_do_statement = false;
-		preferences.compact_else_if = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test161", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/*
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44481
-	 */
-	public void test162() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.insert_new_line_before_catch_in_try_statement = true;
-		preferences.insert_new_line_before_else_in_if_statement = true;
-		preferences.insert_new_line_before_finally_in_try_statement = true;
-		preferences.insert_new_line_before_while_in_do_statement = true;
-		preferences.compact_else_if = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test162", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/*
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44481
-	 */
-	public void test163() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.insert_new_line_before_catch_in_try_statement = true;
-		preferences.insert_new_line_before_else_in_if_statement = true;
-		preferences.insert_new_line_before_finally_in_try_statement = true;
-		preferences.insert_new_line_before_while_in_do_statement = true;
-		preferences.compact_else_if = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test163", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44493
-	 */
-	public void test164() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test164", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test165() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test165", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44546
-	 */
-	public void test166() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test166", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44503
-	 */
-	public void test167() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test167", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44503
-	 */
-	public void test169() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test169", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44503
-	 */
-	public void test170() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test170", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44576
-	 */
-	public void test171() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.brace_position_for_anonymous_type_declaration = DefaultCodeFormatterConstants.END_OF_LINE;
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.END_OF_LINE;
-		preferences.brace_position_for_method_declaration = DefaultCodeFormatterConstants.END_OF_LINE;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.END_OF_LINE;
-		preferences.brace_position_for_switch = DefaultCodeFormatterConstants.END_OF_LINE;
-		preferences.compact_else_if = false;
-		preferences.insert_new_line_before_catch_in_try_statement = true;
-		preferences.insert_new_line_before_else_in_if_statement = true;
-		preferences.insert_new_line_before_finally_in_try_statement = true;
-		preferences.insert_new_line_before_while_in_do_statement = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test171", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44576
-	 */
-	public void test172() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.brace_position_for_anonymous_type_declaration = DefaultCodeFormatterConstants.END_OF_LINE;
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.END_OF_LINE;
-		preferences.brace_position_for_method_declaration = DefaultCodeFormatterConstants.END_OF_LINE;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.END_OF_LINE;
-		preferences.brace_position_for_switch = DefaultCodeFormatterConstants.END_OF_LINE;
-		preferences.compact_else_if = false;
-		preferences.insert_new_line_before_catch_in_try_statement = true;
-		preferences.insert_new_line_before_else_in_if_statement = true;
-		preferences.insert_new_line_before_finally_in_try_statement = true;
-		preferences.insert_new_line_before_while_in_do_statement = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test172", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44570
-	 */
-	public void test173() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test173", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44570
-	 */
-	public void test174() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test174", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44570
-	 */
-	public void test175() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test175", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44570
-	 */
-	public void test176() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_new_line_in_empty_method_body = true;
-		preferences.insert_new_line_in_empty_block = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test176", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44570
-	 */
-	public void test177() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test177", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44570
-	 */
-	public void test178() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = true;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test178", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44570
-	 */
-	public void test179() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = true;
-		preferences.insert_new_line_in_empty_type_declaration = true;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test179", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44570
-	 */
-	public void test180() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test180", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44651
-	 */
-	public void test181() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test181", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44651
-	 */
-	public void test182() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test182", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44653
-	 */
-	public void test183() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test183", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44653
-	 */
-	public void test184() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test184", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44653
-	 */
-	public void test185() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test185", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 */
-	public void _test186() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test186", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44839
-	 */
-	public void test187() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.blank_lines_between_import_groups = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test187", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44839
-	 */
-	public void test188() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test188", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44839
-	 */
-	public void test189() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test189", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 */
-	public void test190() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test190", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 */
-	public void test191() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test191", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test192() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.align_type_members_on_columns = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test192", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test193() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test193", "A.js", CodeFormatter.K_STATEMENTS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test194() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test194", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test195() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test195", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test196() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test196", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test197() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test197", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test198() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test198", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test199() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test199", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test201() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test201", "A.js", CodeFormatter.K_STATEMENTS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * TODO Fix multi local declaration alignment
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44909
-	 */
-	public void test202() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test202", "A.js", CodeFormatter.K_STATEMENTS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * TODO Fix multi local declaration alignment
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44909
-	 */
-	public void _test203() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test203", "A.js", CodeFormatter.K_STATEMENTS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test204() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test204", "A.js", CodeFormatter.K_STATEMENTS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test205() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");//$NON-NLS-1$
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test205", "A.js", CodeFormatter.K_STATEMENTS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test206() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test206", "A.js", CodeFormatter.K_STATEMENTS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test207() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test207", "A.js", CodeFormatter.K_STATEMENTS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test208() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test208", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test209() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");//$NON-NLS-1$
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test209", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test210() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");//$NON-NLS-1$
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test210", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test211() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");//$NON-NLS-1$
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test211", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, 1);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test212() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test212", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test213() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test213", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test214() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test214", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test215() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test215", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test216() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test216", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test217() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test217", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test218() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test218", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, 1);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test219() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test219", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, 1);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test220() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test220", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, 1);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test221() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test221", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test222() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test222", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	public void test223() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test223", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	public void test224() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test224", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test225() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test225", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	public void test226() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test226", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test227() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test227", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	public void test228() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test228", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test229() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test229", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	public void test230() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test230", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test231() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test231", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test232() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test232", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test233() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test233", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, 1);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test234() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test234", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test235() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test235", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test236() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test236", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test237() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test237", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test238() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test238", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test239() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test239", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test240() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test240", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test241() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test241", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test242() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test242", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test243() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test243", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test244() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test244", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test245() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test245", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test246() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test246", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test247() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test247", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test248() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test248", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test249() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test249", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test250() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test250", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test251() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test251", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test252() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test252", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test253() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test253", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test254() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test254", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test255() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test255", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test256() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test256", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test257() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test257", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test258() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test258", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test259() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test259", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test260() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test260", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test261() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test261", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test262() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test262", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test263() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test263", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test264() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test264", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test265() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test265", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test266() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test266", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test267() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test267", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test268() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test268", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test269() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test269", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test270() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test270", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test271() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test271", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test272() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK_IN_CASE, DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test272", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test273() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK_IN_CASE, DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test273", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test274() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test274", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	public void test275() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test275", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test276() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test276", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test277() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test277", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test278() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test278", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test279() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test279", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test280() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test280", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test281() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test281", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test282() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test282", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test283() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test283", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test284() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test284", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test285() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test285", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test286() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test286", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test287() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test287", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test288() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test288", "A.js", CodeFormatter.K_STATEMENTS, 1);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test289() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test289", "A.js", CodeFormatter.K_STATEMENTS, 1);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test290() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test290", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test291() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test291", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test292() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test292", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test293() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test293", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test294() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test294", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test295() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test295", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test296() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test296", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test297() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "100");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test297", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test298() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "80");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test298", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test299() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "80");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test299", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test300() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test300", "A.js", CodeFormatter.K_EXPRESSION, 2);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test301() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_CLOSING_PAREN_IN_CAST, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test301", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test302() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test302", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test303() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.indent_switchstatements_compare_to_cases = true;
-		preferences.indent_switchstatements_compare_to_switch = true;
-		preferences.indent_breaks_compare_to_cases = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test303", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test304() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.indent_switchstatements_compare_to_cases = true;
-		preferences.indent_switchstatements_compare_to_switch = true;
-		preferences.indent_breaks_compare_to_cases = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test304", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test305() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.indent_switchstatements_compare_to_cases = false;
-		preferences.indent_switchstatements_compare_to_switch = true;
-		preferences.indent_breaks_compare_to_cases = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test305", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test306() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.indent_switchstatements_compare_to_cases = true;
-		preferences.indent_switchstatements_compare_to_switch = true;
-		preferences.indent_breaks_compare_to_cases = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test306", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test307() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.indent_switchstatements_compare_to_cases = true;
-		preferences.indent_switchstatements_compare_to_switch = true;
-		preferences.indent_breaks_compare_to_cases = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test307", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test308() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.indent_switchstatements_compare_to_cases = false;
-		preferences.indent_switchstatements_compare_to_switch = false;
-		preferences.indent_breaks_compare_to_cases = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test308", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test309() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.indent_switchstatements_compare_to_cases = false;
-		preferences.indent_switchstatements_compare_to_switch = false;
-		preferences.indent_breaks_compare_to_cases = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test309", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test310() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test310", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test311() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test311", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test312() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test312", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test313() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test313", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test314() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test314", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test315() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		String source = "public final void addDefinitelyAssignedVariables(Scope scope, int initStateIndex) {\n" + 
-				"/*\n" + 
-				"	\n" + 
-				"*/\n" + 
-				"}";
-		String expectedResult = "public final void addDefinitelyAssignedVariables(Scope scope, int initStateIndex) {\r\n" + 
-				"	/*\r\n" + 
-				"	 \r\n" + 
-				"	 */\r\n" + 
-				"}";
-		runTest(source, expectedResult, codeFormatter, CodeFormatter.K_CLASS_BODY_DECLARATIONS, 0, false, 0, -1);
-	}
-
-	public void test316() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		String source = "public final void addDefinitelyAssignedVariables(Scope scope, int initStateIndex) {\r" + 
-				"/*\r" + 
-				"	\r" + 
-				"*/\r" + 
-				"}";
-		String expectedResult = "public final void addDefinitelyAssignedVariables(Scope scope, int initStateIndex) {\r\n" + 
-				"	/*\r\n" + 
-				"	 \r\n" + 
-				"	 */\r\n" + 
-				"}";
-		runTest(source, expectedResult, codeFormatter, CodeFormatter.K_CLASS_BODY_DECLARATIONS, 0, false, 0, -1);
-	}
-	
-	public void test317() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.line_separator = "\n";
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		String source = "public final void addDefinitelyAssignedVariables(Scope scope, int initStateIndex) {\r\n" + 
-				"/*\r\n" + 
-				"	\r\n" + 
-				"*/\r\n" + 
-				"}";
-		String expectedResult = "public final void addDefinitelyAssignedVariables(Scope scope, int initStateIndex) {\n" + 
-				"	/*\n" + 
-				"	 \n" + 
-				"	 */\n" + 
-				"}";
-		runTest(source, expectedResult, codeFormatter, CodeFormatter.K_CLASS_BODY_DECLARATIONS, 0, false, 0, -1);
-	}
-	
-	public void test318() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.line_separator = "\r";
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		String source = "public final void addDefinitelyAssignedVariables(Scope scope, int initStateIndex) {\r" + 
-				"/*\r" + 
-				"	\r" + 
-				"*/\r" + 
-				"}";
-		String expectedResult = "public final void addDefinitelyAssignedVariables(Scope scope, int initStateIndex) {\r" + 
-				"	/*\r" + 
-				"	 \r" + 
-				"	 */\r" + 
-				"}";
-		runTest(source, expectedResult, codeFormatter, CodeFormatter.K_CLASS_BODY_DECLARATIONS, 0, false, 0, -1);
-	}
-
-	public void test319() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test319", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test320() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test320", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test321() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test321", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test322() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test322", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test323() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_anonymous_type_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		preferences.insert_new_line_in_empty_method_body = false;
-		preferences.insert_new_line_in_empty_block = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test323", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=45141
-	 */
-	public void test324() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test324", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=45220
-	 */
-	public void test325() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test325", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=45465
-	 */
-	public void test326() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test326", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=45508
-	 */
-	public void test327() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test327", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=22073
-	 */
-	public void test328() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test328", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=29473
-	 */
-	public void test329() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test329", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=27249
-	 */
-	public void test330() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.keep_empty_array_initializer_on_one_line = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test330", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=23709
-	 */
-	public void test331() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test331", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=23709
-	 */
-	public void test332() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test332", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=45968
-	 */
-	public void test333() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 5;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test333", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46058
-	 */
-	public void test334() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.put_empty_statement_on_new_line = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test334", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46033
-	 */
-	public void test335() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test335", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46023
-	 */
-	public void test336() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test336", "A.js", CodeFormatter.K_STATEMENTS, 8);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46150
-	 */
-	public void test337() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test337", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46686
-	 */
-	public void test338() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test338", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46686
-	 */
-	public void test339() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test339", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46686
-	 */
-	public void test340() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test340", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46689
-	 */
-	public void test341() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_before_unary_operator = false;
-		preferences.insert_space_after_assignment_operator = false;
-		preferences.insert_space_after_binary_operator = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test341", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46690
-	 */
-	public void test342() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_comma_in_multiple_local_declarations = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test342", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46690
-	 */
-	public void test343() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_comma_in_multiple_field_declarations = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test343", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46690
-	 */
-	public void test344() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_comma_in_multiple_field_declarations = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test344", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46690
-	 */
-	public void test345() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_comma_in_multiple_local_declarations = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test345", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44493
-	 */
-	public void test347() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_THROWS_CLAUSE_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		assertEquals(DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.getWrappingStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_THROWS_CLAUSE_IN_METHOD_DECLARATION)));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.blank_lines_before_method = 1;
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-		preferences.insert_new_line_in_empty_method_body = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test347", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44493
-	 */
-	public void test348() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_THROWS_CLAUSE_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.blank_lines_before_method = 1;
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-		preferences.insert_new_line_in_empty_method_body = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test348", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44493
-	 */
-	public void test349() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getJavaConventionsSettings());
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-        preferences.blank_lines_before_first_class_body_declaration = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test349", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44653
-	 */
-	public void test350() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test350", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44765
-	 */
-	public void test351() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test351", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44653
-	 */
-	public void test352() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getJavaConventionsSettings());
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test352", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44642
-	 */
-	public void test353() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test353", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47799
-	 */
-	public void test354() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE, DefaultCodeFormatterConstants.FALSE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test354", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47799
-	 */
-	public void test355() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE, DefaultCodeFormatterConstants.TRUE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test355", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47800
-	 */
-	public void test356() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_BINARY_EXPRESSION, DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test356", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47801
-	 */
-	public void test357() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_PREFIX_OPERATOR, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test357", "A.js", CodeFormatter.K_EXPRESSION);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47801
-	 */
-	public void test358() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_PREFIX_OPERATOR, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test358", "A.js", CodeFormatter.K_EXPRESSION);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47811
-	 */
-	public void test359() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test359", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47811
-	 */
-	public void test360() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "2");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test360", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47811
-	 */
-	public void test361() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test361", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47802
-	 */
-	public void test362() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.page_width = 57;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test362", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47800
-	 */
-	public void test363() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test363", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47986
-	 */
-	public void test364() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_comma_in_for_inits = false;
-		preferences.insert_space_after_comma_in_for_increments = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test364", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47986
-	 */
-	public void test365() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_comma_in_for_inits = false;
-		preferences.insert_space_after_comma_in_for_increments = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test365", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47986
-	 */
-	public void test366() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_comma_in_for_inits = true;
-		preferences.insert_space_before_comma_in_for_inits = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test366", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47986
-	 */
-	public void test367() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_after_comma_in_for_inits = true;
-		preferences.insert_space_before_comma_in_for_inits = true;
-		preferences.insert_space_after_comma_in_multiple_local_declarations = false;
-		preferences.insert_space_before_comma_in_multiple_local_declarations = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test367", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47918
-	 */
-	public void test368() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_METHOD, "0");
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test368", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47918
-	 */
-	public void test369() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_METHOD, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_FIRST_CLASS_BODY_DECLARATION, "1");
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test369", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47918
-	 */
-	public void test370() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_METHOD, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_FIRST_CLASS_BODY_DECLARATION, "1");
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test370", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47918
-	 */
-	public void test371() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_METHOD, "0");
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test371", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47918
-	 */
-	public void test372() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_METHOD, "0");
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test372", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47918
-	 */
-	public void test373() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_METHOD, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_FIRST_CLASS_BODY_DECLARATION, "1");
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test373", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44813
-	 */
-	public void test374() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ARRAY_INITIALIZER, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_CONTINUATION_INDENTATION_FOR_ARRAY_INITIALIZER, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test374", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44813
-	 */
-	public void test375() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ARRAY_INITIALIZER, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_CONTINUATION_INDENTATION_FOR_ARRAY_INITIALIZER, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test375", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44813
-	 */
-	public void test376() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ARRAY_INITIALIZER, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_CONTINUATION_INDENTATION_FOR_ARRAY_INITIALIZER, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test376", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44813
-	 */
-	public void test377() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ARRAY_INITIALIZER, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_CONTINUATION_INDENTATION_FOR_ARRAY_INITIALIZER, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test377", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44813
-	 */
-	public void test378() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ARRAY_INITIALIZER, DefaultCodeFormatterConstants.END_OF_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_CONTINUATION_INDENTATION_FOR_ARRAY_INITIALIZER, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test378", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47997
-	 */
-	public void test379() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ARRAY_INITIALIZER, DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_CONTINUATION_INDENTATION_FOR_ARRAY_INITIALIZER, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test379", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47997
-	 */
-	public void test380() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_FIRST_CLASS_BODY_DECLARATION, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "100");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test380", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47997
-	 */
-	public void test381() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_METHOD, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_FIRST_CLASS_BODY_DECLARATION, "0");
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test381", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48131
-	 */
-	public void test382() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(new DefaultCodeFormatterOptions(options));
-		runTest(codeFormatter, "test382", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48141
-	 */
-	public void test383() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		preferences.blank_lines_before_first_class_body_declaration = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test383", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48143
-	 */
-	public void _test384() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_CONDITIONAL_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test384", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-		
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48143
-	 */
-	public void test385() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_CONDITIONAL_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_NEXT_SHIFTED, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		assertEquals(DefaultCodeFormatterConstants.WRAP_NEXT_SHIFTED, DefaultCodeFormatterConstants.getWrappingStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_CONDITIONAL_EXPRESSION)));
-		assertTrue(DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE != DefaultCodeFormatterConstants.getWrappingStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_CONDITIONAL_EXPRESSION)));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_before_first_class_body_declaration = 0;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test385", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48143
-	 */
-	public void test386() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_CONDITIONAL_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_before_first_class_body_declaration = 0;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test386", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48143
-	 */
-	public void _test387() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_CONDITIONAL_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-//		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "40");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.page_width = 40;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test387", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48167
-	 */
-	public void test388() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		preferences.brace_position_for_array_initializer = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.page_width = 40;
-		preferences.insert_new_line_after_opening_brace_in_array_initializer = true;
-		preferences.insert_new_line_before_closing_brace_in_array_initializer = true;
-		preferences.blank_lines_before_first_class_body_declaration = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test388", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48167
-	 */
-	public void test389() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.continuation_indentation_for_array_initializer = 1;
-		preferences.brace_position_for_array_initializer = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.page_width = 40;
-		preferences.insert_new_line_after_opening_brace_in_array_initializer = true;
-		preferences.insert_new_line_before_closing_brace_in_array_initializer = true;
-		preferences.blank_lines_before_first_class_body_declaration = 0;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test389", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48167
-	 */
-	public void test390() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT_FIRST_BREAK, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.continuation_indentation_for_array_initializer = 1;
-		preferences.brace_position_for_array_initializer = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.page_width = 40;
-		preferences.insert_new_line_after_opening_brace_in_array_initializer = true;
-		preferences.insert_new_line_before_closing_brace_in_array_initializer = true;
-		preferences.blank_lines_before_first_class_body_declaration = 0;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test390", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48167
-	 */
-	public void test391() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_BY_ONE));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_before_first_class_body_declaration = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.continuation_indentation_for_array_initializer = 3;
-		preferences.brace_position_for_array_initializer = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.page_width = 40;
-		preferences.insert_new_line_after_opening_brace_in_array_initializer = true;
-		preferences.insert_new_line_before_closing_brace_in_array_initializer = true;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test391", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48167
-	 */
-	public void test392() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_BY_ONE));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_before_first_class_body_declaration = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.continuation_indentation_for_array_initializer = 3;
-		preferences.brace_position_for_array_initializer = DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED;
-		preferences.page_width = 40;
-		preferences.insert_new_line_after_opening_brace_in_array_initializer = true;
-		preferences.insert_new_line_before_closing_brace_in_array_initializer = true;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test392", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48167
-	 */
-	public void test393() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-		preferences.blank_lines_before_first_class_body_declaration = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.continuation_indentation_for_array_initializer = 1;
-		preferences.brace_position_for_array_initializer = DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED;
-		preferences.page_width = 40;
-		preferences.insert_new_line_after_opening_brace_in_array_initializer = true;
-		preferences.insert_new_line_before_closing_brace_in_array_initializer = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test393", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=48404
-	 */
-	public void test394() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test394", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49318
-	 */
-	public void test395() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.insert_space_before_opening_paren_in_method_declaration = true;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test395", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49243
-	 */
-	public void test396() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.insert_space_before_semicolon_in_for = true;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test396", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49187
-	 */
-	public void test397() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_before_package = 2;
-		preferences.blank_lines_after_package = 0;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test397", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49187
-	 */
-	public void test398() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.blank_lines_before_package = 0;
-		preferences.blank_lines_after_package = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test398", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49187
-	 */
-	public void test399() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_before_package = 1;
-		preferences.blank_lines_after_package = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test399", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49187
-	 */
-	public void test400() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_PACKAGE, "2");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_AFTER_PACKAGE, "2");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test400", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49361
-	 */
-	public void test401() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_BRACES_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_EMPTY_ARRAY_INITIALIZER_ON_ONE_LINE, DefaultCodeFormatterConstants.TRUE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test401", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49361
-	 */
-	public void test402() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_EMPTY_ARRAY_INITIALIZER_ON_ONE_LINE, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_BRACES_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test402", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49298
-	 */
-	public void test403() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test403", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49298
-	 */
-	public void test404() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
- 		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_PARENS_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_PARENS_IN_METHOD_DECLARATION, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test404", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49187
-	 */
-	public void test405() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_PACKAGE, "10");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test405", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49298
-	 */
-	public void test406() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_PARENS_IN_METHOD_INVOCATION, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_PARENS_IN_METHOD_DECLARATION, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test406", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49481
-	 */
-	public void test407() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.blank_lines_before_first_class_body_declaration = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test407", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49481
-	 */
-	public void test408() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.blank_lines_before_first_class_body_declaration = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test408", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49378
-	 */
-	public void test409() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK_IN_CASE, DefaultCodeFormatterConstants.NEXT_LINE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.indent_switchstatements_compare_to_cases = false;
-		preferences.indent_switchstatements_compare_to_switch = true;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_switch = DefaultCodeFormatterConstants.NEXT_LINE;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test409", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49577
-	 */
-	public void test410() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_between_type_declarations = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test410", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49577
-	 */
-	public void test411() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_between_type_declarations = 2;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test411", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49551
-	 */
-	public void test412() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test412", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49551
-	 */
-	public void test413() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_between_type_declarations = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test413", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49551
-	 */
-	public void test414() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test414", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49551
-	 */
-	public void test415() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_between_type_declarations = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test415", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49551
-	 */
-	public void test416() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_between_type_declarations = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test416", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49571
-	 */
-	public void test417() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_before_opening_paren_in_constructor_declaration = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test417", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49571
-	 */
-	public void test418() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_before_opening_paren_in_constructor_declaration = true;
-		preferences.insert_space_before_opening_paren_in_method_declaration = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test418", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49162
-	 */
-	public void _test419() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_BINARY_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test419", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49623
-	 */
-	public void _test420() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.align_type_members_on_columns = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test420", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49298
-	 */
-	public void test421() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_PARENS_IN_METHOD_INVOCATION, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_PARENS_IN_METHOD_DECLARATION, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test421", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49298
-	 */
-	public void test422() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_PARENS_IN_METHOD_INVOCATION, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_PARENS_IN_METHOD_DECLARATION, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test422", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49351
-	 */
-	public void test423() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.END_OF_LINE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test423", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49351
-	 */
-	public void test424() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test424", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49351
-	 */
-	public void test425() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test425", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49351
-	 */
-	public void test426() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test426", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49351
-	 */
-	public void test427() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test427", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49351
-	 */
-	public void test428() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test428", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49351
-	 */
-	public void test429() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test429", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49351
-	 */
-	public void test430() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test430", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49351
-	 */
-	public void test431() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_SEMICOLON_IN_FOR, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test431", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49370
-	 */
-	public void test432() {
-		String resourcePath = getResource("test432", "formatter.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "AIS");
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test432", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49370
-	 */
-	public void test433() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test433", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49660
-	 */
-	public void test434() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		assertEquals(true, DefaultCodeFormatterConstants.getForceWrapping((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION)));
-		assertEquals(DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.getWrappingStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION)));
-		assertEquals(DefaultCodeFormatterConstants.INDENT_ON_COLUMN, DefaultCodeFormatterConstants.getIndentStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION)));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_size = 3;
-		preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.insert_space_after_opening_paren_in_method_invocation = true;
-		preferences.insert_space_before_closing_paren_in_method_invocation = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test434", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49772
-	 */
-	public void test435() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test435", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49772
-	 */
-	public void test436() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_constructor_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test436", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49660
-	 */
-	public void test437() {
-		String resourcePath = getResource("test437", "formatter.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "Felix");
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test437", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49660
-	 */
-	public void test438() {
-		String resourcePath = getResource("test438", "formatter.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "Felix");
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test438", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49660
-	 */
-	public void test439() {
-		String resourcePath = getResource("test439", "formatter.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "Felix");
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test439", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49763
-	 */
-	public void test440() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE, DefaultCodeFormatterConstants.FALSE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test440", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49763
-	 */
-	public void test441() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE, DefaultCodeFormatterConstants.FALSE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test441", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49763
-	 */
-	public void test442() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE, DefaultCodeFormatterConstants.FALSE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test442", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49763
-	 */
-	public void test443() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE, DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test443", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49763
-	 */
-	public void test444() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE, DefaultCodeFormatterConstants.FALSE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test444", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49763
-	 */
-	public void test445() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE, DefaultCodeFormatterConstants.FALSE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test445", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49327
-	 */
-	public void test446() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test446", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49187
-	 */
-	public void test447() {
-		String resourcePath = getResource("test447", "test447.zip");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "settings.xml", "Toms");
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		String input = getZipEntryContents(resourcePath, getIn("Format.js"));
-		assertNotNull("No input", input);
-		String output = getZipEntryContents(resourcePath, getOut("Format.js"));
-		assertNotNull("No output", output);
-		int start = input.indexOf("private");
-		int end = input.indexOf(";");
-		runTest(input, output, codeFormatter, CodeFormatter.K_JAVASCRIPT_UNIT, 0, false, start, end - start + 1, "\r\n");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49953
-	 */
-	public void test448() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_space_before_opening_bracket_in_array_allocation_expression = true;
-		preferences.insert_space_after_opening_bracket_in_array_allocation_expression = true;
-		preferences.insert_space_before_closing_bracket_in_array_allocation_expression = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test448", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49953
-	 */
-	public void test449() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		preferences.insert_space_before_opening_bracket_in_array_allocation_expression = false;
-		preferences.insert_space_after_opening_bracket_in_array_allocation_expression = true;
-		preferences.insert_space_before_closing_bracket_in_array_allocation_expression = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test449", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50225
-	 */
-	public void test450() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test450", "A.js", CodeFormatter.K_UNKNOWN, 0, false, 0, 0);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49187
-	 */
-	public void test451() {
-		String resourcePath = getResource("test451", "test451.zip");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "settings.xml", "Toms");
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		String input = getZipEntryContents(resourcePath, getIn("Format.js"));
-		assertNotNull("No input", input);
-		String output = getZipEntryContents(resourcePath, getOut("Format.js"));
-		assertNotNull("No output", output);
-		int start = input.indexOf("private");
-		int end = input.indexOf(";");
-		runTest(input, output, codeFormatter, CodeFormatter.K_JAVASCRIPT_UNIT, 0, false, start, end - start + 1, "\r\n");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49187
-	 */
-	public void test452() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_PACKAGE, "2");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_AFTER_PACKAGE, "2");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test452", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50719
-	 */
-	public void test453() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test453", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50736
-	 */
-	public void test454() {
-		String resourcePath = getResource("test454", "test454.zip");
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");//$NON-NLS-1$
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		String input = getZipEntryContents(resourcePath, getIn("A.js"));
-		assertNotNull("No input", input);
-		String output = getZipEntryContents(resourcePath, getOut("A.js"));
-		assertNotNull("No output", output);
-		int start = input.indexOf("launch.setAttribute");
-		int end = input.indexOf(";", start + 1);
-		runTest(input, output, codeFormatter, CodeFormatter.K_JAVASCRIPT_UNIT, 0, false, start, end - start + 1, "\r\n");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50736
-	 */
-	public void test455() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");//$NON-NLS-1$
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test455", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50736
-	 */
-	public void test456() {
-		String resourcePath = getResource("test456", "test456.zip");
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		String input = getZipEntryContents(resourcePath, getIn("A.js"));
-		assertNotNull("No input", input);
-		String output = getZipEntryContents(resourcePath, getOut("A.js"));
-		assertNotNull("No output", output);
-		int start = input.indexOf("launch.setAttribute");
-		int end = input.indexOf(";", start + 1);
-		runTest(input, output, codeFormatter, CodeFormatter.K_JAVASCRIPT_UNIT, 0, false, start, end - start + 1, "\r\n");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50989
-	 */
-	public void test457() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test457", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * Check null options
-	 */
-	public void test458() {
-		CodeFormatter codeFormatter = ToolFactory.createCodeFormatter(null);
-		runTest(codeFormatter, "test458", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51158
-	 */
-	public void test459() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(
-						true,
-						DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-						DefaultCodeFormatterConstants.INDENT_BY_ONE
-				));
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_BINARY_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(
-						false,
-						DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-						DefaultCodeFormatterConstants.INDENT_BY_ONE
-				));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test459", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51158
-	 */
-	public void test460() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_BINARY_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(
-						false,
-						DefaultCodeFormatterConstants.WRAP_COMPACT,
-						DefaultCodeFormatterConstants.INDENT_BY_ONE
-				));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test460", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51190
-	 */
-	public void test461() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test461", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51158
-	 */
-	public void test462() {
-		String resourcePath = getResource("test462", "formatter.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "neils");
-		assertNotNull("No preferences", options);
-		
-		options.put(
-			DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
-			DefaultCodeFormatterConstants.createAlignmentValue(
-				true,
-				DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-				DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test462", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50276
-	 */
-	public void test463() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_SELECTOR_IN_METHOD_INVOCATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(
-					false,
-					DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-					DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test463", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51128
-	 */
-	public void test464() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_FOR, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_FOR, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_FOR, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_DECLARATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_METHOD_DECLARATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_STATEMENTS_COMPARE_TO_BLOCK, DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_STATEMENTS_COMPARE_TO_BODY, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test464", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44642
-	 * @deprecated
-	 */
-	public void test465() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-			DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_SELECTOR_IN_METHOD_INVOCATION,
-			DefaultCodeFormatterConstants.createAlignmentValue(
-				false,
-				DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-				DefaultCodeFormatterConstants.INDENT_BY_ONE));
-		options.put(
-			DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
-			DefaultCodeFormatterConstants.createAlignmentValue(
-				false,
-				DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-				DefaultCodeFormatterConstants.INDENT_BY_ONE));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test465", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44642
-	 * @deprecated
-	 */
-	public void test466() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-			DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_SELECTOR_IN_METHOD_INVOCATION,
-			DefaultCodeFormatterConstants.createAlignmentValue(
-				false,
-				DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-				DefaultCodeFormatterConstants.INDENT_BY_ONE));
-		options.put(
-			DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
-			DefaultCodeFormatterConstants.createAlignmentValue(
-				true,
-				DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-				DefaultCodeFormatterConstants.INDENT_BY_ONE));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test466", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44642
-	 * @deprecated
-	 */
-	public void test467() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-			DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_SELECTOR_IN_METHOD_INVOCATION,
-			DefaultCodeFormatterConstants.createAlignmentValue(
-				false,
-				DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-				DefaultCodeFormatterConstants.INDENT_BY_ONE));
-		options.put(
-			DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
-			DefaultCodeFormatterConstants.createAlignmentValue(
-				false,
-				DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-				DefaultCodeFormatterConstants.INDENT_BY_ONE));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test467", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51128
-	 */
-	public void test468() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");//$NON-NLS-1$
-
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test468", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51201
-	 */
-	public void test469() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_BRACKET_IN_ARRAY_ALLOCATION_EXPRESSION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_BRACKET_IN_ARRAY_ALLOCATION_EXPRESSION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_BRACKETS_IN_ARRAY_ALLOCATION_EXPRESSION, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_EMPTY_ARRAY_INITIALIZER_ON_ONE_LINE, DefaultCodeFormatterConstants.TRUE);
-
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test469", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51035
-	 */
-	public void test470() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test470", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51659
-	 */
-	public void test471() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_BRACES_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_EMPTY_ARRAY_INITIALIZER_ON_ONE_LINE, DefaultCodeFormatterConstants.TRUE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test471", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51659
-	 */
-	public void test472() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_BRACES_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_EMPTY_ARRAY_INITIALIZER_ON_ONE_LINE, DefaultCodeFormatterConstants.TRUE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test472", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51659
-	 */
-	public void test473() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_BRACES_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_EMPTY_ARRAY_INITIALIZER_ON_ONE_LINE, DefaultCodeFormatterConstants.TRUE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test473", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51659
-	 */
-	public void test474() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_BRACES_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_EMPTY_ARRAY_INITIALIZER_ON_ONE_LINE, DefaultCodeFormatterConstants.TRUE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test474", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51659
-	 */
-	public void test475() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_BRACES_IN_ARRAY_INITIALIZER, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_EMPTY_ARRAY_INITIALIZER_ON_ONE_LINE, DefaultCodeFormatterConstants.TRUE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test475", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51768 
-	 */
-	public void test476() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_BODY_DECLARATIONS_COMPARE_TO_TYPE_HEADER, DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_STATEMENTS_COMPARE_TO_BLOCK, DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_STATEMENTS_COMPARE_TO_BODY, DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_AFTER_IMPORTS, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_IF, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_IF, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_IF, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_FOR, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_FOR, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_FOR, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_ASSIGNMENT_OPERATOR, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_BINARY_OPERATOR, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_BINARY_OPERATOR, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test476", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51603
-	 */
-	public void test477() {
-		String option = 
-			DefaultCodeFormatterConstants.createAlignmentValue(
-				true,
-				DefaultCodeFormatterConstants.WRAP_NO_SPLIT,
-				DefaultCodeFormatterConstants.INDENT_BY_ONE);
-		assertTrue("Wrong force setting", DefaultCodeFormatterConstants.getForceWrapping(option));
-		assertEquals("Wrong wrapping style", DefaultCodeFormatterConstants.WRAP_NO_SPLIT, DefaultCodeFormatterConstants.getWrappingStyle(option));
-		assertEquals("Wrong indent style", DefaultCodeFormatterConstants.INDENT_BY_ONE, DefaultCodeFormatterConstants.getIndentStyle(option));
-
-		option = DefaultCodeFormatterConstants.setForceWrapping(option, false);
-		assertFalse("Wrong force setting", DefaultCodeFormatterConstants.getForceWrapping(option));
-		assertEquals("Wrong wrapping style", DefaultCodeFormatterConstants.WRAP_NO_SPLIT, DefaultCodeFormatterConstants.getWrappingStyle(option));
-		assertEquals("Wrong indent style", DefaultCodeFormatterConstants.INDENT_BY_ONE, DefaultCodeFormatterConstants.getIndentStyle(option));
-	
-		option = DefaultCodeFormatterConstants.setIndentStyle(option, DefaultCodeFormatterConstants.INDENT_ON_COLUMN);
-		assertFalse("Wrong force setting", DefaultCodeFormatterConstants.getForceWrapping(option));
-		assertEquals("Wrong wrapping style", DefaultCodeFormatterConstants.WRAP_NO_SPLIT, DefaultCodeFormatterConstants.getWrappingStyle(option));
-		assertEquals("Wrong indent style", DefaultCodeFormatterConstants.INDENT_ON_COLUMN, DefaultCodeFormatterConstants.getIndentStyle(option));
-
-	
-		option = DefaultCodeFormatterConstants.setIndentStyle(option, DefaultCodeFormatterConstants.INDENT_DEFAULT);
-		assertFalse("Wrong force setting", DefaultCodeFormatterConstants.getForceWrapping(option));
-		assertEquals("Wrong wrapping style", DefaultCodeFormatterConstants.WRAP_NO_SPLIT, DefaultCodeFormatterConstants.getWrappingStyle(option));
-		assertEquals("Wrong indent style", DefaultCodeFormatterConstants.INDENT_DEFAULT, DefaultCodeFormatterConstants.getIndentStyle(option));
-
-	
-		option = DefaultCodeFormatterConstants.setForceWrapping(option, true);
-		assertTrue("Wrong force setting", DefaultCodeFormatterConstants.getForceWrapping(option));
-		assertEquals("Wrong wrapping style", DefaultCodeFormatterConstants.WRAP_NO_SPLIT, DefaultCodeFormatterConstants.getWrappingStyle(option));
-		assertEquals("Wrong indent style", DefaultCodeFormatterConstants.INDENT_DEFAULT, DefaultCodeFormatterConstants.getIndentStyle(option));
-
-	
-		option = DefaultCodeFormatterConstants.setWrappingStyle(option, DefaultCodeFormatterConstants.WRAP_COMPACT);
-		assertTrue("Wrong force setting", DefaultCodeFormatterConstants.getForceWrapping(option));
-		assertEquals("Wrong wrapping style", DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.getWrappingStyle(option));
-		assertEquals("Wrong indent style", DefaultCodeFormatterConstants.INDENT_DEFAULT, DefaultCodeFormatterConstants.getIndentStyle(option));
-
-	
-		option = DefaultCodeFormatterConstants.setWrappingStyle(option, DefaultCodeFormatterConstants.WRAP_COMPACT_FIRST_BREAK);
-		assertTrue("Wrong force setting", DefaultCodeFormatterConstants.getForceWrapping(option));
-		assertEquals("Wrong wrapping style", DefaultCodeFormatterConstants.WRAP_COMPACT_FIRST_BREAK, DefaultCodeFormatterConstants.getWrappingStyle(option));
-		assertEquals("Wrong indent style", DefaultCodeFormatterConstants.INDENT_DEFAULT, DefaultCodeFormatterConstants.getIndentStyle(option));
-		
-		option = DefaultCodeFormatterConstants.setWrappingStyle(option, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE);
-		assertTrue("Wrong force setting", DefaultCodeFormatterConstants.getForceWrapping(option));
-		assertEquals("Wrong wrapping style", DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.getWrappingStyle(option));
-		assertEquals("Wrong indent style", DefaultCodeFormatterConstants.INDENT_DEFAULT, DefaultCodeFormatterConstants.getIndentStyle(option));
-		
-		option = DefaultCodeFormatterConstants.setWrappingStyle(option, DefaultCodeFormatterConstants.WRAP_NEXT_SHIFTED);
-		assertTrue("Wrong force setting", DefaultCodeFormatterConstants.getForceWrapping(option));
-		assertEquals("Wrong wrapping style", DefaultCodeFormatterConstants.WRAP_NEXT_SHIFTED, DefaultCodeFormatterConstants.getWrappingStyle(option));
-		assertEquals("Wrong indent style", DefaultCodeFormatterConstants.INDENT_DEFAULT, DefaultCodeFormatterConstants.getIndentStyle(option));
-		
-		option = DefaultCodeFormatterConstants.setWrappingStyle(option, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE);
-		assertTrue("Wrong force setting", DefaultCodeFormatterConstants.getForceWrapping(option));
-		assertEquals("Wrong wrapping style", DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.getWrappingStyle(option));
-		assertEquals("Wrong indent style", DefaultCodeFormatterConstants.INDENT_DEFAULT, DefaultCodeFormatterConstants.getIndentStyle(option));
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=52246
-	 */
-	public void test478() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(JavaScriptCore.COMPILER_SOURCE, JavaScriptCore.VERSION_1_4);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, options);
-		runTest(codeFormatter, "test478", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=52479
-	 */
-	public void test479() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test479", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=52479
-	 */
-	public void test480() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test480", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=52283
-	 */
-	public void test481() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test481", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=52283
-	 */
-	public void test482() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_CLOSING_BRACE_IN_BLOCK, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test482", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=52851
-	 */
-	public void test483() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_CLOSING_BRACE_IN_BLOCK, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test483", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50989
-	 */
-	public void test484() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");//$NON-NLS-1$
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test484", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50989
-	 */
-	public void test485() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");//$NON-NLS-1$
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test485", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50989
-	 */
-	public void test486() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);//$NON-NLS-1$
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);//$NON-NLS-1$
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);//$NON-NLS-1$
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);//$NON-NLS-1$
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, DefaultCodeFormatterConstants.NEXT_LINE);//$NON-NLS-1$
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, DefaultCodeFormatterConstants.NEXT_LINE);//$NON-NLS-1$
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test486", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test487() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test487", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test488() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COLON_IN_CASE, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test488", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test489() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test489", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=52747
-	 */
-	public void test490() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ARRAY_INITIALIZER, DefaultCodeFormatterConstants.NEXT_LINE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_EMPTY_ARRAY_INITIALIZER_ON_ONE_LINE, DefaultCodeFormatterConstants.TRUE);
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test490", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=59451
-	 */
-	public void _test491() {
-		String resourcePath = getResource("test491", "formatter.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "DOI");
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test491", "BundleChain.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=59575
-	 */
-	public void test492() {
-		String resourcePath = getResource("test492", "core_formatting.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "core");
-		assertNotNull("No preferences", options);
-		options.put(JavaScriptCore.COMPILER_PB_NON_NLS_STRING_LITERAL, JavaScriptCore.ERROR);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, options);
-		runTest(codeFormatter, "test492", "Main.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=59716
-	 */
-	public void test493() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_AFTER_PACKAGE, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_PACKAGE, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_AFTER_IMPORTS, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_IMPORTS, "1");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test493", "MyClass.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=60035
-	 */
-	public void test494() {
-		String resourcePath = getResource("test494", "format.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "AGPS default");
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, options);
-		runTest(codeFormatter, "test494", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=58565
-	 */
-	public void test495() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test495", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=58565
-	 */
-	public void test496() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test496", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test497() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test497", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test498() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test498", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test499() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.blank_lines_before_first_class_body_declaration = 1;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test499", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, true);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void test500() {
-		Map options = DefaultCodeFormatterConstants.getEclipse21Settings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test500", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=68506
-	 */
-	public void test501() {
-		String resourcePath = getResource("test501", "formatter.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "GMTI");
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test501", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=69806
-	 */
-	public void test502() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test502", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * Formatting foreach
-	 */
-	public void test503() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		Map compilerOptions = new HashMap();
-		compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-		compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-		compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-		runTest(codeFormatter, "test503", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * Formatting parameterized type
-	 */
-	public void test504() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test504", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * Formatting parameterized type
-	 */
-	public void test505() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test505", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * Formatting parameterized type
-	 */
-	public void test506() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test506", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * Formatting enum declaration
-	 */
-	public void test507() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test507", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * Formatting annotation type declaration
-	 */
-	public void test508() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test508", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=68506
-	 */
-	public void test509() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_then_statement_on_same_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.compact_else_if = true;
-		preferences.insert_new_line_at_end_of_file_if_missing = true;
-		preferences.number_of_empty_lines_to_preserve = 0;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter,"test509", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=68506
-	 */
-	public void test510() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_then_statement_on_same_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.compact_else_if = true;
-		preferences.insert_new_line_at_end_of_file_if_missing = false;
-		preferences.number_of_empty_lines_to_preserve = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter,"test510", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=68506
-	 */
-	public void test511() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_then_statement_on_same_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.compact_else_if = true;
-		preferences.insert_new_line_at_end_of_file_if_missing = false;
-		preferences.number_of_empty_lines_to_preserve = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter,"test511", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=68506
-	 */
-	public void test512() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipse21Settings());
-		preferences.keep_simple_if_on_one_line = true;
-		preferences.keep_then_statement_on_same_line = true;
-		preferences.keep_guardian_clause_on_one_line = true;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.compact_else_if = true;
-		preferences.insert_new_line_at_end_of_file_if_missing = true;
-		preferences.number_of_empty_lines_to_preserve = 1;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter,"test512", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=73371
-	 */
-	public void test513() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test513", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=75488
-	 */
-	public void test514() {
-		String resourcePath = getResource("test514", "formatter.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "core");
-		assertNotNull("No preferences", options);
-		options.put(JavaScriptCore.COMPILER_PB_NON_NLS_STRING_LITERAL, JavaScriptCore.ERROR);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, options);
-		runTest(codeFormatter, "test514", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=75720
-	 */
-	public void test515() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test515", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=75720
-	 */
-	public void test516() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_ELLIPSIS, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ELLIPSIS, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);	
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test516", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=75720
-	 */
-	public void test517() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_ELLIPSIS, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ELLIPSIS, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);	
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test517", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=75720
-	 */
-	public void test518() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_ELLIPSIS, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ELLIPSIS, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);	
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test518", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=75720
-	 */
-	public void test519() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_ELLIPSIS, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ELLIPSIS, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);	
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test519", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * Formatting enum declaration
-	 */
-	public void test520() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test520", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=76642
-	 */
-	public void test521() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test521", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=76642
-	 */
-	public void test522() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test522", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=76766
-	 */
-	public void test523() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_type_declaration = true;
-		preferences.insert_new_line_in_empty_enum_constant = false;
-		preferences.insert_new_line_in_empty_enum_declaration = false;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test523", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=76766
-	 */
-	public void test524() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_type_declaration = true;
-		preferences.insert_new_line_in_empty_enum_constant = false;
-		preferences.insert_new_line_in_empty_enum_declaration = true;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test524", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=76766
-	 */
-	public void test525() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_type_declaration = true;
-		preferences.insert_new_line_in_empty_enum_constant = true;
-		preferences.insert_new_line_in_empty_enum_declaration = false;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test525", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=76766
-	 */
-	public void test526() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.insert_new_line_in_empty_type_declaration = true;
-		preferences.insert_new_line_in_empty_enum_constant = true;
-		preferences.insert_new_line_in_empty_enum_declaration = true;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test526", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=77249
-	 */
-	public void test527() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test527", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=79779
-	 */
-	public void test528() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test528", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=79779
-	 */
-	public void test529() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test529", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=79795
-	 */
-	public void test530() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test530", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=79795
-	 */
-	public void test531() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test531", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=79795
-	 */
-	public void test532() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test532", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=79795
-	 */
-	public void test533() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test533", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78698
-	 */
-	public void test534() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test534", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78698
-	 */
-	public void test535() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test535", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=83078
-	 */
-	public void test538() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getJavaConventionsSettings());
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter,"test538", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=83515
-	 */
-	public void test539() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test539", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=83515
-	 */
-	public void test540() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test540", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=83684
-	 */
-	public void test541() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test541", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	public void test542() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getJavaConventionsSettings());
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test542", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void test543() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getJavaConventionsSettings());
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test543", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=86410
-	 */
-	public void test544() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.insert_space_after_closing_angle_bracket_in_type_parameters = true;
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test544", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=86878
-	 */
-	public void test545() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test545", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=86908
-	 */
-	public void test546() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
- 		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test546", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * Add support for comment formatting
-	 */
-	public void test547() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test547", "A.js", CodeFormatter.K_MULTI_LINE_COMMENT, false);//$NON-NLS-1$ //$NON-NLS-2$
-
-		runTest(codeFormatter, "test547", "A.js", CodeFormatter.K_UNKNOWN, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * Add support for comment formatting
-	 */
-	public void test548() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test548", "A.js", CodeFormatter.K_JAVA_DOC, false);//$NON-NLS-1$ //$NON-NLS-2$
-
-		runTest(codeFormatter, "test548", "A.js", CodeFormatter.K_UNKNOWN, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=73104
-	public void test549() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.MIXED;
-		preferences.indentation_size = 4;
-		preferences.tab_size = 8;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test549", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=73104
-	public void test550() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.MIXED;
-		preferences.indentation_size = 4;
-		preferences.tab_size = 8;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test550", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=73104
-	public void test551() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		assertEquals(false, DefaultCodeFormatterConstants.getForceWrapping((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION)));
-		assertEquals(DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.getWrappingStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION)));
-		assertEquals(DefaultCodeFormatterConstants.INDENT_ON_COLUMN, DefaultCodeFormatterConstants.getIndentStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION)));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.MIXED;
-		preferences.indentation_size = 4;
-		preferences.tab_size = 8;
-		preferences.page_width = 57;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test551", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=73104
-	public void test552() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		assertEquals(false, DefaultCodeFormatterConstants.getForceWrapping((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION)));
-		assertEquals(DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.getWrappingStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION)));
-		assertEquals(DefaultCodeFormatterConstants.INDENT_ON_COLUMN, DefaultCodeFormatterConstants.getIndentStyle((String) options.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION)));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.MIXED;
-		preferences.indentation_size = 4;
-		preferences.tab_size = 8;
-		preferences.page_width = 57;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test552", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * Add support for comment formatting
-	 */
-	public void test553() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test553", "A.js", CodeFormatter.K_SINGLE_LINE_COMMENT, false);//$NON-NLS-1$ //$NON-NLS-2$
-
-		runTest(codeFormatter, "test553", "A.js", CodeFormatter.K_UNKNOWN, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * Add support for comment formatting
-	 */
-	public void test554() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test554", "A.js", CodeFormatter.K_SINGLE_LINE_COMMENT, false);//$NON-NLS-1$ //$NON-NLS-2$
-
-		runTest(codeFormatter, "test554", "A.js", CodeFormatter.K_UNKNOWN, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=73104
-	public void test555() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_char = DefaultCodeFormatterOptions.MIXED;
-		preferences.indentation_size = 4;
-		preferences.tab_size = 8;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test555", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/*
-	 * Empty array initializer formatting
-	 */
-	public void test556() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test556", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/*
-	 * Empty array initializer formatting
-	 */
-	public void test557() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.tab_size = 4;
-		preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.keep_empty_array_initializer_on_one_line = true;
-		preferences.insert_space_between_empty_braces_in_array_initializer = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test557", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=89302
-	public void test558() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.insert_space_after_comma_in_enum_declarations = false;
-		preferences.insert_new_line_after_annotation = false;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test558", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=89302
-	public void test559() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.insert_space_after_comma_in_enum_declarations = true;
-		preferences.insert_new_line_after_annotation = false;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test559", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=81497
-	public void test560() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.brace_position_for_array_initializer = DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED;
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.keep_empty_array_initializer_on_one_line = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test560", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=81497
-	public void test561() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		preferences.brace_position_for_array_initializer = DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED;
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.keep_empty_array_initializer_on_one_line = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test561", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=89318
-	public void test562() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		preferences.insert_space_after_closing_angle_bracket_in_type_arguments = false;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test562", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=89318
-	public void test563() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.insert_space_after_closing_angle_bracket_in_type_arguments = true;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test563", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=89299
-	public void test564() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-        preferences.tab_size = 4;
-		preferences.brace_position_for_array_initializer = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.keep_empty_array_initializer_on_one_line = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test564", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/*// https://bugs.eclipse.org/bugs/show_bug.cgi?id=49896
-	public void test565() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_BINARY_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.use_tabs_only_for_leading_indentations = true;
-		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test565", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}*/
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=73658
-	public void test566() {
-		Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-		preferences.brace_position_for_enum_constant = DefaultCodeFormatterConstants.NEXT_LINE;
-		preferences.brace_position_for_enum_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test566", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=49896
-	public void test567() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.use_tabs_only_for_leading_indentations = true;
-        preferences.page_width = 35;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test567", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=49896
-	public void test568() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.indentation_size = 4;
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.MIXED;
-		preferences.use_tabs_only_for_leading_indentations = true;
-        preferences.page_width = 35;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test568", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=49896
-	public void test569() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-        preferences.indentation_size = 4;
-        preferences.tab_size = 4;
-        preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-		preferences.use_tabs_only_for_leading_indentations = false;
-        preferences.page_width = 40;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test569", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=77809
-	public void test570() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ENUM_CONSTANTS,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test570", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=77809
-	public void test571() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ENUM_CONSTANTS,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test571", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=90213
-	public void test572() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.insert_space_after_opening_brace_in_array_initializer = false;
-		preferences.insert_space_before_closing_brace_in_array_initializer = false;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test572", "A.js", CodeFormatter.K_STATEMENTS, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=90213
-	public void test573() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test573", "A.js", CodeFormatter.K_STATEMENTS, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=91238
-	public void test574() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
- 		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test574", "A.js", CodeFormatter.K_JAVA_DOC, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=77809
-	public void test575() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test575", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95431
-	public void test576() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test576", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=98037
-	public void test577() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test577", "A.js", CodeFormatter.K_UNKNOWN, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=98037
-	public void test578() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test578", "A.js", CodeFormatter.K_UNKNOWN, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=98139
-	public void test579() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test579", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=98139
-	public void test580() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test580", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=99084
-	public void test581() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test581", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=99084
-	public void test582() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.insert_space_after_closing_angle_bracket_in_type_arguments = false;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test582", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=100062
-	public void test583() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test583", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=49896
-	public void test584() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_USE_TABS_ONLY_FOR_LEADING_INDENTATIONS, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, DefaultCodeFormatterConstants.MIXED);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "65");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test584", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=49896
-	public void test585() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_USE_TABS_ONLY_FOR_LEADING_INDENTATIONS, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, DefaultCodeFormatterConstants.MIXED);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "80");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test585", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=49896
-	public void test586() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_USE_TABS_ONLY_FOR_LEADING_INDENTATIONS, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "65");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test586", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=49896
-	public void test587() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_USE_TABS_ONLY_FOR_LEADING_INDENTATIONS, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "80");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test587", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=101230
-	public void test588() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test588", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=104796
-	public void test589() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test589", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=103706
-	public void test590() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_EMPTY_LINES, DefaultCodeFormatterConstants.TRUE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test590", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=103706
-	public void test591() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_EMPTY_LINES, DefaultCodeFormatterConstants.FALSE);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test591", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=98089
-	public void test592() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_DECLARATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_METHOD_DECLARATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "60");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_INVOCATION, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test592", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=71766
-	public void test593() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ASSIGNMENT,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_ALLOCATION_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NO_SPLIT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test593", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=71766
-	public void test594() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ASSIGNMENT,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test594", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=71766
-	public void test595() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ASSIGNMENT,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test595", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=71766
-	public void test596() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ASSIGNMENT,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_COMPACT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test596", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=87193
-	public void test597() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, DefaultCodeFormatterConstants.MIXED);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_USE_TABS_ONLY_FOR_LEADING_INDENTATIONS, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "60");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test597", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=87193
-	public void test598() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE, DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_USE_TABS_ONLY_FOR_LEADING_INDENTATIONS, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "60");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test598", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=87193
-	public void test599() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
-				DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_CONTINUATION_INDENTATION, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_USE_TABS_ONLY_FOR_LEADING_INDENTATIONS, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "60");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test599", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// test Scribe2.hasNLSTag()
-	public void test600() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test600", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// Binary expression
-	public void _test601() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_BINARY_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_USE_TABS_ONLY_FOR_LEADING_INDENTATIONS, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "60");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test601", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=108916
-	public void test605() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ENUM_CONSTANTS,
-				DefaultCodeFormatterConstants.createAlignmentValue(
-						true,
-						DefaultCodeFormatterConstants.WRAP_NEXT_PER_LINE,
-						DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test605", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=110304
-	public void test606() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_PARENTHESIZED_EXPRESSION_IN_RETURN, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test606", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=111270 
-	public void test607() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test607", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=111270 
-	public void _test608() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test608", "A.js", CodeFormatter.K_JAVA_DOC, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=116858
-	public void test609() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.indent_switchstatements_compare_to_cases = true;
-		preferences.indent_switchstatements_compare_to_switch = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test609", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=122914
-	 */
-	public void test610() {
-		String resourcePath = getResource("test610", "formatter.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "mhdk");
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test610", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=111446
-	 */
-	public void test611() {
-		{
-			// only tabs, indentation size = 4, tab size = 4
-			// indentation size is ignored
-			Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-			DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-			preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-			preferences.tab_size = 4;
-			preferences.indentation_size = 4;
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-			assertEquals("Wrong indentation string", "\t", codeFormatter.createIndentationString(1));
-			assertEquals("Wrong indentation string", "\t\t", codeFormatter.createIndentationString(2));
-			assertEquals("Wrong indentation string", "\t\t\t", codeFormatter.createIndentationString(3));
-		}
-		{
-			// only tabs, indentation size = 4, tab size = 8
-			// indentation size is ignored
-			Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-			DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-			preferences.tab_char = DefaultCodeFormatterOptions.TAB;
-			preferences.tab_size = 8;
-			preferences.indentation_size = 4;
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-			assertEquals("Wrong indentation string", "\t", codeFormatter.createIndentationString(1));
-			assertEquals("Wrong indentation string", "\t\t", codeFormatter.createIndentationString(2));
-			assertEquals("Wrong indentation string", "\t\t\t", codeFormatter.createIndentationString(3));
-		}
-		{
-			// only spaces, indentation size = 4, tab size = 2
-			// indentation size is ignored
-			Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-			DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-			preferences.tab_char = DefaultCodeFormatterOptions.SPACE;
-			preferences.tab_size = 2;
-			preferences.indentation_size = 4;
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-			assertEquals("Wrong indentation string", "  ", codeFormatter.createIndentationString(1));
-			assertEquals("Wrong indentation string", "    ", codeFormatter.createIndentationString(2));
-			assertEquals("Wrong indentation string", "      ", codeFormatter.createIndentationString(3));
-		}
-		{
-			// mixed, indentation size = 4, tab size = 2
-			Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-			DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-			preferences.tab_char = DefaultCodeFormatterOptions.MIXED;
-			preferences.tab_size = 2;
-			preferences.indentation_size = 4;
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-			assertEquals("Wrong indentation string", "\t\t", codeFormatter.createIndentationString(1));
-			assertEquals("Wrong indentation string", "\t\t\t\t", codeFormatter.createIndentationString(2));
-		}		
-		{
-			// mixed, indentation size = 2, tab size = 4
-			// indentation size is ignored
-			Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-			DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-			preferences.tab_char = DefaultCodeFormatterOptions.MIXED;
-			preferences.tab_size = 4;
-			preferences.indentation_size = 2;
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-			assertEquals("Wrong indentation string", "  ", codeFormatter.createIndentationString(1));
-			assertEquals("Wrong indentation string", "\t", codeFormatter.createIndentationString(2));
-			assertEquals("Wrong indentation string", "\t  ", codeFormatter.createIndentationString(3));
-		}		
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=126625
-	public void test612() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.indent_body_declarations_compare_to_annotation_declaration_header = false;
-		preferences.indent_body_declarations_compare_to_type_header = true;
-		preferences.insert_new_line_in_empty_annotation_declaration = false;
-		preferences.insert_new_line_in_empty_type_declaration = true;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test612", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=126625
-	public void test613() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.indent_body_declarations_compare_to_annotation_declaration_header = true;
-		preferences.indent_body_declarations_compare_to_type_header = false;
-		preferences.insert_new_line_in_empty_annotation_declaration = true;
-		preferences.insert_new_line_in_empty_type_declaration = false;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test613", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=128848
-	public void test614() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test614", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=128848
-	public void test615() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test615", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=128848
-	public void test616() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test616", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=131013
-	public void test617() {
-		String resourcePath = getResource("test617", "formatter.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "JRK");
-		assertNotNull("No preferences", options);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_BINARY_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(
-					true,
-					DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-					DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test617", "A.js", CodeFormatter.K_STATEMENTS);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=137224
-	public void test618() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test618", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=137224
-	public void test619() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test619", "A.js", CodeFormatter.K_CLASS_BODY_DECLARATIONS, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=139291
-	public void test620() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENTS, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test620", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=139291
-	public void test621() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENTS, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test621", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=148370
-	public void test622() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test622", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=148370
-	public void test623() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test623", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=148370
-	public void test624() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test624", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102728
-	public void test625() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_BINARY_EXPRESSION,
-				DefaultCodeFormatterConstants.createAlignmentValue(
-						true,
-						DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE,
-						DefaultCodeFormatterConstants.INDENT_DEFAULT));
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test625", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=152725
-	public void test626() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test626", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158267
-	public void test627() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test627", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158267
-	public void test628() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test628", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158267
-	public void test629() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		preferences.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP;
-		Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-		try {
-			Hashtable newJavaCoreOptions = JavaScriptCore.getOptions();
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-			JavaScriptCore.setOptions(newJavaCoreOptions);
-		
-			Map compilerOptions = new HashMap();
-			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);		
-			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
-			runTest(codeFormatter, "test629", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
-		} finally {
-			JavaScriptCore.setOptions(javaCoreOptions);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158267
-	public void test630() {
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getEclipseDefaultSettings());
-		preferences.insert_space_after_opening_paren_in_parenthesized_expression = true;
-		preferences.insert_space_before_closing_paren_in_parenthesized_expression = true;
-		preferences.insert_space_before_parenthesized_expression_in_throw = true;
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test630", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158267
-	public void test631() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_PARENTHESIZED_EXPRESSION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_PARENTHESIZED_EXPRESSION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_PARENTHESIZED_EXPRESSION_IN_THROW, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test631", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158267
-	public void test632() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_PARENTHESIZED_EXPRESSION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_PARENTHESIZED_EXPRESSION, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_PARENTHESIZED_EXPRESSION_IN_RETURN, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_PARENTHESIZED_EXPRESSION_IN_THROW, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test632", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165210
-	public void test633() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BETWEEN_IMPORT_GROUPS, "3");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test633", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165210
-	public void test634() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BETWEEN_IMPORT_GROUPS, "1");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test634", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165210
-	public void test635() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BETWEEN_IMPORT_GROUPS, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_AFTER_IMPORTS, "0");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test635", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165210
-	public void test636() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BETWEEN_IMPORT_GROUPS, "3");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test636", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165210
-	public void test637() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BETWEEN_IMPORT_GROUPS, "2");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test637", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165210
-	public void test638() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BETWEEN_IMPORT_GROUPS, "1");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test638", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165210
-	public void test639() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BETWEEN_IMPORT_GROUPS, "2");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test639", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165210
-	public void test640() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BETWEEN_IMPORT_GROUPS, "1");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test640", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=168109
-	public void test641() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, DefaultCodeFormatterConstants.MIXED);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_USE_TABS_ONLY_FOR_LEADING_INDENTATIONS, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "36");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENTATION_SIZE, "2");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test641", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=166962
-	public void test642() {
-		String resourcePath = getResource("test642", "formatter.xml");
-		Map options = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(resourcePath, "Visionnaire");
-		assertNotNull("No preferences", options);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test642", "A.js", CodeFormatter.K_JAVASCRIPT_UNIT);//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=171634
-	public void test643() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AT_END_OF_FILE_IF_MISSING, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test643", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=171634
-	public void test644() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AT_END_OF_FILE_IF_MISSING, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test644", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=171634
-	public void test645() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AT_END_OF_FILE_IF_MISSING, JavaScriptCore.INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test645", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=171634
-	public void test646() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AT_END_OF_FILE_IF_MISSING, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test646", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=171634
-	public void test647() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AT_END_OF_FILE_IF_MISSING, JavaScriptCore.DO_NOT_INSERT);
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test647", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=171634
-	public void test648() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AT_END_OF_FILE_IF_MISSING, JavaScriptCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test648", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=171634
-	public void test649() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AT_END_OF_FILE_IF_MISSING, JavaScriptCore.INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test649", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=172848
-	public void test650() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test650", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=172848
-	public void test651() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test651", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=172848
-	public void test652() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test652", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=172848
-	public void test653() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test653", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=172848
-	public void test654() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test654", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=172848
-	public void test655() {
-		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
-		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
-		runTest(codeFormatter, "test655", "A.js");//$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/CommentFormatterUtil.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/CommentFormatterUtil.java
deleted file mode 100644
index 7b6407b..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/CommentFormatterUtil.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.formatter.comment;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextUtilities;
-
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.ToolFactory;
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-import org.eclipse.wst.jsdt.core.formatter.DefaultCodeFormatterConstants;
-
-/**
- * Utilities for the comment formatter.
- * 
- * @since 3.0
- */
-public class CommentFormatterUtil {
-	/**
-	 * Formats the source string as a comment region of the specified kind.
-	 * <p>
-	 * Both offset and length must denote a valid comment partition, that is
-	 * to say a substring that starts and ends with the corresponding
-	 * comment delimiter tokens.
-	 * 
-	 * @param kind the kind of the comment
-	 * @param source the source string to format
-	 * @param offset the offset relative to the source string where to
-	 *                format
-	 * @param length the length of the region in the source string to format
-	 * @param preferences preferences for the comment formatter
-	 * @return the formatted source string
-	 */
-	public static String format(int kind, String source, int offset, int length, Map preferences) {
-		Assert.isNotNull(source);
-		IDocument document= new Document(source);
-		
-		try {
-			int indentOffset= document.getLineOffset(document.getLineOfOffset(offset));
-			int indentationLevel= inferIndentationLevel(document.get(indentOffset, offset - indentOffset), getTabSize(preferences));
-			return format(kind, source, offset, length, indentationLevel, preferences);
-		} catch (BadLocationException x) {
-			throw new RuntimeException(x);
-		}
-	}
-	
-	/**
-	 * Formats the source string as a comment region of the specified kind.
-	 * <p>
-	 * Both offset and length must denote a valid comment partition, that is
-	 * to say a substring that starts and ends with the corresponding
-	 * comment delimiter tokens.
-	 * 
-	 * @param kind the kind of the comment
-	 * @param source the source string to format
-	 * @param offset the offset relative to the source string where to
-	 *                format
-	 * @param length the length of the region in the source string to format
-	 * @param preferences preferences for the comment formatter
-	 * @return the formatted source string
-	 */
-	public static String format(int kind, String source, int offset, int length, int indentationLevel, Map preferences) {
-		Assert.isTrue(kind == CodeFormatter.K_JAVA_DOC || kind == CodeFormatter.K_MULTI_LINE_COMMENT || kind == CodeFormatter.K_SINGLE_LINE_COMMENT);
-
-		Assert.isNotNull(source);
-		Assert.isNotNull(preferences);
-
-		Assert.isTrue(offset >= 0);
-		Assert.isTrue(length <= source.length());
-
-		IDocument document= new Document(source);
-		
-		TextEdit edit;
-		edit= ToolFactory.createCodeFormatter(preferences).format(kind, source, offset, length, indentationLevel, TextUtilities.getDefaultLineDelimiter(document));
-		
-		try {
-			if (edit != null)
-				edit.apply(document);
-		} catch (MalformedTreeException x) {
-			throw new RuntimeException(x);
-		} catch (BadLocationException x) {
-			throw new RuntimeException(x);
-		}
-		return document.get();
-	}
-
-	/**
-	 * Infer the indentation level based on the given reference indentation,
-	 * tab size and text measurement.
-	 * 
-	 * @param reference the reference indentation
-	 * @param tabSize the tab size
-	 * @return the inferred indentation level
-	 * @since 3.1
-	 */
-	private static int inferIndentationLevel(String reference, int tabSize) {
-		StringBuffer expanded= expandTabs(reference, tabSize);
-		
-		int spaceWidth, referenceWidth;
-		spaceWidth= 1;
-		referenceWidth= expanded.length();
-		
-		int level= referenceWidth / (tabSize * spaceWidth);
-		if (referenceWidth % (tabSize * spaceWidth) > 0)
-			level++;
-		return level;
-	}
-	
-	/**
-	 * Expands the given string's tabs according to the given tab size.
-	 * 
-	 * @param string the string
-	 * @param tabSize the tab size
-	 * @return the expanded string
-	 * @since 3.1
-	 */
-	private static StringBuffer expandTabs(String string, int tabSize) {
-		StringBuffer expanded= new StringBuffer();
-		for (int i= 0, n= string.length(), chars= 0; i < n; i++) {
-			char ch= string.charAt(i);
-			if (ch == '\t') {
-				for (; chars < tabSize; chars++)
-					expanded.append(' ');
-				chars= 0;
-			} else {
-				expanded.append(ch);
-				chars++;
-				if (chars >= tabSize)
-					chars= 0;
-			}
-		
-		}
-		return expanded;
-	}
-
-	/**
-	 * Returns the value of {@link DefaultCodeFormatterConstants#FORMATTER_TAB_SIZE}
-	 * from the given preferences.
-	 * 
-	 * @param preferences the preferences
-	 * @return the value of {@link DefaultCodeFormatterConstants#FORMATTER_TAB_SIZE}
-	 *         from the given preferences
-	 * @since 3.1
-	 */
-	private static int getTabSize(Map preferences) {
-		if (preferences.containsKey(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE))
-			try {
-				return Integer.parseInt((String) preferences.get(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE));
-			} catch (NumberFormatException e) {
-				// use default
-			}
-		return 4;
-	}
-
-	/**
-	 * Creates a formatting options with all default options and the given custom user options.
-	 * 
-	 * @param user the custom user options
-	 * @return the formatting options
-	 * @since 3.1
-	 */
-	public static Map createOptions(Map user) {
-		final Map map= JavaScriptCore.getOptions();
-
-		if (user != null) {
-
-			for (final Iterator iterator= user.keySet().iterator(); iterator.hasNext();) {
-
-				Object key= iterator.next();
-				Object value = user.get(key);
-				map.put(key, value);
-			}
-		}
-		return map;
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/CommentTestCase.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/CommentTestCase.java
deleted file mode 100644
index 453cc16..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/CommentTestCase.java
+++ /dev/null
@@ -1,114 +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.jsdt.core.tests.formatter.comment;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextUtilities;
-
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-import org.eclipse.wst.jsdt.core.tests.model.SuiteOfTestCases;
-
-public abstract class CommentTestCase extends SuiteOfTestCases {
-	public static Test buildTestSuite(Class evaluationTestClass) {
-		return buildTestSuite(evaluationTestClass, null); //$NON-NLS-1$
-	}
-
-	public static Test buildTestSuite(Class evaluationTestClass, String suiteName) {
-		TestSuite suite = new Suite(suiteName==null?evaluationTestClass.getName():suiteName);
-		List tests = buildTestsList(evaluationTestClass);
-		for (int index=0, size=tests.size(); index<size; index++) {
-			suite.addTest((Test)tests.get(index));
-		}
-		return suite;
-	}
-
-	public static final String DELIMITER= TextUtilities.getDefaultLineDelimiter(new Document());
-
-	private Map fUserOptions;
-
-	protected CommentTestCase(String name) {
-		super(name);
-	}
-
-	/*
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		fUserOptions= null;
-	}
-	
-	protected abstract int getCommentKind();
-
-	protected Map getUserOptions() {
-		return fUserOptions;
-	}
-	
-	protected void setUserOption(String name, String value) {
-		if (fUserOptions == null)
-			fUserOptions= new HashMap();
-		
-		fUserOptions.put(name, value);
-	}
-	
-	protected void setUserOption(Map options) {
-		if (fUserOptions == null) {
-			fUserOptions= options;
-		} else {
-			fUserOptions.putAll(options);
-		}
-	}	
-	
-	protected final String testFormat(String text) {
-		return testFormat(text, 0, text.length());
-	}
-
-	protected final String testFormat(String text, Map options) {
-		return testFormat(text, 0, text.length(), getCommentKind(), options);
-	}
-	protected String testFormat(String text, int offset, int length) {
-		return testFormat(text, offset, length, getCommentKind());
-	}
-
-	protected String testFormat(String text, int offset, int length, int kind) {
-		return testFormat(text, offset, length, kind, getUserOptions());
-	}
-
-	protected String testFormat(String text, int offset, int length, int kind, Map options) {
-		assertNotNull(text);
-		assertTrue(offset >= 0);
-		assertTrue(offset < text.length());
-		assertTrue(length >= 0);
-		assertTrue(offset + length <= text.length());
-
-		assertTrue(kind == CodeFormatter.K_JAVA_DOC || kind == CodeFormatter.K_MULTI_LINE_COMMENT || kind == CodeFormatter.K_SINGLE_LINE_COMMENT);
-
-		return CommentFormatterUtil.format(kind, text, offset, length, CommentFormatterUtil.createOptions(options));
-	}
-	protected String testFormat(String text, int offset, int length, int kind, int indentationLevel) {
-		assertNotNull(text);
-		assertTrue(offset >= 0);
-		assertTrue(offset < text.length());
-		assertTrue(length >= 0);
-		assertTrue(offset + length <= text.length());
-
-		assertTrue(kind == CodeFormatter.K_JAVA_DOC || kind == CodeFormatter.K_MULTI_LINE_COMMENT || kind == CodeFormatter.K_SINGLE_LINE_COMMENT);
-
-		return CommentFormatterUtil.format(kind, text, offset, length, indentationLevel, CommentFormatterUtil.createOptions(getUserOptions()));
-	}
-
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/CommentsTestSuite.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/CommentsTestSuite.java
deleted file mode 100644
index 2b3c196..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/CommentsTestSuite.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.formatter.comment;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @since 3.0
- */
-public class CommentsTestSuite extends TestSuite {
-
-	public static Test suite() {
-		return new CommentsTestSuite();
-	}
-	
-	public CommentsTestSuite() {
-		addTest(MultiLineTestCase.suite());
-		addTest(SingleLineTestCase.suite());
-		//addTest(JavaDocTestCase.suite());
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/JavaDocTestCase.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/JavaDocTestCase.java
deleted file mode 100644
index e50b9d5..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/JavaDocTestCase.java
+++ /dev/null
@@ -1,703 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.formatter.comment;
-
-import java.util.Map;
-
-import junit.framework.Test;
-
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-import org.eclipse.wst.jsdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.wst.jsdt.internal.formatter.comment.JavaDocLine;
-import org.eclipse.wst.jsdt.internal.formatter.comment.MultiCommentLine;
-
-public class JavaDocTestCase extends CommentTestCase {
-	
-	static {
-//		TESTS_NAMES = new String[] { "test75460" } ;
-	}
-
-	protected static final String INFIX= MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;
-
-	protected static final String POSTFIX= MultiCommentLine.MULTI_COMMENT_END_PREFIX;
-
-	protected static final String PREFIX= JavaDocLine.JAVADOC_START_PREFIX;
-	
-	public static Test suite() {
-		return buildTestSuite(JavaDocTestCase.class);
-	}
-
-	public JavaDocTestCase(String name) {
-		super(name);
-	}
-
-	protected int getCommentKind() {
-		return CodeFormatter.K_JAVA_DOC;
-	}
-
-	public void testSingleLineComment1() {
-		assertEquals(PREFIX + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + "\t\t" + DELIMITER + "*\t test*/")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	public void testSingleLineComment2() {
-		assertEquals(PREFIX + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + "test" + DELIMITER + "\t" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	public void testSingleLineComment3() {
-		assertEquals(PREFIX + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + DELIMITER + "* test\t*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineComment4() {
-		assertEquals(PREFIX + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + "test" + DELIMITER + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentSpace1() {
-		assertEquals(PREFIX + " test" + POSTFIX, testFormat(PREFIX + "test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineCommentSpace2() {
-		assertEquals(PREFIX + " test" + POSTFIX, testFormat(PREFIX + "test" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineCommentSpace3() {
-		assertEquals(PREFIX + " test" + POSTFIX, testFormat(PREFIX + "test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineCommentSpace4() {
-		assertEquals(PREFIX + " test test" + POSTFIX, testFormat(PREFIX + " test   test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineCommentTabs1() {
-		assertEquals(PREFIX + " test test" + POSTFIX, testFormat(PREFIX + "\ttest\ttest" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineCommentTabs2() {
-		assertEquals(PREFIX + " test test" + POSTFIX, testFormat(PREFIX + "\ttest\ttest*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testMultiLineCommentBreak1() {
-		String input= PREFIX + " test<br>test" + POSTFIX; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + INFIX + "test<br>" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$
-		assertEquals(expected, testFormat(input));
-	}
-	
-	public void testMultiLineCommentCodeSnippet1() {
-		String prefix= PREFIX + DELIMITER + INFIX + "<pre>" + DELIMITER + INFIX; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + "while (i != 0) i--;" + postfix; //$NON-NLS-1$
-		String expected= prefix + "while (i != 0)" + DELIMITER + INFIX + "\ti--;" + postfix;    //$NON-NLS-1$//$NON-NLS-2$
-		String result= testFormat(input);
-		assertEquals(expected, result);
-		
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting] Error in formatting parts of java code snippets in comment
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44035
-	 */
-	public void testMultiLineCommentCodeSnippet2() {
-		String prefix= PREFIX + DELIMITER + INFIX + "<pre>" + DELIMITER + INFIX; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + "while (i != 0) { i--; }" + postfix; //$NON-NLS-1$
-		String expected= prefix + "while (i != 0) {" + DELIMITER + INFIX + "\ti--;" + DELIMITER + INFIX + "}" + postfix; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String result= testFormat(input);
-		assertEquals(expected, result);
-		
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		
-		assertEquals(expected, result);
-	}
-	
-	public void testMultiLineCommentCodeSnippet3() {
-		String input= PREFIX + DELIMITER + "<pre>" + DELIMITER + "while (i != 0)" + DELIMITER + "i--;" + DELIMITER + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		String expected= PREFIX + DELIMITER + INFIX + "<pre>" + DELIMITER + INFIX + "while (i != 0)" + DELIMITER + INFIX + "\ti--;" + DELIMITER + INFIX + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		String result= testFormat(input);
-		assertEquals(expected, result);
-		
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		
-		assertEquals(expected, result);
-	}
-	
-	public void testMultiLineCommentCodeSnippetHtmlEntities1() {
-		String prefix= PREFIX + DELIMITER + INFIX + "<pre>" + DELIMITER + INFIX; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + "System.out.println(\"test\");" + postfix; //$NON-NLS-1$
-		String expected= prefix + "System.out.println(&quot;test&quot;);" + postfix; //$NON-NLS-1$
-		String result= testFormat(input);
-		assertEquals(expected, result);
-		
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		
-		assertEquals(expected, result);
-	}
-	
-	public void testMultiLineCommentIndentTabs1() {
-		String prefix= "public class Test {" + DELIMITER + "\t\t"; //$NON-NLS-1$ //$NON-NLS-2$
-		String content= PREFIX + DELIMITER + "\t\t\t" + INFIX + "test test" + DELIMITER + "\t\t\t\t" + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		String postfix= DELIMITER + "}"; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + "\t\t" + INFIX + "test test" + DELIMITER + "\t\t" + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		assertEquals(prefix + expected + postfix, testFormat(prefix + content + postfix, prefix.length(), content.length()));
-	}
-	
-	/**
-	 * [formatting] Comments formatter inserts tabs when it should use spaces
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47491
-	 */
-	public void testMultiLineCommentIndentSpaces1() {
-		String prefix= "public class Test {" + DELIMITER + "\t"; //$NON-NLS-1$ //$NON-NLS-2$
-		String content= PREFIX + DELIMITER + "\t\t" + INFIX + "test test" + DELIMITER + "        " + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		String postfix= DELIMITER + "}"; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + "   " + INFIX + "test test" + DELIMITER + "   " + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.SPACE);
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "3"); //$NON-NLS-1$
-		assertEquals(prefix + expected + postfix, testFormat(prefix + content + postfix, prefix.length(), content.length()));
-	}
-	
-	public void testMultiLineCommentIndentSpaces2() {
-		String prefix= "public class Test {" + DELIMITER + "    "; //$NON-NLS-1$ //$NON-NLS-2$
-		String content= PREFIX + DELIMITER + "\t\t" + INFIX + "test test" + DELIMITER + "        " + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		String postfix= DELIMITER + "}"; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + "      " + INFIX + "test test" + DELIMITER + "      " + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.SPACE);
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "3"); //$NON-NLS-1$
-		assertEquals(prefix + expected + postfix, testFormat(prefix + content + postfix, prefix.length(), content.length()));
-	}
-	
-	public void testMultiLineCommentIndentSpaces3() {
-		String prefix= "public class Test {" + DELIMITER + "  \t  "; //$NON-NLS-1$ //$NON-NLS-2$
-		String content= PREFIX + DELIMITER + "\t\t" + INFIX + "test test" + DELIMITER + "        " + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		String postfix= DELIMITER + "}"; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + "      " + INFIX + "test test" + DELIMITER + "      " + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.SPACE);
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "3"); //$NON-NLS-1$
-		assertEquals(prefix + expected + postfix, testFormat(prefix + content + postfix, prefix.length(), content.length()));
-	}
-	
-	public void testMultiLineCommentIndentSpaces4() {
-		String prefix= "public class Test {" + DELIMITER + "   \t   "; //$NON-NLS-1$ //$NON-NLS-2$
-		String content= PREFIX + DELIMITER + "\t\t" + INFIX + "test test" + DELIMITER + "        " + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		String postfix= DELIMITER + "}"; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + "         " + INFIX + "test test" + DELIMITER + "         " + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.SPACE);
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "3"); //$NON-NLS-1$
-		assertEquals(prefix + expected + postfix, testFormat(prefix + content + postfix, prefix.length(), content.length()));
-	}
-	
-	/**
-	 * [formatting] Repeated insertion of new line when formatting javadoc comment
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50212
-	 */
-	public void testMultiLineCommentBlankLineAfterPre1() {
-		String input= PREFIX + DELIMITER + INFIX + "<pre></pre>" + DELIMITER  + INFIX + "test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$
-		String expected= PREFIX + DELIMITER + INFIX + "<pre></pre>" + DELIMITER + INFIX + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$
-		String result= testFormat(input);
-		assertEquals(expected, result);
-		result= testFormat(result);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting][implementation] comment line length not correctly applied
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46341
-	 * Do not wrap.
-	 */
-	public void testMultiLineCommentLineBreakBeforeImmutableRegions1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "22"); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "a <code>test</code>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting][implementation] comment line length not correctly applied
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46341
-	 * Do wrap.
-	 */
-	public void testMultiLineCommentLineBreakBeforeImmutableRegions2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "21"); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "a <code>test</code>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + INFIX + "a" + DELIMITER + INFIX + "<code>test</code>" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting][implementation] comment line length not correctly applied
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46341
-	 * Do not wrap. (Consecutive immutable regions on multiple lines.)
-	 */
-	public void testMultiLineCommentLineBreakBeforeImmutableRegions3() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "20"); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "a <code>" + DELIMITER + INFIX + "testestestestestestestestestest" + DELIMITER + INFIX + "</code>" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do not insert blank line before Javadoc tags
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS, JavaScriptCore.DO_NOT_INSERT); //$NON-NLS-1$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_JAVADOC_COMMENT, DefaultCodeFormatterConstants.FALSE); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "Description" + DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do insert blank line before Javadoc tags
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS, JavaScriptCore.INSERT); //$NON-NLS-1$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_JAVADOC_COMMENT, DefaultCodeFormatterConstants.TRUE); //$NON-NLS-1$
-		String prefix= PREFIX + DELIMITER + INFIX + "Description"; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + postfix;
-		String expected= prefix + DELIMITER + INFIX + postfix;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do not remove blank line before Javadoc tags
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags3() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS, JavaScriptCore.INSERT); //$NON-NLS-1$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_JAVADOC_COMMENT, DefaultCodeFormatterConstants.TRUE); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "Description" + DELIMITER + INFIX + DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do remove blank line before Javadoc tags
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags4() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS, JavaScriptCore.DO_NOT_INSERT); //$NON-NLS-1$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_JAVADOC_COMMENT,DefaultCodeFormatterConstants.TRUE); //$NON-NLS-1$
-		String prefix= PREFIX + DELIMITER + INFIX + "Description"; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + DELIMITER + INFIX + postfix;
-		String expected= prefix + postfix;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do not insert blank line before Javadoc tags
-	 * @deprecated
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags5() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS, JavaScriptCore.DO_NOT_INSERT); //$NON-NLS-1$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES, DefaultCodeFormatterConstants.FALSE); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "Description" + DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do insert blank line before Javadoc tags
-	 * @deprecated
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags6() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS, JavaScriptCore.INSERT); //$NON-NLS-1$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES, DefaultCodeFormatterConstants.TRUE); //$NON-NLS-1$
-		String prefix= PREFIX + DELIMITER + INFIX + "Description"; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + postfix;
-		String expected= prefix + DELIMITER + INFIX + postfix;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do not remove blank line before Javadoc tags
-	 * @deprecated
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags7() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS, JavaScriptCore.INSERT); //$NON-NLS-1$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES, DefaultCodeFormatterConstants.TRUE); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "Description" + DELIMITER + INFIX + DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do remove blank line before Javadoc tags
-	 * @deprecated
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags8() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS, JavaScriptCore.DO_NOT_INSERT); //$NON-NLS-1$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES,DefaultCodeFormatterConstants.TRUE); //$NON-NLS-1$
-		String prefix= PREFIX + DELIMITER + INFIX + "Description"; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + DELIMITER + INFIX + postfix;
-		String expected= prefix + postfix;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-
-	/**
-	 * [formatting] javadoc formatter removes blank lines between empty javadoc tags (xdoclet fails)
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=68577
-	 */
-	public void testLineBreaksBetweenEmptyJavaDocTags1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_JAVADOC_COMMENT, DefaultCodeFormatterConstants.FALSE); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "@custom1" + DELIMITER + INFIX + DELIMITER + INFIX + "@custom2" + DELIMITER + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting] javadoc formatter removes blank lines between empty javadoc tags (xdoclet fails)
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=68577
-	 */
-	public void testLineBreaksBetweenEmptyJavaDocTags2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_JAVADOC_COMMENT, DefaultCodeFormatterConstants.FALSE); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "@custom1" + DELIMITER + INFIX + "@custom2" + DELIMITER + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	public void testNoChange1() {
-		String content= PREFIX + DELIMITER + POSTFIX;
-		assertEquals(content, testFormat(content));
-	}
-
-	public void testNoFormat1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_JAVADOC_COMMENT, DefaultCodeFormatterConstants.FALSE);
-		String content= PREFIX + DELIMITER + INFIX + "test" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX;
-		assertEquals(content, testFormat(content));
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public void testNoFormat2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT, DefaultCodeFormatterConstants.FALSE);
-		String content= PREFIX + DELIMITER + INFIX + "test" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX;
-		assertEquals(content, testFormat(content));
-	}
-
-	
-	/**
-	 * [formatting] Javadoc Formatter mishandles spaces in comments
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49686
-	 */
-	public void testInlineTag1() {
-		String input= PREFIX + DELIMITER + INFIX + "{@link Object} has many methods." + DELIMITER + POSTFIX;  //$NON-NLS-1$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting] Javadoc Formatter mishandles spaces in comments
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49686
-	 */
-	public void testInlineTag2() {
-		String input= PREFIX + DELIMITER + INFIX + "{@link Object}s are cool." + DELIMITER + POSTFIX;  //$NON-NLS-1$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting] Javadoc Formatter mishandles spaces in comments
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49686
-	 */
-	public void testMultilineInlineTag1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "20"); //$NON-NLS-1$
-		final String prefix= PREFIX + DELIMITER + INFIX + "{@link Object}";
-		final String postfix= "has many methods." + DELIMITER + POSTFIX;
-		String input= prefix + " " + postfix;  //$NON-NLS-1$
-		String expected= prefix + DELIMITER + INFIX + postfix;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting] Javadoc Formatter mishandles spaces in comments
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49686
-	 */
-	public void testMultilineInlineTag2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "20"); //$NON-NLS-1$
-		final String prefix= PREFIX + DELIMITER + INFIX + "{@link Objecterr}s";
-		final String postfix= "are cool." + DELIMITER + POSTFIX;
-		String input= prefix + " " + postfix;  //$NON-NLS-1$
-		String expected= prefix + DELIMITER + INFIX + postfix;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting] Javadoc Formatter mishandles spaces in comments
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49686
-	 */
-	public void testTagWordbreaks1() {
-		String input= PREFIX + DELIMITER + INFIX + "<code>Object</code> rocks." + DELIMITER + POSTFIX;  //$NON-NLS-1$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-
-	/**
-	 * [formatting] Javadoc Formatter mishandles spaces in comments
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49686
-	 */
-	public void testTagWordbreaks2() {
-		String input= PREFIX + DELIMITER + INFIX + "<code>Object</code>s are cool." + DELIMITER + POSTFIX;  //$NON-NLS-1$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-
-	/**
-	 * [formatting] Javadoc Formatter mishandles spaces in comments
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49686
-	 */
-	public void testMultilineTagWordbreaks1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "20"); //$NON-NLS-1$
-		String prefix= PREFIX + DELIMITER + INFIX + "<code>Object</code>";
-		String postfix=  "rocks." + DELIMITER + POSTFIX;  //$NON-NLS-1$
-		String input= prefix + " " + postfix;
-		String expected= prefix + DELIMITER + INFIX + postfix; 
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-
-	/**
-	 * [formatting] Javadoc Formatter mishandles spaces in comments
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=49686
-	 */
-	public void testMultilineTagWordbreaks2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "20"); //$NON-NLS-1$
-		final String prefix= PREFIX + DELIMITER + INFIX + "Foo";
-		final String postfix= "<code>Obj</code>s" + DELIMITER + POSTFIX;
-		String input= prefix + " " + postfix;
-		String expected= prefix + DELIMITER + INFIX + postfix;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	public void testMultiLineComment() {
-		String input= PREFIX + DELIMITER + " TOTO " + POSTFIX; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + INFIX + "TOTO" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		final String result = testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	public void testMultiLineComment2() {
-		String input= PREFIX + DELIMITER + "TOTO" + POSTFIX; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + INFIX + "TOTO" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		final String result = testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting] Javadoc formatting: extra newline with [pre]
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=52921
-	 * <p>
-	 * This test only formats once.
-	 * </p>
-	 */
-	public void testNoExtraNewlineWithPre1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE, DefaultCodeFormatterConstants.TRUE);
-		String input= PREFIX + DELIMITER + INFIX + "<pre>wrap here</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + INFIX + "<pre>" + DELIMITER + INFIX + "wrap here" + DELIMITER + INFIX + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$; //$NON-NLS-2$; //$NON-NLS-3$;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-
-		// now re-format several times
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		
-		expected= PREFIX + DELIMITER + INFIX + "<pre>" + DELIMITER + INFIX + "wrap here" + DELIMITER + INFIX + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$; //$NON-NLS-2$; //$NON-NLS-3$;
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting] Javadoc formatting: extra newline with [pre]
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=52921
-	 * <p>
-	 * This test only formats once.
-	 * </p>
-	 */
-	public void testNoExtraNewlineWithPre2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE, DefaultCodeFormatterConstants.FALSE);
-		String input= PREFIX + DELIMITER + INFIX + "<pre>wrap here</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + INFIX + "<pre>wrap here</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String result= testFormat(input);
-		assertEquals(expected, result);
-
-		// now re-format several times
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		result= testFormat(result);
-		
-		expected= PREFIX + DELIMITER + INFIX + "<pre>wrap here</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		assertEquals(expected, result);
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=109605
-	public void test109605() {
-		String input = "/**" + DELIMITER +
-				"			 * <pre>" + DELIMITER +
-				"			 * " + DELIMITER +
-				"			 * </pre>" + DELIMITER +
-				"			 * " + DELIMITER +
-				"			 * " + DELIMITER +
-				"			 * @author Darren Pearce" + DELIMITER +
-				"			 * @version 22-Sep-2005" + DELIMITER +
-				"			 * " + DELIMITER +
-				"			 */";
-		
-		String expected = "/**" + DELIMITER +
-				" * <pre>" + DELIMITER + 
-				" * </pre>" + DELIMITER + 
-				" * " +  DELIMITER +
-				" * " + DELIMITER + 
-				" * @author Darren Pearce" + DELIMITER +
-				" * @version 22-Sep-2005" + DELIMITER +
-				" * " + DELIMITER + 
-				" */";
-		String result=testFormat(input);
-		assertEquals(expected, result);
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=60453
-	public void test60453() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "80");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_JAVADOC_COMMENT, DefaultCodeFormatterConstants.FALSE);
-
-		String input = "/** Creates a new instance of DynamicEventChannel  sdf sdfs dsdf dsfsd fd fsd fsdf sdf dsfsd (on the same line)" + DELIMITER + 
-				"* @pre obj != null" + DELIMITER + 
-				"*/";
-		
-		String expected = "/**" + DELIMITER +
-				" * Creates a new instance of DynamicEventChannel sdf sdfs dsdf dsfsd fd fsd fsdf" + DELIMITER +
-				" * sdf dsfsd (on the same line)" + DELIMITER +
-				" * " + DELIMITER +
-				" * @pre obj != null" + DELIMITER +
-				" */";
-		String result=testFormat(input, options);
-		assertEquals(expected, result);
-	}
-
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=60453
-	 * @deprecated
-	 */
-	public void test60453_2() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "80");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES, DefaultCodeFormatterConstants.FALSE);
-
-		String input = "/** Creates a new instance of DynamicEventChannel  sdf sdfs dsdf dsfsd fd fsd fsdf sdf dsfsd (on the same line)" + DELIMITER + 
-				"* @pre obj != null" + DELIMITER + 
-				"*/";
-		
-		String expected = "/**" + DELIMITER +
-				" * Creates a new instance of DynamicEventChannel sdf sdfs dsdf dsfsd fd fsd fsdf" + DELIMITER +
-				" * sdf dsfsd (on the same line)" + DELIMITER +
-				" * " + DELIMITER +
-				" * @pre obj != null" + DELIMITER +
-				" */";
-		String result=testFormat(input, options);
-		assertEquals(expected, result);
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=75460
-	public void test75460() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "200");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_JAVADOC_COMMENT, DefaultCodeFormatterConstants.FALSE);
-
-		String input = "/**" + DELIMITER +
-				"<pre>"+ DELIMITER +
-				"            Object[] objects = new Object[3];" + DELIMITER +
-				"            objects[0] = new String(\"Hallo Welt !!!\");" + DELIMITER +
-				"            objects[1] = new String(\"Test !!!\");" + DELIMITER +
-				"            objects[2] = new Integer(\"1980\");" + DELIMITER +
-				"            ObjectFile.write(pathname, objects);" + DELIMITER +
-				"            Object[] objs = ObjectFile.read(pathname);" + DELIMITER +
-				"            for(int i = 0; i < objs.length; i++)" + DELIMITER +
-				"            {" + DELIMITER +
-				"              System.out.println(objs[i].toString());" + DELIMITER +
-				"            }" + DELIMITER +
-				"</pre>"+ DELIMITER +
-				"*/";
-		
-		String expected = "/**" + DELIMITER +
-				" * <pre>" + DELIMITER +
-				" * Object[] objects = new Object[3];" + DELIMITER +
-				" * objects[0] = new String(&quot;Hallo Welt !!!&quot;);" + DELIMITER +
-				" * objects[1] = new String(&quot;Test !!!&quot;);" + DELIMITER +
-				" * objects[2] = new Integer(&quot;1980&quot;);" + DELIMITER +
-				" * ObjectFile.write(pathname, objects);" + DELIMITER +
-				" * Object[] objs = ObjectFile.read(pathname);" + DELIMITER +
-				" * for (int i = 0; i &lt; objs.length; i++) {" + DELIMITER +
-				" * 	System.out.println(objs[i].toString());" + DELIMITER +
-				" * }" + DELIMITER +
-				" * </pre>" + DELIMITER +
-				" */";
-		String result=testFormat(input, options);
-		assertEquals(expected, result);
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/MultiLineTestCase.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/MultiLineTestCase.java
deleted file mode 100644
index 0fbc781..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/MultiLineTestCase.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.formatter.comment;
-
-import java.util.Map;
-
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-import org.eclipse.wst.jsdt.core.formatter.DefaultCodeFormatterConstants;
-
-import junit.framework.Test;
-
-import org.eclipse.wst.jsdt.internal.formatter.comment.MultiCommentLine;
-
-public class MultiLineTestCase extends CommentTestCase {
-	protected static final String INFIX= MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;
-
-	protected static final String POSTFIX= MultiCommentLine.MULTI_COMMENT_END_PREFIX;
-
-	protected static final String PREFIX= MultiCommentLine.MULTI_COMMENT_START_PREFIX;
-
-	public static Test suite() {
-		return buildTestSuite(MultiLineTestCase.class);
-	}
-
-	public MultiLineTestCase(String name) {
-		super(name);
-	}
-
-	protected int getCommentKind() {
-		return CodeFormatter.K_MULTI_LINE_COMMENT;
-	}
-
-	public void testSingleLineComment1() {
-		assertEquals("/*" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat("/*\t\t" + DELIMITER + "*\t test*/")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	}
-
-	public void testSingleLineComment2() {
-		assertEquals("/*" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + "test" + DELIMITER + "\t" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	}
-
-	public void testSingleLineComment3() {
-		assertEquals("/*" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + DELIMITER + "* test\t*/")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	public void testSingleLineComment4() {
-		assertEquals("/*" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat("/*test" + DELIMITER + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	public void testSingleLineCommentSpace1() {
-		assertEquals(PREFIX + "test" + POSTFIX, testFormat("/*test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentSpace2() {
-		assertEquals(PREFIX + "test" + POSTFIX, testFormat("/*test" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentSpace3() {
-		assertEquals(PREFIX + "test" + POSTFIX, testFormat(PREFIX + "test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentSpace4() {
-		assertEquals(PREFIX + "test test" + POSTFIX, testFormat("/* test   test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentTabs1() {
-		assertEquals(PREFIX + "test test" + POSTFIX, testFormat("/*\ttest\ttest" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentTabs2() {
-		assertEquals(PREFIX + "test test" + POSTFIX, testFormat("/*\ttest\ttest*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * [formatting] formatter removes last line with block comments
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51654
-	 */
-	public void testMultiLineCommentAsterisk1() {
-		// test3 (currently) forces the comment formatter to actually do something, it wouldn't do anything otherwise.
-		String input= PREFIX + INFIX + "test1" + DELIMITER + "test2" + INFIX + DELIMITER + "test3" + DELIMITER + "test4" + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		String result= testFormat(input);
-		assertTrue(result.indexOf("test1") != -1); //$NON-NLS-1$
-		assertTrue(result.indexOf("test2") != -1); //$NON-NLS-1$
-		assertTrue(result.indexOf("test3") != -1); //$NON-NLS-1$
-		assertTrue(result.indexOf("test4") != -1); //$NON-NLS-1$
-	}
-	
-	public void testNoChange1() {
-		String content= PREFIX + DELIMITER + POSTFIX;
-		assertEquals(content, testFormat(content));
-	}
-	
-	public void testNoFormat1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT, DefaultCodeFormatterConstants.FALSE);
-		String content= PREFIX + DELIMITER + INFIX + "test" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX;
-		assertEquals(content, testFormat(content));
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=145544
-	 */
-	public void testMultiLineCommentFor145544() {
-		setUserOption(DefaultCodeFormatterConstants.getJavaConventionsSettings());
-		String input= "/**\n" +  //$NON-NLS-1$
-				" * Member comment\n" +//$NON-NLS-1$ 
-				" */";//$NON-NLS-1$
-		String result= testFormat(input, 0, input.length(), CodeFormatter.K_MULTI_LINE_COMMENT , 2);
-		String expectedOutput = "/***********************************************************************\n" + 
-				"	 * Member comment\n" + 
-				"	 */";
-		assertEquals("Different output", expectedOutput, result);
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=75460
-	public void test75460() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "200");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT, DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_BLOCK_COMMENT, DefaultCodeFormatterConstants.FALSE);
-
-		String input = "/*" + DELIMITER +
-				"            var objects = new Array(3);" + DELIMITER +
-				"            objects[0] = new String(\"Hallo Welt !!!\");" + DELIMITER +
-				"            objects[1] = new String(\"Test !!!\");" + DELIMITER +
-				"            objects[2] = new Number(\"1980\");" + DELIMITER +
-				"            var objs = ObjectFile.read(pathname);" + DELIMITER +
-				"            for(int i = 0; i < objs.length; i++)" + DELIMITER +
-				"            {" + DELIMITER +
-				"              alert(objs[i].toString());" + DELIMITER +
-				"            }" + DELIMITER +
-				"*/";
-		
-		String expected = input;
-		String result=testFormat(input, options);
-		assertEquals(expected, result);
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=49412
-	// check backward compatibility
-	public void test49412() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "200");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_BLOCK_COMMENT, DefaultCodeFormatterConstants.TRUE);
-
-		String input = "/*" + DELIMITER + DELIMITER +
-				" test block comment with a blank line" + DELIMITER +
-				"*/";
-		
-		String expected= "/*" + DELIMITER +
-		" * test block comment with a blank line" + DELIMITER +
-		" */";
-
-		String result=testFormat(input, options);
-		assertEquals(expected, result);
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=49412
-	// check backward compatibility
-	public void test49412_2() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "200");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT, DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_BLOCK_COMMENT, DefaultCodeFormatterConstants.TRUE);
-
-		String input = "/*" + DELIMITER + DELIMITER +
-				" test block comment with a blank line" + DELIMITER +
-				"*/";
-		
-		String expected= input;
-
-		String result=testFormat(input, options);
-		assertEquals(expected, result);
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=49412
-	// check backward compatibility
-	public void test49412_3() {
-		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "200");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT, DefaultCodeFormatterConstants.TRUE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_BLOCK_COMMENT, DefaultCodeFormatterConstants.FALSE);
-
-		String input = "/*" + DELIMITER + DELIMITER +
-				" test block comment with a blank line" + DELIMITER +
-				"*/";
-		
-		String expected= "/*" + DELIMITER +
-		" * "+ DELIMITER +
-		" * test block comment with a blank line" + DELIMITER +
-		" */";
-
-		String result=testFormat(input, options);
-		assertEquals(expected, result);
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/SingleLineTestCase.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/SingleLineTestCase.java
deleted file mode 100644
index 8130848..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/formatter/comment/SingleLineTestCase.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.formatter.comment;
-
-import junit.framework.Test;
-
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-import org.eclipse.wst.jsdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.wst.jsdt.internal.formatter.comment.SingleCommentLine;
-
-public class SingleLineTestCase extends CommentTestCase {
-	protected static final String PREFIX= SingleCommentLine.SINGLE_COMMENT_PREFIX;
-	
-	public static Test suite() {
-		return buildTestSuite(SingleLineTestCase.class);
-	}
-
-	public SingleLineTestCase(String name) {
-		super(name);
-	}
-
-	protected int getCommentKind() {
-		return CodeFormatter.K_SINGLE_LINE_COMMENT;
-	}
-
-	public void testClearBlankLines1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "5"); //$NON-NLS-1$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_BLOCK_COMMENT, DefaultCodeFormatterConstants.FALSE);
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_JAVADOC_COMMENT, DefaultCodeFormatterConstants.FALSE);
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\ttest" + DELIMITER + "//" + DELIMITER + "//\t\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
-	}
-
-	public void testClearBlankLines2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "5"); //$NON-NLS-1$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_BLOCK_COMMENT, DefaultCodeFormatterConstants.FALSE);
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_JAVADOC_COMMENT, DefaultCodeFormatterConstants.FALSE);
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\t\ttest" + DELIMITER + PREFIX + DELIMITER + "//\t\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-	}
-
-	public void testClearBlankLines3() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "5"); //$NON-NLS-1$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_BLOCK_COMMENT, DefaultCodeFormatterConstants.FALSE);
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES_IN_JAVADOC_COMMENT, DefaultCodeFormatterConstants.FALSE);
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\ttest" + DELIMITER + "//" + DELIMITER + PREFIX + "test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
-	}
-
-	public void testCommentBegin1() {
-		assertEquals(PREFIX + "test" + DELIMITER, testFormat("//test")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentBegin2() {
-		assertEquals(PREFIX + "test" + DELIMITER, testFormat(PREFIX + "test")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentBegin3() {
-		assertEquals(PREFIX + "test" + DELIMITER, testFormat("//\t\ttest " + DELIMITER)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentDelimiter1() {
-		assertEquals(PREFIX + "test" + DELIMITER, testFormat("//\t\ttest " + DELIMITER + DELIMITER)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentDelimiter2() {
-		assertEquals(PREFIX + "test" + DELIMITER, testFormat(PREFIX + "test " + DELIMITER + DELIMITER + DELIMITER)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentSpace1() {
-		assertEquals(PREFIX + "test test" + DELIMITER, testFormat("//test\t \t test")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentSpace2() {
-		assertEquals(PREFIX + "test test" + DELIMITER, testFormat("//test test")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentSpace3() {
-		assertEquals(PREFIX + "test test" + DELIMITER, testFormat(PREFIX + "test \t    \t test")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentWrapping1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "5"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	public void testCommentWrapping2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "1"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	public void testCommentWrapping3() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "32"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test test" + DELIMITER, testFormat("//test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	public void testCommentWrapping4() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "32"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test test" + DELIMITER, testFormat("//test\ttest" + DELIMITER)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	public void testCommentWrapping5() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		String prefix= "public class Test {" + DELIMITER + "	int test; // test test test test test test test test test test test test";
-		String inputInfix= " ";
-		String expectedInfix= DELIMITER + "\t\t\t\t" + PREFIX;
-		String suffix= "test" + DELIMITER + "}" + DELIMITER;
-		String input= prefix + inputInfix + suffix;
-		int offset= input.indexOf("//");
-		assertEquals(prefix + expectedInfix + suffix, testFormat(input, offset, input.indexOf(DELIMITER, offset) + DELIMITER.length() - offset));
-	}
-
-	public void testHeaderComment1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HEADER, DefaultCodeFormatterConstants.FALSE);
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "12"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test test" + DELIMITER + PREFIX + "test test" + DELIMITER + PREFIX + "test test" + DELIMITER, testFormat("//test\t\t\t\ttest" + DELIMITER + PREFIX + "test test test test")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	}
-
-	public void testHeaderComment2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HEADER, DefaultCodeFormatterConstants.FALSE);
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "24"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test test test test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\t\t\t" + DELIMITER + PREFIX + "test test test test" + DELIMITER)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	}
-
-	public void testIllegalLineLength1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "1"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	public void testIllegalLineLength2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "-16"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat(PREFIX + "\t\t test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	public void testMultipleComments1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "5"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test test" + DELIMITER + PREFIX + "test test test test")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-	}
-
-	public void testMultipleComments2() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "12"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test test" + DELIMITER + PREFIX + "test test" + DELIMITER + PREFIX + "test test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test test\ttest" + DELIMITER + PREFIX + DELIMITER + PREFIX + "test test test test")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-	}
-
-	public void testMultipleComments3() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "11"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//   test\t\t\ttest\ttest" + DELIMITER + PREFIX + "test test test test")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-	}
-	
-	public void testIndentedComment1() {
-		String prefix= "public class Test {" + DELIMITER + "\t";
-		String comment= PREFIX + "test" + DELIMITER;
-		String postfix= "}" + DELIMITER;
-		String string= prefix + comment + postfix;
-		assertEquals(string, testFormat(string, prefix.length(), comment.length()));
-	}
-	
-	public void testIndentedComment2() {
-		String prefix= "public class Test {" + DELIMITER + "\tpublic void test() {" + DELIMITER + "\t\t";
-		String comment= PREFIX + "test" + DELIMITER;
-		String postfix= "\t}" + DELIMITER + "}" + DELIMITER;
-		String string= prefix + comment + postfix;
-		assertEquals(string, testFormat(string, prefix.length(), comment.length()));
-	}
-	
-	public void testIndentedComment3() {
-		String prefix= "public class Test {" + DELIMITER + "\tpublic void test() {" + DELIMITER + "\t\tif (true) {" + DELIMITER + "\t\t\t";
-		String comment= PREFIX + "test" + DELIMITER;
-		String postfix= "\t\t}" + DELIMITER + "\t}" + DELIMITER + "}" + DELIMITER;
-		String string= prefix + comment + postfix;
-		assertEquals(string, testFormat(string, prefix.length(), comment.length()));
-	}
-	
-	public void testNoChange1() {
-		String content= PREFIX;
-		assertEquals(content, testFormat(content));
-	}
-	
-	public void testNoFormat1() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT, DefaultCodeFormatterConstants.FALSE);
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "1");
-		String content= PREFIX + "test test";
-		assertEquals(content, testFormat(content));
-	}
-	public void _test109581() {
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT, DefaultCodeFormatterConstants.TRUE);
-		String content= "//// some comment ////";
-		assertEquals(content + DELIMITER, testFormat(content));
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavaModelCompletionTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavaModelCompletionTests.java
deleted file mode 100644
index 15f8beb..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavaModelCompletionTests.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.model;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.core.*;
-import org.eclipse.wst.jsdt.internal.codeassist.RelevanceConstants;
-
-import junit.framework.*;
-
-public abstract class AbstractJavaModelCompletionTests extends AbstractJavaModelTests implements RelevanceConstants {
-	public static List COMPLETION_SUITES = null;
-	protected static IJavaScriptProject COMPLETION_PROJECT;
-	protected class CompletionResult {
-		public String proposals;
-		public String context;
-		public int cursorLocation;
-		public int tokenStart;
-		public int tokenEnd;
-	}
-	Hashtable oldOptions;
-	IJavaScriptUnit wc = null;
-public AbstractJavaModelCompletionTests(String name) {
-	super(name);
-}
-protected void addLibrary(String projectName, String jarName, String sourceZipName, String docZipName, boolean exported) throws JavaScriptModelException {
-	IJavaScriptProject javaProject = getJavaProject(projectName);
-	IProject project = javaProject.getProject();
-	String projectPath = '/' + project.getName() + '/';
-	
-	IIncludePathAttribute[] extraAttributes;
-	if(docZipName == null) {
-		extraAttributes = new IIncludePathAttribute[0];
-	} else {
-		extraAttributes =
-			new IIncludePathAttribute[]{
-				JavaScriptCore.newIncludepathAttribute(
-						IIncludePathAttribute.JSDOC_LOCATION_ATTRIBUTE_NAME,
-						"jar:platform:/resource"+projectPath+docZipName+"!/")};
-	}
-	
-	addLibraryEntry(
-			javaProject,
-			new Path(projectPath + jarName),
-			sourceZipName == null ? null : new Path(projectPath + sourceZipName),
-			sourceZipName == null ? null : new Path(""),
-			null,
-			null,
-			extraAttributes,
-			exported);
-} 
-protected void removeLibrary(String projectName, String jarName) throws CoreException, IOException {
-	IJavaScriptProject javaProject = getJavaProject(projectName);		
-	IProject project = javaProject.getProject();
-	String projectPath = '/' + project.getName() + '/';
-	removeLibraryEntry(javaProject, new Path(projectPath + jarName));
-}
-public IJavaScriptUnit getWorkingCopy(String path, String source) throws JavaScriptModelException {
-	return super.getWorkingCopy(path, source, this.wcOwner, null);
-}
-protected CompletionResult complete(String path, String source, String completeBehind) throws JavaScriptModelException {
-	return this.complete(path, source, false, completeBehind);
-}
-protected CompletionResult complete(String path, String source, boolean showPositions, String completeBehind) throws JavaScriptModelException {
-	return this.complete(path,source,showPositions, completeBehind, null, null);
-}
-protected CompletionResult complete(String path, String source, boolean showPositions, String completeBehind, String tokenStartBehind, String token) throws JavaScriptModelException {
-	this.wc = getWorkingCopy(path, source);
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, showPositions);
-	String str = this.wc.getSource();
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	int tokenStart = -1;
-	int tokenEnd = -1;
-	if(tokenStartBehind != null && token != null) {
-		tokenStart = str.lastIndexOf(tokenStartBehind) + tokenStartBehind.length();
-		tokenEnd = tokenStart + token.length() - 1;
-	}
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-	CompletionResult result =  new CompletionResult();
-	result.proposals = requestor.getResults();
-	result.context = requestor.getContext();
-	result.cursorLocation = cursorLocation;
-	result.tokenStart = tokenStart;
-	result.tokenEnd = tokenEnd;
-	return result;
-}
-protected CompletionResult contextComplete(IJavaScriptUnit cu, int cursorLocation) throws JavaScriptModelException {
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, false, false);
-	cu.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-	CompletionResult result =  new CompletionResult();
-	result.proposals = requestor.getResults();
-	result.context = requestor.getContext();
-	result.cursorLocation = cursorLocation;
-	return result;
-}
-protected CompletionResult snippetContextComplete(
-		IType type,
-		String snippet,
-		int insertion,
-		int cursorLocation,
-		boolean isStatic) throws JavaScriptModelException {
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, false, false);
-	type.codeComplete(snippet.toCharArray(), insertion, cursorLocation, null, null, null, isStatic, requestor, this.wcOwner);
-	
-	CompletionResult result =  new CompletionResult();
-	result.proposals = requestor.getResults();
-	result.context = requestor.getContext();
-	result.cursorLocation = cursorLocation;
-	return result;
-}
-public void setUpSuite() throws Exception {
-	super.setUpSuite();
-	this.oldOptions = JavaScriptCore.getOptions();
-	waitUntilIndexesReady();
-}
-protected void setUp() throws Exception {
-	super.setUp();
-	this.wcOwner = new WorkingCopyOwner(){};
-}
-public void tearDownSuite() throws Exception {
-	JavaScriptCore.setOptions(this.oldOptions);
-	this.oldOptions = null;
-	if (COMPLETION_SUITES == null) {
-		deleteProject("Completion");
-	} else {
-		COMPLETION_SUITES.remove(getClass());
-		if (COMPLETION_SUITES.size() == 0) {
-			deleteProject("Completion");
-			COMPLETION_SUITES = null;
-		}
-	}
-	super.tearDownSuite();
-}
-protected void tearDown() throws Exception {
-	if(this.wc != null) {
-		this.wc.discardWorkingCopy();
-		this.wc = null;
-	}
-	super.tearDown();
-}
-protected void assertResults(String expected, String actual) {
-	try {
-		assertEquals(expected, actual);
-	} catch(ComparisonFailure c) {
-		System.out.println(actual);
-		System.out.println();
-		throw c;
-	}
-}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavaModelTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavaModelTests.java
deleted file mode 100644
index ca77cbc..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavaModelTests.java
+++ /dev/null
@@ -1,2261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.jsdt.core.*;
-import org.eclipse.wst.jsdt.core.compiler.CharOperation;
-import org.eclipse.wst.jsdt.core.compiler.IProblem;
-import org.eclipse.wst.jsdt.core.compiler.libraries.SystemLibraryLocation;
-import org.eclipse.wst.jsdt.core.dom.ASTNode;
-import org.eclipse.wst.jsdt.core.dom.JavaScriptUnit;
-import org.eclipse.wst.jsdt.core.search.*;
-import org.eclipse.wst.jsdt.core.tests.junit.extension.TestCase;
-import org.eclipse.wst.jsdt.internal.compiler.impl.CompilerOptions;
-import org.eclipse.wst.jsdt.internal.core.ClasspathEntry;
-import org.eclipse.wst.jsdt.internal.core.JavaCorePreferenceInitializer;
-import org.eclipse.wst.jsdt.internal.core.JavaElement;
-import org.eclipse.wst.jsdt.internal.core.JavaModelManager;
-import org.eclipse.wst.jsdt.internal.core.NameLookup;
-import org.eclipse.wst.jsdt.internal.core.ResolvedSourceMethod;
-import org.eclipse.wst.jsdt.internal.core.ResolvedSourceType;
-import org.eclipse.wst.jsdt.internal.core.search.BasicSearchEngine;
-import org.eclipse.wst.jsdt.internal.core.util.Util;
-
-public abstract class AbstractJavaModelTests extends SuiteOfTestCases {
-	
-	/**
-	 * The java.io.File path to the directory that contains the external jars.
-	 */
-	protected static String EXTERNAL_JAR_DIR_PATH;
-
-	// used java project
-	protected IJavaScriptProject currentProject;
-
-	// working copies usage
-	protected IJavaScriptUnit[] workingCopies;
-	protected WorkingCopyOwner wcOwner;
-	
-	// infos for invalid results
-	protected int tabs = 2;
-	protected boolean displayName = false;
-	protected String endChar = ",";
-	
-	public static class ProblemRequestor implements IProblemRequestor {
-		public StringBuffer problems;
-		public int problemCount;
-		protected char[] unitSource;
-		public ProblemRequestor() {
-			initialize(null);
-		}
-		public void acceptProblem(IProblem problem) {
-			org.eclipse.wst.jsdt.core.tests.util.Util.appendProblem(this.problems, problem, this.unitSource, ++this.problemCount);
-			this.problems.append("----------\n");
-		}
-		public void beginReporting() {
-			this.problems.append("----------\n");
-		}
-		public void endReporting() {
-			if (this.problemCount == 0)
-				this.problems.append("----------\n");
-		}
-		public boolean isActive() {
-			return true;
-		}
-		public void initialize(char[] source) {
-			this.problems = new StringBuffer();
-			this.problemCount = 0;
-			this.unitSource = source;
-		}
-	}
-	
-	/**
-	 * Delta listener
-	 */
-	protected class DeltaListener implements IElementChangedListener {
-		/**
-		 * Deltas received from the java model. See 
-		 * <code>#startDeltas</code> and
-		 * <code>#stopDeltas</code>.
-		 */
-		public IJavaScriptElementDelta[] deltas;
-		
-		public ByteArrayOutputStream stackTraces;
-	
-		public void elementChanged(ElementChangedEvent ev) {
-			IJavaScriptElementDelta[] copy= new IJavaScriptElementDelta[deltas.length + 1];
-			System.arraycopy(deltas, 0, copy, 0, deltas.length);
-			copy[deltas.length]= ev.getDelta();
-			deltas= copy;
-			
-//			new Throwable("Caller of IElementChangedListener#elementChanged").printStackTrace(new PrintStream(this.stackTraces));
-		}
-		public JavaScriptUnit getCompilationUnitAST(IJavaScriptUnit workingCopy) {
-			for (int i=0, length= this.deltas.length; i<length; i++) {
-				JavaScriptUnit result = getCompilationUnitAST(workingCopy, this.deltas[i]);
-				if (result != null)
-					return result;
-			}
-			return null;
-		}
-		private JavaScriptUnit getCompilationUnitAST(IJavaScriptUnit workingCopy, IJavaScriptElementDelta delta) {
-			if ((delta.getFlags() & IJavaScriptElementDelta.F_AST_AFFECTED) != 0 && workingCopy.equals(delta.getElement()))
-				return delta.getJavaScriptUnitAST();
-			return null;
-		}
-		protected void sortDeltas(IJavaScriptElementDelta[] elementDeltas) {
-			org.eclipse.wst.jsdt.internal.core.util.Util.Comparer comparer = new org.eclipse.wst.jsdt.internal.core.util.Util.Comparer() {
-				public int compare(Object a, Object b) {
-					IJavaScriptElementDelta deltaA = (IJavaScriptElementDelta)a;
-					IJavaScriptElementDelta deltaB = (IJavaScriptElementDelta)b;
-					return deltaA.getElement().getElementName().compareTo(deltaB.getElement().getElementName());
-				}
-			};
-			org.eclipse.wst.jsdt.internal.core.util.Util.sort(elementDeltas, comparer);
-			for (int i = 0, max = elementDeltas.length; i < max; i++) {
-				IJavaScriptElementDelta delta = elementDeltas[i];
-				IJavaScriptElementDelta[] children = delta.getAffectedChildren();
-				if (children != null) {
-					sortDeltas(children);
-				}
-			}
-		}
-		public String toString() {
-			StringBuffer buffer = new StringBuffer();
-			for (int i=0, length= this.deltas.length; i<length; i++) {
-				IJavaScriptElementDelta delta = this.deltas[i];
-				IJavaScriptElementDelta[] children = delta.getAffectedChildren();
-				int childrenLength=children.length;
-				IResourceDelta[] resourceDeltas = delta.getResourceDeltas();
-				int resourceDeltasLength = resourceDeltas == null ? 0 : resourceDeltas.length;
-				if (childrenLength == 0 && resourceDeltasLength == 0) {
-					buffer.append(delta);
-				} else {
-					sortDeltas(children);
-					for (int j=0; j<childrenLength; j++) {
-						buffer.append(children[j]);
-						if (j != childrenLength-1) {
-							buffer.append("\n");
-						}
-					}
-					for (int j=0; j<resourceDeltasLength; j++) {
-						if (j == 0 && buffer.length() != 0) {
-							buffer.append("\n");
-						}
-						buffer.append(resourceDeltas[j]);
-						if (j != resourceDeltasLength-1) {
-							buffer.append("\n");
-						}
-					}
-				}
-				if (i != length-1) {
-					buffer.append("\n\n");
-				}
-			}
-			return buffer.toString();
-		}
-	}
-	protected DeltaListener deltaListener = new DeltaListener();
-	 
-	
-	public AbstractJavaModelTests(String name) {
-		super(name);
-	}
-
-	public AbstractJavaModelTests(String name, int tabs) {
-		super(name);
-		this.tabs = tabs;
-	}
-
-	/**
-	 * Build a test suite with all tests computed from public methods starting with "test"
-	 * found in the given test class.
-	 * Test suite name is the name of the given test class.
-	 * 
-	 * Note that this lis maybe reduced using some mechanisms detailed in {@link #buildTestsList(Class)} method.
-	 * 
-	 * This test suite differ from this computed in {@link TestCase} in the fact that this is
-	 * a {@link SuiteOfTestCases.Suite} instead of a simple framework {@link TestSuite}.
-	 * 
-	 * @param evaluationTestClass
-	 * @return a test suite ({@link Test}) 
-	 */
-	public static Test buildModelTestSuite(Class evaluationTestClass) {
-		return buildModelTestSuite(evaluationTestClass, ORDERING);
-	}
-
-	/**
-	 * Build a test suite with all tests computed from public methods starting with "test"
-	 * found in the given test class and sorted in alphabetical order.
-	 * Test suite name is the name of the given test class.
-	 * 
-	 * Note that this lis maybe reduced using some mechanisms detailed in {@link #buildTestsList(Class)} method.
-	 * 
-	 * This test suite differ from this computed in {@link TestCase} in the fact that this is
-	 * a {@link SuiteOfTestCases.Suite} instead of a simple framework {@link TestSuite}.
-	 * 
-	 * @param evaluationTestClass
-	 * @param ordering kind of sort use for the list (see {@link #ORDERING} for possible values)
-	 * @return a test suite ({@link Test}) 
-	 */
-	public static Test buildModelTestSuite(Class evaluationTestClass, long ordering) {
-		TestSuite suite = new Suite(evaluationTestClass.getName());
-		List tests = buildTestsList(evaluationTestClass, 0, ordering);
-		for (int index=0, size=tests.size(); index<size; index++) {
-			suite.addTest((Test)tests.get(index));
-		}
-		return suite;
-	}
-
-	protected void addJavaNature(String projectName) throws CoreException {
-		IProject project = getWorkspaceRoot().getProject(projectName);
-		IProjectDescription description = project.getDescription();
-		description.setNatureIds(new String[] {JavaScriptCore.NATURE_ID});
-		project.setDescription(description, null);
-	}
-	protected void assertSearchResults(String expected, Object collector) {
-		assertSearchResults("Unexpected search results", expected, collector);
-	}
-	protected void assertSearchResults(String message, String expected, Object collector) {
-		String actual = collector.toString();
-		if (!expected.equals(actual)) {
-			if (this.displayName) System.out.println(getName()+" actual result is:");
-			System.out.print(displayString(actual, this.tabs));
-			System.out.println(",");
-		}
-		assertEquals(
-			message,
-			expected,
-			actual
-		);
-	}
-	protected void addLibrary(String jarName, String sourceZipName, String[] pathAndContents, String compliance) throws CoreException, IOException {
-		addLibrary(this.currentProject, jarName, sourceZipName, pathAndContents, null, null, compliance);
-	}
-	protected void addLibrary(IJavaScriptProject javaProject, String jarName, String sourceZipName, String[] pathAndContents, String compliance) throws CoreException, IOException {
-		addLibrary(javaProject, jarName, sourceZipName, pathAndContents, null, null, compliance);
-	}
-	protected void addLibrary(IJavaScriptProject javaProject, String libraryPath, String sourceZipName, String[] pathAndContents, String[] librariesInclusionPatterns, String[] librariesExclusionPatterns, String compliance) throws CoreException, IOException {
-		IProject project = javaProject.getProject();
-		String projectLocation = project.getLocation().toOSString();
-	    boolean projectbased=libraryPath==null;
-	    if (projectbased)
-	    	libraryPath=projectLocation;
-		
-		for (int i = 0; i < pathAndContents.length; i+=2) {
-			
-			String jarPath = libraryPath + File.separator + pathAndContents[i];
-			org.eclipse.wst.jsdt.core.tests.util.Util.createFile(jarPath, pathAndContents[i+1]);
-			if (projectbased)
-				project.refreshLocal(IResource.DEPTH_INFINITE, null);
-			String projectPath = '/' + project.getName() + '/';
-			Path path = (projectbased) ?
-					new Path(projectPath +  pathAndContents[i]) :
-						new Path(jarPath);
-			addLibraryEntry(
-				javaProject,
-				path,
-				null,
-				null,
-				toIPathArray(librariesInclusionPatterns),
-				toIPathArray(librariesExclusionPatterns),
-				true
-			);
-			
-		}
-
-	}
-	protected void addLibraryEntry(String path, boolean exported) throws JavaScriptModelException {
-		addLibraryEntry(this.currentProject, new Path(path), null, null, null, null, exported);
-	} 
-	protected void addLibraryEntry(IJavaScriptProject project, String path, boolean exported) throws JavaScriptModelException {
-		addLibraryEntry(project, new Path(path), null, null, null, null, exported);
-	} 
-	protected void addLibraryEntry(IJavaScriptProject project, String path, String srcAttachmentPath, String srcAttachmentPathRoot, boolean exported) throws JavaScriptModelException{
-		addLibraryEntry(
-			project,
-			new Path(path),
-			srcAttachmentPath == null ? null : new Path(srcAttachmentPath),
-			srcAttachmentPathRoot == null ? null : new Path(srcAttachmentPathRoot),
-			null,
-			null,
-			new IIncludePathAttribute[0],
-			exported
-		);
-	}
-	protected void addLibraryEntry(IJavaScriptProject project, IPath path, IPath srcAttachmentPath, IPath srcAttachmentPathRoot, IPath[] accessibleFiles, IPath[] nonAccessibleFiles, boolean exported) throws JavaScriptModelException{
-		addLibraryEntry(
-			project,
-			path,
-			srcAttachmentPath,
-			srcAttachmentPathRoot,
-			accessibleFiles,
-			nonAccessibleFiles,
-			new IIncludePathAttribute[0],
-			exported
-		);
-	}
-	protected void addLibraryEntry(IJavaScriptProject project, IPath path, IPath srcAttachmentPath, IPath srcAttachmentPathRoot, IPath[] accessibleFiles, IPath[] nonAccessibleFiles, IIncludePathAttribute[] extraAttributes, boolean exported) throws JavaScriptModelException{
-		IIncludePathEntry[] entries = project.getRawIncludepath();
-		int length = entries.length;
-		System.arraycopy(entries, 0, entries = new IIncludePathEntry[length + 1], 0, length);
-		entries[length] = JavaScriptCore.newLibraryEntry(
-			path, 
-			srcAttachmentPath, 
-			srcAttachmentPathRoot, 
-			ClasspathEntry.getAccessRules(accessibleFiles, nonAccessibleFiles), 
-			extraAttributes, 
-			exported);
-		project.setRawIncludepath(entries, null);
-	}
-	protected void assertSortedElementsEqual(String message, String expected, IJavaScriptElement[] elements) {
-		sortElements(elements);
-		assertElementsEqual(message, expected, elements);
-	}
-	
-	
-	protected void assertResourcesEqual(String message, String expected, Object[] resources) {
-		sortResources(resources);
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0, length = resources.length; i < length; i++) {
-			if (resources[i] instanceof IResource) {
-				buffer.append(((IResource) resources[i]).getFullPath().toString());
-			} else if (resources[i] instanceof IStorage) {
-				buffer.append(((IStorage) resources[i]).getFullPath().toString());
-			} else if (resources[i] == null) {
-				buffer.append("<null>");
-			}
-			if (i != length-1)buffer.append("\n");
-		}
-		if (!expected.equals(buffer.toString())) {
-			System.out.print(org.eclipse.wst.jsdt.core.tests.util.Util.displayString(buffer.toString(), 2));
-			System.out.println(this.endChar);
-		}
-		assertEquals(
-			message,
-			expected,
-			buffer.toString()
-		);
-	}
-	protected void assertResourceNamesEqual(String message, String expected, Object[] resources) {
-		sortResources(resources);
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0, length = resources.length; i < length; i++) {
-			if (resources[i] instanceof IResource) {
-				buffer.append(((IResource)resources[i]).getName());
-			} else if (resources[i] instanceof IStorage) {
-				buffer.append(((IStorage) resources[i]).getName());
-			} else if (resources[i] == null) {
-				buffer.append("<null>");
-			}
-			if (i != length-1)buffer.append("\n");
-		}
-		if (!expected.equals(buffer.toString())) {
-			System.out.print(org.eclipse.wst.jsdt.core.tests.util.Util.displayString(buffer.toString(), 2));
-			System.out.println(this.endChar);
-		}
-		assertEquals(
-			message,
-			expected,
-			buffer.toString()
-		);
-	}
-	protected void assertElementEquals(String message, String expected, IJavaScriptElement element) {
-		String actual = element == null ? "<null>" : ((JavaElement) element).toStringWithAncestors(false/*don't show key*/);
-		if (!expected.equals(actual)) {
-			if (this.displayName) System.out.println(getName()+" actual result is:");
-			System.out.println(displayString(actual, this.tabs) + this.endChar);
-		}
-		assertEquals(message, expected, actual);
-	}
-	protected void assertElementsEqual(String message, String expected, IJavaScriptElement[] elements) {
-		assertElementsEqual(message, expected, elements, false/*don't show key*/);
-	}
-	protected void assertElementsEqual(String message, String expected, IJavaScriptElement[] elements, boolean showResolvedInfo) {
-		StringBuffer buffer = new StringBuffer();
-		if (elements != null) {
-			for (int i = 0, length = elements.length; i < length; i++){
-				JavaElement element = (JavaElement)elements[i];
-				if (element == null) {
-					buffer.append("<null>");
-				} else {
-					buffer.append(element.toStringWithAncestors(showResolvedInfo));
-				}
-				if (i != length-1) buffer.append("\n");
-			}
-		} else {
-			buffer.append("<null>");
-		}
-		String actual = buffer.toString();
-		if (!expected.equals(actual)) {
-			if (this.displayName) System.out.println(getName()+" actual result is:");
-			System.out.println(displayString(actual, this.tabs) + this.endChar);
-		}
-		assertEquals(message, expected, actual);
-	}
-	protected void assertExceptionEquals(String message, String expected, JavaScriptModelException exception) {
-		String actual = exception == null ? "<null>" : exception.getStatus().getMessage();
-		if (!expected.equals(actual)) {
-			if (this.displayName) System.out.println(getName()+" actual result is:");
-			System.out.println(displayString(actual, this.tabs) + this.endChar);
-		}
-		assertEquals(message, expected, actual);
-	}
-	protected void assertHierarchyEquals(String expected, ITypeHierarchy hierarchy) {
-		String actual = hierarchy.toString();
-		if (!expected.equals(actual)) {
-			if (this.displayName) System.out.println(getName()+" actual result is:");
-			System.out.println(displayString(actual, this.tabs) + this.endChar);
-		}
-		assertEquals("Unexpected type hierarchy", expected, actual);
-	}
-	protected void assertMarkers(String message, String expectedMarkers, IJavaScriptProject project) throws CoreException {
-		waitForAutoBuild();
-		IMarker[] markers = project.getProject().findMarkers(IJavaScriptModelMarker.BUILDPATH_PROBLEM_MARKER, false, IResource.DEPTH_ZERO);
-		sortMarkers(markers);
-		assertMarkers(message, expectedMarkers, markers);
-	}
-	protected void sortMarkers(IMarker[] markers) {
-		org.eclipse.wst.jsdt.internal.core.util.Util.Comparer comparer = new org.eclipse.wst.jsdt.internal.core.util.Util.Comparer() {
-			public int compare(Object a, Object b) {
-				IMarker markerA = (IMarker)a;
-				IMarker markerB = (IMarker)b;
-				return markerA.getAttribute(IMarker.MESSAGE, "").compareTo(markerB.getAttribute(IMarker.MESSAGE, "")); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		};
-		org.eclipse.wst.jsdt.internal.core.util.Util.sort(markers, comparer);
-	}
-	protected void assertMarkers(String message, String expectedMarkers, IMarker[] markers) throws CoreException {
-		StringBuffer buffer = new StringBuffer();
-		if (markers != null) {
-			for (int i = 0, length = markers.length; i < length; i++) {
-				IMarker marker = markers[i];
-				buffer.append(marker.getAttribute(IMarker.MESSAGE));
-				if (i != length-1) {
-					buffer.append("\n");
-				}
-			}
-		}
-		String actual = buffer.toString();
-		if (!expectedMarkers.equals(actual)) {
-		 	System.out.println(org.eclipse.wst.jsdt.core.tests.util.Util.displayString(actual, 2));
-		}
-		assertEquals(message, expectedMarkers, actual);
-	}
-	
-	protected void assertProblems(String message, String expected, ProblemRequestor problemRequestor) {
-		String actual = org.eclipse.wst.jsdt.core.tests.util.Util.convertToIndependantLineDelimiter(problemRequestor.problems.toString());
-		String independantExpectedString = org.eclipse.wst.jsdt.core.tests.util.Util.convertToIndependantLineDelimiter(expected);
-		if (!independantExpectedString.equals(actual)){
-		 	System.out.println(org.eclipse.wst.jsdt.core.tests.util.Util.displayString(actual, this.tabs));
-		}
-		assertEquals(
-			message,
-			independantExpectedString,
-			actual);
-	}
-	/*
-	 * Asserts that the given actual source (usually coming from a file content) is equal to the expected one.
-	 * Note that 'expected' is assumed to have the '\n' line separator. 
-	 * The line separators in 'actual' are converted to '\n' before the comparison.
-	 */
-	protected void assertSourceEquals(String message, String expected, String actual) {
-		if (actual == null) {
-			assertEquals(message, expected, null);
-			return;
-		}
-		actual = org.eclipse.wst.jsdt.core.tests.util.Util.convertToIndependantLineDelimiter(actual);
-		if (!actual.equals(expected)) {
-			System.out.print(org.eclipse.wst.jsdt.core.tests.util.Util.displayString(actual.toString(), 2));
-			System.out.println(this.endChar);
-		}
-		assertEquals(message, expected, actual);
-	}
-	/*
-	 * Ensures that the toString() of the given AST node is as expected.
-	 */
-	public void assertASTNodeEquals(String message, String expected, ASTNode actual) {
-		String actualString = actual == null ? "null" : actual.toString();
-		assertSourceEquals(message, expected, actualString);
-	}
-	/**
-	 * Ensures the elements are present after creation.
-	 */
-	public void assertCreation(IJavaScriptElement[] newElements) {
-		for (int i = 0; i < newElements.length; i++) {
-			IJavaScriptElement newElement = newElements[i];
-			assertTrue("Element should be present after creation", newElement.exists());
-		}
-	}
-	protected void assertClasspathEquals(IIncludePathEntry[] classpath, String expected) {
-		String actual;
-		if (classpath == null) {
-			actual = "<null>";
-		} else {
-			StringBuffer buffer = new StringBuffer();
-			int length = classpath.length;
-			for (int i=0; i<length; i++) {
-				buffer.append(classpath[i]);
-				if (i < length-1)
-					buffer.append('\n');
-			}
-			actual = buffer.toString();
-		}
-		if (!actual.equals(expected)) {
-		 	System.out.print(org.eclipse.wst.jsdt.core.tests.util.Util.displayString(actual, 2));
-		}
-		assertEquals(expected, actual);
-	}
-	/**
-	 * Ensures the element is present after creation.
-	 */
-	public void assertCreation(IJavaScriptElement newElement) {
-		assertCreation(new IJavaScriptElement[] {newElement});
-	}
-	/**
-	 * Creates an operation to delete the given elements, asserts
-	 * the operation is successful, and ensures the elements are no
-	 * longer present in the model.
-	 */
-	public void assertDeletion(IJavaScriptElement[] elementsToDelete) throws JavaScriptModelException {
-		IJavaScriptElement elementToDelete = null;
-		for (int i = 0; i < elementsToDelete.length; i++) {
-			elementToDelete = elementsToDelete[i];
-			assertTrue("Element must be present to be deleted", elementToDelete.exists());
-		}
-	
-		getJavaModel().delete(elementsToDelete, false, null);
-		
-		for (int i = 0; i < elementsToDelete.length; i++) {
-			elementToDelete = elementsToDelete[i];
-			assertTrue("Element should not be present after deletion: " + elementToDelete, !elementToDelete.exists());
-		}
-	}
-	protected void assertDeltas(String message, String expected) {
-		String actual = this.deltaListener.toString();
-		if (!expected.equals(actual)) {
-			System.out.println(displayString(actual, 2));
-			System.err.println(this.deltaListener.stackTraces.toString());
-		}
-		assertEquals(
-			message,
-			expected,
-			actual);
-	}
-	protected void assertDeltas(String message, String expected, IJavaScriptElementDelta delta) {
-		String actual = delta == null ? "<null>" : delta.toString();
-		if (!expected.equals(actual)) {
-			System.out.println(displayString(actual, 2));
-			System.err.println(this.deltaListener.stackTraces.toString());
-		}
-		assertEquals(
-			message,
-			expected,
-			actual);
-	}
-	protected void assertTypesEqual(String message, String expected, IType[] types) {
-		assertTypesEqual(message, expected, types, true);
-	}
-	protected void assertTypesEqual(String message, String expected, IType[] types, boolean sort) {
-		if (sort) this.sortTypes(types);
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < types.length; i++){
-			if (types[i] == null)
-				buffer.append("<null>");
-			else
-				buffer.append(types[i].getFullyQualifiedName());
-			buffer.append("\n");
-		}
-		String actual = buffer.toString();
-		if (!expected.equals(actual)) {
-			System.out.println(displayString(actual, 2) +  this.endChar);
-		}
-		assertEquals(message, expected, actual);
-	}
-	protected void assertSortedStringsEqual(String message, String expected, String[] strings) {
-		Util.sort(strings);
-		assertStringsEqual(message, expected, strings);
-	}
-	protected void assertStringsEqual(String message, String expected, String[] strings) {
-		String actual = toString(strings, true/*add extra new lines*/);
-		if (!expected.equals(actual)) {
-			System.out.println(displayString(actual, this.tabs) + this.endChar);
-		}
-		assertEquals(message, expected, actual);
-	}
-	protected void assertStringsEqual(String message, String[] expectedStrings, String[] actualStrings) {
-		String expected = toString(expectedStrings, false/*don't add extra new lines*/);
-		String actual = toString(actualStrings, false/*don't add extra new lines*/);
-		if (!expected.equals(actual)) {
-			System.out.println(displayString(actual, this.tabs) + this.endChar);
-		}
-		assertEquals(message, expected, actual);
-	}
-	/**
-	 * Attaches a source zip to the given jar package fragment root.
-	 */
-	protected void attachSource(IPackageFragmentRoot root, String sourcePath, String sourceRoot) throws JavaScriptModelException {
-		IJavaScriptProject javaProject = root.getJavaScriptProject();
-		IIncludePathEntry[] entries = (IIncludePathEntry[])javaProject.getRawIncludepath().clone();
-		for (int i = 0; i < entries.length; i++){
-			IIncludePathEntry entry = entries[i];
-			if (entry.getPath().toOSString().toLowerCase().equals(root.getPath().toOSString().toLowerCase())) {
-				entries[i] = JavaScriptCore.newLibraryEntry(
-					root.getPath(),
-					sourcePath == null ? null : new Path(sourcePath),
-					sourceRoot == null ? null : new Path(sourceRoot),
-					false);
-				break;
-			}
-		}
-		javaProject.setRawIncludepath(entries, null);
-	}
-	/**
-	 * Creates an operation to delete the given element, asserts
-	 * the operation is successfull, and ensures the element is no
-	 * longer present in the model.
-	 */
-	public void assertDeletion(IJavaScriptElement elementToDelete) throws JavaScriptModelException {
-		assertDeletion(new IJavaScriptElement[] {elementToDelete});
-	}
-	/**
-	 * Empties the current deltas.
-	 */
-	public void clearDeltas() {
-		this.deltaListener.deltas = new IJavaScriptElementDelta[0];
-		this.deltaListener.stackTraces = new ByteArrayOutputStream();
-	}
-	protected IJavaScriptElement[] codeSelect(ISourceReference sourceReference, String selectAt, String selection) throws JavaScriptModelException {
-		String str = sourceReference.getSource();
-		int start = str.indexOf(selectAt);
-		int length = selection.length();
-		return ((ICodeAssist)sourceReference).codeSelect(start, length);
-	}
-	protected IJavaScriptElement[] codeSelectAt(ISourceReference sourceReference, String selectAt) throws JavaScriptModelException {
-		String str = sourceReference.getSource();
-		int start = str.indexOf(selectAt) + selectAt.length();
-		int length = 0;
-		return ((ICodeAssist)sourceReference).codeSelect(start, length);
-	}
-	/**
-	 * Copy file from src (path to the original file) to dest (path to the destination file).
-	 */
-	public void copy(File src, File dest) throws IOException {
-		// read source bytes
-		byte[] srcBytes = this.read(src);
-		
-		if (convertToIndependantLineDelimiter(src)) {
-			String contents = new String(srcBytes);
-			contents = org.eclipse.wst.jsdt.core.tests.util.Util.convertToIndependantLineDelimiter(contents);
-			srcBytes = contents.getBytes();
-		}
-	
-		// write bytes to dest
-		FileOutputStream out = new FileOutputStream(dest);
-		out.write(srcBytes);
-		out.close();
-	}
-	
-	public boolean convertToIndependantLineDelimiter(File file) {
-		return file.getName().endsWith(".js");
-	}
-	
-	/**
-	 * Copy the given source directory (and all its contents) to the given target directory.
-	 */
-	protected void copyDirectory(File source, File target) throws IOException {
-		if (!target.exists()) {
-			target.mkdirs();
-		}
-		File[] files = source.listFiles();
-		if (files == null) return;
-		for (int i = 0; i < files.length; i++) {
-			File sourceChild = files[i];
-			String name =  sourceChild.getName();
-			if (name.equals("CVS") || name.equals(".svn")) continue;
-			File targetChild = new File(target, name);
-			if (sourceChild.isDirectory()) {
-				copyDirectory(sourceChild, targetChild);
-			} else {
-				copy(sourceChild, targetChild);
-			}
-		}
-	}
-	protected IFolder createFolder(IPath path) throws CoreException {
-		final IFolder folder = getWorkspaceRoot().getFolder(path);
-		getWorkspace().run(new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				IContainer parent = folder.getParent();
-				if (parent instanceof IFolder && !parent.exists()) {
-					createFolder(parent.getFullPath());
-				} 
-				folder.create(true, true, null);
-			}
-		},
-		null);
-	
-		return folder;
-	}
-	/*
-	 * Creates a Java project where prj=src=bin and with JCL_LIB on its classpath.
-	 */
-	protected IJavaScriptProject createJavaProject(String projectName) throws CoreException {
-		return this.createJavaProject(projectName, new String[] {""}, new String[] {"JCL_LIB"});
-	}
-	/*
-	 * Creates a Java project with the given source folders an output location. 
-	 * Add those on the project's classpath.
-	 */
-	protected IJavaScriptProject createJavaProject(String projectName, String[] sourceFolders) throws CoreException {
-		return 
-			this.createJavaProject(
-				projectName, 
-				sourceFolders, 
-				null/*no lib*/, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				null/*no project*/, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				null/*no exported project*/, 
-				null/*no inclusion pattern*/, 
-				null/*no exclusion pattern*/,
-				"1.4"
-			);
-	}
-	/*
-	 * Creates a Java project with the given source folders an output location. 
-	 * Add those on the project's classpath.
-	 */
-	protected IJavaScriptProject createJavaProject(String projectName, String[] sourceFolders, String output, String[] sourceOutputs) throws CoreException {
-		return 
-			this.createJavaProject(
-				projectName, 
-				sourceFolders, 
-				null/*no lib*/, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				null/*no project*/, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				null/*no exported project*/, 
-				null/*no inclusion pattern*/, 
-				null/*no exclusion pattern*/,
-				"1.4"
-			);
-	}
-	protected IJavaScriptProject createJavaProject(String projectName, String[] sourceFolders, String[] libraries) throws CoreException {
-		return 
-			this.createJavaProject(
-				projectName, 
-				sourceFolders, 
-				libraries, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				null/*no project*/, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				null/*no exported project*/, 
-				null/*no inclusion pattern*/, 
-				null/*no exclusion pattern*/,
-				"1.4"
-			);
-	}
-	protected IJavaScriptProject createJavaProject(String projectName, String[] sourceFolders, String[] libraries, String output, String compliance) throws CoreException {
-		return 
-			this.createJavaProject(
-				projectName, 
-				sourceFolders, 
-				libraries, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				null/*no project*/, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				null/*no exported project*/, 
-				null/*no inclusion pattern*/, 
-				null/*no exclusion pattern*/,
-				compliance
-			);
-	}
-	protected IJavaScriptProject createJavaProject(String projectName, String[] sourceFolders, String[] libraries, String[] projects) throws CoreException {
-		return
-			this.createJavaProject(
-				projectName,
-				sourceFolders,
-				libraries,
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				projects,
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				null/*no exported project*/, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				"1.4"
-			);
-	}
-	protected SearchPattern createPattern(IJavaScriptElement element, int limitTo) {
-		return SearchPattern.createPattern(element, limitTo);
-	}
-	protected SearchPattern createPattern(String stringPattern, int searchFor, int limitTo, boolean isCaseSensitive) {
-		int matchMode = stringPattern.indexOf('*') != -1 || stringPattern.indexOf('?') != -1
-			? SearchPattern.R_PATTERN_MATCH
-			: SearchPattern.R_EXACT_MATCH;
-		int matchRule = isCaseSensitive ? matchMode | SearchPattern.R_CASE_SENSITIVE : matchMode;
-		return SearchPattern.createPattern(stringPattern, searchFor, limitTo, matchRule);
-	}
-	protected IJavaScriptProject createJavaProject(String projectName, String[] sourceFolders, String[] libraries, String[] projects, boolean[] exportedProject, String projectOutput) throws CoreException {
-		return
-			this.createJavaProject(
-				projectName,
-				sourceFolders,
-				libraries,
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				projects,
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				exportedProject, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				"1.4"
-			);
-	}
-	protected IJavaScriptProject createJavaProject(String projectName, String[] sourceFolders, String[] libraries, String[] projects, String projectOutput, String compliance) throws CoreException {
-		return 
-			createJavaProject(
-				projectName, 
-				sourceFolders, 
-				libraries, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				projects, 
-				null/*no inclusion pattern*/,
-				null/*no exclusion pattern*/,
-				null/*no exported project*/, 
-				null/*no inclusion pattern*/, 
-				null/*no exclusion pattern*/,
-				compliance
-			);
-		}
-	protected IJavaScriptProject createJavaProject(final String projectName, final String[] sourceFolders, final String[] libraries, final String[] projects, final boolean[] exportedProjects, final String projectOutput, final String[] sourceOutputs, final String[][] inclusionPatterns, final String[][] exclusionPatterns, final String compliance) throws CoreException {
-		return
-		this.createJavaProject(
-			projectName,
-			sourceFolders,
-			libraries,
-			null/*no inclusion pattern*/,
-			null/*no exclusion pattern*/,
-			projects,
-			null/*no inclusion pattern*/,
-			null/*no exclusion pattern*/,
-			exportedProjects, 
-			inclusionPatterns,
-			exclusionPatterns,
-			compliance
-		);
-	}
-	protected IJavaScriptProject createJavaProject(
-			final String projectName,
-			final String[] sourceFolders,
-			final String[] libraries,
-			final String[][] librariesInclusionPatterns,
-			final String[][] librariesExclusionPatterns,
-			final String[] projects,
-			final String[][] projectsInclusionPatterns,
-			final String[][] projectsExclusionPatterns,
-			final boolean[] exportedProjects,
-			final String[][] inclusionPatterns,
-			final String[][] exclusionPatterns,
-			final String compliance) throws CoreException {
-		return createJavaProject(
-			projectName,
-			sourceFolders,
-			libraries,
-			librariesInclusionPatterns,
-			librariesExclusionPatterns,
-			projects,
-			projectsInclusionPatterns,
-			projectsExclusionPatterns,
-			true, // combine access restrictions by default
-			exportedProjects,
-			inclusionPatterns,
-			exclusionPatterns,
-			compliance);
-	}
-	protected IJavaScriptProject createJavaProject(
-			final String projectName,
-			final String[] sourceFolders,
-			final String[] libraries,
-			final String[][] librariesInclusionPatterns,
-			final String[][] librariesExclusionPatterns,
-			final String[] projects,
-			final String[][] projectsInclusionPatterns,
-			final String[][] projectsExclusionPatterns,
-			final boolean combineAccessRestrictions,
-			final boolean[] exportedProjects,
-			final String[][] inclusionPatterns,
-			final String[][] exclusionPatterns,
-			final String compliance) throws CoreException {
-		final IJavaScriptProject[] result = new IJavaScriptProject[1];
-		IWorkspaceRunnable create = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				// create project
-				createProject(projectName);
-				
-				// set java nature
-				addJavaNature(projectName);
-				
-				// create classpath entries 
-				
-				IProject project = getWorkspaceRoot().getProject(projectName);
-				IPath projectPath = project.getFullPath();
-				int sourceLength = sourceFolders == null ? 0 : sourceFolders.length;
-				int libLength = libraries == null ? 0 : libraries.length;
-				int projectLength = projects == null ? 0 : projects.length;
-				/* 
-				 * 
-				 * Default JRE entry
-				 */
-				
-				
-				
-				IIncludePathEntry[] entries = new IIncludePathEntry[sourceLength+libLength+projectLength+1];
-				for (int i= 0; i < sourceLength; i++) {
-					IPath sourcePath = new Path(sourceFolders[i]);
-					int segmentCount = sourcePath.segmentCount();
-					if (segmentCount > 0) {
-						// create folder and its parents
-						IContainer container = project;
-						for (int j = 0; j < segmentCount; j++) {
-							IFolder folder = container.getFolder(new Path(sourcePath.segment(j)));
-							if (!folder.exists()) {
-								folder.create(true, true, null);
-							}
-							container = folder;
-						}
-					}
-
-					// inclusion patterns
-					IPath[] inclusionPaths;
-					if (inclusionPatterns == null) {
-						inclusionPaths = new IPath[0];
-					} else {
-						String[] patterns = inclusionPatterns[i];
-						int length = patterns.length;
-						inclusionPaths = new IPath[length];
-						for (int j = 0; j < length; j++) {
-							String inclusionPattern = patterns[j];
-							inclusionPaths[j] = new Path(inclusionPattern);
-						}
-					}
-					// exclusion patterns
-					IPath[] exclusionPaths;
-					if (exclusionPatterns == null) {
-						exclusionPaths = new IPath[0];
-					} else {
-						String[] patterns = exclusionPatterns[i];
-						int length = patterns.length;
-						exclusionPaths = new IPath[length];
-						for (int j = 0; j < length; j++) {
-							String exclusionPattern = patterns[j];
-							exclusionPaths[j] = new Path(exclusionPattern);
-						}
-					}
-					// create source entry
-					entries[i] = 
-						JavaScriptCore.newSourceEntry(
-							projectPath.append(sourcePath), 
-							inclusionPaths,
-							exclusionPaths, 
-							null
-						);
-				}
-				
-		
-				
-				for (int i= 0; i < libLength; i++) {
-					String lib = libraries[i];
-					if (lib.startsWith("JCL")) {
-						try {
-							// ensure JCL variables are set
-							setUpJCLClasspathVariables(compliance);
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-					}
-					
-					// accessible files
-					IPath[] accessibleFiles;
-					if (librariesInclusionPatterns == null) {
-						accessibleFiles = new IPath[0];
-					} else {
-						String[] patterns = librariesInclusionPatterns[i];
-						int length = patterns.length;
-						accessibleFiles = new IPath[length];
-						for (int j = 0; j < length; j++) {
-							String inclusionPattern = patterns[j];
-							accessibleFiles[j] = new Path(inclusionPattern);
-						}
-					}
-					// non accessible files
-					IPath[] nonAccessibleFiles;
-					if (librariesExclusionPatterns == null) {
-						nonAccessibleFiles = new IPath[0];
-					} else {
-						String[] patterns = librariesExclusionPatterns[i];
-						int length = patterns.length;
-						nonAccessibleFiles = new IPath[length];
-						for (int j = 0; j < length; j++) {
-							String exclusionPattern = patterns[j];
-							nonAccessibleFiles[j] = new Path(exclusionPattern);
-						}
-					}
-					if (lib.indexOf(File.separatorChar) == -1 && lib.charAt(0) != '/' && lib.equals(lib.toUpperCase())) { // all upper case is a var 
-						char[][] vars = CharOperation.splitOn(',', lib.toCharArray());
-						entries[sourceLength+i] = JavaScriptCore.newVariableEntry(
-							new Path(new String(vars[0])), 
-							vars.length > 1 ? new Path(new String(vars[1])) : null, 
-							vars.length > 2 ? new Path(new String(vars[2])) : null);
-					} else if (lib.startsWith("org.eclipse.wst.jsdt.core.tests.model.")) { // container
-						entries[sourceLength+i] = JavaScriptCore.newContainerEntry(
-								new Path(lib),
-								ClasspathEntry.getAccessRules(accessibleFiles, nonAccessibleFiles),
-								new IIncludePathAttribute[0],
-								false);
-					} else {
-						IPath libPath = new Path(lib);
-						if (!libPath.isAbsolute() && libPath.segmentCount() > 0 && libPath.getFileExtension() == null) {
-							project.getFolder(libPath).create(true, true, null);
-							libPath = projectPath.append(libPath);
-						}
-						entries[sourceLength+i] = JavaScriptCore.newLibraryEntry(
-								libPath,
-								null,
-								null,
-								ClasspathEntry.getAccessRules(accessibleFiles, nonAccessibleFiles),
-								new IIncludePathAttribute[0], 
-								false);
-					}
-				}
-				for  (int i= 0; i < projectLength; i++) {
-					boolean isExported = exportedProjects != null && exportedProjects.length > i && exportedProjects[i];
-					
-					// accessible files
-					IPath[] accessibleFiles;
-					if (projectsInclusionPatterns == null) {
-						accessibleFiles = new IPath[0];
-					} else {
-						String[] patterns = projectsInclusionPatterns[i];
-						int length = patterns.length;
-						accessibleFiles = new IPath[length];
-						for (int j = 0; j < length; j++) {
-							String inclusionPattern = patterns[j];
-							accessibleFiles[j] = new Path(inclusionPattern);
-						}
-					}
-					// non accessible files
-					IPath[] nonAccessibleFiles;
-					if (projectsExclusionPatterns == null) {
-						nonAccessibleFiles = new IPath[0];
-					} else {
-						String[] patterns = projectsExclusionPatterns[i];
-						int length = patterns.length;
-						nonAccessibleFiles = new IPath[length];
-						for (int j = 0; j < length; j++) {
-							String exclusionPattern = patterns[j];
-							nonAccessibleFiles[j] = new Path(exclusionPattern);
-						}
-					}
-					
-					entries[sourceLength+libLength+i] =
-						JavaScriptCore.newProjectEntry(
-								new Path(projects[i]),
-								ClasspathEntry.getAccessRules(accessibleFiles, nonAccessibleFiles),
-								combineAccessRestrictions,
-								new IIncludePathAttribute[0], 
-								isExported);
-				}
-				
-				// set classpath and output location
-				IJavaScriptProject javaProject = JavaScriptCore.create(project);
-				
-				
-				
-				
-				/* ensure system.js entry */
-				IIncludePathEntry jreEntry = JavaScriptCore.newContainerEntry(new Path("org.eclipse.wst.jsdt.launching.JRE_CONTAINER"));
-				entries[entries.length-1] = jreEntry;
-				
-				
-				javaProject.setRawIncludepath(entries, null);
-				
-				// set compliance level options
-				if ("1.5".equals(compliance)) {
-					Map options = new HashMap();
-					options.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
-					options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);	
-					options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);	
-					javaProject.setOptions(options);
-				}
-				
-				result[0] = javaProject;
-			}
-		};
-	
-		getWorkspace().run(create, null);
-		
-		
-		return result[0];
-	}
-	/*
-	 * Create simple project.
-	 */
-	protected IProject createProject(final String projectName) throws CoreException {
-		final IProject project = getProject(projectName);
-		IWorkspaceRunnable create = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				project.create(null);
-				project.open(null);
-			}
-		};
-		getWorkspace().run(create, null);	
-		return project;
-	}
-	public void deleteFile(File file) {
-		int retryCount = 0;
-		while (++retryCount <= 60) { // wait 1 minute at most
-			if (org.eclipse.wst.jsdt.core.tests.util.Util.delete(file)) {
-				break;
-			}
-		}
-	}
-	protected void deleteFolder(IPath folderPath) throws CoreException {
-		deleteResource(getFolder(folderPath));
-	}
-	protected void deleteProject(String projectName) throws CoreException {
-		IProject project = this.getProject(projectName);
-		if (project.exists() && !project.isOpen()) { // force opening so that project can be deleted without logging (see bug 23629)
-			project.open(null);
-		}
-		deleteResource(project);
-	}
-	protected void deleteProject(IJavaScriptProject project) throws CoreException {
-		if (project.exists() && !project.isOpen()) { // force opening so that project can be deleted without logging (see bug 23629)
-			project.open(null);
-		}
-		deleteResource(project.getProject());
-	}
-	
-	/**
-	 * Batch deletion of projects
-	 */
-	protected void deleteProjects(final String[] projectNames) throws CoreException {
-		ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				if (projectNames != null){
-					for (int i = 0, max = projectNames.length; i < max; i++){
-						if (projectNames[i] != null)
-							deleteProject(projectNames[i]);
-					}
-				}
-			}
-		},
-		null);
-	}
-	/**
-	 * Delete this resource.
-	 */
-	public void deleteResource(IResource resource) throws CoreException {
-		int retryCount = 0; // wait 1 minute at most
-		while (++retryCount <= 60) {
-			if (!org.eclipse.wst.jsdt.core.tests.util.Util.delete(resource)) {
-				System.gc();
-			}
-		}
-	}
-	/**
-	 * Returns true if this delta is flagged as having changed children.
-	 */
-	protected boolean deltaChildrenChanged(IJavaScriptElementDelta delta) {
-		return delta.getKind() == IJavaScriptElementDelta.CHANGED &&
-			(delta.getFlags() & IJavaScriptElementDelta.F_CHILDREN) != 0;
-	}
-	/**
-	 * Returns true if this delta is flagged as having had a content change
-	 */
-	protected boolean deltaContentChanged(IJavaScriptElementDelta delta) {
-		return delta.getKind() == IJavaScriptElementDelta.CHANGED &&
-			(delta.getFlags() & IJavaScriptElementDelta.F_CONTENT) != 0;
-	}
-	/**
-	 * Returns true if this delta is flagged as having moved from a location
-	 */
-	protected boolean deltaMovedFrom(IJavaScriptElementDelta delta) {
-		return delta.getKind() == IJavaScriptElementDelta.ADDED &&
-			(delta.getFlags() & IJavaScriptElementDelta.F_MOVED_FROM) != 0;
-	}
-	/**
-	 * Returns true if this delta is flagged as having moved to a location
-	 */
-	protected boolean deltaMovedTo(IJavaScriptElementDelta delta) {
-		return delta.getKind() == IJavaScriptElementDelta.REMOVED &&
-			(delta.getFlags() & IJavaScriptElementDelta.F_MOVED_TO) != 0;
-	}
-	/**
-	 * Ensure that the positioned element is in the correct position within the parent.
-	 */
-	public void ensureCorrectPositioning(IParent container, IJavaScriptElement sibling, IJavaScriptElement positioned) throws JavaScriptModelException {
-		IJavaScriptElement[] children = container.getChildren();
-		if (sibling != null) {
-			// find the sibling
-			boolean found = false;
-			for (int i = 0; i < children.length; i++) {
-				if (children[i].equals(sibling)) {
-					assertTrue("element should be before sibling", i > 0 && children[i - 1].equals(positioned));
-					found = true;
-					break;
-				}
-			}
-			assertTrue("Did not find sibling", found);
-		}
-	}
-	/**
-	 * Returns the specified compilation unit in the given project, root, and
-	 * package fragment or <code>null</code> if it does not exist.
-	 */
-	public IClassFile getClassFile(String projectName, String rootPath, String packageName, String className) throws JavaScriptModelException {
-		IPackageFragment pkg= getPackageFragment(projectName, rootPath, packageName);
-		if (pkg == null) {
-			return null;
-		}
-		return pkg.getClassFile(className);
-	}
-	protected IJavaScriptUnit getCompilationUnit(String path) {
-		return (IJavaScriptUnit)JavaScriptCore.create(getFile(path));
-	}
-	/**
-	 * Returns the specified compilation unit in the given project, root, and
-	 * package fragment or <code>null</code> if it does not exist.
-	 */
-	public IJavaScriptUnit getCompilationUnit(String projectName, String rootPath, String packageName, String cuName) throws JavaScriptModelException {
-		IPackageFragment pkg= getPackageFragment(projectName, rootPath, packageName);
-		if (pkg == null) {
-			return null;
-		}
-		return pkg.getJavaScriptUnit(cuName);
-	}
-	/**
-	 * Returns the specified compilation unit in the given project, root, and
-	 * package fragment or <code>null</code> if it does not exist.
-	 */
-	public IJavaScriptUnit[] getCompilationUnits(String projectName, String rootPath, String packageName) throws JavaScriptModelException {
-		IPackageFragment pkg= getPackageFragment(projectName, rootPath, packageName);
-		if (pkg == null) {
-			return null;
-		}
-		return pkg.getJavaScriptUnits();
-	}
-	protected IJavaScriptUnit getCompilationUnitFor(IJavaScriptElement element) {
-	
-		if (element instanceof IJavaScriptUnit) {
-			return (IJavaScriptUnit)element;
-		}
-	
-		if (element instanceof IMember) {
-			return ((IMember)element).getJavaScriptUnit();
-		}
-	
-		if (element instanceof IImportDeclaration) {
-				return (IJavaScriptUnit)element.getParent();
-			}
-	
-		return null;
-	
-	}
-	/**
-	 * Returns the last delta for the given element from the cached delta.
-	 */
-	protected IJavaScriptElementDelta getDeltaFor(IJavaScriptElement element) {
-		return getDeltaFor(element, false);
-	}
-	/**
-	 * Returns the delta for the given element from the cached delta.
-	 * If the boolean is true returns the first delta found.
-	 */
-	protected IJavaScriptElementDelta getDeltaFor(IJavaScriptElement element, boolean returnFirst) {
-		IJavaScriptElementDelta[] deltas = this.deltaListener.deltas;
-		if (deltas == null) return null;
-		IJavaScriptElementDelta result = null;
-		for (int i = 0; i < deltas.length; i++) {
-			IJavaScriptElementDelta delta = searchForDelta(element, this.deltaListener.deltas[i]);
-			if (delta != null) {
-				if (returnFirst) {
-					return delta;
-				}
-				result = delta;
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Returns the IPath to the external java class library (e.g. jclMin.jar)
-	 */
-	protected IPath getExternalJCLPath(String compliance) {
- 		return new Path(getExternalJCLPathString(compliance));
-	}
-
-	/**
-	 * Returns the java.io path to the external java class library (e.g. jclMin.jar)
-	 */
-	protected String getExternalJCLPathString(String compliance) {
-		return getSystemJsPathString();
-//		return SystemLibraries.getLibraryPath("system.js");
-//		return getExternalPath() + "jclMin" + compliance + ".jar";
-	}
-	
-	protected IPath getSystemJsPath() {
-		return new Path(getSystemJsPathString());
-	}
-	
-	protected String getSystemJsPathString()
-	{
-		IPath targetRoot =  (new Path(System.getProperty("user.dir"))).removeLastSegments(1);
-		IPath pluginDir = targetRoot.append(new Path("org.eclipse.wst.jsdt.core"));
-		IPath libDir = pluginDir.append(new Path(new String(SystemLibraryLocation.LIBRARY_PLUGIN_DIRECTORY)));
-		IPath fullDir = libDir.append(new Path(new String(SystemLibraryLocation.SYSTEM_LIBARAY_NAME)));
-		return	fullDir.toOSString();
-	}
-	
-	/**
-	 * Returns the IPath to the root source of the external java class library (e.g. "src")
-	 */
-	protected IPath getExternalJCLRootSourcePath() {
-		return new Path("src");
-	}
-	/**
-	 * Returns the IPath to the source of the external java class library (e.g. jclMinsrc.zip)
-	 */
-	protected IPath getExternalJCLSourcePath() {
-		return new Path(getExternalJCLSourcePathString(""));
-	}
-	/**
-	 * Returns the IPath to the source of the external java class library (e.g. jclMinsrc.zip)
-	 */
-	protected IPath getExternalJCLSourcePath(String compliance) {
-		return new Path(getExternalJCLSourcePathString(compliance));
-	}
-	/**
-	 * Returns the java.io path to the source of the external java class library (e.g. jclMinsrc.zip)
-	 */
-	protected String getExternalJCLSourcePathString() {
-		return getExternalJCLSourcePathString("");
-	}
-	/**
-	 * Returns the java.io path to the source of the external java class library (e.g. jclMinsrc.zip)
-	 */
-	protected String getExternalJCLSourcePathString(String compliance) {
-		return getExternalPath() + "jclMin" + compliance + "src.zip";
-	}
-	/*
-	 * Returns the OS path to the external directory that contains external jar files.
-	 * This path ends with a File.separatorChar.
-	 */
-	protected String getExternalPath() {
-		if (EXTERNAL_JAR_DIR_PATH == null)
-			try {
-				String path = getWorkspaceRoot().getLocation().toFile().getParentFile().getCanonicalPath();
-				if (path.charAt(path.length()-1) != File.separatorChar)
-					path += File.separatorChar;
-				EXTERNAL_JAR_DIR_PATH = path;
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		return EXTERNAL_JAR_DIR_PATH;
-	}
-	protected IFile getFile(String path) {
-		return getWorkspaceRoot().getFile(new Path(path));
-	}
-	protected IFolder getFolder(IPath path) {
-		return getWorkspaceRoot().getFolder(path);
-	}
-	/**
-	 * Returns the Java Model this test suite is running on.
-	 */
-	public IJavaScriptModel getJavaModel() {
-		return JavaScriptCore.create(getWorkspaceRoot());
-	}
-	/**
-	 * Returns the Java Project with the given name in this test
-	 * suite's model. This is a convenience method.
-	 */
-	public IJavaScriptProject getJavaProject(String name) {
-		IProject project = getProject(name);
-		return JavaScriptCore.create(project);
-	}
-	protected ILocalVariable getLocalVariable(ISourceReference cu, String selectAt, String selection) throws JavaScriptModelException {
-		IJavaScriptElement[] elements = codeSelect(cu, selectAt, selection);
-		if (elements.length == 0) return null;
-		if (elements[0] instanceof ILocalVariable) {
-			return (ILocalVariable)elements[0];
-		}
-		return null;
-	}
-	protected ILocalVariable getLocalVariable(String cuPath, String selectAt, String selection) throws JavaScriptModelException {
-		ISourceReference cu = getCompilationUnit(cuPath);
-		return getLocalVariable(cu, selectAt, selection);
-	}
-	protected String getNameSource(String cuSource, IJavaScriptElement element) throws JavaScriptModelException {
-		ISourceRange nameRange = ((IMember) element).getNameRange();
-		int start = nameRange.getOffset();
-		int end = start+nameRange.getLength();
-		String actualSource = start >= 0 && end >= start ? cuSource.substring(start, end) : "";
-		return actualSource;
-	}
-	/**
-	 * Returns the specified package fragment in the given project and root, or
-	 * <code>null</code> if it does not exist.
-	 * The rootPath must be specified as a project relative path. The empty
-	 * path refers to the default package fragment.
-	 */
-	public IPackageFragment getPackageFragment(String projectName, String rootPath, String packageName) throws JavaScriptModelException {
-		IPackageFragmentRoot root= getPackageFragmentRoot(projectName, rootPath);
-		if (root == null) {
-			return null;
-		}
-		return root.getPackageFragment(packageName);
-	}
-	/**
-	 * Returns the specified package fragment root in the given project, or
-	 * <code>null</code> if it does not exist.
-	 * If relative, the rootPath must be specified as a project relative path. 
-	 * The empty path refers to the package fragment root that is the project
-	 * folder iteslf.
-	 * If absolute, the rootPath refers to either an external jar, or a resource 
-	 * internal to the workspace
-	 */
-	public IPackageFragmentRoot getPackageFragmentRoot(
-		String projectName, 
-		String rootPath)
-		throws JavaScriptModelException {
-			
-		IJavaScriptProject project = getJavaProject(projectName);
-		if (project == null) {
-			return null;
-		}
-		IPath path = new Path(rootPath);
-		if (path.isAbsolute()) {
-			IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-			IResource resource = workspaceRoot.findMember(path);
-			IPackageFragmentRoot root;
-			if (resource == null) {
-				// external jar
-				root = project.getPackageFragmentRoot(rootPath);
-			} else {
-				// resource in the workspace
-				root = project.getPackageFragmentRoot(resource);
-			}
-			return root;
-		} else {
-			IPackageFragmentRoot[] roots = project.getPackageFragmentRoots();
-			if (roots == null || roots.length == 0) {
-				return null;
-			}
-			for (int i = 0; i < roots.length; i++) {
-				IPackageFragmentRoot root = roots[i];
-				if (!root.isExternal()
-					&& root.getUnderlyingResource().getProjectRelativePath().equals(path)) {
-					return root;
-				}
-			}
-		}
-		return null;
-	}
-	protected IProject getProject(String project) {
-		return getWorkspaceRoot().getProject(project);
-	}
-	/**
-	 * Returns the OS path to the directory that contains this plugin.
-	 */
-	protected String getPluginDirectoryPath() {
-		try {
-			URL platformURL = Platform.getBundle("org.eclipse.wst.jsdt.core.tests.model").getEntry("/");
-			return new File(FileLocator.toFileURL(platformURL).getFile()).getAbsolutePath();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	public String getSourceWorkspacePath() {
-		return getPluginDirectoryPath() +  java.io.File.separator + "workspace";
-	}
-	public IJavaScriptUnit getWorkingCopy(String path, boolean computeProblems) throws JavaScriptModelException {
-		return getWorkingCopy(path, "", computeProblems);
-	}	
-	public IJavaScriptUnit getWorkingCopy(String path, String source) throws JavaScriptModelException {
-		return getWorkingCopy(path, source, false);
-	}	
-	public IJavaScriptUnit getWorkingCopy(String path, String source, boolean computeProblems) throws JavaScriptModelException {
-		if (this.wcOwner == null) this.wcOwner = new WorkingCopyOwner() {};
-		return getWorkingCopy(path, source, this.wcOwner, computeProblems);
-	}
-	public IJavaScriptUnit getWorkingCopy(String path, String source, WorkingCopyOwner owner, boolean computeProblems) throws JavaScriptModelException {
-		IProblemRequestor problemRequestor = computeProblems
-			? new IProblemRequestor() {
-				public void acceptProblem(IProblem problem) {}
-				public void beginReporting() {}
-				public void endReporting() {}
-				public boolean isActive() {
-					return true;
-				}
-			} 
-			: null;
-		return getWorkingCopy(path, source, owner, problemRequestor);
-	}
-	public IJavaScriptUnit getWorkingCopy(String path, String source, WorkingCopyOwner owner, IProblemRequestor problemRequestor) throws JavaScriptModelException {
-		IJavaScriptUnit workingCopy = getCompilationUnit(path);
-		if (owner != null)
-			workingCopy = workingCopy.getWorkingCopy(owner, null/*no progress monitor*/);
-		else
-			workingCopy.becomeWorkingCopy(null/*no progress monitor*/);
-		workingCopy.getBuffer().setContents(source);
-		if (problemRequestor instanceof ProblemRequestor)
-			((ProblemRequestor) problemRequestor).initialize(source.toCharArray());
-		workingCopy.makeConsistent(null/*no progress monitor*/);
-		return workingCopy;
-	}
-	/**
-	 * Returns the IWorkspace this test suite is running on.
-	 */
-	public IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	public IWorkspaceRoot getWorkspaceRoot() {
-		return getWorkspace().getRoot();
-	}
-	protected void discardWorkingCopies(IJavaScriptUnit[] units) throws JavaScriptModelException {
-		if (units == null) return;
-		for (int i = 0, length = units.length; i < length; i++)
-			if (units[i] != null)
-				units[i].discardWorkingCopy();
-	}
-	
-	protected String displayString(String toPrint, int indent) {
-    	char[] toDisplay = 
-    		CharOperation.replace(
-    			toPrint.toCharArray(), 
-    			getSystemJsPathString().toCharArray(), 
-    			"getSystemJsPathString()".toCharArray());
-		toDisplay = 
-    		CharOperation.replace(
-    			toDisplay, 
-    			getExternalJCLPathString("1.5").toCharArray(), 
-    			"getExternalJCLPathString(\"1.5\")".toCharArray());
-		toDisplay = 
-    		CharOperation.replace(
-    			toDisplay, 
-    			org.eclipse.wst.jsdt.core.tests.util.Util.displayString(getExternalJCLSourcePathString(), 0).toCharArray(), 
-    			"getExternalJCLSourcePathString()".toCharArray());
-		toDisplay = 
-    		CharOperation.replace(
-    			toDisplay, 
-    			org.eclipse.wst.jsdt.core.tests.util.Util.displayString(getExternalJCLSourcePathString("1.5"), 0).toCharArray(), 
-    			"getExternalJCLSourcePathString(\"1.5\")".toCharArray());
-    	toDisplay = org.eclipse.wst.jsdt.core.tests.util.Util.displayString(new String(toDisplay), indent).toCharArray();
-    	toDisplay = 
-    		CharOperation.replace(
-    			toDisplay, 
-    			"getExternalJCLPathString()".toCharArray(), 
-    			("\"+ getExternalJCLPathString() + \"").toCharArray());
-    	toDisplay = 
-    		CharOperation.replace(
-    			toDisplay, 
-    			"getExternalJCLPathString(\\\"1.5\\\")".toCharArray(), 
-    			("\"+ getExternalJCLPathString(\"1.5\") + \"").toCharArray());
-    	toDisplay = 
-    		CharOperation.replace(
-    			toDisplay, 
-    			"getExternalJCLSourcePathString()".toCharArray(), 
-    			("\"+ getExternalJCLSourcePathString() + \"").toCharArray());
-    	toDisplay = 
-    		CharOperation.replace(
-    			toDisplay, 
-    			"getExternalJCLSourcePathString(\\\"1.5\\\")".toCharArray(), 
-    			("\"+ getExternalJCLSourcePathString(\"1.5\") + \"").toCharArray());
-    	return new String(toDisplay);
-    }
-	
-	protected IJavaScriptUnit newExternalWorkingCopy(String name, final String contents) throws JavaScriptModelException {
-		return newExternalWorkingCopy(name, null/*no classpath*/, null/*no problem requestor*/, contents);
-	}
-	protected IJavaScriptUnit newExternalWorkingCopy(String name, IIncludePathEntry[] classpath, IProblemRequestor problemRequestor, final String contents) throws JavaScriptModelException {
-		WorkingCopyOwner owner = new WorkingCopyOwner() {
-			public IBuffer createBuffer(IJavaScriptUnit wc) {
-				IBuffer buffer = super.createBuffer(wc);
-				buffer.setContents(contents);
-				return buffer;
-			}
-		};
-		return owner.newWorkingCopy(name, classpath, null/*no progress monitor*/);
-	}
-
-	public byte[] read(java.io.File file) throws java.io.IOException {
-		int fileLength;
-		byte[] fileBytes = new byte[fileLength = (int) file.length()];
-		java.io.FileInputStream stream = new java.io.FileInputStream(file);
-		int bytesRead = 0;
-		int lastReadSize = 0;
-		while ((lastReadSize != -1) && (bytesRead != fileLength)) {
-			lastReadSize = stream.read(fileBytes, bytesRead, fileLength - bytesRead);
-			bytesRead += lastReadSize;
-		}
-		stream.close();
-		return fileBytes;
-	}
-	protected void removeJavaNature(String projectName) throws CoreException {
-		IProject project = this.getProject(projectName);
-		IProjectDescription description = project.getDescription();
-		description.setNatureIds(new String[] {});
-		project.setDescription(description, null);
-	}
-	protected void removeLibrary(IJavaScriptProject javaProject, String jarName, String sourceZipName) throws CoreException, IOException {
-		IProject project = javaProject.getProject();
-		String projectPath = '/' + project.getName() + '/';
-		removeLibraryEntry(javaProject, new Path(projectPath + jarName));
-		org.eclipse.wst.jsdt.core.tests.util.Util.delete(project.getFile(jarName));
-		if (sourceZipName != null && sourceZipName.length() != 0) {
-			org.eclipse.wst.jsdt.core.tests.util.Util.delete(project.getFile(sourceZipName));
-		}
-	}
-	protected void removeLibraryEntry(Path path) throws JavaScriptModelException {
-		removeLibraryEntry(this.currentProject, path);
-	}
-	protected void removeLibraryEntry(IJavaScriptProject project, Path path) throws JavaScriptModelException {
-		IIncludePathEntry[] entries = project.getRawIncludepath();
-		int length = entries.length;
-		IIncludePathEntry[] newEntries = null;
-		for (int i = 0; i < length; i++) {
-			IIncludePathEntry entry = entries[i];
-			if (entry.getPath().equals(path)) {
-				newEntries = new IIncludePathEntry[length-1];
-				if (i > 0)
-					System.arraycopy(entries, 0, newEntries, 0, i);
-				if (i < length-1)
-				System.arraycopy(entries, i+1, newEntries, i, length-1-i);
-				break;
-			}	
-		}
-		if (newEntries != null)
-			project.setRawIncludepath(newEntries, null);
-	}
-
-	/**
-	 * Returns a delta for the given element in the delta tree
-	 */
-	protected IJavaScriptElementDelta searchForDelta(IJavaScriptElement element, IJavaScriptElementDelta delta) {
-	
-		if (delta == null) {
-			return null;
-		}
-		if (delta.getElement().equals(element)) {
-			return delta;
-		}
-		for (int i= 0; i < delta.getAffectedChildren().length; i++) {
-			IJavaScriptElementDelta child= searchForDelta(element, delta.getAffectedChildren()[i]);
-			if (child != null) {
-				return child;
-			}
-		}
-		return null;
-	}
-	protected void search(IJavaScriptElement element, int limitTo, IJavaScriptSearchScope scope, SearchRequestor requestor) throws CoreException {
-		search(element, limitTo, SearchPattern.R_EXACT_MATCH|SearchPattern.R_CASE_SENSITIVE, scope, requestor);
-	}
-	protected void search(IJavaScriptElement element, int limitTo, int matchRule, IJavaScriptSearchScope scope, SearchRequestor requestor) throws CoreException {
-		SearchPattern pattern = SearchPattern.createPattern(element, limitTo, matchRule);
-		assertNotNull("Pattern should not be null", pattern);
-		new SearchEngine().search(
-			pattern,
-			new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
-			scope,
-			requestor,
-			null
-		);
-	}
-	protected void search(String patternString, int searchFor, int limitTo, IJavaScriptSearchScope scope, SearchRequestor requestor) throws CoreException {
-		search(patternString, searchFor, limitTo, SearchPattern.R_EXACT_MATCH|SearchPattern.R_CASE_SENSITIVE, scope, requestor);
-	}
-	protected void search(String patternString, int searchFor, int limitTo, int matchRule, IJavaScriptSearchScope scope, SearchRequestor requestor) throws CoreException {
-		if (patternString.indexOf('*') != -1 || patternString.indexOf('?') != -1)
-			matchRule |= SearchPattern.R_PATTERN_MATCH;
-		SearchPattern pattern = SearchPattern.createPattern(
-			patternString, 
-			searchFor,
-			limitTo, 
-			matchRule);
-		assertNotNull("Pattern should not be null", pattern);
-		new SearchEngine().search(
-			pattern,
-			new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
-			scope,
-			requestor,
-			null);
-	}
-
-	/*
-	 * Selection of java elements.
-	 */
-
-	/*
-	 * Search several occurences of a selection in a compilation unit source and returns its start and length.
-	 * If occurence is negative, then perform a backward search from the end of file.
-	 * If selection starts or ends with a comment (to help identification in source), it is removed from returned selection info.
-	 */
-	int[] selectionInfo(IJavaScriptUnit cu, String selection, int occurences) throws JavaScriptModelException {
-		String source = cu.getSource();
-		int index = occurences < 0 ? source.lastIndexOf(selection) : source.indexOf(selection);
-		int max = Math.abs(occurences)-1;
-		for (int n=0; index >= 0 && n<max; n++) {
-			index = occurences < 0 ? source.lastIndexOf(selection, index) : source.indexOf(selection, index+selection.length());
-		}
-		StringBuffer msg = new StringBuffer("Selection '");
-		msg.append(selection);
-		if (index >= 0) {
-			if (selection.startsWith("/**")) { // comment is before
-				int start = source.indexOf("*/", index);
-				if (start >=0) {
-					return new int[] { start+2, selection.length()-(start+2-index) };
-				} else {
-					msg.append("' starts with an unterminated comment");
-				}
-			} else if (selection.endsWith("*/")) { // comment is after
-				int end = source.lastIndexOf("/**", index+selection.length());
-				if (end >=0) {
-					return new int[] { index, index-end };
-				} else {
-					msg.append("' ends with an unstartted comment");
-				}
-			} else { // no comment => use whole selection
-				return new int[] { index, selection.length() };
-			}
-		} else {
-			msg.append("' was not found in ");
-		}
-		msg.append(cu.getElementName());
-		msg.append(":\n");
-		msg.append(source);
-		assertTrue(msg.toString(), false);
-		return null;
-	}
-
-	/**
-	 * Select a field in a compilation unit identified with the first occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @return IField
-	 * @throws JavaScriptModelException
-	 */
-	protected IField selectField(IJavaScriptUnit unit, String selection) throws JavaScriptModelException {
-		return selectField(unit, selection, 1);
-	}
-
-	/**
-	 * Select a field in a compilation unit identified with the nth occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @param occurences
-	 * @return IField
-	 * @throws JavaScriptModelException
-	 */
-	protected IField selectField(IJavaScriptUnit unit, String selection, int occurences) throws JavaScriptModelException {
-		return (IField) selectJavaElement(unit, selection, occurences, IJavaScriptElement.FIELD);
-	}
-
-	/**
-	 * Select a local variable in a compilation unit identified with the first occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @return IType
-	 * @throws JavaScriptModelException
-	 */
-	protected ILocalVariable selectLocalVariable(IJavaScriptUnit unit, String selection) throws JavaScriptModelException {
-		return selectLocalVariable(unit, selection, 1);
-	}
-
-	/**
-	 * Select a local variable in a compilation unit identified with the nth occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @param occurences
-	 * @return IType
-	 * @throws JavaScriptModelException
-	 */
-	protected ILocalVariable selectLocalVariable(IJavaScriptUnit unit, String selection, int occurences) throws JavaScriptModelException {
-		return (ILocalVariable) selectJavaElement(unit, selection, occurences, IJavaScriptElement.LOCAL_VARIABLE);
-	}
-
-	/**
-	 * Select a method in a compilation unit identified with the first occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @return IFunction
-	 * @throws JavaScriptModelException
-	 */
-	protected IFunction selectMethod(IJavaScriptUnit unit, String selection) throws JavaScriptModelException {
-		return selectMethod(unit, selection, 1);
-	}
-
-	/**
-	 * Select a method in a compilation unit identified with the nth occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @param occurences
-	 * @return IFunction
-	 * @throws JavaScriptModelException
-	 */
-	protected IFunction selectMethod(IJavaScriptUnit unit, String selection, int occurences) throws JavaScriptModelException {
-		return (IFunction) selectJavaElement(unit, selection, occurences, IJavaScriptElement.METHOD);
-	}
-
-	/**
-	 * Select a parameterized source method in a compilation unit identified with the first occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @return ParameterizedSourceMethod
-	 * @throws JavaScriptModelException
-	 */
-	protected ResolvedSourceMethod selectParameterizedMethod(IJavaScriptUnit unit, String selection) throws JavaScriptModelException {
-		return selectParameterizedMethod(unit, selection, 1);
-	}
-	
-	/**
-	 * Select a parameterized source method in a compilation unit identified with the nth occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @param occurences
-	 * @return ParameterizedSourceMethod
-	 * @throws JavaScriptModelException
-	 */
-	protected ResolvedSourceMethod selectParameterizedMethod(IJavaScriptUnit unit, String selection, int occurences) throws JavaScriptModelException {
-		IFunction type = selectMethod(unit, selection, occurences);
-		assertTrue("Not a parameterized source type: "+type.getElementName(), type instanceof ResolvedSourceMethod);
-		return (ResolvedSourceMethod) type;
-	}
-
-	/**
-	 * Select a parameterized source type in a compilation unit identified with the first occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @return ParameterizedSourceType
-	 * @throws JavaScriptModelException
-	 */
-	protected ResolvedSourceType selectParameterizedType(IJavaScriptUnit unit, String selection) throws JavaScriptModelException {
-		return selectParameterizedType(unit, selection, 1);
-	}
-	
-	/**
-	 * Select a parameterized source type in a compilation unit identified with the nth occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @param occurences
-	 * @return ParameterizedSourceType
-	 * @throws JavaScriptModelException
-	 */
-	protected ResolvedSourceType selectParameterizedType(IJavaScriptUnit unit, String selection, int occurences) throws JavaScriptModelException {
-		IType type = selectType(unit, selection, occurences);
-		assertTrue("Not a parameterized source type: "+type.getElementName(), type instanceof ResolvedSourceType);
-		return (ResolvedSourceType) type;
-	}
-
-	/**
-	 * Select a type in a compilation unit identified with the first occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @return IType
-	 * @throws JavaScriptModelException
-	 */
-	protected IType selectType(IJavaScriptUnit unit, String selection) throws JavaScriptModelException {
-		return selectType(unit, selection, 1);
-	}
-
-	/**
-	 * Select a type in a compilation unit identified with the nth occurence in the source of a given selection.
-	 * @param unit
-	 * @param selection
-	 * @param occurences
-	 * @return IType
-	 * @throws JavaScriptModelException
-	 */
-	protected IType selectType(IJavaScriptUnit unit, String selection, int occurences) throws JavaScriptModelException {
-		return (IType) selectJavaElement(unit, selection, occurences, IJavaScriptElement.TYPE);
-	}
-
-	/**
-	 * Select a java element in a compilation unit identified with the nth occurence in the source of a given selection.
-	 * Do not allow subclasses to call this method as we want to verify IJavaScriptElement kind.
-	 */
-	IJavaScriptElement selectJavaElement(IJavaScriptUnit unit, String selection, int occurences, int elementType) throws JavaScriptModelException {
-		int[] selectionPositions = selectionInfo(unit, selection, occurences);
-		IJavaScriptElement[] elements = null;
-		if (wcOwner == null) {
-			elements = unit.codeSelect(selectionPositions[0], selectionPositions[1]);
-		} else {
-			elements = unit.codeSelect(selectionPositions[0], selectionPositions[1], wcOwner);
-		}
-		assertEquals("Invalid selection number", 1, elements.length);
-		assertEquals("Invalid java element type: "+elements[0].getElementName(), elements[0].getElementType(), elementType);
-		return elements[0];
-	}
-
-	/* ************
-	 * Suite set-ups *
-	 *************/
-	/**
-	 * Sets the class path of the Java project.
-	 */
-	public void setClasspath(IJavaScriptProject javaProject, IIncludePathEntry[] classpath) {
-		try {
-			javaProject.setRawIncludepath(classpath, null);
-		} catch (JavaScriptModelException e) {
-			assertTrue("failed to set classpath", false);
-		}
-	}
-	/**
-	 * Check locally for the required JCL files, <jclName>.jar and <jclName>src.zip.
-	 * If not available, copy from the project resources.
-	 */
-	public void setupExternalJCL(String jclName) throws IOException {
-		String externalPath = getExternalPath();
-		String separator = java.io.File.separator;
-		String resourceJCLDir = getPluginDirectoryPath() + separator + "JCL";
-		java.io.File jclDir = new java.io.File(externalPath);
-		java.io.File jclMin =
-			new java.io.File(externalPath + jclName + ".jar");
-		java.io.File jclMinsrc = new java.io.File(externalPath + jclName + "src.zip");
-		if (!jclDir.exists()) {
-			if (!jclDir.mkdir()) {
-				//mkdir failed
-				throw new IOException("Could not create the directory " + jclDir);
-			}
-			//copy the two files to the JCL directory
-			java.io.File resourceJCLMin =
-				new java.io.File(resourceJCLDir + separator + jclName + ".jar");
-			copy(resourceJCLMin, jclMin);
-			java.io.File resourceJCLMinsrc =
-				new java.io.File(resourceJCLDir + separator + jclName + "src.zip");
-			copy(resourceJCLMinsrc, jclMinsrc);
-		} else {
-			//check that the two files, jclMin.jar and jclMinsrc.zip are present
-			//copy either file that is missing or less recent than the one in workspace
-			java.io.File resourceJCLMin =
-				new java.io.File(resourceJCLDir + separator + jclName + ".jar");
-			if ((jclMin.lastModified() < resourceJCLMin.lastModified())
-                    || (jclMin.length() != resourceJCLMin.length())) {
-				copy(resourceJCLMin, jclMin);
-			}
-			java.io.File resourceJCLMinsrc =
-				new java.io.File(resourceJCLDir + separator + jclName + "src.zip");
-			if ((jclMinsrc.lastModified() < resourceJCLMinsrc.lastModified())
-                    || (jclMinsrc.length() != resourceJCLMinsrc.length())) {
-				copy(resourceJCLMinsrc, jclMinsrc);
-			}
-		}
-	}
-	protected IJavaScriptProject setUpJavaProject(final String projectName) throws CoreException, IOException {
-		this.currentProject = setUpJavaProject(projectName, "1.4");
-		return this.currentProject;
-	}
-	protected IJavaScriptProject setUpJavaProject(final String projectName, String compliance) throws CoreException, IOException {
-		// copy files in project from source workspace to target workspace
-		String sourceWorkspacePath = getSourceWorkspacePath();
-		String targetWorkspacePath = getWorkspaceRoot().getLocation().toFile().getCanonicalPath();
-		copyDirectory(new File(sourceWorkspacePath, projectName), new File(targetWorkspacePath, projectName));
-
-		// ensure variables are set
-		setUpJCLClasspathVariables(compliance);
-
-		// create project
-		final IProject project = getWorkspaceRoot().getProject(projectName);
-		IWorkspaceRunnable populate = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				project.create(null);
-				project.open(null);
-			}
-		};
-		getWorkspace().run(populate, null);
-		IJavaScriptProject javaProject = JavaScriptCore.create(project);
-		setUpProjectCompliance(javaProject, compliance);
-		javaProject.setOption(JavaScriptCore.COMPILER_PB_UNUSED_LOCAL, JavaScriptCore.IGNORE);
-		javaProject.setOption(JavaScriptCore.COMPILER_PB_UNUSED_PRIVATE_MEMBER, JavaScriptCore.IGNORE);
-		javaProject.setOption(JavaScriptCore.COMPILER_PB_FIELD_HIDING, JavaScriptCore.IGNORE);
-		javaProject.setOption(JavaScriptCore.COMPILER_PB_LOCAL_VARIABLE_HIDING, JavaScriptCore.IGNORE);
-		javaProject.setOption(JavaScriptCore.COMPILER_PB_TYPE_PARAMETER_HIDING, JavaScriptCore.IGNORE);
-		return javaProject;
-	}
-
-	protected void setUpProjectCompliance(IJavaScriptProject javaProject, String compliance) throws JavaScriptModelException, IOException {
-		// Look for version to set and return if that's already done
-		String version = CompilerOptions.VERSION_1_4;
-		String jclLibString = null;
-		String newJclLibString = null;
-		String newJclSrcString = null;
-		switch (compliance.charAt(2)) {
-			case '5':
-				version = CompilerOptions.VERSION_1_5;
-				if (version.equals(javaProject.getOption(CompilerOptions.OPTION_Compliance, false))) {
-					return;
-				}
-				jclLibString = "JCL_LIB";
-				newJclLibString = "JCL15_LIB";
-				newJclSrcString = "JCL15_SRC";
-				break;
-			case '3':
-				version = CompilerOptions.VERSION_1_3;
-			default:
-				if (version.equals(javaProject.getOption(CompilerOptions.OPTION_Compliance, false))) {
-					return;
-				}
-				jclLibString = "JCL15_LIB";
-				newJclLibString = "JCL_LIB";
-				newJclSrcString = "JCL_SRC";
-				break;
-		}
-		
-		// ensure variables are set
-		setUpJCLClasspathVariables(compliance);
-		
-		// set options
-		Map options = new HashMap();
-		options.put(CompilerOptions.OPTION_Compliance, version);
-		options.put(CompilerOptions.OPTION_Source, version);	
-		options.put(CompilerOptions.OPTION_TargetPlatform, version);	
-		javaProject.setOptions(options);
-		
-		// replace JCL_LIB with JCL15_LIB, and JCL_SRC with JCL15_SRC
-		IIncludePathEntry[] classpath = javaProject.getRawIncludepath();
-		IPath jclLib = new Path(jclLibString);
-		for (int i = 0, length = classpath.length; i < length; i++) {
-			IIncludePathEntry entry = classpath[i];
-			if (entry.getPath().equals(jclLib)) {
-				classpath[i] = JavaScriptCore.newVariableEntry(
-						new Path(newJclLibString), 
-						new Path(newJclSrcString), 
-						entry.getSourceAttachmentRootPath(), 
-						entry.getAccessRules(), 
-						new IIncludePathAttribute[0], 
-						entry.isExported());
-				break;
-			}
-		}
-		javaProject.setRawIncludepath(classpath, null);
-	}
-	public void setUpJCLClasspathVariables(String compliance) throws JavaScriptModelException, IOException {
-		if ("1.5".equals(compliance)) {
-			if (JavaScriptCore.getIncludepathVariable("JCL15_LIB") == null) {
-//				setupExternalJCL("jclMin1.5");
-				JavaScriptCore.setIncludepathVariables(
-					new String[] {"JCL15_LIB", "JCL15_SRC", "JCL_SRCROOT"},
-					new IPath[] {getExternalJCLPath(compliance), getExternalJCLSourcePath(compliance), getExternalJCLRootSourcePath()},
-					null);
-			} 
-		} else {
-			if (JavaScriptCore.getIncludepathVariable("JCL_LIB") == null) {
-//				setupExternalJCL("jclMin");
-				JavaScriptCore.setIncludepathVariables(
-					new String[] {"JCL_LIB", "JCL_SRC", "JCL_SRCROOT"},
-					new IPath[] {getExternalJCLPath(""), getExternalJCLSourcePath(), getExternalJCLRootSourcePath()},
-					null);
-			} 
-		}	
-	}
-	public void setUpSuite() throws Exception {
-		super.setUpSuite();
-		
-		// ensure autobuilding is turned off
-		IWorkspaceDescription description = getWorkspace().getDescription();
-		if (description.isAutoBuilding()) {
-			description.setAutoBuilding(false);
-			getWorkspace().setDescription(description);
-		}
-	}
-	protected void setUp () throws Exception {
-		super.setUp();
-		if (NameLookup.VERBOSE || BasicSearchEngine.VERBOSE || JavaModelManager.VERBOSE) {
-			System.out.println("--------------------------------------------------------------------------------");
-			System.out.println("Running test "+getName()+"...");
-		}
-	}
-	protected void sortElements(IJavaScriptElement[] elements) {
-		Util.Comparer comparer = new Util.Comparer() {
-			public int compare(Object a, Object b) {
-				JavaElement elementA = (JavaElement)a;
-				JavaElement elementB = (JavaElement)b;
-				char[] tempJCLPath = "<externalJCLPath>".toCharArray();
-	    		String idA = new String(CharOperation.replace(
-	    			elementA.toStringWithAncestors().toCharArray(), 
-	    			getSystemJsPathString().toCharArray(), 
-	    			tempJCLPath));
-	    		String idB = new String(CharOperation.replace(
-	    			elementB.toStringWithAncestors().toCharArray(), 
-	    			getSystemJsPathString().toCharArray(), 
-	    			tempJCLPath));
-				return idA.compareTo(idB);
-			}
-		};
-		Util.sort(elements, comparer);
-	}
-	protected void sortResources(Object[] resources) {
-		Util.Comparer comparer = new Util.Comparer() {
-			public int compare(Object a, Object b) {
-				IResource resourceA = (IResource)a;
-				IResource resourceB = (IResource)b;
-				return resourceA.getFullPath().toString().compareTo(resourceB.getFullPath().toString());			}
-		};
-		Util.sort(resources, comparer);
-	}
-	protected void sortTypes(IType[] types) {
-		Util.Comparer comparer = new Util.Comparer() {
-			public int compare(Object a, Object b) {
-				IType typeA = (IType)a;
-				IType typeB = (IType)b;
-				return typeA.getFullyQualifiedName().compareTo(typeB.getFullyQualifiedName());
-			}
-		};
-		Util.sort(types, comparer);
-	}
-	/*
-	 * Simulate a save/exit of the workspace
-	 */
-	protected void simulateExit() throws CoreException {
-		waitForAutoBuild();
-		getWorkspace().save(true/*full save*/, null/*no progress*/);
-		JavaModelManager.getJavaModelManager().shutdown();
-	}
-	/*
-	 * Simulate a save/exit/restart of the workspace
-	 */
-	protected void simulateExitRestart() throws CoreException {
-		simulateExit();
-		simulateRestart();
-	}
-	/*
-	 * Simulate a restart of the workspace
-	 */
-	protected void simulateRestart() throws CoreException {
-		JavaModelManager.doNotUse(); // reset the MANAGER singleton
-		JavaModelManager.getJavaModelManager().startup();
-		new JavaCorePreferenceInitializer().initializeDefaultPreferences();
-	}
-	/**
-	 * Starts listening to element deltas, and queues them in fgDeltas.
-	 */
-	public void startDeltas() {
-		clearDeltas();
-		JavaScriptCore.addElementChangedListener(this.deltaListener);
-	}
-	/**
-	 * Stops listening to element deltas, and clears the current deltas.
-	 */
-	public void stopDeltas() {
-		JavaScriptCore.removeElementChangedListener(this.deltaListener);
-		clearDeltas();
-	}
-	protected IPath[] toIPathArray(String[] paths) {
-		if (paths == null) return null;
-		int length = paths.length;
-		IPath[] result = new IPath[length];
-		for (int i = 0; i < length; i++) {
-			result[i] = new Path(paths[i]);
-		}
-		return result;
-	}
-	protected String toString(String[] strings) {
-		return toString(strings, false/*don't add extra new line*/);
-	}
-	protected String toString(String[] strings, boolean addExtraNewLine) {
-		if (strings == null) return "null";
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0, length = strings.length; i < length; i++){
-			buffer.append(strings[i]);
-			if (addExtraNewLine || i < length - 1)
-				buffer.append("\n");
-		}
-		return buffer.toString();
-	}
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (this.workingCopies != null) {
-			discardWorkingCopies(this.workingCopies);
-			this.workingCopies = null;
-		}
-		this.wcOwner = null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.core.tests.model.SuiteOfTestCases#tearDownSuite()
-	 */
-	public void tearDownSuite() throws Exception {
-		super.tearDownSuite();
-	}
-
-	/**
-	 * Wait for autobuild notification to occur
-	 */
-	public static void waitForAutoBuild() {
-		boolean wasInterrupted = false;
-		do {
-			try {
-				Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-				wasInterrupted = false;
-			} catch (OperationCanceledException e) {
-				e.printStackTrace();
-			} catch (InterruptedException e) {
-				wasInterrupted = true;
-			}
-		} while (wasInterrupted);
-	}
-
-	public static void waitUntilIndexesReady() {
-		// dummy query for waiting until the indexes are ready
-		SearchEngine engine = new SearchEngine();
-		IJavaScriptSearchScope scope = SearchEngine.createWorkspaceScope();
-		try {
-			engine.searchAllTypeNames(
-				null,
-				SearchPattern.R_EXACT_MATCH,
-				"!@$#!@".toCharArray(),
-				SearchPattern.R_PATTERN_MATCH | SearchPattern.R_CASE_SENSITIVE,
-				IJavaScriptSearchConstants.CLASS,
-				scope, 
-				new TypeNameRequestor() {
-					public void acceptType(
-						int modifiers,
-						char[] packageName,
-						char[] simpleTypeName,
-						char[][] enclosingTypeNames,
-						String path) {}
-				},
-				IJavaScriptSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
-				null);
-		} catch (CoreException e) {
-		}
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavaSearchTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavaSearchTests.java
deleted file mode 100644
index 0e7f507..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavaSearchTests.java
+++ /dev/null
@@ -1,607 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.wst.jsdt.core.*;
-import org.eclipse.wst.jsdt.core.compiler.CharOperation;
-import org.eclipse.wst.jsdt.core.search.*;
-import org.eclipse.wst.jsdt.internal.compiler.problem.AbortCompilationUnit;
-import org.eclipse.wst.jsdt.internal.core.PackageFragment;
-//import org.eclipse.wst.jsdt.internal.core.ResolvedSourceMethod;
-//import org.eclipse.wst.jsdt.internal.core.ResolvedSourceType;
-import org.eclipse.wst.jsdt.internal.core.SourceRefElement;
-import org.eclipse.wst.jsdt.internal.core.search.matching.PatternLocator;
-
-/**
- * Abstract class for Java Search tests.
- */
-public class AbstractJavaSearchTests extends AbstractJavaModelTests implements IJavaScriptSearchConstants {
-
-	public static List JAVA_SEARCH_SUITES = null;
-	protected static IJavaScriptProject JAVA_PROJECT;
-	protected static boolean COPY_DIRS = true;
-	protected static int EXACT_RULE = SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE;
-	protected static int EQUIVALENT_RULE = EXACT_RULE | SearchPattern.R_EQUIVALENT_MATCH;
-	protected static int ERASURE_RULE = EXACT_RULE | SearchPattern.R_ERASURE_MATCH;
-	protected static int RAW_RULE = EXACT_RULE | SearchPattern.R_ERASURE_MATCH | SearchPattern.R_EQUIVALENT_MATCH;
-
-//	IJavaScriptUnit[] workingCopies;
-//	boolean discard;
-
-	/**
-	 * Collects results as a string.
-	 */
-	public static class JavaSearchResultCollector extends SearchRequestor {
-		protected SearchMatch match;
-		public StringBuffer results = new StringBuffer(), line;
-		public boolean showAccuracy;
-		public boolean showContext;
-		public boolean showRule;
-		public boolean showInsideDoc;
-		public boolean showPotential = true;
-		public boolean showProject;
-		public boolean showSynthetic;
-		public int showFlavors = 0;
-		public int count = 0;
-		public void acceptSearchMatch(SearchMatch searchMatch) throws CoreException {
-			count++;
-			this.match = searchMatch;
-			writeLine();
-			if (line != null) {
-				writeLineToResult();
-			}
-		}
-		protected void writeLineToResult() {
-			if (match.getAccuracy() == SearchMatch.A_ACCURATE || showPotential) {
-				if (results.length() > 0) results.append("\n");
-				results.append(line);
-			}
-		}
-		protected void writeLine() throws CoreException {
-			try {
-				IResource resource = match.getResource();
-				IJavaScriptElement element = getElement(match);
-				line = new StringBuffer(getPathString(resource, element));
-				if (this.showProject) {
-					IProject project = element.getJavaScriptProject().getProject();
-					line.append(" [in ");
-					line.append(project.getName());
-					line.append("]");
-				}
-				IJavaScriptUnit unit = null;
-				if (element instanceof IFunction) {
-					line.append(" ");
-					IFunction method = (IFunction)element;
-					append(method);
-					unit = method.getJavaScriptUnit();
-				} else if (element instanceof IType) {
-					line.append(" ");
-					IType type = (IType)element;
-					append(type);
-					unit = type.getJavaScriptUnit();
-				} else if (element instanceof IField) {
-					line.append(" ");
-					IField field = (IField)element;
-					append(field);
-					unit = field.getJavaScriptUnit();
-				} else if (element instanceof IInitializer) {
-					line.append(" ");
-					IInitializer initializer = (IInitializer)element;
-					append(initializer);
-					unit = initializer.getJavaScriptUnit();
-				} else if (element instanceof IPackageFragment) {
-					line.append(" ");
-					append((IPackageFragment)element);
-				} else if (element instanceof ILocalVariable) {
-					line.append(" ");
-					ILocalVariable localVar = (ILocalVariable)element;
-					IJavaScriptElement parent = localVar.getParent();
-					if (parent instanceof IInitializer) {
-						IInitializer initializer = (IInitializer)parent;
-						append(initializer);
-						line.append(".");
-					} else if (parent instanceof IFunction){ // IFunction
-						IFunction method = (IFunction)parent;
-						append(method);
-						line.append(".");
-					}
-					line.append(localVar.getElementName());
-					unit = (IJavaScriptUnit)localVar.getAncestor(IJavaScriptElement.JAVASCRIPT_UNIT);
-				} else if (element instanceof IImportDeclaration) {
-					IImportDeclaration importDeclaration = (IImportDeclaration)element;
-					unit = (IJavaScriptUnit)importDeclaration.getAncestor(IJavaScriptElement.JAVASCRIPT_UNIT);
-				}
-				if (resource instanceof IFile) {
-					char[] contents = getSource(resource, element, unit);
-					int start = match.getOffset();
-					int end = start + match.getLength();
-					if (start == -1 || (contents != null && contents.length > 0)) { // retrieving attached source not implemented here
-						line.append(" [");
-						if (start > -1) {
-							if (this.showContext) {
-								int lineStart1 = CharOperation.lastIndexOf('\n', contents, 0, start);
-								int lineStart2 = CharOperation.lastIndexOf('\r', contents, 0, start);
-								int lineStart = Math.max(lineStart1, lineStart2) + 1;
-								line.append(CharOperation.subarray(contents, lineStart, start));
-								line.append("<");
-							}
-							line.append(CharOperation.subarray(contents, start, end));
-							if (this.showContext) {
-								line.append(">");
-								int lineEnd1 = CharOperation.indexOf('\n', contents, end);
-								int lineEnd2 = CharOperation.indexOf('\r', contents, end);
-								int lineEnd = lineEnd1 > 0 && lineEnd2 > 0 ? Math.min(lineEnd1, lineEnd2) : Math.max(lineEnd1, lineEnd2);
-								if (lineEnd == -1) lineEnd = contents.length;
-								line.append(CharOperation.subarray(contents, end, lineEnd));
-							}
-						} else {
-							line.append("No source");
-						}
-						line.append("]");
-					}
-				}
-				if (this.showAccuracy) {
-					line.append(" ");
-					if (match.getAccuracy() == SearchMatch.A_ACCURATE) {
-						if (this.showRule) {
-							if (match.isExact()) {
-								line.append("EXACT_");
-							} else if (match.isEquivalent()) {
-								line.append("EQUIVALENT_");
-							} else if (match.isErasure()) {
-								line.append("ERASURE_");
-							} else {
-								line.append("INVALID_RULE_");
-							}
-							if (match.isRaw()) {
-								line.append("RAW_");
-							}
-						} else {
-							line.append("EXACT_");
-						}
-						line.append("MATCH");
-					} else {
-						line.append("POTENTIAL_MATCH");
-					}
-				}
-				if (this.showInsideDoc) {
-					line.append(" ");
-					if (match.isInsideDocComment()) {
-						line.append("INSIDE_JAVADOC");
-					} else {
-						line.append("OUTSIDE_JAVADOC");
-					}
-				}
-				if (this.showSynthetic) {
-					if (match instanceof MethodReferenceMatch) {
-						MethodReferenceMatch methRef = (MethodReferenceMatch) match;
-					}
-				}
-				if (this.showFlavors > 0) {
-					if (match instanceof MethodReferenceMatch) {
-						MethodReferenceMatch methRef = (MethodReferenceMatch) match;
-						if (methRef.isSuperInvocation() && showSuperInvocation()) {
-							line.append(" SUPER INVOCATION");
-						}
-					}
-				}
-			} catch (JavaScriptModelException e) {
-				results.append("\n");
-				results.append(e.toString());
-			}
-		}
-		private boolean showSuperInvocation() {
-			return (this.showFlavors & PatternLocator.SUPER_INVOCATION_FLAVOR) != 0;
-		}
-		protected void append(IField field) throws JavaScriptModelException {
-			append(field.getDeclaringType());
-			line.append(".");
-			line.append(field.getElementName());
-		}
-		private void append(IInitializer initializer) throws JavaScriptModelException {
-			append(initializer.getDeclaringType());
-			line.append(".");
-			if (Flags.isStatic(initializer.getFlags())) {
-				line.append("static ");
-			}
-			line.append("{}");
-		}
-		private void append(IFunction method) throws JavaScriptModelException {
-			if (!method.isConstructor() && method.getReturnType()!=null) {
-				line.append(Signature.toString(method.getReturnType()));
-				line.append(" ");
-			}
-			if (method.getDeclaringType()!=null)
-			{
-				append(method.getDeclaringType());
-				line.append(".");
-			}
-			if (!method.isConstructor()) {
-				line.append(method.getElementName());
-			}
-			line.append("(");
-			String[] parameters = method.getParameterTypes();
-			boolean varargs = Flags.isVarargs(method.getFlags());
-			for (int i = 0, length=parameters.length; i<length; i++) {
-				if (i < length - 1) {
-					line.append(Signature.toString(parameters[i]));
-					line.append(", "); //$NON-NLS-1$
-				} else if (varargs) {
-					// remove array from signature
-					String parameter = parameters[i].substring(1);
-					line.append(Signature.toString(parameter));
-					line.append(" ..."); //$NON-NLS-1$
-				} else {
-					line.append(Signature.toString(parameters[i]));
-				}
-			}
-			line.append(")");
-		}
-		private void append(IPackageFragment pkg) {
-			line.append(pkg.getElementName());
-		}
-		private void append(IType type) throws JavaScriptModelException {
-			IJavaScriptElement parent = type.getParent();
-			boolean isLocal = false;
-			switch (parent.getElementType()) {
-				case IJavaScriptElement.JAVASCRIPT_UNIT:
-					IPackageFragment pkg = type.getPackageFragment();
-					append(pkg);
-					if (!pkg.getElementName().equals(IPackageFragment.DEFAULT_PACKAGE_NAME)) {
-						line.append(".");
-					}
-					break;
-				case IJavaScriptElement.CLASS_FILE:
-					IType declaringType = type.getDeclaringType();
-					if (declaringType != null) {
-						append(type.getDeclaringType());
-						line.append("$");
-					} else {
-						pkg = type.getPackageFragment();
-						append(pkg);
-						if (!pkg.getElementName().equals(IPackageFragment.DEFAULT_PACKAGE_NAME)) {
-							line.append(".");
-						}
-					}
-					break;
-				case IJavaScriptElement.TYPE:
-					append((IType)parent);
-					line.append("$");
-					break;
-				case IJavaScriptElement.FIELD:
-					append((IField)parent);
-					isLocal = true;
-					break;
-				case IJavaScriptElement.INITIALIZER:
-					append((IInitializer)parent);
-					isLocal = true;
-					break;
-				case IJavaScriptElement.METHOD:
-					append((IFunction)parent);
-					isLocal = true;
-					break;
-			}
-			if (isLocal) {
-				line.append(":");
-			}
-			String typeName = type.getElementName();
-			if (typeName.length() == 0) {
-				line.append("<anonymous>");
-			} else {
-				line.append(typeName);
-			}
-			if (isLocal) {
-				line.append("#");
-				line.append(((SourceRefElement)type).occurrenceCount);
-			}
-		}
-		protected IJavaScriptElement getElement(SearchMatch searchMatch) {
-			return (IJavaScriptElement) searchMatch.getElement();
-		}
-		protected String getPathString(IResource resource, IJavaScriptElement element) {
-			String pathString;
-			if (resource != null) {
-				IPath path = resource.getProjectRelativePath();
-				if (path.segmentCount() == 0) {
-					IJavaScriptElement root = element;
-					while (root != null && !(root instanceof IPackageFragmentRoot)) {
-						root = root.getParent();
-					}
-					if (root != null) {
-						IPackageFragmentRoot pkgFragmentRoot = (IPackageFragmentRoot)root;
-						if (pkgFragmentRoot.isExternal()) {
-							pathString = pkgFragmentRoot.getPath().toOSString();
-						} else {
-							pathString = pkgFragmentRoot.getPath().toString();
-						}
-					} else {
-						pathString = "";
-					}
-				} else {
-					pathString = path.toString();
-				}
-			} else {
-				pathString = element.getPath().toString();
-			}
-			return pathString;
-		}
-		protected char[] getSource(IResource resource, IJavaScriptElement element, IJavaScriptUnit unit) throws CoreException {
-			char[] contents = CharOperation.NO_CHAR;
-			if ("js".equals(resource.getFileExtension())) {
-				IJavaScriptUnit cu = (IJavaScriptUnit)element.getAncestor(IJavaScriptElement.JAVASCRIPT_UNIT);
-				if (cu != null && cu.isWorkingCopy()) {
-					// working copy
-					contents = unit.getBuffer().getCharacters();
-				} else {
-					IFile file = ((IFile) resource);
-					try {
-						contents = new org.eclipse.wst.jsdt.internal.compiler.batch.CompilationUnit(
-							null, 
-							file.getLocation().toFile().getPath(),
-							file.getCharset()).getContents();
-					} catch(AbortCompilationUnit e) {
-						// TODO (philippe) occured with a FileNotFoundException
-						// ignore
-					}
-				}
-			}
-			return contents;
-		}
-		public String toString() {
-			return results.toString();
-		}
-	}
-	
-	static class TypeNameMatchCollector extends TypeNameMatchRequestor {
-		List matches = new ArrayList();
-		public void acceptTypeNameMatch(TypeNameMatch match) {
-			IType type = match.getType();
-			if (type != null) {
-				this.matches.add(type);
-			}
-		}
-		public int size() {
-			return this.matches.size();
-		}
-		private String toString(int kind) {
-			int size = size();
-			if (size == 0) return "";
-			String[] strings = new String[size];
-			for (int i=0; i<size; i++) {
-				IType type = (IType) this.matches.get(i);
-				switch (kind) {
-					case 1: // fully qualified name
-						strings[i] = type.getFullyQualifiedName();
-						break;
-					case 0:
-					default:
-						strings[i] = type.toString();
-				}
-			}
-			Arrays.sort(strings);
-			StringBuffer buffer = new StringBuffer();
-			for (int i=0; i<size; i++) {
-				if (i>0) buffer.append('\n');
-				buffer.append(strings[i]);
-			}
-			return buffer.toString();
-		}
-		public String toString() {
-			return toString(0);
-		}
-		public String toFullyQualifiedNamesString() {
-			return toString(1);
-		}
-	}
-
-protected JavaSearchResultCollector resultCollector;
-
-	public AbstractJavaSearchTests(String name) {
-		this(name, 2);
-	}
-	public AbstractJavaSearchTests(String name, int tabs) {
-		super(name, tabs);
-		this.displayName = true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.core.tests.model.AbstractJavaModelTests#assertSearchResults(java.lang.String, java.lang.Object)
-	 */
-	protected void assertSearchResults(String expected) {
-		assertSearchResults(expected, resultCollector);
-	}
-	protected void assertSearchResults(String expected, JavaSearchResultCollector collector) {
-		assertSearchResults("Unexpected search results", expected, collector);
-	}
-	protected void assertSearchResults(String message, String expected, JavaSearchResultCollector collector) {
-		String actual = collector.toString();
-		if (!expected.equals(actual)) {
-			if (this.displayName) {
-				System.out.print(getName());
-				System.out.print(" got ");
-				if (collector.count==0)
-					System.out.println("no result!");
-				else {
-					System.out.print(collector.count);
-					System.out.print(" result");
-					if (collector.count==1)
-						System.out.println(":");
-					else
-						System.out.println("s:");
-				}
-			}
-			if (!displayName || collector.count>0) {
-				System.out.print(displayString(actual, this.tabs));
-				System.out.println(this.endChar);
-			}
-			if (this.workingCopies != null) {
-				int length = this.workingCopies.length;
-				String[] sources = new String[length*2];
-				for (int i=0; i<length; i++) {
-					sources[i*2] = this.workingCopies[i].getPath().toString();
-					try {
-						sources[i*2+1] = this.workingCopies[i].getSource();
-					} catch (JavaScriptModelException e) {
-						// ignore
-					}
-				}
-				System.out.println("--------------------------------------------------------------------------------");
-				for (int i=0; i<length; i+=2) {
-					System.out.println(sources[i]);
-					System.out.println(sources[i+1]);
-				}
-			}
-		}
-		assertEquals(
-			message,
-			expected,
-			actual
-		);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.core.tests.model.AbstractJavaModelTests#copyDirectory(java.io.File, java.io.File)
-	 */
-	protected void copyDirectory(File sourceDir, File targetDir) throws IOException {
-		if (COPY_DIRS) {
-			super.copyDirectory(sourceDir, targetDir);
-		} else {
-			targetDir.mkdirs();
-			File sourceFile = new File(sourceDir, ".project");
-			File targetFile = new File(targetDir, ".project");
-			targetFile.createNewFile();
-			copy(sourceFile, targetFile);
-			sourceFile = new File(sourceDir, ".classpath");
-			targetFile = new File(targetDir, ".classpath");
-			targetFile.createNewFile();
-			copy(sourceFile, targetFile);
-		}
-	}
-	IJavaScriptSearchScope getJavaSearchScope() {
-		return SearchEngine.createJavaSearchScope(new IJavaScriptProject[] {getJavaProject("JSSearch")});
-	}
-	IJavaScriptSearchScope getJavaSearchScope15() {
-		return SearchEngine.createJavaSearchScope(new IJavaScriptProject[] {getJavaProject("JavaSearch15")});
-	}
-	IJavaScriptSearchScope getJavaSearchScope15(String packageName, boolean addSubpackages) throws JavaScriptModelException {
-		if (packageName == null) return getJavaSearchScope15();
-		return getJavaSearchPackageScope("JavaSearch15", packageName, addSubpackages);
-	}
-	IJavaScriptSearchScope getJavaSearchPackageScope(String projectName, String packageName, boolean addSubpackages) throws JavaScriptModelException {
-		IPackageFragment fragment = getPackageFragment(projectName, "src", packageName);
-		if (fragment == null) return null;
-		IJavaScriptElement[] searchPackages = null;
-		if (addSubpackages) {
-			// Create list of package with first found one
-			List packages = new ArrayList();
-			packages.add(fragment);
-			// Add all possible subpackages
-			IJavaScriptElement[] children= ((IPackageFragmentRoot)fragment.getParent()).getChildren();
-			String[] names = ((PackageFragment)fragment).names;
-			int namesLength = names.length;
-			nextPackage: for (int i= 0, length = children.length; i < length; i++) {
-				PackageFragment currentPackage = (PackageFragment) children[i];
-				String[] otherNames = currentPackage.names;
-				if (otherNames.length <= namesLength) continue nextPackage;
-				for (int j = 0; j < namesLength; j++) {
-					if (!names[j].equals(otherNames[j]))
-						continue nextPackage;
-				}
-				packages.add(currentPackage);
-			}
-			searchPackages = new IJavaScriptElement[packages.size()];
-			packages.toArray(searchPackages);
-		} else {
-			searchPackages = new IJavaScriptElement[1];
-			searchPackages[0] = fragment;
-		}
-		return SearchEngine.createJavaSearchScope(searchPackages);
-	}
-	IJavaScriptSearchScope getJavaSearchCUScope(String projectName, String packageName, String cuName) throws JavaScriptModelException {
-		IJavaScriptUnit cu = getCompilationUnit(projectName, "src", packageName, cuName);
-		return SearchEngine.createJavaSearchScope(new IJavaScriptUnit[] { cu });
-	}
-	protected void search(IJavaScriptElement element, int limitTo, IJavaScriptSearchScope scope) throws CoreException {
-		search(element, limitTo, EXACT_RULE, scope, resultCollector);
-	}
-	IJavaScriptSearchScope getJavaSearchWorkingCopiesScope(IJavaScriptUnit workingCopy) throws JavaScriptModelException {
-		return SearchEngine.createJavaSearchScope(new IJavaScriptUnit[] { workingCopy });
-	}
-	IJavaScriptSearchScope getJavaSearchWorkingCopiesScope() throws JavaScriptModelException {
-		return SearchEngine.createJavaSearchScope(this.workingCopies);
-	}
-	protected void search(IJavaScriptElement element, int limitTo, int matchRule, IJavaScriptSearchScope scope) throws CoreException {
-		search(element, limitTo, matchRule, scope, resultCollector);
-	}
-	protected void search(IJavaScriptElement element, int limitTo, int matchRule, IJavaScriptSearchScope scope, SearchRequestor requestor) throws CoreException {
-		SearchPattern pattern = SearchPattern.createPattern(element, limitTo, matchRule);
-		assertNotNull("Pattern should not be null", pattern);
-		new SearchEngine(workingCopies).search(
-			pattern,
-			new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
-			scope,
-			requestor,
-			null
-		);
-	}
-	protected void search(SearchPattern searchPattern, IJavaScriptSearchScope scope, SearchRequestor requestor) throws CoreException {
-		new SearchEngine().search(
-			searchPattern, 
-			new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
-			scope,
-			requestor,
-			null);
-	}
-	protected void search(String patternString, int searchFor, int limitTo, IJavaScriptSearchScope scope) throws CoreException {
-		search(patternString, searchFor, limitTo, EXACT_RULE, scope, resultCollector);
-	}
-	protected void search(String patternString, int searchFor, int limitTo, int matchRule, IJavaScriptSearchScope scope) throws CoreException {
-		search(patternString, searchFor, limitTo, matchRule, scope, resultCollector);
-	}
-	protected void search(String patternString, int searchFor, int limitTo, int matchRule, IJavaScriptSearchScope scope, SearchRequestor requestor) throws CoreException {
-		if (patternString.indexOf('*') != -1 || patternString.indexOf('?') != -1) {
-			matchRule |= SearchPattern.R_PATTERN_MATCH;
-		}
-		SearchPattern pattern = SearchPattern.createPattern(
-			patternString, 
-			searchFor,
-			limitTo, 
-			matchRule);
-		assertNotNull("Pattern should not be null", pattern);
-		new SearchEngine(workingCopies).search(
-			pattern,
-			new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
-			scope,
-			requestor,
-			null);
-	}
-	protected void searchDeclarationsOfAccessedFields(IJavaScriptElement enclosingElement, SearchRequestor requestor) throws JavaScriptModelException {
-		new SearchEngine().searchDeclarationsOfAccessedFields(enclosingElement, requestor, null);
-	}
-	protected void searchDeclarationsOfReferencedTypes(IJavaScriptElement enclosingElement, SearchRequestor requestor) throws JavaScriptModelException {
-		new SearchEngine().searchDeclarationsOfReferencedTypes(enclosingElement, requestor, null);
-	}
-	protected void searchDeclarationsOfSentMessages(IJavaScriptElement enclosingElement, SearchRequestor requestor) throws JavaScriptModelException {
-		new SearchEngine().searchDeclarationsOfSentMessages(enclosingElement, requestor, null);
-	}
-	protected void setUp () throws Exception {
-		super.setUp();
-		this.resultCollector = new JavaSearchResultCollector();
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavadocCompletionModelTest.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavadocCompletionModelTest.java
deleted file mode 100644
index 2a9cabe..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AbstractJavadocCompletionModelTest.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.Test;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.tests.util.Util;
-import org.eclipse.wst.jsdt.internal.compiler.parser.JavadocTagConstants;
-
-public abstract class AbstractJavadocCompletionModelTest extends AbstractJavaModelCompletionTests implements JavadocTagConstants {
-
-	// Basic relevance values
-	/** R_DEFAULT+R_INTERESTING+R_NON_RESTRICTED<br>= 8 */
-	protected final static int JAVADOC_RELEVANCE = R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED;
-	/** R_DEFAULT+R_INTERESTING<br>+R_UNQUALIFIED+R_NON_RESTRICTED<br>= 11 */
-	protected final static int R_DIUNR= R_DEFAULT+R_INTERESTING+R_UNQUALIFIED+R_NON_RESTRICTED;
-	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED<br>= 18 */
-	protected static final int R_DICNR = R_DEFAULT+R_INTERESTING+R_CASE+R_NON_RESTRICTED;
-	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_QUALIFIED+R_NON_RESTRICTED<br>= 20 */
-	protected static final int R_DICQNR = R_DEFAULT+R_INTERESTING+R_CASE+R_QUALIFIED+R_NON_RESTRICTED;
-	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_UNQUALIFIED+R_NON_RESTRICTED<br>= 21 */
-	protected static final int R_DICUNR = R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED+R_NON_RESTRICTED;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED<br>= 22 */
-	protected static final int R_DICENNR = R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME+R_NON_RESTRICTED;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_QUALIFIED+R_NON_RESTRICTED<br>= 24 */
-	protected static final int R_DICENQNR = R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME+R_QUALIFIED+R_NON_RESTRICTED;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED<br>= 25 */
-	protected static final int R_DICENUNR = R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME+R_UNQUALIFIED+R_NON_RESTRICTED;
-	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_NON_STATIC<br>= 29 */
-	protected static final int R_DICNRNS = R_DEFAULT+R_INTERESTING+R_CASE+R_NON_RESTRICTED+R_NON_STATIC;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_NON_STATIC<br>= 33 */
-	protected static final int R_DICENNRNS = R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME+R_NON_RESTRICTED+R_NON_STATIC;
-
-	// Exception relevance values
-	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_EXCEPTION<br>= 38 */
-	protected static final int R_DICNRE = R_DICNR+R_EXCEPTION;
-	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_EXCEPTION<br>= 41 */
-	protected static final int R_DICUNRE = R_DICUNR+R_EXCEPTION;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_EXCEPTION<br>= 42 */
-	protected static final int R_DICENNRE = R_DICENNR+R_EXCEPTION;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_EXCEPTION<br>= 45 */
-	protected static final int R_DICENUNRE = R_DICENUNR+R_EXCEPTION;
-
-	// Exact Expected relevance values
-	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE<br>= 48 */
-	protected static final int R_DICNREET = R_DICNR+R_EXACT_EXPECTED_TYPE;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE<br>= 51 */
-	protected static final int R_DICUNREET = R_DICUNR+R_EXACT_EXPECTED_TYPE;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE+R_EXCEPTION<br>= 71 */
-	protected static final int R_DICUNREETE = R_DICUNR+R_EXACT_EXPECTED_TYPE+R_EXCEPTION;
-
-	// Exact Expected Exception relevance values
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_NON_RESTRICTED<br>+R_EXCEPTION+R_EXACT_EXPECTED_TYPE<br>= 68 */
-	protected static final int R_DICNREEET = R_DICNRE+R_EXACT_EXPECTED_TYPE;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXCEPTION<br>
-	 * +R_EXACT_EXPECTED_TYPE<br>= 71 */
-	protected static final int R_DICUNREEET = R_DICUNRE+R_EXACT_EXPECTED_TYPE;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_EXCEPTION<br>
-	 * +R_EXACT_EXPECTED_TYPE<br>= 72 */
-	protected static final int R_DICENNREEET = R_DICENNRE+R_EXACT_EXPECTED_TYPE;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_EXCEPTION<br>
-	 * +R_EXACT_EXPECTED_TYPE<br>= 75 */
-	protected static final int R_DICENUNREEET = R_DICENUNRE+R_EXACT_EXPECTED_TYPE;
-
-	// Inline tag relevance values
-	/** R_DEFAULT+R_INTERESTING+R_NON_RESTRICTED<br>+R_INLINE_TAG<br>= 39 */
-	protected static final int JAVADOC_RELEVANCE_IT = JAVADOC_RELEVANCE+R_INLINE_TAG;
-	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_INLINE_TAG<br>= 49 */
-	protected static final int R_DICNRIT = R_DICNR+R_INLINE_TAG;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_INLINE_TAG<br>= 52 */
-	protected static final int R_DICUNRIT = R_DICUNR+R_INLINE_TAG;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_INLINE_TAG<br>= 53 */
-	protected static final int R_DICENNRIT = R_DICENNR+R_INLINE_TAG;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_INLINE_TAG<br>= 56 */
-	protected static final int R_DICENUNRIT = R_DICENUNR+R_INLINE_TAG;
-	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_NON_STATIC+R_INLINE_TAG<br>= 60 */
-	protected static final int R_DICNRNSIT = R_DICNRNS+R_INLINE_TAG;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_NON_RESTRICTED<br>+R_EXACT_EXPECTED_TYPE+R_INLINE_TAG<br>= 79 */
-	protected static final int R_DICNREETIT = R_DICNREET+R_INLINE_TAG;
-	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE<br>
-	 * +R_INLINE_TAG<br>= 82 */
-	protected static final int R_DICUNREETIT = R_DICUNREET+R_INLINE_TAG;
-	
-	// Store all relevance values in array
-	private static final int[] RELEVANCES = {
-		JAVADOC_RELEVANCE,
-		R_DIUNR,
-		R_DICNR,
-		R_DICQNR,
-		R_DICUNR,
-		R_DICENNR,
-		R_DICENQNR,
-		R_DICENUNR,
-		R_DICNRNS,
-		R_DICENNRNS,
-		R_DICNRE,
-		R_DICUNRE,
-		R_DICENNRE,
-		R_DICENUNRE,
-		R_DICNREET,
-		R_DICUNREET,
-		R_DICNREEET,
-		R_DICUNREEET,
-		R_DICENNREEET,
-		R_DICENUNREEET,
-		JAVADOC_RELEVANCE_IT,
-		R_DICNRIT,
-		R_DICUNRIT,
-		R_DICENNRIT,
-		R_DICENUNRIT,
-		R_DICNRNSIT,
-		R_DICNREETIT,
-		R_DICUNREETIT,
-	};
-	private static final String[] RELEVANCES_NAMES = {
-		"JAVADOC_RELEVANCE",
-		"R_DIUNR",
-		"R_DICNR",
-		"R_DICQNR",
-		"R_DICUNR",
-		"R_DICENNR",
-		"R_DICENQNR",
-		"R_DICENUNR",
-		"R_DICNRNS",
-		"R_DICENNRNS",
-		"R_DICNRE",
-		"R_DICUNRE",
-		"R_DICENNRE",
-		"R_DICENUNRE",
-		"R_DICNREET",
-		"R_DICUNREET",
-		"R_DICNREEET",
-		"R_DICUNREEET",
-		"R_DICENNREEET",
-		"R_DICENUNREEET",
-		"JAVADOC_RELEVANCE_IT",
-		"R_DICNRIT",
-		"R_DICUNRIT",
-		"R_DICENNRIT",
-		"R_DICENUNRIT",
-		"R_DICNRNSIT",
-		"R_DICNREETIT",
-		"R_DICUNREETIT",
-	};
-
-	// Write file contents
-	protected static final String WRITE_DIR = System.getProperty("writeDir");
-	protected static final File WRITE_DIR_FILE;
-	protected static final Set PACKAGE_FILES = new HashSet();
-	static {
-		File writeDir = null;
-		if (WRITE_DIR != null) {
-			// Create write directory if necessay
-			writeDir = new File(WRITE_DIR);
-			if (writeDir.exists()) {
-				// perhaps delete all files...
-			} else if (!writeDir.mkdirs()) {
-				System.err.println(WRITE_DIR+" does NOT exist and cannot be created!!!");
-				writeDir = null;
-			}
-			
-		}
-		WRITE_DIR_FILE = writeDir;
-	}
-
-	CompletionTestsRequestor2 requestor;
-	protected int cursorLocation;
-	protected int completionStart;
-	protected String replacedText;
-	protected String positions;
-
-	public AbstractJavadocCompletionModelTest(String name) {
-		super(name);
-		this.tabs = 2;
-		this.displayName = true;
-		this.endChar = "";
-	}
-
-	public static Test suite() {
-		return buildModelTestSuite(AbstractJavadocCompletionModelTest.class);
-	}
-	protected void assertResults(String expected) throws JavaScriptModelException {
-		int length = this.workingCopies.length;
-		String[] sources = new String[length*2];
-		for (int i=0; i<length; i++) {
-			sources[i*2] = this.workingCopies[i].getPath().toString();
-			sources[i*2+1] = this.workingCopies[i].getSource();
-		}
-		assertResults(sources, expected, this.requestor.getResultsWithoutSorting());
-	}
-	protected void assertSortedResults(String expected) throws JavaScriptModelException {
-		int length = this.workingCopies.length;
-		String[] sources = new String[length*2];
-		for (int i=0; i<length; i++) {
-			sources[i*2] = this.workingCopies[i].getPath().toString();
-			sources[i*2+1] = this.workingCopies[i].getSource();
-		}
-		assertResults(sources, expected, this.requestor.getReversedResults());
-	}
-	private void assertResults(String[] sources, String expected, String actual) {
-		int count = this.requestor.proposalsPtr+1;
-		if (!expected.equals(actual)) {
-			System.out.println("********************************************************************************");
-			if (this.displayName) {
-				System.out.print(getName());
-				System.out.print(" got ");
-				if (count==0)
-					System.out.println("no result!");
-				else {
-					System.out.print(count);
-					System.out.print(" result");
-					if (count==1)
-						System.out.println(":");
-					else
-						System.out.println("s:");
-				}
-			}
-			if (!this.displayName || count>0) {
-				System.out.println(displayString(actual, this.tabs));
-				System.out.println(this.endChar);
-			}
-			System.out.println("--------------------------------------------------------------------------------");
-			for (int i=0, length = sources.length; i<length; i+=2) {
-				System.out.println(sources[i]);
-				System.out.println(sources[i+1]);
-			}
-		}
-		assertEquals(
-			"Completion proposals are not correct!",
-			expected,
-			actual
-		);
-	}
-	protected void assertNoProblem(String path) {
-		String problem = this.requestor.getProblem();
-		if (problem.length() > 0) {
-			System.out.println("********************************************************************************");
-			if (this.displayName) {
-				System.out.print(getName());
-				System.out.println(" contains an error although it should NOT:");
-			}
-			System.out.println(displayString(problem, this.tabs));
-			System.out.println("--------------------------------------------------------------------------------");
-			System.out.println(this.workingCopies[0].getPath().toString()+'\n');
-			try {
-				System.out.println(this.workingCopies[0].getSource());
-			} catch (JavaScriptModelException e) {
-				// forget it
-			}
-			assertEquals(
-				path+" should have NO problem!",
-				"",
-				problem
-			);
-		}
-	}
-
-	protected void completeInJavadoc(String path, String source, boolean showPositions, String completeBehind) throws JavaScriptModelException {
-		completeInJavadoc(path, source, showPositions, completeBehind, 1 /* first index */);
-	}
-
-	protected void completeInJavadoc(String path, String source, boolean showPositions, String completeBehind, boolean last) throws JavaScriptModelException {
-		completeInJavadoc(path, source, showPositions, completeBehind, last ? -1 : 1);
-	}
-
-	protected void completeInJavadoc(String path, String source, boolean showPositions, String completeBehind, int occurencePosition) throws JavaScriptModelException {
-		completeInJavadoc(new String[] { path, source }, showPositions, completeBehind, occurencePosition, null);
-	}
-
-	protected void completeInJavadoc(String path, String source, boolean showPositions, String completeBehind, int occurencePosition, int[] ignoreList) throws JavaScriptModelException {
-		completeInJavadoc(new String[] { path, source }, showPositions, completeBehind, occurencePosition, ignoreList);
-	}
-	protected void completeInJavadoc(String[] sources, boolean showPositions, String completeBehind) throws JavaScriptModelException {
-		completeInJavadoc(sources, showPositions, completeBehind, 1, null);
-	}
-	
-	protected void completeInJavadoc(String[] sources, boolean showPositions, String completeBehind, int occurencePosition) throws JavaScriptModelException {
-		completeInJavadoc(sources, showPositions, completeBehind, occurencePosition, null);
-	}
-
-	protected void completeInJavadoc(String[] sources, boolean showPositions, String completeBehind, int occurencePosition, int[] ignoreList) throws JavaScriptModelException {
-		assertNotNull("We should have sources!!!", sources);
-		assertTrue("Invalid number of sources!!!",  sources.length%2==0);
-
-		// Build working copy(ies)
-		int length = sources.length / 2;
-		this.workingCopies = new IJavaScriptUnit[length];
-		for (int i=0; i<length; i++) {
-			this.workingCopies[i] = getWorkingCopy(sources[i*2], sources[i*2+1]);
-			if (WRITE_DIR != null) 	writeFiles(sources);
-		}
-		
-		// Wait for indexes
-		waitUntilIndexesReady();
-		
-		// Complete
-		this.requestor = new CompletionTestsRequestor2(true, false, showPositions);
-		if (ignoreList != null) {
-			for (int i = 0; i < ignoreList.length; i++) {
-				this.requestor.setIgnored(ignoreList[i], true);
-			}
-		}
-		String source = this.workingCopies[0].getSource();
-		this.replacedText = completeBehind;
-		this.completionStart = -1;
-		int cursorPos = this.replacedText.length();
-		if (occurencePosition < -10) { // case where we want to specify directly the cursor location relatively to completion start
-			this.completionStart = source.indexOf(this.replacedText);
-			cursorPos = -occurencePosition - 10;
-		} else if (occurencePosition < 0) {
-			this.completionStart = source.lastIndexOf(this.replacedText);
-			int max = -occurencePosition;
-			for (int i=1; i<max; i++) {
-				this.completionStart = source.lastIndexOf(this.replacedText, this.completionStart);
-			}
-		} else {
-			this.completionStart = source.indexOf(this.replacedText);
-			int shift = this.replacedText.length();
-			for (int i=1; i<occurencePosition && this.completionStart>0; i++) {
-				this.completionStart = source.indexOf(this.replacedText, this.completionStart+shift);
-			}
-		}
-		assertTrue("We should have found "+occurencePosition+" occurence(s) of '"+this.replacedText+"' in:\n"+source, this.completionStart>0);
-		this.cursorLocation =  this.completionStart + cursorPos;
-		this.workingCopies[0].codeComplete(this.cursorLocation, requestor, this.wcOwner);
-		assertNoProblem(sources[0]);
-
-		// Store replacement info
-		if (occurencePosition == 0) { // special case for completion on empty token...
-			this.completionStart = this.cursorLocation;
-		}
-		int endPosition = this.cursorLocation;
-		char ch = source.charAt(endPosition);
-		if (Character.isJavaIdentifierPart(ch) || ch == '>' || ch == '}' || ch == '(' || ch == ')') {
-			do {
-				ch = source.charAt(++endPosition);
-			} while (Character.isJavaIdentifierPart(ch) || ch == '>' || ch == '}' || ch == '(' || ch == ')');
-		}
-		this.positions = "["+this.completionStart+", "+endPosition+"], ";
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.core.tests.model.AbstractJavaModelTests#displayString(java.lang.String, int)
-	 */
-	protected String displayString(String toPrint, int indent) {
-		String toDisplay = super.displayString(toPrint, indent);
-		int openBracket = toDisplay.indexOf(", [");
-		if (openBracket > 0) {
-			StringBuffer buffer = new StringBuffer();
-			int closeBracket = 0;
-			while (openBracket > 0) {
-				buffer.append(toDisplay.substring(closeBracket, openBracket+2));
-				closeBracket = toDisplay.indexOf("], ", openBracket+3);
-				if (closeBracket < 0) break; // invalid
-				closeBracket += 3;
-				buffer.append("\"+this.positions+");
-				int i=0;
-				while (toDisplay.charAt(closeBracket+i) != '}') i++;
-				try {
-					int relevance = Integer.parseInt(toDisplay.substring(closeBracket, closeBracket+i));
-					int length = RELEVANCES.length;
-					boolean found = false;
-					for (int r=0; !found && r<length; r++) {
-						if (RELEVANCES[r] == relevance) {
-							buffer.append(RELEVANCES_NAMES[r]);
-							buffer.append("+\"");
-							found = true;
-						}
-					}
-					if (!found) {
-						buffer.append('"');
-						buffer.append(relevance);
-					}
-					closeBracket += i;
-				}
-				catch (NumberFormatException nfe) {
-					System.err.println(nfe.getMessage()+" should not occur!");
-				}
-				openBracket = toDisplay.indexOf(", [", closeBracket);
-			}
-			if (closeBracket > 0) {
-				buffer.append(toDisplay.substring(closeBracket, toDisplay.length()));
-				toDisplay = buffer.toString();
-			}
-		}
-		return toDisplay.replaceAll(", 8}", ", \"+JAVADOC_RELEVANCE+\"}");
-	}
-
-	protected void setUpProjectOptions(String compliance) throws JavaScriptModelException {
-		try {
-			setUpProjectCompliance(COMPLETION_PROJECT, compliance);
-		} catch (IOException e) {
-			assertTrue("Unexpected IOException: "+e.getMessage(), false);
-		}
-	}
-
-	public void setUpSuite() throws Exception {
-		super.setUpSuite();
-		if (COMPLETION_PROJECT == null)  {
-			COMPLETION_PROJECT = setUpJavaProject("Completion");
-			createFolder(new Path("/Completion/src/javadoc/tags"));
-		} else {
-			setUpProjectCompliance(COMPLETION_PROJECT, "1.4");
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.core.tests.model.AbstractJavaModelTests#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		this.requestor = null;
-		super.tearDown();
-	}
-
-	public void tearDownSuite() throws Exception {
-		deleteFolder(new Path("/Completion/src/javadoc/tags"));
-		super.tearDownSuite();
-		if (COMPLETION_SUITES == null) {
-			COMPLETION_PROJECT = null;
-		}
-	}
-
-	/*
-	 * Write files for self-hosting debug.
-	 */
-	protected void writeFiles(String[] sources) {
-
-		// Get write directory path
-		if (WRITE_DIR_FILE == null) return;
-		
-		// Get test name
-		String testName = getName();
-		int idx = testName.indexOf(" - ");
-		if (idx > 0) {
-			testName = testName.substring(idx+3);
-		}
-//		testName = "Test"+testName.substring(4);
-		
-		// Write sources to dir
-		int length = sources.length / 2;
-		String[][] names = new String[length][3];
-		for (int i=0; i<length; i++) {
-			
-			// Get pathes
-			IPath filePath = new Path(sources[2*i]).removeFirstSegments(2); // remove project and source folder
-			IPath dirPath = filePath.removeLastSegments(1);
-			String fileDir = dirPath.toString();
-			String typeName = filePath.removeFileExtension().lastSegment();
-			
-			// Create package dir or delete files if already exist
-			File packageDir = new File(WRITE_DIR_FILE, fileDir);
-			if (!PACKAGE_FILES.contains(packageDir)) {
-				if (packageDir.exists()) {
-					PACKAGE_FILES.add(packageDir);
-					Util.delete(packageDir);
-				} else if (packageDir.mkdirs()) {
-					PACKAGE_FILES.add(packageDir);
-				} else {
-					System.err.println(packageDir+" does not exist and CANNOT be created!!!");
-					continue;
-				}
-			}
-			
-			// Store names info
-			names[i][0] = typeName;
-			String fileName = (typeName.length() <= 3) ? typeName : typeName.substring(0, typeName.length()-3);
-			fileName = fileName + testName.substring(4);
-			names[i][1] = fileName;
-			names[i][2] = packageDir.getAbsolutePath()+"\\"+fileName+".js";
-		}
-			
-		// Write modified contents
-		for (int i=0; i<length; i++) {
-			String contents = sources[2*i+1];
-			for (int j=0; j<length; j++) {
-				contents = contents.replaceAll(names[j][0], names[j][1]);
-			}
-			String fullPathName = names[i][2];
-			System.out.println("Write file "+fullPathName);
-			Util.writeToFile(contents, fullPathName);
-		}
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AccessRestrictionsTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AccessRestrictionsTests.java
deleted file mode 100644
index 00423a3..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AccessRestrictionsTests.java
+++ /dev/null
@@ -1,1023 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.model;
-
-
-import junit.framework.Test;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.jsdt.core.*;
-import org.eclipse.wst.jsdt.core.compiler.IProblem;
-
-public class AccessRestrictionsTests extends ModifyingResourceTests {
-	static class ProblemRequestor extends AbstractJavaModelTests.ProblemRequestor {
-		ProblemRequestor (String source) {
-			if (source != null) 
-				unitSource = source.toCharArray();
-		}
-		ProblemRequestor() {
-		}
-		public void acceptProblem(IProblem problem) {
-			super.acceptProblem(problem);
-		}
-	}
-	
-	protected ProblemRequestor problemRequestor;
-
-	public AccessRestrictionsTests(String name) {
-		super(name);
-	}
-	
-	// Use this static initializer to specify subset for tests
-	// All specified tests which do not belong to the class are skipped...
-	static {
-		// Names of tests to run, like "testXXX"
-  		//TESTS_NAMES = new String[] { "test004" };
-		// Numbers of tests to run: "test<number>" will be run for each number of this array
-		//TESTS_NUMBERS = new int[] { 1 };
-		// Range numbers of tests to run: all tests between "test<first>" and "test<last>" will be run for { first, last }
-		//TESTS_RANGE = new int[] { 16, -1 };
-	}
-
-	public static Test suite() {
-		return buildModelTestSuite(AccessRestrictionsTests.class);
-	}
-
-	protected void assertProblems(String message, String expected) {
-		assertProblems(message, expected, this.problemRequestor);
-	}
-
-/*
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=76266
- * Ensures that a problem is created for a reference to a method of a type that is not
- * accessible in a prereq project, even though it is accessed through an intermediate 
- * accessible class.
- */
-public void test001() throws CoreException {
-	IJavaScriptUnit x1 = null, x2 = null, y =  null, z = null;
-	try {
-		WorkingCopyOwner owner = new WorkingCopyOwner(){};
-		createJavaProject(
-			"P1", 
-			new String[] {"src"}, 
-			new String[] {"JCL_LIB"});
-		this.problemRequestor = new ProblemRequestor();
-		x1 = getWorkingCopy(
-			"/P1/src/p/X1.js",
-			"package p;\n" +
-			"public class X1 {\n" +
-			"	void foo() {\n" +
-			"	}\n" +
-			"}",
-			owner,
-			this.problemRequestor);	
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		x2 = getWorkingCopy(			
-			"/P1/src/p/X2.js",
-			"package p;\n" +
-			"public class X2 extends X1 {\n" +
-			"	void bar() {\n" +
-			"	}\n" +
-			"}",			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		IJavaScriptProject p2 = createJavaProject("P2", new String[] {"src"}, 
-				new String[] {"JCL_LIB"});
-		IIncludePathEntry[] classpath = p2.getRawIncludepath();
-		int length = classpath.length;
-		System.arraycopy(classpath, 0, classpath = new IIncludePathEntry[length+1], 0, length);
-		classpath[length] = createSourceEntry("P2", "/P1", "-p/X1");
-		p2.setRawIncludepath(classpath, null);
-		// check the most basic case
-		String src =
-			"package p;\n" +
-			"public class Z extends X1 {\n" +
-			"}";
-		this.problemRequestor = new ProblemRequestor(src);
-		z = getWorkingCopy(			
-			"/P2/src/p/Z.js", 
-			src,
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems value", 
-			"----------\n" + 
-			"1. ERROR in /P2/src/p/Z.java (at line 2)\n" + 
-			"	public class Z extends X1 {\n" + 
-			"	                       ^^\n" + 
-			"Access restriction: The type X1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n"
-		);
-		// check the specifics of this test case
-		src = 
-			"package p;\n" +
-			"public class Y extends X2 {\n" +
-			"	void foobar() {\n" +
-			"		foo(); // accesses X1.foo, should trigger an error\n" +
-			"		bar(); // accesses X2.bar, OK\n" +
-			"	}\n" +
-			"}";
-		this.problemRequestor = new ProblemRequestor(src);
-		y = getWorkingCopy(			
-			"/P2/src/p/Y.js", 
-			src,
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems value", 
-			"----------\n" + 
-			"1. ERROR in /P2/src/p/Y.java (at line 4)\n" + 
-			"	foo(); // accesses X1.foo, should trigger an error\n" + 
-			"	^^^^^\n" + 
-			"Access restriction: The method foo() from the type X1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n"
-		);
-	} finally {
-		if (x1 != null)
-			x1.discardWorkingCopy();
-		if (x2 != null)
-			x2.discardWorkingCopy();
-		if (y != null)
-			y.discardWorkingCopy();
-		if (z != null)
-			z.discardWorkingCopy();
-		deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-
-/*
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=76266
- * Ensures that a problem is created for a reference to a field of a type that is not
- * accessible in a prereq project, even though it is accessed through an intermediate 
- * accessible class.
- */
-public void test002() throws CoreException {
-	IJavaScriptUnit x1 = null, x2 = null, y =  null;
-	try {
-		WorkingCopyOwner owner = new WorkingCopyOwner(){};
-		createJavaProject(
-			"P1", 
-			new String[] {"src"}, 
-			new String[] {"JCL_LIB"});
-		this.problemRequestor = new ProblemRequestor();
-		x1 = getWorkingCopy(
-			"/P1/src/p/X1.js",
-			"package p;\n" +
-			"public class X1 {\n" +
-			"	int m1;\n" +
-			"}",
-			owner,
-			this.problemRequestor);	
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		x2 = getWorkingCopy(			
-			"/P1/src/p/X2.js",
-			"package p;\n" +
-			"public class X2 extends X1 {\n" +
-			"	char m2;\n" +
-			"}",
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		IJavaScriptProject p2 = createJavaProject("P2", new String[] {"src"}, 
-				new String[] {"JCL_LIB"});
-		IIncludePathEntry[] classpath = p2.getRawIncludepath();
-		int length = classpath.length;
-		System.arraycopy(classpath, 0, classpath = new IIncludePathEntry[length+1], 0, length);
-		classpath[length] = createSourceEntry("P2", "/P1", "-p/X1");
-		p2.setRawIncludepath(classpath, null);
-		String src = 
-			"package p;\n" +
-			"public class Y extends X2 {\n" +
-			"	void foobar() {\n" +
-			"		int l1 = m1; // accesses X1.m1, should trigger an error\n" +
-			"		char l2 = m2; // accesses X2.m2, OK\n" +
-			"	}\n" +
-			"}";
-		this.problemRequestor = new ProblemRequestor(src);
-		y = getWorkingCopy(			
-			"/P2/src/p/Y.js", 
-			src,
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems value", 
-			"----------\n" + 
-			"1. ERROR in /P2/src/p/Y.java (at line 4)\n" + 
-			"	int l1 = m1; // accesses X1.m1, should trigger an error\n" + 
-			"	         ^^\n" + 
-			"Access restriction: The field m1 from the type X1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n"
-		);
-	} finally {
-		if (x1 != null)
-			x1.discardWorkingCopy();
-		if (x2 != null)
-			x2.discardWorkingCopy();
-		if (y != null)
-			y.discardWorkingCopy();
-		deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-
-/*
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=76266
- * Ensures that a problem is created for a reference to a member type of a type that is not
- * accessible in a prereq project, even though it is accessed through an intermediate 
- * accessible class.
- */
-public void test003() throws CoreException {
-	IJavaScriptUnit x1 = null, x2 = null, y =  null;
-	try {
-		WorkingCopyOwner owner = new WorkingCopyOwner(){};
-		createJavaProject(
-			"P1", 
-			new String[] {"src"}, 
-			new String[] {"JCL_LIB"});
-		this.problemRequestor = new ProblemRequestor();
-		x1 = getWorkingCopy(
-			"/P1/src/p/X1.js",
-			"package p;\n" +
-			"public class X1 {\n" +
-			"	class C1 {\n" +
-			"	   protected C1 (int dummy) {}\n" +
-			"	   protected void foo() {}\n" +
-			"	}\n" +
-			"	interface I1 {}\n" +
-			"}",
-			owner,
-			this.problemRequestor);	
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		x2 = getWorkingCopy(			
-			"/P1/src/p/X2.js",
-			"package p;\n" +
-			"public class X2 extends X1 {\n" +
-			"	class C2 {}\n" +
-			"	interface I2 {}\n" +
-			"}",
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		IJavaScriptProject p2 = createJavaProject("P2", new String[] {"src"}, 
-				new String[] {"JCL_LIB"});
-		IIncludePathEntry[] classpath = p2.getRawIncludepath();
-		int length = classpath.length;
-		System.arraycopy(classpath, 0, classpath = new IIncludePathEntry[length+1], 0, length);
-		classpath[length] = createSourceEntry("P2", "/P1", "-p/X1");
-		p2.setRawIncludepath(classpath, null);
-		String src =
-			"package p;\n" +
-			"public class Y extends X2 {\n" +
-			"	class C3a extends C1 {      // error\n" +
-			"	   C3a() {\n" +
-			"	      super(0);\n" +
-			"	      foo();                // error\n" +
-			"	   }\n" +
-			"	}\n" +
-			"	class C3c extends C2 implements I2 {}\n" +
-			"	void foobar() {\n" +
-			"		C1 m1 =                 // error\n" +
-			"		        new C1(0);      // error\n" +
-			"		C2 m2 = new C2();\n" +
-			"	}\n" +
-			"}";
-		this.problemRequestor = new ProblemRequestor(src);
-		y = getWorkingCopy(			
-			"/P2/src/p/Y.js", 
-			src,
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems value", 
-			"----------\n" + 
-			"1. ERROR in /P2/src/p/Y.java (at line 3)\n" + 
-			"	class C3a extends C1 {      // error\n" + 
-			"	                  ^^\n" + 
-			"Access restriction: The type X1.C1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"2. ERROR in /P2/src/p/Y.java (at line 5)\n" + 
-			"	super(0);\n" + 
-			"	^^^^^^^^^\n" + 
-			"Access restriction: The constructor X1.C1(int) is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"3. ERROR in /P2/src/p/Y.java (at line 6)\n" + 
-			"	foo();                // error\n" + 
-			"	^^^^^\n" + 
-			"Access restriction: The method foo() from the type X1.C1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"4. ERROR in /P2/src/p/Y.java (at line 11)\n" + 
-			"	C1 m1 =                 // error\n" + 
-			"	^^\n" + 
-			"Access restriction: The type X1.C1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"5. ERROR in /P2/src/p/Y.java (at line 12)\n" + 
-			"	new C1(0);      // error\n" + 
-			"	^^^^^^^^^\n" + 
-			"Access restriction: The constructor X1.C1(int) is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"6. ERROR in /P2/src/p/Y.java (at line 12)\n" + 
-			"	new C1(0);      // error\n" + 
-			"	    ^^\n" + 
-			"Access restriction: The type X1.C1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n"
-		);
-	} finally {
-		if (x1 != null)
-			x1.discardWorkingCopy();
-		if (x2 != null)
-			x2.discardWorkingCopy();
-		if (y != null)
-			y.discardWorkingCopy();
-		deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-
-/*
- * Discouraged access message - type via discouraged rule.
- */
-public void test004() throws CoreException {
-	IJavaScriptUnit x1 = null, z = null;
-	try {
-		WorkingCopyOwner owner = new WorkingCopyOwner(){};
-		createJavaProject(
-			"P1", 
-			new String[] {"src"}, 
-			new String[] {"JCL_LIB"});
-		this.problemRequestor = new ProblemRequestor();
-		x1 = getWorkingCopy(
-			"/P1/src/p/X1.js",
-			"package p;\n" +
-			"public class X1 {\n" +
-			"	class C1 {}\n" +
-			"	interface I1 {}\n" +
-			"}",
-			owner,
-			this.problemRequestor);	
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		IJavaScriptProject p2 = createJavaProject("P2", new String[] {"src"}, 
-				new String[] {"JCL_LIB"});
-		IIncludePathEntry[] classpath = p2.getRawIncludepath();
-		int length = classpath.length;
-		System.arraycopy(classpath, 0, classpath = new IIncludePathEntry[length+1], 0, length);
-		classpath[length] = createSourceEntry("P2", "/P1", "~p/X1");
-		p2.setRawIncludepath(classpath, null);
-		String src =
-			"package p;\n" +
-			"public class Z extends X1 {\n" +
-			"}";
-		this.problemRequestor = new ProblemRequestor(src);
-		z = getWorkingCopy(			
-			"/P2/src/p/Z.js", 
-			src,
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems value", 
-			"----------\n" + 
-			"1. WARNING in /P2/src/p/Z.java (at line 2)\n" + 
-			"	public class Z extends X1 {\n" + 
-			"	                       ^^\n" + 
-			"Discouraged access: The type X1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n"
-		);
-	} finally {
-		if (x1 != null)
-			x1.discardWorkingCopy();
-		if (z != null)
-			z.discardWorkingCopy();
-		deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-
-/*
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=76266
- * Ensures that a problem is created for a reference to a method of a type that is not
- * accessible in a prereq project, even though it is accessed through an intermediate 
- * class that implements an interface that defines the same method, both the second
- * class and the interface being accessible.
- * The point here is that the existence of the accessible interface may imply that the
- * foo method be accessible through X2. By design, the lookup returns X1#foo though, 
- * like it does for a press upon F3 in the interface, and hence the access restriction
- * gets triggered. Rule of thumb: if pressing F3 on a method or field directs the
- * interface to a definition within a restricted type, then the use of the said method
- * or field is restricted.
- */
-public void test005() throws CoreException {
-	IJavaScriptUnit x1 = null, i1 = null, x2 = null, y =  null;
-	try {
-		WorkingCopyOwner owner = new WorkingCopyOwner(){};
-		createJavaProject(
-			"P1", 
-			new String[] {"src"}, 
-			new String[] {"JCL_LIB"});
-		this.problemRequestor = new ProblemRequestor();
-		x1 = getWorkingCopy(
-			"/P1/src/p/X1.js",
-			"package p;\n" +
-			"public class X1 {\n" +
-			"	public void foo() {\n" +
-			"	}\n" +
-			"}",
-			owner,
-			this.problemRequestor);	
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		i1 = getWorkingCopy(			
-			"/P1/src/q/I1.js",
-			"package q;\n" +
-			"interface I1 {\n" +
-			"	void foo();\n" +
-			"}",			
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		x2 = getWorkingCopy(			
-			"/P1/src/q/X2.js",
-			"package q;\n" +
-			"public class X2 extends p.X1 {\n" +
-			"	public void bar() {\n" +
-			"	  foo();\n" +
-			"	}\n" +
-			"}",
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		IJavaScriptProject p2 = createJavaProject(
-			"P2", 
-			new String[] {"src"}, 
-			new String[] {"JCL_LIB"});
-		IIncludePathEntry[] classpath = p2.getRawIncludepath();
-		int length = classpath.length;
-		System.arraycopy(classpath, 0, 
-				classpath = new IIncludePathEntry[length + 1], 0, length);
-		classpath[length] = createSourceEntry("P2", "/P1", "-p/X1");
-		p2.setRawIncludepath(classpath, null);
-		String src = 
-			"package r;\n" +
-			"public class Y {\n" +
-			"	void foobar() {\n" +
-			"		(new q.X2()).foo(); // accesses p.X1#foo, should trigger an error\n" +
-			"		(new q.X2()).bar(); // accesses q.X2#bar, OK\n" +
-			"	}\n" +
-			"}";
-		this.problemRequestor = new ProblemRequestor(src);
-		y = getWorkingCopy(			
-			"/P2/src/r/Y.js", 
-			src,
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems value", 
-			"----------\n" + 
-			"1. ERROR in /P2/src/r/Y.java (at line 4)\n" + 
-			"	(new q.X2()).foo(); // accesses p.X1#foo, should trigger an error\n" + 
-			"	^^^^^^^^^^^^^^^^^^\n" + 
-			"Access restriction: The method foo() from the type X1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n"
-		);
-	} finally {
-		if (x1 != null)
-			x1.discardWorkingCopy();
-		if (i1 != null)
-			i1.discardWorkingCopy();
-		if (x2 != null)
-			x2.discardWorkingCopy();
-		if (y != null)
-			y.discardWorkingCopy();
-		deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-
-/*
- * Missing access restriction violation error on generic type.
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=122995
- */
-public void test006() throws CoreException {
-	IJavaScriptUnit x = null, y =  null;
-	try {
-		WorkingCopyOwner owner = new WorkingCopyOwner(){};
-		IJavaScriptProject p1 = createJavaProject(
-			"P1", 
-			new String[] {"src"}, 
-			new String[] {"JCL_LIB"});
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.compliance", "1.5");
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.source", "1.5");
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.targetPlatform", "1.5");
-		p1.setOption(JavaScriptCore.COMPILER_PB_RAW_TYPE_REFERENCE, JavaScriptCore.IGNORE);
-		this.problemRequestor = new ProblemRequestor();
-		x = getWorkingCopy(
-			"/P1/src/p/X.js",
-			"package p;\n" +
-			"public class X<T> {\n" +
-			"	T m;\n" +
-			"}",
-			owner,
-			this.problemRequestor);	
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		IJavaScriptProject p2 = createJavaProject(
-				"P2", 
-				new String[] {"src"}, 
-				new String[] {"JCL_LIB"});
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.compliance", "1.5");
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.source", "1.5");
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.targetPlatform", "1.5");
-		p2.setOption(JavaScriptCore.COMPILER_PB_RAW_TYPE_REFERENCE, JavaScriptCore.IGNORE);
-		IIncludePathEntry[] classpath = p2.getRawIncludepath();
-		int length = classpath.length;
-		System.arraycopy(classpath, 0, classpath = new IIncludePathEntry[length+1], 0, length);
-		classpath[length] = createSourceEntry("P2", "/P1", "-p/X");
-		p2.setRawIncludepath(classpath, null);
-		String src =
-			"package p;\n" +
-			"public class Y {\n" +
-			"	X x1;\n" +
-			"	X<String> x2 = new X<String>();\n" +
-			"}";
-		this.problemRequestor = new ProblemRequestor(src);
-		y = getWorkingCopy(			
-			"/P2/src/p/Y.js", 
-			src,
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems value", 
-			"----------\n" + 
-			"1. ERROR in /P2/src/p/Y.java (at line 3)\n" + 
-			"	X x1;\n" + 
-			"	^\n" + 
-			"Access restriction: The type X<T> is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"2. ERROR in /P2/src/p/Y.java (at line 4)\n" + 
-			"	X<String> x2 = new X<String>();\n" + 
-			"	^\n" + 
-			"Access restriction: The type X<String> is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"3. ERROR in /P2/src/p/Y.java (at line 4)\n" + 
-			"	X<String> x2 = new X<String>();\n" + 
-			"	               ^^^^^^^^^^^^^^^\n" + 
-			"Access restriction: The constructor X<String>() is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"4. ERROR in /P2/src/p/Y.java (at line 4)\n" + 
-			"	X<String> x2 = new X<String>();\n" + 
-			"	                   ^\n" + 
-			"Access restriction: The type X<String> is not accessible due to restriction on required project P1\n" + 
-			"----------\n");
-	} finally {
-		if (x != null) {
-			x.discardWorkingCopy();
-		}
-		if (y != null) {
-			y.discardWorkingCopy();
-		}
-		deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-
-/*
- * Missing access restriction violation error on generic type.
- * More complex type parameter - stretch the erasure.
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=122995
- */
-public void test007() throws CoreException {
-	IJavaScriptUnit x = null, y =  null;
-	try {
-		WorkingCopyOwner owner = new WorkingCopyOwner(){};
-		IJavaScriptProject p1 = createJavaProject(
-			"P1", 
-			new String[] {"src"}, 
-			new String[] {"JCL_LIB"});
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.compliance", "1.5");
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.source", "1.5");
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.targetPlatform", "1.5");
-		p1.setOption(JavaScriptCore.COMPILER_PB_RAW_TYPE_REFERENCE, JavaScriptCore.IGNORE);
-		this.problemRequestor = new ProblemRequestor();
-		x = getWorkingCopy(
-			"/P1/src/p/X.js",
-			"package p;\n" +
-			"public class X<T extends String> {\n" +
-			"  T m;\n" +
-			"  public X (T t) {\n" +
-			"    this.m = t;\n" +
-			"  }\n" +
-			"}",
-			owner,
-			this.problemRequestor);	
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		IJavaScriptProject p2 = createJavaProject(
-				"P2", 
-				new String[] {"src"}, 
-				new String[] {"JCL_LIB"});
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.compliance", "1.5");
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.source", "1.5");
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.targetPlatform", "1.5");
-		p2.setOption(JavaScriptCore.COMPILER_PB_RAW_TYPE_REFERENCE, JavaScriptCore.IGNORE);
-		IIncludePathEntry[] classpath = p2.getRawIncludepath();
-		int length = classpath.length;
-		System.arraycopy(classpath, 0, classpath = new IIncludePathEntry[length+1], 0, length);
-		classpath[length] = createSourceEntry("P2", "/P1", "-p/X");
-		p2.setRawIncludepath(classpath, null);
-		String src =
-			"package p;\n" +
-			"public class Y {\n" +
-			"	X x1;\n" +
-			"	X<String> x2 = new X<String>(\"\");\n" +
-			"}";
-		this.problemRequestor = new ProblemRequestor(src);
-		y = getWorkingCopy(			
-			"/P2/src/p/Y.js", 
-			src,
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems value", 
-			"----------\n" + 
-			"1. ERROR in /P2/src/p/Y.java (at line 3)\n" + 
-			"	X x1;\n" + 
-			"	^\n" + 
-			"Access restriction: The type X<T> is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"2. ERROR in /P2/src/p/Y.java (at line 4)\n" + 
-			"	X<String> x2 = new X<String>(\"\");\n" + 
-			"	^\n" + 
-			"Access restriction: The type X<String> is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"3. ERROR in /P2/src/p/Y.java (at line 4)\n" + 
-			"	X<String> x2 = new X<String>(\"\");\n" + 
-			"	               ^^^^^^^^^^^^^^^^^\n" + 
-			"Access restriction: The constructor X<String>(String) is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"4. ERROR in /P2/src/p/Y.java (at line 4)\n" + 
-			"	X<String> x2 = new X<String>(\"\");\n" + 
-			"	                   ^\n" + 
-			"Access restriction: The type X<String> is not accessible due to restriction on required project P1\n" + 
-			"----------\n");
-	} finally {
-		if (x != null) {
-			x.discardWorkingCopy();
-		}
-		if (y != null) {
-			y.discardWorkingCopy();
-		}
-		deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-
-/*
- * Missing access restriction violation error on generic type.
- * Method case.
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=122995
- */
-public void test008() throws CoreException {
-	IJavaScriptUnit x1 = null, x2 = null, y =  null;
-	try {
-		WorkingCopyOwner owner = new WorkingCopyOwner(){};
-		IJavaScriptProject p1 = createJavaProject(
-			"P1", 
-			new String[] {"src"}, 
-			new String[] {"JCL_LIB"});
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.compliance", "1.5");
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.source", "1.5");
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.targetPlatform", "1.5");		
-		p1.setOption(JavaScriptCore.COMPILER_PB_RAW_TYPE_REFERENCE, JavaScriptCore.IGNORE);
-		this.problemRequestor = new ProblemRequestor();
-		x1 = getWorkingCopy(
-			"/P1/src/p/X1.js",
-			"package p;\n" +
-			"public class X1<T> {\n" +
-			"	void foo() {\n" +
-			"	}\n" +
-			"}",
-			owner,
-			this.problemRequestor);	
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		x2 = getWorkingCopy(			
-			"/P1/src/p/X2.js",
-			"package p;\n" +
-			"public class X2 extends X1 {\n" +
-			"	void bar() {\n" +
-			"	}\n" +
-			"}",			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		IJavaScriptProject p2 = createJavaProject("P2", new String[] {"src"}, 
-				new String[] {"JCL_LIB"});
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.compliance", "1.5");
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.source", "1.5");
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.targetPlatform", "1.5");		
-		IIncludePathEntry[] classpath = p2.getRawIncludepath();
-		int length = classpath.length;
-		System.arraycopy(classpath, 0, classpath = new IIncludePathEntry[length+1], 0, length);
-		classpath[length] = createSourceEntry("P2", "/P1", "-p/X1");
-		p2.setRawIncludepath(classpath, null);
-		String src = 
-			"package p;\n" +
-			"public class Y extends X2 {\n" +
-			"	void foobar() {\n" +
-			"		foo(); // accesses X1.foo, should trigger an error\n" +
-			"		bar(); // accesses X2.bar, OK\n" +
-			"	}\n" +
-			"}";
-		this.problemRequestor = new ProblemRequestor(src);
-		y = getWorkingCopy(			
-			"/P2/src/p/Y.js", 
-			src,
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems value", 
-			"----------\n" + 
-			"1. ERROR in /P2/src/p/Y.java (at line 4)\n" + 
-			"	foo(); // accesses X1.foo, should trigger an error\n" + 
-			"	^^^^^\n" + 
-			"Access restriction: The method foo() from the type X1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n"
-		);
-	} finally {
-		if (x1 != null)
-			x1.discardWorkingCopy();
-		if (x2 != null)
-			x2.discardWorkingCopy();
-		if (y != null)
-			y.discardWorkingCopy();
-		deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-
-/*
- * Missing access restriction violation error on generic type.
- * Field case.
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=122995
- */
-public void test009() throws CoreException {
-	IJavaScriptUnit x1 = null, x2 = null, y =  null;
-	try {
-		WorkingCopyOwner owner = new WorkingCopyOwner(){};
-		IJavaScriptProject p1 = createJavaProject(
-			"P1", 
-			new String[] {"src"}, 
-			new String[] {"JCL_LIB"});
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.compliance", "1.5");
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.source", "1.5");
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.targetPlatform", "1.5");		
-		p1.setOption(JavaScriptCore.COMPILER_PB_RAW_TYPE_REFERENCE, JavaScriptCore.IGNORE);
-		this.problemRequestor = new ProblemRequestor();
-		x1 = getWorkingCopy(
-			"/P1/src/p/X1.js",
-			"package p;\n" +
-			"public class X1<T> {\n" +
-			"	int m1;\n" +
-			"}",
-			owner,
-			this.problemRequestor);	
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		x2 = getWorkingCopy(			
-			"/P1/src/p/X2.js",
-			"package p;\n" +
-			"public class X2 extends X1 {\n" +
-			"	char m2;\n" +
-			"}",
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		IJavaScriptProject p2 = createJavaProject("P2", new String[] {"src"}, 
-				new String[] {"JCL_LIB"});
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.compliance", "1.5");
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.source", "1.5");
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.targetPlatform", "1.5");		
-		IIncludePathEntry[] classpath = p2.getRawIncludepath();
-		int length = classpath.length;
-		System.arraycopy(classpath, 0, classpath = new IIncludePathEntry[length+1], 0, length);
-		classpath[length] = createSourceEntry("P2", "/P1", "-p/X1");
-		p2.setRawIncludepath(classpath, null);
-		String src = 
-			"package p;\n" +
-			"public class Y extends X2 {\n" +
-			"	void foobar() {\n" +
-			"		int l1 = m1; // accesses X1.m1, should trigger an error\n" +
-			"		char l2 = m2; // accesses X2.m2, OK\n" +
-			"	}\n" +
-			"}";
-		this.problemRequestor = new ProblemRequestor(src);
-		y = getWorkingCopy(			
-			"/P2/src/p/Y.js", 
-			src,
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems value", 
-			"----------\n" + 
-			"1. ERROR in /P2/src/p/Y.java (at line 4)\n" + 
-			"	int l1 = m1; // accesses X1.m1, should trigger an error\n" + 
-			"	         ^^\n" + 
-			"Access restriction: The field m1 from the type X1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n"
-		);
-	} finally {
-		if (x1 != null)
-			x1.discardWorkingCopy();
-		if (x2 != null)
-			x2.discardWorkingCopy();
-		if (y != null)
-			y.discardWorkingCopy();
-		deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-
-/*
- * Missing access restriction violation error on generic type.
- * Inner type case.
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=122995
- */
-public void test010() throws CoreException {
-	IJavaScriptUnit x1 = null, x2 = null, y =  null;
-	try {
-		WorkingCopyOwner owner = new WorkingCopyOwner(){};
-		IJavaScriptProject p1 = createJavaProject(
-			"P1", 
-			new String[] {"src"}, 
-			new String[] {"JCL_LIB"});
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.compliance", "1.5");
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.source", "1.5");
-		p1.setOption("org.eclipse.wst.jsdt.core.compiler.targetPlatform", "1.5");		
-		p1.setOption(JavaScriptCore.COMPILER_PB_RAW_TYPE_REFERENCE, JavaScriptCore.IGNORE);
-		this.problemRequestor = new ProblemRequestor();
-		x1 = getWorkingCopy(
-			"/P1/src/p/X1.js",
-			"package p;\n" +
-			"public class X1<T> {\n" +
-			"	class C1 {\n" +
-			"	   protected C1 (int dummy) {}\n" +
-			"	   protected void foo() {}\n" +
-			"	}\n" +
-			"	interface I1 {}\n" +
-			"}",
-			owner,
-			this.problemRequestor);	
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		x2 = getWorkingCopy(			
-			"/P1/src/p/X2.js",
-			"package p;\n" +
-			"public class X2 extends X1 {\n" +
-			"	class C2 {}\n" +
-			"	interface I2 {}\n" +
-			"}",
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n"
-		);
-		IJavaScriptProject p2 = createJavaProject("P2", new String[] {"src"}, 
-				new String[] {"JCL_LIB"});
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.compliance", "1.5");
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.source", "1.5");
-		p2.setOption("org.eclipse.wst.jsdt.core.compiler.targetPlatform", "1.5");		
-		p2.setOption(JavaScriptCore.COMPILER_PB_RAW_TYPE_REFERENCE, JavaScriptCore.IGNORE);
-		IIncludePathEntry[] classpath = p2.getRawIncludepath();
-		int length = classpath.length;
-		System.arraycopy(classpath, 0, classpath = new IIncludePathEntry[length+1], 0, length);
-		classpath[length] = createSourceEntry("P2", "/P1", "-p/X1");
-		p2.setRawIncludepath(classpath, null);
-		String src =
-			"package p;\n" +
-			"public class Y extends X2 {\n" +
-			"	class C3a extends C1 {      // error\n" +
-			"	   C3a() {\n" +
-			"	      super(0);\n" +
-			"	      foo();                // error\n" +
-			"	   }\n" +
-			"	}\n" +
-			"	class C3c extends C2 implements I2 {}\n" +
-			"	void foobar() {\n" +
-			"		C1 m1 =                 // error\n" +
-			"		        new C1(0);      // error\n" +
-			"		C2 m2 = new C2();\n" +
-			"	}\n" +
-			"}";
-		this.problemRequestor = new ProblemRequestor(src);
-		y = getWorkingCopy(			
-			"/P2/src/p/Y.js", 
-			src,
-			owner,
-			this.problemRequestor);
-		assertProblems(
-			"Unexpected problems value", 
-			"----------\n" + 
-			"1. ERROR in /P2/src/p/Y.java (at line 3)\n" + 
-			"	class C3a extends C1 {      // error\n" + 
-			"	                  ^^\n" + 
-			"Access restriction: The type X1.C1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"2. ERROR in /P2/src/p/Y.java (at line 5)\n" + 
-			"	super(0);\n" + 
-			"	^^^^^^^^^\n" + 
-			"Access restriction: The constructor X1.C1(int) is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"3. ERROR in /P2/src/p/Y.java (at line 6)\n" + 
-			"	foo();                // error\n" + 
-			"	^^^^^\n" + 
-			"Access restriction: The method foo() from the type X1.C1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"4. ERROR in /P2/src/p/Y.java (at line 11)\n" + 
-			"	C1 m1 =                 // error\n" + 
-			"	^^\n" + 
-			"Access restriction: The type X1.C1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"5. ERROR in /P2/src/p/Y.java (at line 12)\n" + 
-			"	new C1(0);      // error\n" + 
-			"	^^^^^^^^^\n" + 
-			"Access restriction: The constructor X1.C1(int) is not accessible due to restriction on required project P1\n" + 
-			"----------\n" + 
-			"6. ERROR in /P2/src/p/Y.java (at line 12)\n" + 
-			"	new C1(0);      // error\n" + 
-			"	    ^^\n" + 
-			"Access restriction: The type X1.C1 is not accessible due to restriction on required project P1\n" + 
-			"----------\n"
-		);
-	} finally {
-		if (x1 != null)
-			x1.discardWorkingCopy();
-		if (x2 != null)
-			x2.discardWorkingCopy();
-		if (y != null)
-			y.discardWorkingCopy();
-		deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AttachSourceTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AttachSourceTests.java
deleted file mode 100644
index dec120e..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AttachSourceTests.java
+++ /dev/null
@@ -1,1141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.model;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.core.IClassFile;
-import org.eclipse.wst.jsdt.core.IFunction;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.IMember;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.core.IPackageFragmentRoot;
-import org.eclipse.wst.jsdt.core.ISourceRange;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.dom.AST;
-import org.eclipse.wst.jsdt.core.dom.ASTNode;
-import org.eclipse.wst.jsdt.core.dom.ASTParser;
-
-/**
- * TO DO:
- * - source attachment on external jar.
- * - don't use assertTrue where assertEquals should be used
- * - don't hardcode positions
-*/
-public class AttachSourceTests extends ModifyingResourceTests {
-	static {
-//		TESTS_NAMES = new String[] { "testClassFileGetElementAt04" };
-//		TESTS_NUMBERS = new int[] { 5 };
-//		TESTS_RANGE = new int[] { 169, 180 };
-	}
-
-	public static Test suite() {
-		return buildModelTestSuite(AttachSourceTests.class);
-	}
-
-	/** @deprecated using deprecated code */
-	private static final int AST_INTERNAL_JLS2 = AST.JLS2;
-	
-	private IPackageFragmentRoot pkgFragmentRoot;
-	private IType genericType;
-	private IPackageFragment innerClasses;
-	
-public AttachSourceTests(String name) {
-	super(name);
-}
-public ASTNode runConversion(IClassFile classFile, boolean resolveBindings) {
-	ASTParser parser = ASTParser.newParser(AST_INTERNAL_JLS2);
-	parser.setSource(classFile);
-	parser.setResolveBindings(resolveBindings);
-	parser.setWorkingCopyOwner(null);
-	return parser.createAST(null);
-}
-protected void setUp() throws Exception {
-	super.setUp();
-	this.attachSource(this.pkgFragmentRoot, "/AttachSourceTests/attachsrc.zip", "");
-}
-/**
- * Create project and set the jar placeholder.
- */
-public void setUpSuite() throws Exception {
-	super.setUpSuite();
-	
-	setUpJavaProject("AttachSourceTests");
-	addLibraryEntry("/AttachSourceTests/b153133.jar", false);
-	this.pkgFragmentRoot = this.currentProject.getPackageFragmentRoot(this.getFile("/AttachSourceTests/attach.jar"));
-	setUpGenericJar();
-	setUpInnerClassesJar();
-}
-private void setUpGenericJar() throws IOException, CoreException {
-	String[] pathAndContents = new String[] {
-		"generic/X.js", 
-		"package generic;\n" +
-		"public class X<T> {\n" + 
-		"  void foo(X<T> x) {\n" +
-		"  }\n" +
-		"  <K, V> V foo(K key, V value) {\n" +
-		"    return value;\n" +
-		"  }\n" +
-		"  void foo(int i, X<Object[]> x) {\n" +
-		"  }\n" +
-		"  void foo(boolean b, X<? extends X> x) {\n" +
-		"  }\n" +
-		"  void foo(float f, X<?> x) {\n" +
-		"  }\n" +
-		"  void foo(Y<? extends Integer, ? extends Object> y) {\n" +
-		"  }\n" +
-		"  void foo(Z.Inner<Object> inner) {\n" +
-		"  }\n" +
-		"  void foo(AType<Object> t) {\n" +
-		"  }\n" +
-		"}\n" +
-		"class Y<K, V> {\n" +
-		"}\n" +
-		"class Z {\n" +
-		"  class Inner<E> {\n" +
-		"  }\n" +
-		"}\n" +
-		"class AType<E> {\n" + // type name containing character 'T'
-		"}"
-	};
-	addLibrary("generic.jar", "genericsrc.zip", pathAndContents, JavaScriptCore.VERSION_1_5);
-	IFile jar = getFile("/AttachSourceTests/generic.jar");
-	this.genericType = this.currentProject.getPackageFragmentRoot(jar).getPackageFragment("generic").getClassFile("X.class").getType();
-}
-private void setUpInnerClassesJar() throws IOException, CoreException {
-	String[] pathAndContents = new String[] {
-		"inner/X.js", 
-		"package inner;\n" +
-		"public class X {\n" + 
-		"  void foo() {\n" +
-		"    new X() {};\n" +
-		"    class Y {}\n" +
-		"    new Y() {\n" +
-		"      class Z {}\n" +
-		"    };\n" +
-		"    class W {\n" +
-		"      void bar() {\n" +
-		"        new W() {};\n" +
-		"      }\n" +
-		"    }\n" +
-		"    new Object() {\n" +
-		"      class U {\n" +
-		"        U(String s) {\n" +
-		"        }\n" +
-		"      }\n" +
-		"    };\n" +
-		"  }\n" +
-		"  class V {\n" +
-		"    V(String s) {\n" +
-		"    }\n" +
-		"  }\n" +
-		"}"
-	};
-	addLibrary("innerClasses.jar", "innerClassessrc.zip", pathAndContents, JavaScriptCore.VERSION_1_4);
-	IFile jar = getFile("/AttachSourceTests/innerClasses.jar");
-	this.innerClasses = this.currentProject.getPackageFragmentRoot(jar).getPackageFragment("inner");
-}
-protected void tearDown() throws Exception {
-	IPackageFragmentRoot[] roots = this.currentProject.getAllPackageFragmentRoots();
-	for (int i = 0; i < roots.length; i++) {
-		IPackageFragmentRoot root = roots[i];
-		if (this.genericType != null && root.equals(this.genericType.getPackageFragment().getParent())) continue;
-		if (this.innerClasses != null && root.equals(this.innerClasses.getParent())) continue;
-		if (root.getKind() == IPackageFragmentRoot.K_BINARY) {
-			this.attachSource(root, null, null); // detach source
-		}
-	}
-	super.tearDown();
-}
-
-/**
- * Reset the jar placeholder and delete project.
- */
-public void tearDownSuite() throws Exception {
-	deleteProject(this.currentProject);
-	super.tearDownSuite();
-}
-
-/**
- * Test AST.parseCompilationUnit(IClassFile, boolean).
- */
-public void testASTParsing() throws JavaScriptModelException {
-	this.attachSource(this.pkgFragmentRoot, "/AttachSourceTests/attachsrc.zip", "");	
-	IClassFile classFile = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	ASTNode node = runConversion(classFile, true);
-	assertNotNull("No node", node);
-	this.attachSource(this.pkgFragmentRoot, null, null);
-	IClassFile cf = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	assertTrue("source code should no longer exist for A", cf.getSource() == null);
-	try {
-		node = runConversion(classFile, true);
-		assertTrue("Should not be here", false);
-	} catch(IllegalStateException e) {
-		assertTrue(true);
-	}
-}
-/**
- * Test AST.parseCompilationUnit(IClassFile, boolean).
- * Test for http://bugs.eclipse.org/bugs/show_bug.cgi?id=30471
- */
-public void testASTParsing2() throws JavaScriptModelException {
-	this.attachSource(this.pkgFragmentRoot, "/AttachSourceTests/attachsrc.zip", "");	
-	IClassFile classFile = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	ASTNode node = runConversion(classFile, false);
-	assertNotNull("No node", node);
-	this.attachSource(this.pkgFragmentRoot, null, null);
-	IClassFile cf = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	assertTrue("source code should no longer exist for A", cf.getSource() == null);
-	try {
-		node = runConversion(classFile, false);
-		assertTrue("Should not be here", false);
-	} catch(IllegalStateException e) {
-		assertTrue(true);
-	}
-}
-/**
- * Changing the source attachment file should update the java model.
- * (regression test for bug 23292 Must restart Eclipse after debug of source in .zip is updated)
- */
-public void testChangeSourceAttachmentFile() throws CoreException {
-	IClassFile cf = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	IFunction method = cf.getType().getFunction("foo", new String[] {});
-	
-	// check initial source
-	assertSourceEquals(
-		"unexpected initial source for foo()",
-		"public void foo() {\n" +
-		"	}",
-		method.getSource());
-
-	// replace source attachment file
-	this.swapFiles("AttachSourceTests/attachsrc.zip", "AttachSourceTests/attachsrc.new.zip");
-	assertSourceEquals(
-		"unexpected source for foo() after replacement",
-		"public void foo() {\n" +
-		"		System.out.println(\"foo\");\n" +
-		"	}",
-		method.getSource());
-		
-	// delete source attachment file
-	this.deleteFile("AttachSourceTests/attachsrc.zip");
-	assertSourceEquals(
-		"unexpected source for foo() after deletion",
-		null,
-		method.getSource());
-		
-	// add source attachment file back
-	this.moveFile("AttachSourceTests/attachsrc.new.zip", "AttachSourceTests/attachsrc.zip");
-	assertSourceEquals(
-		"unexpected source for foo() after addition",
-		"public void foo() {\n" +
-		"	}",
-		method.getSource());
-}
-/**
- * Ensure that a class file with an attached source can retrieve its children given a source index.
- */
-public void testClassFileGetElementAt01() throws JavaScriptModelException {
-	IClassFile classFile = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	String source = classFile.getSource();
-	IJavaScriptElement element = classFile.getElementAt(source.indexOf("class A"));
-	assertElementEquals(
-		"Unexpected element",
-		"A [in A.class [in x.y [in attach.jar [in AttachSourceTests]]]]",
-		element);
-}
-/**
- * Ensure that a class file with an attached source can retrieve its children given a source index.
- */
-public void testClassFileGetElementAt02() throws JavaScriptModelException {
-	IClassFile classFile = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	String source = classFile.getSource();
-	IJavaScriptElement element = classFile.getElementAt(source.indexOf("public A"));
-	assertElementEquals(
-		"Unexpected element",
-		"A() [in A [in A.class [in x.y [in attach.jar [in AttachSourceTests]]]]]",
-		element);
-}
-/**
- * Ensure that a class file with an attached source can retrieve its children given a source index.
- */
-public void testClassFileGetElementAt03() throws JavaScriptModelException {
-	IClassFile classFile = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	String source = classFile.getSource();
-	IJavaScriptElement element = classFile.getElementAt(source.indexOf("void foo"));
-	assertElementEquals(
-		"Unexpected element",
-		"foo() [in A [in A.class [in x.y [in attach.jar [in AttachSourceTests]]]]]",
-		element);
-}
-/*
- * Ensure that a constructor of a binary member type can be retrieved with its source position.
- * (regression test for bug 119249 codeResolve, search, etc. don't work on constructor of binary inner class)
- */
-public void testClassFileGetElementAt04() throws JavaScriptModelException {
-	IClassFile classFile = this.innerClasses.getClassFile("X$V.class");
-	String source = classFile.getSource();
-	IJavaScriptElement element = classFile.getElementAt(source.indexOf("V(String s)"));
-	assertElementEquals(
-		"Unexpected element",
-		"V(inner.X, java.lang.String) [in V [in X$V.class [in inner [in innerClasses.jar [in AttachSourceTests]]]]]",
-		element);
-}/*
- * Ensures that the source of a .class file is implicetely attached when prj=src=bin
- * (regression test for bug 41444 [navigation] error dialog on opening class file)
- */
-public void testClassFileInOutput() throws CoreException {
-	IClassFile classFile = getClassFile("AttachSourceTests/src/A.class");
-	String source = classFile.getSource();
-	assertSourceEquals(
-		"Unexpected source",
-		"public class A {\n" + 
-		"}",
-		source);
-}
-/**
- * Retrieves the source code for "A.class", which is
- * the entire CU for "A.js".
- */
-public void testClassRetrieval() throws JavaScriptModelException {
-	IClassFile objectCF = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	assertTrue("source code does not exist for the entire attached compilation unit", objectCF.getSource() != null);
-}
-/**
- * Removes the source attachment from the jar.
- */
-public void testDetachSource() throws JavaScriptModelException {
-	this.attachSource(this.pkgFragmentRoot, null, null);
-	IClassFile cf = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	assertTrue("source code should no longer exist for A", cf.getSource() == null);
-	assertTrue("name range should no longer exist for A", cf.getType().getNameRange().getOffset() == -1);
-	assertTrue("source range should no longer exist for A", cf.getType().getSourceRange().getOffset() == -1);
-	assertTrue("Source attachment path should be null", null == this.pkgFragmentRoot.getSourceAttachmentPath());
-	assertTrue("Source attachment root path should be null", null ==this.pkgFragmentRoot.getSourceAttachmentRootPath());
-}
-/*
- * Ensures that the source of a generic method can be retrieved.
- */
-public void testGeneric1() throws JavaScriptModelException {
-	IFunction method = this.genericType.getFunction("foo", new String[] {"QX<QT;>;"});
-	assertSourceEquals(
-		"Unexpected source",
-		"void foo(X<T> x) {\n" + 
-		"  }",
-		method.getSource());
-}
-/*
- * Ensures that the source of a generic method can be retrieved.
- */
-public void testGeneric2() throws JavaScriptModelException {
-	IFunction method = this.genericType.getFunction("foo", new String[] {"QK;", "QV;"});
-	assertSourceEquals(
-		"Unexpected source",
-		"<K, V> V foo(K key, V value) {\n" + 
-		"    return value;\n" + 
-		"  }",
-		method.getSource());
-}
-/*
- * Ensures that the source of a generic method can be retrieved.
- * (regression test for bug 129317 Outline view inconsistent with code
- */
-public void testGeneric3() throws JavaScriptModelException {
-	IFunction method = this.genericType.getFunction("foo", new String[] {"I", "Lgeneric.X<[Ljava.lang.Object;>;"});
-	assertSourceEquals(
-		"Unexpected source",
-		"void foo(int i, X<Object[]> x) {\n" + 
-		"  }",
-		method.getSource());
-}
-public void testGeneric4() throws JavaScriptModelException {
-	IFunction method = this.genericType.getFunction("foo", new String[] {"Z", "Lgeneric.X<+Lgeneric.X;>;"});
-	assertSourceEquals(
-		"Unexpected source",
-		"void foo(boolean b, X<? extends X> x) {\n" + 
-		"  }",
-		method.getSource());
-}
-public void testGeneric5() throws JavaScriptModelException {
-	IFunction method = this.genericType.getFunction("foo", new String[] {"F", "Lgeneric.X<*>;"});
-	assertSourceEquals(
-		"Unexpected source",
-		"void foo(float f, X<?> x) {\n" + 
-		"  }",
-		method.getSource());
-}
-public void testGeneric6() throws JavaScriptModelException {
-	IFunction method = this.genericType.getFunction("foo", new String[] {"Lgeneric.Y<+Ljava.lang.Integer;+Ljava.lang.Object;>;"});
-	assertSourceEquals(
-		"Unexpected source",
-		"void foo(Y<? extends Integer, ? extends Object> y) {\n" + 
-		"  }",
-		method.getSource());
-}
-public void testGeneric7() throws JavaScriptModelException {
-	IFunction method = this.genericType.getFunction("foo", new String[] {"Lgeneric.Z.Inner<Ljava.lang.Object;>;"});
-	assertSourceEquals(
-		"Unexpected source",
-		"void foo(Z.Inner<Object> inner) {\n" + 
-		"  }",
-		method.getSource());
-}
-public void testGeneric8() throws JavaScriptModelException {
-	IFunction method = this.genericType.getFunction("foo", new String[] {"Lgeneric.AType<Ljava.lang.Object;>;"});
-	assertSourceEquals(
-		"Unexpected source",
-		"void foo(AType<Object> t) {\n" + 
-		"  }",
-		method.getSource());
-}
-/**
- * Ensures that name ranges exists for BinaryMembers that have
- * mapped source.
- */
-public void testGetNameRange01() throws JavaScriptModelException {
-	IClassFile classFile = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	IFunction method = classFile.getType().getFunction("foo", null);
-	assertSourceEquals("Unexpected name source", "foo", getNameSource(classFile.getSource(), method));
-}
-/**
- * Ensures that name ranges exists for BinaryMembers that have
- * mapped source.
- */
-public void testGetNameRange02() throws JavaScriptModelException {
-	IClassFile classFile = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	assertSourceEquals("Unexpected name source", "A", getNameSource(classFile.getSource(), classFile.getType()));
-}
-/*
- * Ensure that the name range for a constructor of a binary member type is correct.
- * (regression test for bug 119249 codeResolve, search, etc. don't work on constructor of binary inner class)
- */
-public void testGetNameRange03() throws JavaScriptModelException {
-	IClassFile classFile = this.innerClasses.getClassFile("X$V.class");
-	IFunction constructor = classFile.getType().getFunction("V", new String[] {"Linner.X;", "Ljava.lang.String;"});
-	assertSourceEquals("Unexpected name source", "V", getNameSource(classFile.getSource(), constructor));
-}
-/**
- * Retrieves the source attachment paths for jar root.
- */
-public void testGetSourceAttachmentPath() throws JavaScriptModelException {
-	IPath saPath= this.pkgFragmentRoot.getSourceAttachmentPath();
-	assertEquals("Source attachment path not correct for root " + this.pkgFragmentRoot, "/AttachSourceTests/attachsrc.zip", saPath.toString());
-	assertEquals("Source attachment root path should be empty", new Path(""), this.pkgFragmentRoot.getSourceAttachmentRootPath());
-}
-/**
- * Ensures that a source range exists for the class file that has
- * mapped source.
- */
-public void testGetSourceRange() throws JavaScriptModelException {
-	IClassFile cf = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	ISourceRange sourceRange = cf.getSourceRange();
-	assertTrue("Class file should have associated source range", sourceRange != null);
-	assertEquals("Unexpected offset", 0, sourceRange.getOffset());
-	assertEquals("Unexpected length", 100, sourceRange.getLength());
-}
-/**
- * Ensures that a source range exists for the (inner) class file that has
- * mapped source.
- */
-public void testGetSourceRangeInnerClass() throws JavaScriptModelException {
-	IClassFile cf = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A$Inner.class");
-	ISourceRange sourceRange = cf.getSourceRange();
-	assertTrue("Inner class file should have associated source range", sourceRange != null);
-	assertEquals("Unexpected offset", 0, sourceRange.getOffset());
-	assertEquals("Unexpected length", 100, sourceRange.getLength());
-}
-/*
- * Ensures that the source of an inner class can be retrieved.
- */
-public void testInnerClass1() throws JavaScriptModelException {
-	IType type = this.innerClasses.getClassFile("X.class").getType();
-	assertSourceEquals(
-		"Unexpected source",
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    new X() {};\n" + 
-		"    class Y {}\n" + 
-		"    new Y() {\n" + 
-		"      class Z {}\n" + 
-		"    };\n" + 
-		"    class W {\n" + 
-		"      void bar() {\n" + 
-		"        new W() {};\n" + 
-		"      }\n" + 
-		"    }\n" + 
-		"    new Object() {\n" + 
-		"      class U {\n" + 
-		"        U(String s) {\n" + 
-		"        }\n" + 
-		"      }\n" + 
-		"    };\n" + 
-		"  }\n" + 
-		"  class V {\n" + 
-		"    V(String s) {\n" + 
-		"    }\n" + 
-		"  }\n" + 
-		"}",
-		type.getSource());
-}
-/*
- * Ensures that the source of an inner class can be retrieved.
- */
-public void testInnerClass2() throws JavaScriptModelException {
-	IType type = this.innerClasses.getClassFile("X$1.class").getType();
-	assertSourceEquals(
-		"Unexpected source",
-		"X() {}",
-		type.getSource());
-}
-/*
- * Ensures that the source of an inner class can be retrieved.
- */
-public void testInnerClass3() throws JavaScriptModelException {
-	IType type = this.innerClasses.getClassFile("X$2.class").getType();
-	assertSourceEquals(
-		"Unexpected source",
-		"Y() {\n" + 
-		"      class Z {}\n" + 
-		"    }",
-		type.getSource());
-}
-/*
- * Ensures that the source of an inner class can be retrieved.
- */
-public void testInnerClass4() throws JavaScriptModelException {
-	IType type = this.innerClasses.getClassFile("X$3.class").getType();
-	assertSourceEquals(
-		"Unexpected source",
-		"W() {}",
-		type.getSource());
-}
-/*
- * Ensures that the source of an inner class can be retrieved.
- */
-public void testInnerClass5() throws JavaScriptModelException {
-	IType type = this.innerClasses.getClassFile("X$1$Y.class").getType();
-	assertSourceEquals(
-		"Unexpected source",
-		"class Y {}",
-		type.getSource());
-}
-/*
- * Ensures that the source of an inner class can be retrieved.
- */
-public void testInnerClass6() throws JavaScriptModelException {
-	IType type = this.innerClasses.getClassFile("X$1$W.class").getType();
-	assertSourceEquals(
-		"Unexpected source",
-		"class W {\n" + 
-		"      void bar() {\n" + 
-		"        new W() {};\n" + 
-		"      }\n" + 
-		"    }",
-		type.getSource());
-}
-/*
- * Ensures that the source of an inner class can be retrieved.
- */
-public void testInnerClass7() throws JavaScriptModelException {
-	IType type = this.innerClasses.getClassFile("X$2$Z.class").getType();
-	assertSourceEquals(
-		"Unexpected source",
-		"class Z {}",
-		type.getSource());
-}
-/*
- * Ensures that the source of an inner class can be retrieved.
- */
-public void testInnerClass8() throws JavaScriptModelException {
-	IType type = this.innerClasses.getClassFile("X$V.class").getType();
-	assertSourceEquals(
-		"Unexpected source",
-		"class V {\n" + 
-		"    V(String s) {\n" + 
-		"    }\n" + 
-		"  }",
-		type.getSource());
-}
-/*
- * Ensures that the source of an inner class can be retrieved.
- * (regression test for bug 124611 IAE in Signature.createCharArrayTypeSignature)
- */
-public void testInnerClass9() throws JavaScriptModelException {
-	IType type = this.innerClasses.getClassFile("X$4$U.class").getType();
-	assertSourceEquals(
-		"Unexpected source",
-		"class U {\n" + 
-		"        U(String s) {\n" + 
-		"        }\n" + 
-		"      }",
-		type.getSource());
-}
-
-/**
- * Ensures that a source folder can be attached to a lib folder.
- */
-public void testLibFolder() throws JavaScriptModelException {
-	IPackageFragmentRoot root = this.getPackageFragmentRoot("/AttachSourceTests/lib");
-	this.attachSource(root, "/AttachSourceTests/srcLib", "");
-	
-	IClassFile cf = root.getPackageFragment("p").getClassFile("X.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package p;\n" +
-		"public class X {\n" +
-		"	public void foo() {\n" +
-		"	}\n" +
-		"}",
-		cf.getSource());
-}
-/**
- * Retrieves the source code for methods of class A.
- */
-public void testMethodRetrieval() throws JavaScriptModelException {
-	IClassFile cf = this.pkgFragmentRoot.getPackageFragment("x.y").getClassFile("A.class");
-	IFunction[] methods = cf.getType().getFunctions();
-	for (int i = 0; i < methods.length; i++) {
-		IFunction method = methods[i];
-		assertTrue("source code does not exist for the method " + method, method.getSource() != null);
-		assertTrue("method name range not correct", method.getNameRange().getOffset() != -1 && method.getNameRange().getLength() != 0);
-	}
-}
-/**
- * Closes the jar, to ensure when it is re-opened the source
- * attachment still exists.
- */
-public void testPersistence() throws JavaScriptModelException {
-	this.pkgFragmentRoot.close();
-	testClassRetrieval();
-	testMethodRetrieval();
-}
-
-/*
- * Ensures that having a project as a class folder and attaching its sources finds the source
- * of a class in a non-default package.
- * (regression test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=65186)
- */
-public void testProjectAsClassFolder1() throws CoreException {
-	try {
-		createJavaProject("P1");
-		createFolder("/P1/p");
-		createFile(
-			"/P1/p/X.js",
-			"package p;\n" +
-			"public class X {\n" +
-			"}"
-		);
-		IProject p1 = getProject("P1");
-		p1.build(IncrementalProjectBuilder.FULL_BUILD, null);
-		IJavaScriptProject javaProject = createJavaProject("P2", new String[]{""}, new String[]{"/P1"});
-		IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(p1);
-		attachSource(root, "/P1", null);
-		IClassFile cf = root.getPackageFragment("p").getClassFile("X.class");
-		assertSourceEquals(
-			"Unexpected source for class file P1/p/X.class",
-			"package p;\n" +
-			"public class X {\n" +
-			"}",
-			cf.getSource());		
-	} finally {
-		deleteProject("P1");
-		deleteProject("P2");
-	}
-}
-
-/*
- * Ensures that having a project as a class folder and attaching its sources finds the source
- * of a class in the default package.
- * (regression test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=65186)
- */
-public void testProjectAsClassFolder2() throws CoreException {
-	try {
-		createJavaProject("P1");
-		createFile(
-			"/P1/X.js",
-			"public class X {\n" +
-			"}"
-		);
-		IProject p1 = getProject("P1");
-		p1.build(IncrementalProjectBuilder.FULL_BUILD, null);
-		IJavaScriptProject javaProject = createJavaProject("P2", new String[]{""}, new String[]{"/P1"});
-		IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(p1);
-		attachSource(root, "/P1", null);
-		IClassFile cf = root.getPackageFragment("").getClassFile("X.class");
-		assertSourceEquals(
-			"Unexpected source for class file P1/X.class",
-			"public class X {\n" +
-			"}",
-			cf.getSource());		
-	} finally {
-		deleteProject("P1");
-		deleteProject("P2");
-	}
-}
-
-/*
- * Ensures that having a project as source attachement finds the source
- * (regression test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=65186)
- */
-public void testProjectAsSourceAttachment() throws CoreException {
-	try {
-		IJavaScriptProject javaProject = createJavaProject("Test", new String[]{""}, new String[]{"/AttachSourceTests/test.jar"});
-		createFolder("/Test/test1");
-		createFile("/Test/test1/Test.js",
-			"package test1;\n" + 
-			"\n" + 
-			"public class Test {}");
-		IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(getFile("/AttachSourceTests/test.jar"));
-		attachSource(root, "/Test", null);
-		IClassFile cf = root.getPackageFragment("test1").getClassFile("Test.class");
-		assertSourceEquals(
-			"Unexpected source for class file test1/Test.class",
-			"package test1;\n" + 
-			"\n" + 
-			"public class Test {}",
-			cf.getSource());		
-	} finally {
-		deleteProject("Test");
-	}
-}
-
-///**
-// * Attaches a source zip to a jar.  The source zip has
-// * a nested root structure and exists as a resource.  Tests that
-// * the attachment is persisted as a server property for the jar.
-// */
-//public void testRootPath() throws JavaScriptModelException {
-//	IJavaScriptProject project = getJavaProject("AttachSourceTests");
-//	IFile jar = (IFile) project.getProject().findMember("attach2.jar");
-//	IFile srcZip=(IFile) project.getProject().findMember("attach2src.zip");
-//	JarPackageFragmentRoot root = (JarPackageFragmentRoot) project.getPackageFragmentRoot(jar);
-//	root.attachSource(srcZip.getFullPath(), new Path("src/nested"), null);
-//
-//	IClassFile cf = root.getPackageFragment("x.y").getClassFile("B.class");
-//	assertTrue("source code does not exist for the entire attached compilation unit", cf.getSource() != null);
-//	root.close();
-//	cf = root.getPackageFragment("x.y").getClassFile("B.class");
-//	assertTrue("source code does not exist for the entire attached compilation unit", cf.getSource() != null);
-//
-//	IPath rootSAPath= root.getSourceAttachmentRootPath();
-//	assertEquals("Unexpected source attachment root path for " + root.getPath(), "src/nested", rootSAPath.toString());
-//
-//	IPath saPath= root.getSourceAttachmentPath();
-//	assertEquals("Unexpected source attachment path for " + root.getPath(), "/AttachSourceTests/attach2src.zip", saPath.toString());
-//	
-//	root.close();
-//}
-///**
-// * Attaches a source zip to a jar specifying an invalid root path.  
-// * Ensures that the root path is just used as a hint, and that the source is still retrieved.
-// */
-//public void testRootPath2() throws JavaScriptModelException {
-//	IJavaScriptProject project = getJavaProject("AttachSourceTests");
-//	IFile jar = (IFile) project.getProject().findMember("attach2.jar");
-//	IFile srcZip=(IFile) project.getProject().findMember("attach2src.zip");
-//	JarPackageFragmentRoot root = (JarPackageFragmentRoot) project.getPackageFragmentRoot(jar);
-//	root.attachSource(srcZip.getFullPath(), new Path(""), null);
-//
-//	IClassFile cf = root.getPackageFragment("x.y").getClassFile("B.class");
-//	assertTrue("source code does not exist for the entire attached compilation unit", cf.getSource() != null);
-//	root.close();
-//}
-///**
-// * Attaches a sa source folder can be attached to a lib folder specifying an invalid root path.  
-// * Ensures that the root path is just used as a hint, and that the source is still retrieved.
-// */
-//public void testRootPath3() throws JavaScriptModelException {
-//	IPackageFragmentRoot root = this.getPackageFragmentRoot("/AttachSourceTests/lib");
-//	this.attachSource(root, "/AttachSourceTests/srcLib", "invalid");
-//	
-//	IClassFile cf = root.getPackageFragment("p").getClassFile("X.class");
-//	assertSourceEquals(
-//		"Unexpected source for class file",
-//		"package p;\n" +
-//		"public class X {\n" +
-//		"	public void foo() {\n" +
-//		"	}\n" +
-//		"}",
-//		cf.getSource());
-//	root.close();
-//}
-/**
- * Attach a jar with a source attachement that doesn't contain the source folders
- */
-public void testRootPath4() throws JavaScriptModelException {
-	IJavaScriptProject project = this.getJavaProject("/AttachSourceTests");
-	IPackageFragmentRoot root = project.getPackageFragmentRoot(this.getFile("/AttachSourceTests/test.jar"));
-	this.attachSource(root, "/AttachSourceTests/src.zip", "invalid");
-	
-	IClassFile cf = root.getPackageFragment("test1").getClassFile("Test.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package test1;\n" +
-		"\n" +
-		"public class Test {}",
-		cf.getSource());
-	root.close();
-}
-/**
- * Attach a jar with a source attachement that doesn't contain the source folders
- */
-public void testRootPath5() throws JavaScriptModelException {
-	IJavaScriptProject project = this.getJavaProject("/AttachSourceTests");
-	IPackageFragmentRoot root = project.getPackageFragmentRoot(this.getFile("/AttachSourceTests/update.jar"));
-	this.attachSource(root, "/AttachSourceTests/src.zip", "invalid");
-	
-	IClassFile cf = root.getPackageFragment("p1.p2").getClassFile("A.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package p1.p2;\n" +
-		"\n" +
-		"public class A {}",
-		cf.getSource());
-		
-	cf = root.getPackageFragment("").getClassFile("B.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"public class B {}",
-		cf.getSource());		
-	
-	this.attachSource(root, null, null); // detach source
-	root.close();
-}
-/**
- * Attach a jar with a source attachement that doesn't contain the source folders
- */
-public void testRootPath6() throws JavaScriptModelException {
-	IJavaScriptProject project = this.getJavaProject("/AttachSourceTests");
-	IPackageFragmentRoot root = project.getPackageFragmentRoot(this.getFile("/AttachSourceTests/update.jar"));
-	this.attachSource(root, "/AttachSourceTests/src.zip", null);
-	
-	IClassFile cf = root.getPackageFragment("p1.p2").getClassFile("A.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package p1.p2;\n" +
-		"\n" +
-		"public class A {}",
-		cf.getSource());
-		
-	cf = root.getPackageFragment("").getClassFile("B.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"public class B {}",
-		cf.getSource());		
-
-	this.attachSource(root, null, null); // detach source
-	root.close();
-}
-/**
- * Attach a jar with a source attachement that doesn't contain the source folders
- */
-public void testRootPath7() throws JavaScriptModelException {
-	IJavaScriptProject project = this.getJavaProject("/AttachSourceTests");
-	IPackageFragmentRoot root = project.getPackageFragmentRoot(this.getFile("/AttachSourceTests/full.jar"));
-	this.attachSource(root, "/AttachSourceTests/src.zip", null);
-	
-	IClassFile cf = root.getPackageFragment("p1.p2").getClassFile("A.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package p1.p2;\n" +
-		"\n" +
-		"public class A {}",
-		cf.getSource());
-		
-	cf = root.getPackageFragment("").getClassFile("B.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"public class B {}",
-		cf.getSource());
-		
-	cf = root.getPackageFragment("test1").getClassFile("Test.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package test1;\n" +
-		"\n" +
-		"public class Test {}",
-		cf.getSource());				
-	
-	this.attachSource(root, null, null); // detach source
-	root.close();
-}
-/**
- * Attach a jar with a source attachement that contains the source folders
- */
-public void testRootPath8() throws JavaScriptModelException {
-	IJavaScriptProject project = this.getJavaProject("/AttachSourceTests");
-	IPackageFragmentRoot root = project.getPackageFragmentRoot(this.getFile("/AttachSourceTests/full.jar"));
-	this.attachSource(root, "/AttachSourceTests/fullsrc.zip", null);
-	
-	IClassFile cf = root.getPackageFragment("p1.p2").getClassFile("A.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package p1.p2;\n" +
-		"\n" +
-		"public class A {}",
-		cf.getSource());
-		
-	cf = root.getPackageFragment("").getClassFile("B.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"public class B {}",
-		cf.getSource());
-		
-	cf = root.getPackageFragment("test1").getClassFile("Test.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package test1;\n" +
-		"\n" +
-		"public class Test {}",
-		cf.getSource());				
-	
-	this.attachSource(root, null, null); // detach source
-	root.close();
-}
-/**
- * Attach a jar with a source attachement that contains the source folders
- */
-public void testRootPath9() throws JavaScriptModelException {
-	IJavaScriptProject project = this.getJavaProject("/AttachSourceTests");
-	IPackageFragmentRoot root = project.getPackageFragmentRoot(this.getFile("/AttachSourceTests/full.jar"));
-	this.attachSource(root, "/AttachSourceTests/fullsrc.zip", "invalid");
-	
-	IClassFile cf = root.getPackageFragment("p1.p2").getClassFile("A.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package p1.p2;\n" +
-		"\n" +
-		"public class A {}",
-		cf.getSource());
-		
-	cf = root.getPackageFragment("").getClassFile("B.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"public class B {}",
-		cf.getSource());
-		
-	cf = root.getPackageFragment("test1").getClassFile("Test.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package test1;\n" +
-		"\n" +
-		"public class Test {}",
-		cf.getSource());				
-	
-	this.attachSource(root, null, null); // detach source
-	root.close();
-}
-/**
- * Attach a jar with a source attachement that is itself
- */
-public void testRootPath10() throws JavaScriptModelException {
-	IJavaScriptProject project = this.getJavaProject("/AttachSourceTests");
-	IPackageFragmentRoot root = project.getPackageFragmentRoot(this.getFile("/AttachSourceTests/test2.jar"));
-	this.attachSource(root, "/AttachSourceTests/test2.jar", null);
-	
-	IClassFile cf = root.getPackageFragment("p").getClassFile("X.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package p;\n" +
-		"\n" +
-		"public class X {\n" +
-		"\n" +
-		"	public static void main(String[] args) {\n" +
-		"	}\n" +
-		"}",
-		cf.getSource());
-	this.attachSource(root, null, null); // detach source
-	root.close();
-}
-///**
-// * http://bugs.eclipse.org/bugs/show_bug.cgi?id=35965
-// */
-//public void testRootPath11() throws JavaScriptModelException {
-//	IJavaScriptProject project = this.getJavaProject("/AttachSourceTests");
-//	IPackageFragmentRoot root = project.getPackageFragmentRoot(this.getFile("/AttachSourceTests/test4.jar"));
-//	this.attachSource(root, "/AttachSourceTests/test4_src.zip", null);
-//	
-//	IClassFile cf = root.getPackageFragment("P1").getClassFile("D.class");
-//	assertSourceEquals(
-//		"Unexpected source for class file P1.D",
-//		"package P1;\n" +
-//		"\n" +
-//		"public class D {}",
-//		cf.getSource());
-//
-//	cf = root.getPackageFragment("P1.p2").getClassFile("A.class");
-//	assertSourceEquals(
-//		"Unexpected source for class file P1.p2.A",
-//		"package P1.p2;\n" +
-//		"\n" +
-//		"public class A {}",
-//		cf.getSource());	
-//
-//	assertTrue("Not a binary root", root.getKind() == IPackageFragmentRoot.K_BINARY);
-//	assertEquals("wrong jdk level", ClassFileConstants.JDK1_2, Util.getJdkLevel(root.getResource()));
-//	this.attachSource(root, null, null); // detach source
-//	root.close();
-//}
-/**
- * Attach a jar with a source attachement that is itself. The jar contains 2 root paths for the same class file.
- * (regression test for bug 74014 prefix path for source attachements - automatic detection does not seem to work)
- */
-public void testRootPath12() throws JavaScriptModelException {
-	IJavaScriptProject project = this.getJavaProject("/AttachSourceTests");
-	IPackageFragmentRoot root = project.getPackageFragmentRoot(this.getFile("/AttachSourceTests/test5.jar"));
-	attachSource(root, "/AttachSourceTests/test5.jar", null);
-	
-	IClassFile cf = root.getPackageFragment("p1.p2").getClassFile("X.class");
-	assertSourceEquals(
-		"Unexpected source for class file",
-		"package p1.p2;\n" +
-		"public class X {\n" +
-		"}\n",
-		cf.getSource());
-	attachSource(root, null, null); // detach source
-	root.close();
-}
-/**
- * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=110172"
- */
-public void testBug110172() throws JavaScriptModelException {
-	IJavaScriptProject project = this.getJavaProject("/AttachSourceTests");
-	IPackageFragmentRoot root = project.getPackageFragmentRoot(this.getFile("/AttachSourceTests/test6.jar"));
-	assertTrue("Root doesn't exist", root.exists());
-	attachSource(root, "/AttachSourceTests/test6src.zip", null);
-	
-	try {
-		// check the javadoc source range in a class file
-		IClassFile cf = root.getPackageFragment("p1.p2").getClassFile("X.class");
-		assertNotNull(cf);
-		final String source = cf.getSource();
-		assertNotNull("No source", source);
-		IJavaScriptElement[] children = cf.getChildren();
-		assertEquals("Wrong number of children", 1, children.length);
-		IJavaScriptElement element = children[0];
-		assertTrue("Not a type", element instanceof IType);
-		IType type = (IType) element;
-		IJavaScriptElement[] members = type.getChildren();
-		final int length = members.length;
-		assertEquals("Wrong number", 9, length);
-		for (int i = 0; i < length; i++) {
-			element = members[i];
-			assertTrue(element instanceof IMember);
-			final ISourceRange javadocRange = ((IMember) element).getJSdocRange();
-			final String elementName = element.getElementName();
-			if ("f".equals(elementName)) {
-				assertNotNull("No javadoc source range", javadocRange);
-				final int start = javadocRange.getOffset();
-				final int end = javadocRange.getLength() + start - 1;
-				String javadocSource = source.substring(start, end);
-				assertTrue("Wrong javadoc", javadocSource.indexOf("field f") != -1);
-			} else if ("foo".equals(elementName)) {
-				assertNotNull("No javadoc source range", javadocRange);
-				final int start = javadocRange.getOffset();
-				final int end = javadocRange.getLength() + start - 1;
-				String javadocSource = source.substring(start, end);
-				assertTrue("Wrong javadoc", javadocSource.indexOf("method foo") != -1);
-			} else if ("A".equals(elementName)) {
-				assertNotNull("No javadoc source range", javadocRange);
-				final int start = javadocRange.getOffset();
-				final int end = javadocRange.getLength() + start - 1;
-				String javadocSource = source.substring(start, end);
-				assertTrue("Wrong javadoc", javadocSource.indexOf("member type A") != -1);
-			} else if ("X".equals(elementName)) {
-				// need treatment for the two constructors
-				assertTrue("Not an IFunction", element instanceof IFunction);
-				IFunction method = (IFunction) element;
-				switch(method.getNumberOfParameters()) {
-					case 0 :
-						assertNull("Has a javadoc source range", javadocRange);
-						break;
-					case 1:
-						assertNotNull("No javadoc source range", javadocRange);
-						final int start = javadocRange.getOffset();
-						final int end = javadocRange.getLength() + start - 1;
-						String javadocSource = source.substring(start, end);
-						assertTrue("Wrong javadoc", javadocSource.indexOf("constructor") != -1);
-				}
-			} else if ("f3".equals(elementName)) {
-				assertNotNull("No javadoc source range", javadocRange);
-				final int start = javadocRange.getOffset();
-				final int end = javadocRange.getLength() + start - 1;
-				String javadocSource = source.substring(start, end);
-				assertTrue("Wrong javadoc", javadocSource.indexOf("Real") != -1);
-			} else if ("f2".equals(elementName)) {
-				assertNull("Has a javadoc source range", javadocRange);
-			} else if ("foo2".equals(elementName)) {
-				assertNull("Has a javadoc source range", javadocRange);
-			} else if ("B".equals(elementName)) {
-				assertNull("Has a javadoc source range", javadocRange);
-			}
-		}
-	} finally {
-		attachSource(root, null, null); // detach source
-		root.close();
-	}
-}
-/**
- * @test bug 153133: [model] toggle breakpoint in constructor creates a class load breakpoint
- * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=153133"
- */
-public void testBug153133() throws JavaScriptModelException {
-	IPackageFragmentRoot root = this.currentProject.getPackageFragmentRoot(this.getFile("/AttachSourceTests/b153133.jar"));
-	assertTrue("Root doesn't exist", root.exists());
-	
-	try {
-		// Get class file type from jar
-		IClassFile cf = root.getPackageFragment("test").getClassFile("Test.class");
-		assertNotNull(cf);
-		final String source = cf.getSource();
-		assertNotNull("No source", source);
-		IJavaScriptElement[] children = cf.getChildren();
-		assertEquals("Wrong number of children", 1, children.length);
-		IJavaScriptElement element = children[0];
-		assertTrue("Not a type", element instanceof IType);
-		IType type = (IType) element;
-		IJavaScriptElement[] members = type.getChildren();
-		final int length = members.length;
-		assertEquals("Wrong number", 7, length);
-		
-		// Need to get type members constructors
-		for (int i = 0; i < length; i++) {
-			assertTrue(members[i] instanceof IMember);
-			if (((IMember)members[i]).getElementType() == IJavaScriptElement.TYPE) {
-				IType typeMember = (IType) members[i];
-				String typeName = typeMember.getElementName();
-				IFunction[] methods = typeMember.getFunctions();
-				assertEquals("Expected only one constructor defined in type "+typeName, 1, methods.length);
-				// Verify that source range is valid
-				assertTrue("Expected a constructor instead of a method in type "+typeName, methods[0].isConstructor());
-				IFunction constructor = methods[0];
-				ISourceRange sourceRange = constructor.getSourceRange();
-				assertTrue("Constructor "+constructor.getElementName()+" has invalid offset: "+sourceRange, sourceRange.getOffset() >= 0);
-				assertTrue("Constructor "+constructor.getElementName()+" has invalid length: "+sourceRange, sourceRange.getLength() > 0);
-			}
-		}
-	} finally {
-		removeLibraryEntry(new Path("/JavaSearchBugs/lib/b148215.jar"));
-		root.close();
-	}
-}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AttachedJavadocTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AttachedJavadocTests.java
deleted file mode 100644
index 549f6ca..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/AttachedJavadocTests.java
+++ /dev/null
@@ -1,509 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.model;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Map;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.jsdt.core.IClassFile;
-import org.eclipse.wst.jsdt.core.IIncludePathAttribute;
-import org.eclipse.wst.jsdt.core.IIncludePathEntry;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IField;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.IFunction;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.core.IPackageFragmentRoot;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.WorkingCopyOwner;
-
-public class AttachedJavadocTests extends ModifyingResourceTests {
-	static {
-//		TESTS_NAMES = new String[] { "test010" };
-//		TESTS_NUMBERS = new int[] { 20 };
-//		TESTS_RANGE = new int[] { 169, 180 };
-	}
-
-	public static Test suite() {
-		return buildModelTestSuite(AttachedJavadocTests.class);
-	}
-
-	private IJavaScriptProject project;
-	private IPackageFragmentRoot root;
-
-	public AttachedJavadocTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Create project and set the jar placeholder.
-	 */
-	public void setUpSuite() throws Exception {
-		super.setUpSuite();
-
-		this.project = setUpJavaProject("AttachedJavadocProject", "1.5"); //$NON-NLS-1$
-		Map options = this.project.getOptions(true);
-		options.put(JavaScriptCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, "2000"); //$NON-NLS-1$
-		this.project.setOptions(options);
-		IIncludePathEntry[] entries = this.project.getRawIncludepath();
-		IResource resource = this.project.getProject().findMember("/doc/"); //$NON-NLS-1$
-		assertNotNull("doc folder cannot be null", resource); //$NON-NLS-1$
-		URI locationURI = resource.getLocationURI();
-		assertNotNull("doc folder cannot be null", locationURI); //$NON-NLS-1$
-		URL docUrl = null;
-		try {
-			docUrl = locationURI.toURL();
-		} catch (MalformedURLException e) {
-			assertTrue("Should not happen", false); //$NON-NLS-1$
-		} catch(IllegalArgumentException e) {
-			assertTrue("Should not happen", false); //$NON-NLS-1$
-		}
-		IIncludePathAttribute attribute = JavaScriptCore.newIncludepathAttribute(IIncludePathAttribute.JSDOC_LOCATION_ATTRIBUTE_NAME, docUrl.toExternalForm());
-		for (int i = 0, max = entries.length; i < max; i++) {
-			final IIncludePathEntry entry = entries[i];
-			if (entry.getEntryKind() == IIncludePathEntry.CPE_LIBRARY
-					&& entry.getContentKind() == IPackageFragmentRoot.K_BINARY
-					&& "/AttachedJavadocProject/lib/test6.jar".equals(entry.getPath().toString())) { //$NON-NLS-1$
-				entries[i] = JavaScriptCore.newLibraryEntry(entry.getPath(), entry.getSourceAttachmentPath(), entry.getSourceAttachmentRootPath(), entry.getAccessRules(), new IIncludePathAttribute[] { attribute}, entry.isExported());
-			}
-		}
-		project.setRawIncludepath(entries, null);
-
-		IPackageFragmentRoot[] roots = this.project.getAllPackageFragmentRoots();
-		int count = 0;
-		for (int i = 0, max = roots.length; i < max; i++) {
-			final IPackageFragmentRoot packageFragmentRoot = roots[i];
-			switch(packageFragmentRoot.getKind()) {
-				case IPackageFragmentRoot.K_BINARY :
-					if (!packageFragmentRoot.isExternal()) {
-						count++;
-						if (root == null) {
-							root = packageFragmentRoot;
-						}
-					}
-			}
-		}
-		assertEquals("Wrong value", 1, count); //$NON-NLS-1$
-		assertNotNull("Should not be null", root); //$NON-NLS-1$
-	}
-
-	/**
-	 * Reset the jar placeholder and delete project.
-	 */
-	public void tearDownSuite() throws Exception {
-		this.deleteProject("AttachedJavadocProject"); //$NON-NLS-1$
-		this.root = null;
-		this.project = null;
-		super.tearDownSuite();
-	}
-
-	// test javadoc for a package fragment
-	public void test001() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		String javadoc = packageFragment.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-	}
-
-	// for a class file
-	public void test002() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("X.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		String javadoc = classFile.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-	}
-
-	// for a field
-	public void test003() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("X.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		IType type = classFile.getType();
-		IField field = type.getField("f"); //$NON-NLS-1$
-		assertNotNull(field);
-		String javadoc = field.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-	}
-
-	// for a method
-	public void test004() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("X.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		IType type = classFile.getType();
-		IFunction method = type.getFunction("foo", new String[] {"I", "J", "Ljava.lang.String;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		assertTrue(method.exists());
-		String javadoc = method.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-		String[] paramNames = method.getParameterNames();
-		assertNotNull(paramNames);
-		assertEquals("Wrong size", 3, paramNames.length); //$NON-NLS-1$
-		assertEquals("Wrong name for first param", "i", paramNames[0]); //$NON-NLS-1$ //$NON-NLS-2$
-		assertEquals("Wrong name for second param", "l", paramNames[1]); //$NON-NLS-1$ //$NON-NLS-2$
-		assertEquals("Wrong name for third param", "s", paramNames[2]); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// for a constructor
-	public void test005() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("X.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		IType type = classFile.getType();
-		IFunction method = type.getFunction("X", new String[] {"I"}); //$NON-NLS-1$ //$NON-NLS-2$
-		assertTrue(method.exists());
-		String javadoc = method.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-		String[] paramNames = method.getParameterNames();
-		assertNotNull(paramNames);
-		assertEquals("Wrong size", 1, paramNames.length); //$NON-NLS-1$
-		assertEquals("Wrong name for first param", "i", paramNames[0]);		 //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// for a member type
-	public void test006() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("X$A.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		String javadoc = classFile.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-	}
-	
-	// for a constructor
-	public void test007() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("X$A.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		IType type = classFile.getType();
-		IFunction method = type.getFunction("A", new String[] {"Lp1.p2.X;", "F"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		assertTrue(method.exists());
-		String javadoc = method.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-		String[] paramNames = method.getParameterNames();
-		assertNotNull(paramNames);
-		assertEquals("Wrong size", 1, paramNames.length); //$NON-NLS-1$
-		assertEquals("Wrong name for first param", "f", paramNames[0]); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	// for a method foo2
-	public void test008() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("X.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		IType type = classFile.getType();
-		IFunction method = type.getFunction("foo2", new String[0]); //$NON-NLS-1$
-		assertTrue(method.exists());
-		String javadoc = method.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-		String[] paramNames = method.getParameterNames();
-		assertNotNull(paramNames);
-		assertEquals("Wrong size", 0, paramNames.length); //$NON-NLS-1$
-	}
-	
-	// for a field f2
-	public void test009() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("X.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		IType type = classFile.getType();
-		IField field = type.getField("f2"); //$NON-NLS-1$
-		assertNotNull(field);
-		String javadoc = field.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-	}
-	
-	// test archive doc
-	public void test010() throws JavaScriptModelException {
-		IIncludePathEntry[] savedEntries = null;
-		try {
-			IIncludePathEntry[] entries = this.project.getRawIncludepath();
-			savedEntries = (IIncludePathEntry[]) entries.clone();
-			IResource resource = this.project.getProject().findMember("/doc.zip"); //$NON-NLS-1$
-			assertNotNull("doc folder cannot be null", resource); //$NON-NLS-1$
-			URI locationURI = resource.getLocationURI();
-			assertNotNull("doc folder cannot be null", locationURI); //$NON-NLS-1$
-			URL docUrl = null;
-			try {
-				docUrl = locationURI.toURL();
-			} catch (MalformedURLException e) {
-				assertTrue("Should not happen", false); //$NON-NLS-1$
-			} catch(IllegalArgumentException e) {
-				assertTrue("Should not happen", false); //$NON-NLS-1$
-			}
-			final String path = "jar:" + docUrl.toExternalForm() + "!/doc"; //$NON-NLS-1$ //$NON-NLS-2$
-			//final String path = "jar:" + "platform:/resource/AttachedJavadocProject/doc.zip" + "!/doc";
-			IIncludePathAttribute attribute = JavaScriptCore.newIncludepathAttribute(IIncludePathAttribute.JSDOC_LOCATION_ATTRIBUTE_NAME, path);
-			for (int i = 0, max = entries.length; i < max; i++) {
-				final IIncludePathEntry entry = entries[i];
-				if (entry.getEntryKind() == IIncludePathEntry.CPE_LIBRARY
-						&& entry.getContentKind() == IPackageFragmentRoot.K_BINARY
-						&& "/AttachedJavadocProject/lib/test6.jar".equals(entry.getPath().toString())) { //$NON-NLS-1$
-					entries[i] = JavaScriptCore.newLibraryEntry(entry.getPath(), entry.getSourceAttachmentPath(), entry.getSourceAttachmentRootPath(), entry.getAccessRules(), new IIncludePathAttribute[] { attribute }, entry.isExported());
-				}
-			}
-			this.project.setRawIncludepath(entries, null);
-			IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-			assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-			IClassFile classFile = packageFragment.getClassFile("X.class"); //$NON-NLS-1$
-			assertNotNull(classFile);
-			IType type = classFile.getType();
-			IField field = type.getField("f"); //$NON-NLS-1$
-			assertNotNull(field);
-			String javadoc = field.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-			assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-		} finally {
-			// restore classpath
-			if (savedEntries != null) {
-				this.project.setRawIncludepath(savedEntries, null);
-			}
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=120597
-	public void test011() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("Z.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		IType type = classFile.getType();
-		IField field = type.getField("out"); //$NON-NLS-1$
-		assertNotNull(field);
-		String javadoc = field.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=120637
-	public void test012() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("Z.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		String javadoc = classFile.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-		assertTrue("Should not contain reference to out", javadoc.indexOf("out") == -1);
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=120559
-	public void test013() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("W.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		String javadoc = classFile.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNull("Should not have a javadoc", javadoc); //$NON-NLS-1$
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=120637
-	public void test014() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("E.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		String javadoc = classFile.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-		assertTrue("Should not contain reference to Constant C", javadoc.indexOf("Constant C") == -1);
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=120637
-	public void test015() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("Annot.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		String javadoc = classFile.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-		assertTrue("Should not contain reference to name", javadoc.indexOf("name") == -1);
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=120847
-	public void test016() throws JavaScriptModelException {
-		IIncludePathEntry[] savedEntries = null;
-		try {
-			IIncludePathEntry[] entries = this.project.getRawIncludepath();
-			savedEntries = (IIncludePathEntry[]) entries.clone();
-			IIncludePathAttribute attribute = JavaScriptCore.newIncludepathAttribute(IIncludePathAttribute.JSDOC_LOCATION_ATTRIBUTE_NAME, "invalid_path");
-			for (int i = 0, max = entries.length; i < max; i++) {
-				final IIncludePathEntry entry = entries[i];
-				if (entry.getEntryKind() == IIncludePathEntry.CPE_LIBRARY
-						&& entry.getContentKind() == IPackageFragmentRoot.K_BINARY
-						&& "/AttachedJavadocProject/lib/test6.jar".equals(entry.getPath().toString())) { //$NON-NLS-1$
-					entries[i] = JavaScriptCore.newLibraryEntry(entry.getPath(), entry.getSourceAttachmentPath(), entry.getSourceAttachmentRootPath(), entry.getAccessRules(), new IIncludePathAttribute[] { attribute }, entry.isExported());
-				}
-			}
-			this.project.setRawIncludepath(entries, null);
-			IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-			assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-			IClassFile classFile = packageFragment.getClassFile("X.class"); //$NON-NLS-1$
-			assertNotNull(classFile);
-			IType type = classFile.getType();
-			IField field = type.getField("f"); //$NON-NLS-1$
-			assertNotNull(field);
-			field.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-			assertFalse("Should be unreachable", true);
-		} catch(JavaScriptModelException e) {
-			assertTrue("Must occur", true);
-			assertEquals("Wrong error message", "Cannot retrieve the attached javadoc for invalid_path", e.getMessage());
-		} finally {
-			// restore classpath
-			if (savedEntries != null) {
-				this.project.setRawIncludepath(savedEntries, null);
-			}
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=120875
-	public void test017() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("Annot2.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		String javadoc = classFile.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-		assertTrue("Should not contain reference to name2", javadoc.indexOf("name2") == -1);
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=138167
-	public void test018() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2/p3"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("C.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		IType type = classFile.getType();
-		IFunction[] methods = type.getFunctions();
-		NullProgressMonitor monitor = new NullProgressMonitor();
-		for (int i = 0, max = methods.length; i < max; i++) {
-			IFunction method = methods[i];
-			String javadoc = method.getAttachedJavadoc(monitor);
-			assertNotNull("Should have a javadoc", javadoc);
-			final String selector = method.getElementName();
-			assertTrue("Wrong doc", javadoc.indexOf(selector) != -1);
-		}
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=138167
-	public void test019() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2/p3"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("C.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		IType type = classFile.getType();
-		IFunction method = type.getFunction("bar5", new String[] {"Ljava.util.Map<TK;TV;>;", "I", "Ljava.util.Map<TK;TV;>;"}); //$NON-NLS-1$
-		assertTrue(method.exists());
-		String javadoc = method.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		assertNotNull("Should have a javadoc", javadoc); //$NON-NLS-1$
-		String[] names = method.getParameterNames();
-		assertNotNull("No names", names);
-		assertEquals("Wrong size", 3, names.length);
-		assertEquals("Wrong parameter name", "m", names[0]);
-		assertEquals("Wrong parameter name", "j", names[1]);
-		assertEquals("Wrong parameter name", "m2", names[2]);
-	}
-	
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=139160
-	public void test020() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("Z.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		IType type = classFile.getType();
-		IFunction method = type.getFunction("foo", new String[] {"I", "I"}); //$NON-NLS-1$
-		assertTrue(method.exists());
-		String javadoc = null;
-		try {
-			javadoc = method.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		} catch(JavaScriptModelException e) {
-			assertTrue("Should not happen", false);
-		}
-		assertNull("Should not have a javadoc", javadoc); //$NON-NLS-1$
-		String[] paramNames = method.getParameterNames();
-		assertNotNull(paramNames);
-		assertEquals("Wrong size", 2, paramNames.length); //$NON-NLS-1$
-		assertEquals("Wrong name", "arg0", paramNames[0]); //$NON-NLS-1$
-		assertEquals("Wrong name", "arg1", paramNames[1]); //$NON-NLS-1$
-	}
-	
-	/*
-	 * Ensures that calling getAttachedJavadoc(...) on a binary method
-	 * has no side-effect on the underlying Java model cache.
-	 * (regression test for bug 140879 Spontaneous error "java.util.Set cannot be resolved...")
-	 */
-	public void test021() throws CoreException, IOException {
-		IJavaScriptUnit workingCopy = null;
-		try {
-			IPackageFragment p = this.root.getPackageFragment("p2");
-			IType type = p.getClassFile("X.class").getType();
-			IFunction method = type.getFunction("foo", new String[0]);
-			
-			// the following call should have no side-effect
-			method.getAttachedJavadoc(null);
-			
-			// ensure no side-effect
-			ProblemRequestor problemRequestor = new ProblemRequestor();
-			workingCopy = getWorkingCopy(
-				"/AttachedJavadocProject/src/Test.js", 
-				"import p2.Y;\n" +
-				"public class Test extends Y { }",
-				new WorkingCopyOwner() {},
-				problemRequestor
-			);
-			assertProblems(
-				"Unexpected problems", 
-				"----------\n" + 
-				"----------\n",
-				problemRequestor);
-		} finally {
-			if (workingCopy != null)
-				workingCopy.discardWorkingCopy();
-			deleteProject("P");
-		}
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=149154
-	public void test022() throws JavaScriptModelException {
-		IPackageFragment packageFragment = this.root.getPackageFragment("p1/p2"); //$NON-NLS-1$
-		assertNotNull("Should not be null", packageFragment); //$NON-NLS-1$
-		IClassFile classFile = packageFragment.getClassFile("X.class"); //$NON-NLS-1$
-		assertNotNull(classFile);
-		IType type = classFile.getType();
-		IFunction method = type.getFunction("access$1", new String[] {"Lp1.p2.X;", "I"}); //$NON-NLS-1$
-		assertTrue(method.exists());
-		String javadoc = null;
-		try {
-			javadoc = method.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
-		} catch(JavaScriptModelException e) {
-			assertTrue("Should not happen", false);
-		}
-		assertNull("Should not have a javadoc", javadoc); //$NON-NLS-1$
-		String[] paramNames = method.getParameterNames();
-		assertNotNull(paramNames);
-		assertEquals("Wrong size", 2, paramNames.length); //$NON-NLS-1$
-		assertEquals("Wrong name", "arg0", paramNames[0]); //$NON-NLS-1$
-		assertEquals("Wrong name", "arg1", paramNames[1]); //$NON-NLS-1$
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/BindingKeyTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/BindingKeyTests.java
deleted file mode 100644
index 11a08b9..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/BindingKeyTests.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import org.eclipse.wst.jsdt.core.BindingKey;
-
-import junit.framework.Test;
-
-public class BindingKeyTests extends AbstractJavaModelTests {
-	
-	static {
-	}
-
-	public BindingKeyTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return buildModelTestSuite(BindingKeyTests.class);
-	}
-	
-	protected void assertBindingKeyEquals(String expected, String key) {
-		if (!(expected.equals(key)))
-			System.out.println(displayString(key, 3) + ",");
-		assertEquals(expected, key);
-	}
-	
-	protected void assertBindingKeySignatureEquals(String expected, String key) {
-		BindingKey bindingKey = new BindingKey(key);
-		String signature = bindingKey.toSignature();
-		if (!(expected.equals(signature)))
-			System.out.println(displayString(signature, 3) + ",");
-		assertEquals(expected, signature);
-	}
-	
-	/*
-	 * Package.
-	 */
-	public void test001() {
-		assertBindingKeySignatureEquals(
-			"p",
-			"p"
-		);
-	}
-
-	/*
-	 * Top level type in non default package.
-	 */
-	public void test002() {
-		assertBindingKeySignatureEquals(
-			"Lp.X;",
-			"Lp/X;"
-		);
-	}
-
-	/*
-	 * Top level type in default package.
-	 */
-	public void test003() {
-		assertBindingKeySignatureEquals(
-			"LClazz;",
-			"LClazz;"
-		);
-	}
-
-	/*
-	 * Member type
-	 */
-	public void test004() {
-		assertBindingKeySignatureEquals(
-			"Lp.X$Member;",
-			"Lp/X$Member;"
-		);
-	}
-
-	/*
-	 * Member type (2 levels deep)
-	 */
-	public void test005() {
-		assertBindingKeySignatureEquals(
-			"Lp1.X$Member1$Member2;",
-			"Lp1/X$Member1$Member2;"
-		);
-	}
-
-	/*
-	 * Anonymous type
-	 */
-	public void test006() {
-		assertBindingKeySignatureEquals(
-			"Lp1.X$1;",
-			"Lp1/X$1;"
-		);
-	}
-
-	/*
-	 * Local type
-	 */
-	public void test007() {
-		assertBindingKeySignatureEquals(
-			"Lp1.X$1$Y;",
-			"Lp1/X$1$Y;"
-		);
-	}
-
-	/*
-	 * Array type
-	 */
-	public void test008() {
-		assertBindingKeySignatureEquals(
-			"[Lp1.X;",
-			"[Lp1/X;"
-		);
-	}
-
-	/*
-	 * Secondary type
-	 */
-	public void test012() {
-		assertBindingKeySignatureEquals(
-			"Lp1.Secondary;",
-			"Lp1/X~Secondary;"
-		);
-	}
-
-	/*
-	 * Anonymous in a secondary type
-	 */
-	public void test013() {
-		assertBindingKeySignatureEquals(
-			"Lp1.Secondary$1;",
-			"Lp1/X~Secondary$1;"
-		);
-	}
-
-	/*
-	 * Method
-	 * (regression test for bug 85811 BindingKey.toSignature should return method signature for methods)
-	 */
-	public void test014() {
-		assertBindingKeySignatureEquals(
-			"(Ljava.lang.String;I)Z",
-			"Lp1/X;.foo(Ljava/lang/String;I)Z"
-		);
-	}
-	
-	/*
-	 * Create a type binding key from a fully qualified name
-	 */
-	public void test015() {
-		String key = BindingKey.createTypeBindingKey("java.lang.Object");
-		assertBindingKeyEquals(
-			"Ljava/lang/Object;",
-			key);
-	}
-
-	/*
-	 * Create a type binding key from an array type name
-	 */
-	public void test017() {
-		String key = BindingKey.createTypeBindingKey("Boolean[]");
-		assertBindingKeyEquals(
-			"[LBoolean;",
-			key);
-	}
-
-	/*
-	 * Create an array type binding key
-	 */
-	public void test020() {
-		String key = BindingKey.createArrayTypeBindingKey("Ljava/lang/Object;", 1);
-		assertBindingKeyEquals(
-			"[Ljava/lang/Object;",
-			key);
-	}
-
-	/*
-	 * Create an array type binding key
-	 */
-	public void test021() {
-		String key = BindingKey.createArrayTypeBindingKey("I", 2);
-		assertBindingKeyEquals(
-			"[[I",
-			key);
-	}
-	
-	/*
-	 * Method starting with an upper case corresponding to a primitive type
-	 * (regression test for bug 94398 Error attempting to find References)
-	 */
-	public void test034() {
-		assertBindingKeySignatureEquals(
-			"(Ljava.lang.String;I)Z",
-			"Lp1/X;.Set(Ljava/lang/String;I)Z"
-		);
-	}
-	
-	/*
-	 * Field
-	 * (regression test for bug  87362 BindingKey#internalToSignature() should return the field's type signature)
-	 */
-	public void test037() {
-		assertBindingKeySignatureEquals(
-			"Ljava.lang.String;",
-			"Lp/X;.foo)Ljava/lang/String;"
-		);
-	}
-
-	/*
-	 * Base type
-	 * (regression test for bug 97187 [rendering] Shows Single Char for primitve Types)
-	 */
-	public void test039() {
-		assertBindingKeySignatureEquals(
-			"Z",
-			"Z"
-		);
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/BufferTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/BufferTests.java
deleted file mode 100644
index 7d1cd0a..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/BufferTests.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.wst.jsdt.core.*;
-
-import junit.framework.Test;
-
-public class BufferTests extends ModifyingResourceTests implements
-		IBufferChangedListener {
-	protected ArrayList events = null;
-
-	public BufferTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Cache the event
-	 */
-	public void bufferChanged(BufferChangedEvent bufferChangedEvent) {
-		this.events.add(bufferChangedEvent);
-	}
-
-	protected IBuffer createBuffer(String path, String content)
-			throws CoreException {
-		waitUntilIndexesReady(); // ensure that the indexer is not reading the
-									// file
-		this.createFile(path, content);
-		IJavaScriptUnit cu = this.getCompilationUnit(path);
-		IBuffer buffer = cu.getBuffer();
-		buffer.addBufferChangedListener(this);
-		this.events = new ArrayList();
-		return buffer;
-	}
-
-	protected void deleteBuffer(IBuffer buffer) throws CoreException {
-		buffer.removeBufferChangedListener(this);
-		IResource resource = buffer.getUnderlyingResource();
-		if (resource != null) {
-			deleteResource(resource);
-		}
-	}
-
-	/**
-	 * @see AbstractJavaModelTests#setUpSuite()
-	 */
-	public void setUpSuite() throws Exception {
-		super.setUpSuite();
-		try {
-			this.createJavaProject("P", new String[] { "" });
-			this.createFolder("P/x/y");
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @see AbstractJavaModelTests#tearDownSuite()
-	 */
-	public void tearDownSuite() throws Exception {
-		super.tearDownSuite();
-		this.deleteProject("P");
-	}
-
-	public static Test suite() {
-		return buildModelTestSuite(BufferTests.class);
-	}
-
-	/**
-	 * Tests appending to a buffer.
-	 */
-	public void testAppend() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		try {
-			int oldLength = buffer.getLength();
-			buffer.append("\nvar a = new A();");
-			assertBufferEvent(oldLength, 0, "\nvar a = new A();");
-			assertSourceEquals("unexpected buffer contents", "function A() {\n};"
-					+ "\nvar a = new A();", buffer.getContents());
-			assertTrue("should have unsaved changes", buffer
-					.hasUnsavedChanges());
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests appending to a read-only buffer.
-	 */
-	//TODO
-	/*public void testAppendReadOnly() throws CoreException {
-		IBuffer buffer = null;
-		try {
-			createJavaProject("P1", new String[] {}, "");
-			// IClassFile classFile = getClassFile("P1",
-			// getExternalJCLPathString(), "", "system.js");
-			IJavaScriptUnit unit = getCompilationUnit("P1",
-					getExternalJCLPathString(), "", "system.js");
-			buffer = unit.getBuffer();
-			buffer.addBufferChangedListener(this);
-			this.events = new ArrayList();
-			buffer.append("\nclass B {}");
-			assertTrue("unexpected event", this.events.isEmpty());
-			assertSourceEquals("unexpected buffer contents",
-					"package java.lang;\n" + "\n" + "public class String {\n"
-							+ "}\n", buffer.getContents());
-			assertTrue("should not have unsaved changes", !buffer
-					.hasUnsavedChanges());
-		} finally {
-			if (buffer != null) {
-				buffer.removeBufferChangedListener(this);
-			}
-			deleteProject("P1");
-		}
-	}*/
-
-	public void testClose() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		try {
-			buffer.close();
-			assertBufferEvent(0, 0, null);
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests getting the underlying resource of a buffer.
-	 */
-	public void testGetUnderlyingResource() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		IJavaScriptUnit copy = null;
-		try {
-			IFile file = this.getFile("P/x/y/A.js");
-			assertEquals("Unexpected underlying resource", file, buffer
-					.getUnderlyingResource());
-
-			copy = this.getCompilationUnit("P/x/y/A.js").getWorkingCopy(null);
-			assertEquals("Unexpected underlying resource 2", file, copy
-					.getBuffer().getUnderlyingResource());
-		} finally {
-			this.deleteBuffer(buffer);
-			if (copy != null) {
-				copy.discardWorkingCopy();
-			}
-		}
-	}
-
-	/**
-	 * Tests deleting text at the beginning of a buffer.
-	 */
-	public void testDeleteBeginning() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};\n" +
-			"var a = new A();");
-		try {
-			buffer.replace(0, 18, "");
-			assertBufferEvent(0, 18, null);
-			assertSourceEquals("unexpected buffer contents",
-					"var a = new A();", buffer.getContents());
-			assertTrue("should have unsaved changes", buffer
-					.hasUnsavedChanges());
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests deleting text in the middle of a buffer.
-	 */
-	public void testDeleteMiddle() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};\n" +
-			"var a = new A();\nvar a1 = new A();");
-		try {
-			// delete var a = new A();\n
-			buffer.replace(18, 17, "");
-			assertBufferEvent(18, 17, null);
-			assertSourceEquals("unexpected buffer contents", "function A() {\n};\n" +
-					"var a1 = new A();", buffer.getContents());
-			assertTrue("should have unsaved changes", buffer
-					.hasUnsavedChanges());
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests deleting text at the end of a buffer.
-	 */
-	public void testDeleteEnd() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};\n" +
-				"var a = new A();");
-		try {
-			// delete "public class A {\n}"
-			buffer.replace(17, 17, "");
-			assertBufferEvent(17, 17, null);
-			assertSourceEquals("unexpected buffer contents", "function A() {\n};",
-					buffer.getContents());
-			assertTrue("should have unsaved changes", buffer
-					.hasUnsavedChanges());
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests the buffer char retrieval via source position
-	 */
-	public void testGetChar() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		try {
-			assertEquals("Unexpected char at position 9", 'A', buffer
-					.getChar(9));
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests the buffer char retrieval via source position doesn't throw an
-	 * exception if the buffer is closed.
-	 */
-	public void testGetChar2() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		buffer.close();
-		try {
-			assertEquals("Unexpected char at position 9", Character.MIN_VALUE,
-					buffer.getChar(9));
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests the buffer getLength()
-	 */
-	public void testGetLength() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		try {
-			assertEquals("Unexpected length", 17, buffer.getLength());
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests the buffer text retrieval via source position
-	 */
-	public void testGetText() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		try {
-			assertSourceEquals("Unexpected text (1)", "f", buffer.getText(0, 1));
-			assertSourceEquals("Unexpected text (2)", "A()", buffer.getText(
-					9, 3));
-			assertSourceEquals("Unexpected text (3)", "", buffer.getText(12, 0));
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests inserting text at the beginning of a buffer.
-	 */
-	public void testInsertBeginning() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		try {
-			buffer.replace(0, 0, "/* copyright mycompany */\n");
-			assertBufferEvent(0, 0, "/* copyright mycompany */\n");
-			assertSourceEquals("unexpected buffer contents",
-					"/* copyright mycompany */\n" + "function A() {\n};", 
-					buffer.getContents());
-			assertTrue("should have unsaved changes", buffer
-					.hasUnsavedChanges());
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests replacing text at the beginning of a buffer.
-	 */
-	public void testReplaceBeginning() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		try {
-			// replace function A() with function B()
-			buffer.replace(0, 12, "function B()");
-			assertBufferEvent(0, 12, "function B()");
-			assertSourceEquals("unexpected buffer contents", "function B() {\n};",
-					buffer.getContents());
-			assertTrue("should have unsaved changes", buffer
-					.hasUnsavedChanges());
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests replacing text in the middle of a buffer.
-	 */
-	public void testReplaceMiddle() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		try {
-			// replace "A()" after the \n of package statement
-			buffer.replace(9, 3, "B( )");
-			assertBufferEvent(9, 3, "B( )");
-			assertSourceEquals("unexpected buffer contents", "function B( ) {\n};",
-					buffer.getContents());
-			assertTrue("should have unsaved changes", buffer
-					.hasUnsavedChanges());
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests replacing text at the end of a buffer.
-	 */
-	public void testReplaceEnd() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		try {
-			// replace ";" at the end of cu with ";\n"
-			int end = buffer.getLength();
-			buffer.replace(end - 1, 1, ";\n");
-			assertBufferEvent(end - 1, 1, ";\n");
-			assertSourceEquals("unexpected buffer contents", "function A() {\n};\n", 
-					buffer.getContents());
-			assertTrue("should have unsaved changes", buffer
-					.hasUnsavedChanges());
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests inserting text in the middle of a buffer.
-	 */
-	public void testInsertMiddle() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A() {\n};");
-		try {
-			// insert comment in the middle of the {\n}
-			buffer.replace(15, 0, "// comment\n");
-			assertBufferEvent(15, 0, "// comment\n");
-			assertSourceEquals("unexpected buffer contents", 
-					"function A() {\n// comment\n};",
-					buffer.getContents());
-			assertTrue("should have unsaved changes", buffer
-					.hasUnsavedChanges());
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Tests inserting text at the end of a buffer.
-	 */
-	public void testInsertEnd() throws CoreException {
-		IBuffer buffer = this.createBuffer("P/x/y/A.js", "function A(){\n};");
-		try {
-			// insert function B(){\n} at the end of the buffer
-			int end = buffer.getLength();
-			buffer.replace(end, 0, "\nfunction B(){\n};");
-			assertBufferEvent(end, 0, "\nfunction B(){\n};");
-			assertSourceEquals("unexpected buffer contents", 
-					"function A(){\n};\nfunction B(){\n};", buffer
-					.getContents());
-			assertTrue("should have unsaved changes", buffer
-					.hasUnsavedChanges());
-		} finally {
-			this.deleteBuffer(buffer);
-		}
-	}
-
-	/**
-	 * Verify the buffer changed event. The given text must contain '\n' line
-	 * separators.
-	 */
-	protected void assertBufferEvent(int offset, int length, String text) {
-		assertTrue("events should not be null", this.events != null);
-		assertTrue("events should not be empty", !this.events.isEmpty());
-		BufferChangedEvent event = (BufferChangedEvent) this.events.get(0);
-		assertEquals("unexpected offset", offset, event.getOffset());
-		assertEquals("unexpected length", length, event.getLength());
-		if (text == null) {
-			assertTrue("text should be null", event.getText() == null);
-		} else {
-			assertSourceEquals("unexpected text", text, event.getText());
-		}
-	}
-
-	protected void assertBufferEvents(String expected) {
-		StringBuffer buffer = new StringBuffer();
-		if (this.events == null)
-			buffer.append("<null>");
-		else {
-			for (int i = 0, length = this.events.size(); i < length; i++) {
-				BufferChangedEvent event = (BufferChangedEvent) this.events
-						.get(i);
-				buffer.append('(');
-				buffer.append(event.getOffset());
-				buffer.append(", ");
-				buffer.append(event.getLength());
-				buffer.append(") ");
-				buffer.append(event.getText());
-				if (i < length - 1)
-					buffer.append("\n");
-			}
-		}
-		assertSourceEquals("Unexpected buffer events", expected, buffer
-				.toString());
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CancelCounter.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CancelCounter.java
deleted file mode 100644
index 033b9b2..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CancelCounter.java
+++ /dev/null
@@ -1,31 +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
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/*
- * Counts the number of time isCancelled() is called.
- */
-public class CancelCounter implements IProgressMonitor {
-	public int count = 0;
-	public void beginTask(String name, int totalWork) {}
-	public void done() {}
-	public void internalWorked(double work) {}
-	public boolean isCanceled() {
-		count++;
-		return false;
-	}
-	public void setCanceled(boolean value) {}
-	public void setTaskName(String name) {}
-	public void subTask(String name) {}
-	public void worked(int work) {}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/Canceler.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/Canceler.java
deleted file mode 100644
index 01bd795..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/Canceler.java
+++ /dev/null
@@ -1,34 +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
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/*
- * Cancels the operation on the count time isCanceled() is called.
- */
-public class Canceler implements IProgressMonitor {
-	int count;
-	public Canceler(int count) {
-		this.count = count;
-	}
-	public void beginTask(String name, int totalWork) {}
-	public void done() {}
-	public void internalWorked(double work) {}
-	public boolean isCanceled() {
-		return --count < 0;
-	}
-	public void setCanceled(boolean value) {}
-	public void setTaskName(String name) {}
-	public void subTask(String name) {}
-	public void worked(int work) {}
-}
-
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClassFileTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClassFileTests.java
deleted file mode 100644
index 24815a6..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClassFileTests.java
+++ /dev/null
@@ -1,824 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.jsdt.core.Flags;
-import org.eclipse.wst.jsdt.core.IClassFile;
-import org.eclipse.wst.jsdt.core.IFunction;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.core.IPackageFragmentRoot;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.WorkingCopyOwner;
-import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchConstants;
-import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchScope;
-import org.eclipse.wst.jsdt.core.search.SearchEngine;
-
-public class ClassFileTests extends ModifyingResourceTests {
-	
-	IPackageFragmentRoot jarRoot;
-	IJavaScriptUnit workingCopy;
-	IClassFile classFile;
-	
-public ClassFileTests(String name) {
-	super(name);
-}
-
-// Use this static initializer to specify subset for tests
-// All specified tests which do not belong to the class are skipped...
-static {
-//	TESTS_PREFIX = "testGetCategories";
-//	TESTS_NAMES = new String[] { "testWorkingCopy11"};
-//	TESTS_NUMBERS = new int[] { 13 };
-//	TESTS_RANGE = new int[] { 16, -1 };
-}
-public static Test suite() {
-	return buildModelTestSuite(ClassFileTests.class);
-}
-
-public void setUpSuite() throws Exception {
-	super.setUpSuite();
-	IJavaScriptProject javaProject = createJavaProject("P");
-	String[] pathAndContents = new String[] {
-		"nongeneric/A.js", 
-		"package nongeneric;\n" +
-		"public class A {\n" + 
-		"}",			
-		"generic/X.js", 
-		"package generic;\n" +
-		"public class X<T> {\n" + 
-		"  <U extends Exception> X<T> foo(X<T> x) throws RuntimeException, U {\n" +
-		"    return null;\n" +
-		"  }\n" +
-		"  <K, V> V foo(K key, V value) throws Exception {\n" +
-		"    return value;\n" +
-		"  }\n" +
-		"}",
-		"generic/Y.js", 
-		"package generic;\n" +
-		"public class Y<K, L> {\n" + 
-		"}",
-		"generic/Z.js", 
-		"package generic;\n" +
-		"public class Z<T extends Object & I<? super T>> {\n" + 
-		"}",
-		"generic/I.js", 
-		"package generic;\n" +
-		"public interface I<T> {\n" + 
-		"}",
-		"generic/W.js", 
-		"package generic;\n" +
-		"public class W<T extends X<T> , U extends T> {\n" + 
-		"}",
-		"generic/V.js", 
-		"package generic;\n" +
-		"public class V extends X<Thread> implements I<String> {\n" + 
-		"}",
-		"varargs/X.js", 
-		"package varargs;\n" +
-		"public class X {\n" + 
-		"  void foo(String s, Object ... others) {\n" +
-		"  }\n" +
-		"}",
-		"workingcopy/X.js", 
-		"package workingcopy;\n" +
-		"public class X {\n" + 
-		"  void foo() {\n" +
-		"    System.out.println();\n" +
-		"  }\n" +
-		"}",
-		"workingcopy/Y.js", 
-		"package workingcopy;\n" +
-		"public class Y<W> {\n" + 
-		"  <T> T foo(T t, String... args) {\n" +
-		"    return t;\n" +
-		"  }\n" +
-		"}",
-	};
-	addLibrary(javaProject, "lib.jar", "libsrc.zip", pathAndContents, JavaScriptCore.VERSION_1_5);
-	this.jarRoot = javaProject.getPackageFragmentRoot(getFile("/P/lib.jar"));
-}
-
-public void tearDownSuite() throws Exception {
-	super.tearDownSuite();
-	deleteProject("P");
-}
-
-protected void tearDown() throws Exception {
-	if (this.workingCopy != null)
-		this.workingCopy.discardWorkingCopy();
-	if (this.classFile != null) {
-		removeLibrary(getJavaProject("P"), "lib2.jar", "src2.zip");
-		this.classFile = null;
-	}
-	super.tearDown();
-}
-
-private IClassFile createClassFile(String contents) throws CoreException, IOException {
-	IJavaScriptProject project = getJavaProject("P");
-	addLibrary(project, "lib2.jar", "src2.zip", new String[] {"p/X.js", contents}, "1.5");
-	this.classFile =  project.getPackageFragmentRoot(getFile("/P/lib2.jar")).getPackageFragment("p").getClassFile("X.class");
-	return this.classFile;
-}
-
-/*
- * Ensures that no exception is thrown for a .class file name with a dot
- * (regression test for bug 114140 assertion failed when opening a class file not not the classpath)
- */
-public void testDotName() throws JavaScriptModelException {
-	IType type = getClassFile("/P/X.Y.class").getType();
-	assertEquals("X.Y", type.getElementName());
-}
-
-/*
- * Ensure that the categories for a class are correct.
- */
-public void testGetCategories01() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"/**\n" +
-		" * @category test\n" +
-		" */\n" +
-		"public class X {\n" +
-		"}"
-	);
-	String[] categories = this.classFile.getType().getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test\n",
-		categories);
-}
-public void testGetCategories02() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"/**\n" +
-		" * @category test1 test2 test3 test4 test5 test6 test7 test8 test9 test10\n" +
-		" */\n" +
-		"public class X {\n" +
-		"}"
-	);
-	String[] categories = this.classFile.getType().getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test1\ntest2\ntest3\ntest4\ntest5\ntest6\ntest7\ntest8\ntest9\ntest10\n",
-		categories);
-}
-
-/*
- * Ensure that the categories for a field are correct.
- */
-public void testGetCategories03() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"public class X {\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  int field;\n" +
-		"}"
-	);
-	String[] categories = this.classFile.getType().getField("field").getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test\n",
-		categories);
-}
-public void testGetCategories04() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"public class X {\n" +
-		"  /**\n" +
-		"   * @category test1 test2\n" +
-		"   */\n" +
-		"  int field;\n" +
-		"}"
-	);
-	String[] categories = this.classFile.getType().getField("field").getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test1\ntest2\n",
-		categories);
-}
-
-/*
- * Ensure that the categories for a method are correct.
- */
-public void testGetCategories05() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"public class X {\n" +
-		"  /**\n" +
-		" * @category test\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = this.classFile.getType().getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test\n",
-		categories);
-}
-public void testGetCategories06() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"public class X {\n" +
-		"  /**\n" +
-		" * @category test1 test2 test3 test4 test5\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = this.classFile.getType().getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test1\ntest2\ntest3\ntest4\ntest5\n",
-		categories);
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=125676
-public void testGetCategories07() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"public class X {\n" +
-		"  /**\n" +
-		"   * @category " +
-		"	 *		test\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = this.classFile.getType().getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"",
-		categories);
-}
-public void testGetCategories08() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"public class X {\n" +
-		"  /**\n" +
-		"   * @category" +
-		"	 *		test\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = this.classFile.getType().getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"",
-		categories);
-}
-public void testGetCategories09() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"public class X {\n" +
-		"  /**\n" +
-		"   * @category test1" +
-		"	 *		test2\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = this.classFile.getType().getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test1\n",
-		categories);
-}
-
-/*
- * Ensure that the categories for a member that has no categories when another member defines some are correct.
- */
-public void testGetCategories10() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"public class X {\n" +
-		"  int field1;\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  int field2;\n" +
-		"}"
-	);
-	String[] categories = this.classFile.getType().getField("field1").getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"",
-		categories);
-}
-
-/*
- * Ensures that the children of a type for a given category are correct.
- */
-public void testGetChildrenForCategory01() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"public class X {\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  int field;\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  void foo1() {}\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  void foo2() {}\n" +
-		"  /**\n" +
-		"   * @category other\n" +
-		"   */\n" +
-		"  void foo3() {}\n" +
-		"}"
-	);
-	IJavaScriptElement[] children = this.classFile.getType().getChildrenForCategory("test");
-	assertElementsEqual(
-		"Unexpected children",
-		"field [in X [in X.class [in p [in lib2.jar [in P]]]]]\n" + 
-		"foo1() [in X [in X.class [in p [in lib2.jar [in P]]]]]\n" + 
-		"foo2() [in X [in X.class [in p [in lib2.jar [in P]]]]]",
-		children);
-}
-public void testGetChildrenForCategory02() throws CoreException, IOException {
-	createClassFile(
-		"package p;\n" +
-		"public class X {\n" +
-		"  /**\n" +
-		"   * @category fields test all\n" +
-		"   */\n" +
-		"  int field;\n" +
-		"  /**\n" +
-		"   * @category methods test all\n" +
-		"   */\n" +
-		"  void foo1() {}\n" +
-		"  /**\n" +
-		"   * @category methods test all\n" +
-		"   */\n" +
-		"  void foo2() {}\n" +
-		"  /**\n" +
-		"   * @category methods other all\n" +
-		"   */\n" +
-		"  void foo3() {}\n" +
-		"}"
-	);
-	IJavaScriptElement[] tests  = this.classFile.getType().getChildrenForCategory("test");
-	assertElementsEqual(
-		"Unexpected children",
-		"field [in X [in X.class [in p [in lib2.jar [in P]]]]]\n" + 
-		"foo1() [in X [in X.class [in p [in lib2.jar [in P]]]]]\n" + 
-		"foo2() [in X [in X.class [in p [in lib2.jar [in P]]]]]",
-		tests);
-	IJavaScriptElement[] methods = this.classFile.getType().getChildrenForCategory("methods");
-	assertElementsEqual(
-		"Unexpected children",
-		"foo1() [in X [in X.class [in p [in lib2.jar [in P]]]]]\n" + 
-		"foo2() [in X [in X.class [in p [in lib2.jar [in P]]]]]\n" + 
-		"foo3() [in X [in X.class [in p [in lib2.jar [in P]]]]]",
-		methods);
-	IJavaScriptElement[] others = this.classFile.getType().getChildrenForCategory("other");
-	assertElementsEqual(
-		"Unexpected children",
-		"foo3() [in X [in X.class [in p [in lib2.jar [in P]]]]]",
-		others);
-	IJavaScriptElement[] all = this.classFile.getType().getChildrenForCategory("all");
-	assertElementsEqual(
-		"Unexpected children",
-		"field [in X [in X.class [in p [in lib2.jar [in P]]]]]\n" + 
-		"foo1() [in X [in X.class [in p [in lib2.jar [in P]]]]]\n" + 
-		"foo2() [in X [in X.class [in p [in lib2.jar [in P]]]]]\n" + 
-		"foo3() [in X [in X.class [in p [in lib2.jar [in P]]]]]",
-		all);
-}
-
-/*
- * Ensures that IType#getSuperclassTypeSignature() is correct for a binary type.
- * (regression test for bug 78520 [model] IType#getSuperInterfaceTypeSignatures() doesn't include type arguments)
- */
-public void testGetSuperclassTypeSignature() throws JavaScriptModelException {
-	IType type = this.jarRoot.getPackageFragment("generic").getClassFile("V.class").getType();
-	assertEquals(
-		"Unexpected signature", 
-		"Lgeneric.X<Ljava.lang.Thread;>;",
-		type.getSuperclassTypeSignature());
-}
-
-/*
- * Ensures that the parameter names of a binary method with source attached are correct.
- */
-public void testParameterNames01() throws CoreException {
-	IFunction method = this.jarRoot.getPackageFragment("generic").getClassFile("X.class").getType().getFunction("foo", new String[] {"TK;", "TV;"});
-	String[] parameterNames = method.getParameterNames();
-	assertStringsEqual(
-		"Unexpected parameter names", 
-		"key\n" + 
-		"value\n",
-		parameterNames);
-}
-
-/*
- * Ensures that the parameter names of a binary method without source attached are correct.
- */
-public void testParameterNames02() throws CoreException {
-	IPath sourceAttachmentPath = this.jarRoot.getSourceAttachmentPath();
-	try {
-		attachSource(this.jarRoot, null, null);
-		IFunction method = this.jarRoot.getPackageFragment("generic").getClassFile("X.class").getType().getFunction("foo", new String[] {"TK;", "TV;"});
-		String[] parameterNames = method.getParameterNames();
-		assertStringsEqual(
-			"Unexpected parameter names", 
-			"arg0\n" + 
-			"arg1\n",
-			parameterNames);
-	} finally {
-		attachSource(this.jarRoot, sourceAttachmentPath.toString(), null);
-	}
-}
-
-/*
- * Ensures that the raw parameter names of a binary method with source attached are correct.
- */
-public void testRawParameterNames01() throws CoreException {
-	IFunction method = this.jarRoot.getPackageFragment("generic").getClassFile("X.class").getType().getFunction("foo", new String[] {"TK;", "TV;"});
-	String[] parameterNames = method.getRawParameterNames();
-	assertStringsEqual(
-		"Unexpected parameter names", 
-		"arg0\n" + 
-		"arg1\n",
-		parameterNames);
-}
-
-/*
- * Ensures that the raw parameter names of a binary method without source attached are correct.
- */
-public void testRawParameterNames02() throws CoreException {
-	IPath sourceAttachmentPath = this.jarRoot.getSourceAttachmentPath();
-	try {
-		attachSource(this.jarRoot, null, null);
-		IFunction method = this.jarRoot.getPackageFragment("generic").getClassFile("X.class").getType().getFunction("foo", new String[] {"TK;", "TV;"});
-		String[] parameterNames = method.getParameterNames();
-		assertStringsEqual(
-			"Unexpected parameter names", 
-			"arg0\n" + 
-			"arg1\n",
-			parameterNames);
-	} finally {
-		attachSource(this.jarRoot, sourceAttachmentPath.toString(), null);
-	}
-}
-
-/*
- * Ensure that the return type of a binary method is correct.
- */
-public void testReturnType1() throws JavaScriptModelException {
-	IType type = this.jarRoot.getPackageFragment("generic").getClassFile("X.class").getType();
-	IFunction method = type.getFunction("foo", new String[] {"TK;", "TV;"});
-	assertEquals(
-		"Unexpected return type",
-		"TV;",
-		method.getReturnType());
-}
-
-/*
- * Ensure that the return type of a binary method is correct.
- */
-public void testReturnType2() throws JavaScriptModelException {
-	IType type = this.jarRoot.getPackageFragment("generic").getClassFile("X.class").getType();
-	IFunction method = type.getFunction("foo", new String[] {"Lgeneric.X<TT;>;"});
-	assertEquals(
-		"Unexpected return type",
-		"Lgeneric.X<TT;>;",
-		method.getReturnType());
-}
-
-/*
- * Ensures that asking for the source range of a IClassFile in a non-Java project throws a JavaScriptModelException
- * (regression test for bug 132494 JavaScriptModelException opening up class file in non java project)
- */
-public void testSourceRangeNonJavaProject() throws CoreException {
-	try {
-		createProject("Simple");
-		createFile("/Simple/X.class", "");
-		IClassFile classX = getClassFile("/Simple/X.class");
-		JavaScriptModelException exception = null;
-		try {
-			classX.getSourceRange();
-		} catch (JavaScriptModelException e) {
-			exception = e;
-		}
-		assertExceptionEquals("Unexpected exception", "Simple does not exist", exception);
-	} finally {
-		deleteProject("Simple");
-	}
-}
-
-/*
- * Ensures that asking for the source range of a IClassFile not on the classpath of a Java project doesn't throw a JavaScriptModelException
- * (regression test for bug 138507 exception in .class file editor for classes imported via plug-in import)
- */
-public void testSourceRangeNotOnClasspath() throws CoreException {
-	try {
-		createJavaProject("P2", new String[] {"src"});
-		createFile("/P2/bin/X.class", "");
-		IClassFile classX = getClassFile("/P2/bin/X.class");
-		assertNull("Unxepected source range", classX.getSourceRange());
-	} finally {
-		deleteProject("P2");
-	}
-}
-
-/*
- * Ensure that a method with varargs has the AccVarargs flag set.
- */
-public void testVarargs() throws JavaScriptModelException {
-	IType type = this.jarRoot.getPackageFragment("varargs").getClassFile("X.class").getType();
-	IFunction method = type.getFunction("foo", new String[]{"Ljava.lang.String;", "[Ljava.lang.Object;"});
-	assertTrue("Should have the AccVarargs flag set", Flags.isVarargs(method.getFlags()));
-}
-
-/*
- * Ensures that a class file can be turned into a working copy and that its children are correct.
- */
-public void testWorkingCopy01() throws CoreException {
-	IClassFile clazz = this.jarRoot.getPackageFragment("workingcopy").getClassFile("X.class");
-	this.workingCopy = clazz.getWorkingCopy(null, null);
-	assertElementDescendants(
-		"Unexpected children", 
-		"[Working copy] X.class\n" + 
-		"  package workingcopy\n" + 
-		"  class X\n" + 
-		"    void foo()",
-		this.workingCopy);
-}
-
-/*
- * Ensures that a class file without source attached can be turned into a working copy and that its children are correct.
- */
-public void testWorkingCopy02() throws CoreException {
-	IPath sourceAttachmentPath = this.jarRoot.getSourceAttachmentPath();
-	try {
-		attachSource(this.jarRoot, null, null);
-		IClassFile clazz = this.jarRoot.getPackageFragment("workingcopy").getClassFile("X.class");
-		assertNull("Should not have source attached", clazz.getSource());
-		this.workingCopy = clazz.getWorkingCopy(null, null);
-		assertElementDescendants(
-			"Unexpected children", 
-			"[Working copy] X.class\n" + 
-			"  package workingcopy\n" + 
-			"  class X\n" + 
-			"    X()\n" + 
-			"    void foo()",
-			this.workingCopy);
-	} finally {
-		attachSource(this.jarRoot, sourceAttachmentPath.toString(), null);
-	}
-}
-
-/*
- * Ensures that a class file can be turned into a working copy, modified and that its children are correct.
- */
-public void testWorkingCopy03() throws CoreException {
-	IClassFile clazz = this.jarRoot.getPackageFragment("workingcopy").getClassFile("X.class");
-	this.workingCopy = clazz.getWorkingCopy(null, null);
-	this.workingCopy.getBuffer().setContents(
-		"package workingcopy;\n" +
-		"public class X {\n" + 
-		"  void bar() {\n" +
-		"  }\n" +
-		"}"
-	);
-	this.workingCopy.reconcile(IJavaScriptUnit.NO_AST, false/*don't force problems*/, null/*primary owner*/, null/*no progress*/);
-	assertElementDescendants(
-		"Unexpected children", 
-		"[Working copy] X.class\n" + 
-		"  package workingcopy\n" + 
-		"  class X\n" + 
-		"    void bar()",
-		this.workingCopy);
-}
-
-/*
- * Ensures that a class file working copy cannot be commited
- */
-public void testWorkingCopy04() throws CoreException {
-	IClassFile clazz = this.jarRoot.getPackageFragment("workingcopy").getClassFile("X.class");
-	this.workingCopy = clazz.getWorkingCopy(null, null);
-	this.workingCopy.getBuffer().setContents(
-		"package workingcopy;\n" +
-		"public class X {\n" + 
-		"  void bar() {\n" +
-		"  }\n" +
-		"}"
-	);
-	JavaScriptModelException exception = null;
-	try {
-		this.workingCopy.commitWorkingCopy(false/*don't force*/, null);
-	} catch (JavaScriptModelException e) {
-		exception = e;
-	}
-	assertEquals(
-		"Unxepected JavaScriptModelException", 
-		"JavaScript Model Exception: JavaScript Model Status [Operation not supported for specified element type(s):[Working copy] X.class [in workingcopy [in lib.jar [in P]]]]", 
-		exception.toString());
-}
-
-/*
- * Ensures that a type can be created in class file working copy.
- */
-public void testWorkingCopy05() throws CoreException {
-	IClassFile clazz = this.jarRoot.getPackageFragment("workingcopy").getClassFile("X.class");
-	this.workingCopy = clazz.getWorkingCopy(null, null);
-	this.workingCopy.createType(
-		"class Y {\n" + 
-		"}",
-		null,
-		false/*don't force*/,
-		null);
-	assertElementDescendants(
-		"Unexpected children", 
-		"[Working copy] X.class\n" + 
-		"  package workingcopy\n" + 
-		"  class X\n" + 
-		"    void foo()\n" + 
-		"  class Y",
-		this.workingCopy);
-}
-
-/*
- * Ensures that the primary compilation unit of class file working copy is correct.
- */
-public void testWorkingCopy06() throws CoreException {
-	IClassFile clazz = this.jarRoot.getPackageFragment("workingcopy").getClassFile("X.class");
-	WorkingCopyOwner owner = new WorkingCopyOwner() {};
-	this.workingCopy = clazz.getWorkingCopy(owner, null);
-	IJavaScriptUnit primary = this.workingCopy.getPrimary();
-	assertEquals("Unexpected owner of primary working copy", null, primary.getOwner());
-}
-
-/*
- * Ensures that a class file working copy can be restored from the original source.
- */
-public void testWorkingCopy07() throws CoreException {
-	IClassFile clazz = this.jarRoot.getPackageFragment("workingcopy").getClassFile("X.class");
-	WorkingCopyOwner owner = new WorkingCopyOwner() {};
-	this.workingCopy = clazz.getWorkingCopy(owner, null);
-	this.workingCopy.getBuffer().setContents(
-		"package workingcopy;\n" +
-		"public class X {\n" + 
-		"  void bar() {\n" +
-		"  }\n" +
-		"}"
-	);
-	this.workingCopy.reconcile(IJavaScriptUnit.NO_AST, false/*don't force problems*/, null/*primary owner*/, null/*no progress*/);
-	this.workingCopy.restore();
-	assertElementDescendants(
-		"Unexpected children", 
-		"[Working copy] X.class\n" + 
-		"  package workingcopy\n" + 
-		"  class X\n" + 
-		"    void foo()",
-		this.workingCopy);
-}
-
-/*
- * Ensures that a class file working copy can be reconciled against.
- */
-public void testWorkingCopy08() throws CoreException {
-	IClassFile clazz = this.jarRoot.getPackageFragment("workingcopy").getClassFile("X.class");
-	WorkingCopyOwner owner = new WorkingCopyOwner() {};
-	this.workingCopy = clazz.getWorkingCopy(owner, null);
-	this.workingCopy.getBuffer().setContents(
-		"package workingcopy;\n" +
-		"public class X {\n" + 
-		"  public void bar() {\n" +
-		"  }\n" +
-		"}"
-	);
-	this.workingCopy.makeConsistent(null);
-	
-	IJavaScriptUnit cu = getCompilationUnit("/P/Y.js");
-	IJavaScriptUnit copy = null;
-	try {
-		ProblemRequestor problemRequestor = new ProblemRequestor();
-		copy = cu.getWorkingCopy(owner, null/*no prpgress*/);
-		copy.getBuffer().setContents(
-			"public class Y {\n" +
-			"  void foo(workingcopy.X x) {\n" +
-			"    x.bar();\n" +
-			"  }\n" +
-			"}"
-		);
-		problemRequestor.problems = new StringBuffer();
-		copy.reconcile(IJavaScriptUnit.NO_AST, false/*don't force problems*/, owner, null/*no progress*/);
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"----------\n",
-			problemRequestor);
-	} finally {
-		if (copy != null)
-			copy.discardWorkingCopy();
-	}
-}
-
-/*
- * Ensures that types in a class file are hidden when reconciling against if the class file working copy is empty.
- */
-public void testWorkingCopy09() throws CoreException {
-	IClassFile clazz = this.jarRoot.getPackageFragment("workingcopy").getClassFile("X.class");
-	WorkingCopyOwner owner = new WorkingCopyOwner() {};
-	this.workingCopy = clazz.getWorkingCopy(owner, null);
-	this.workingCopy.getBuffer().setContents(	"");
-	this.workingCopy.makeConsistent(null);
-	
-	IJavaScriptUnit cu = getCompilationUnit("/P/Y.js");
-	IJavaScriptUnit copy = null;
-	try {
-		ProblemRequestor problemRequestor = new ProblemRequestor();
-		copy = cu.getWorkingCopy(owner, null/*no prpgress*/);
-		copy.getBuffer().setContents(
-			"public class Y {\n" +
-			"  workingcopy.X x;\n" +
-			"}"
-		);
-		problemRequestor.problems = new StringBuffer();
-		copy.reconcile(IJavaScriptUnit.NO_AST, false/*don't force problems*/, owner, null/*no progress*/);
-		assertProblems(
-			"Unexpected problems", 
-			"----------\n" + 
-			"1. ERROR in /P/Y.java\n" + 
-			"workingcopy.X cannot be resolved to a type\n" + 
-			"----------\n",
-			problemRequestor);
-	} finally {
-		if (copy != null)
-			copy.discardWorkingCopy();
-	}
-}
-
-/*
- * Ensures that a 1.5 class file without source attached can be turned into a working copy and that its source is correct.
- */
-public void testWorkingCopy10() throws CoreException {
-	IPath sourceAttachmentPath = this.jarRoot.getSourceAttachmentPath();
-	try {
-		attachSource(this.jarRoot, null, null);
-		IClassFile clazz = this.jarRoot.getPackageFragment("workingcopy").getClassFile("Y.class");
-		assertNull("Should not have source attached", clazz.getSource());
-		this.workingCopy = clazz.getWorkingCopy(null, null);
-		assertSourceEquals(
-			"Unexpected source", 
-			"package workingcopy;\n" + 
-			"public class Y<W> {\n" + 
-			"  \n" + 
-			"  public Y() {\n" + 
-			"  }\n" + 
-			"  \n" + 
-			"  <T> T foo(T t, java.lang.String... args) {\n" + 
-			"    return null;\n" + 
-			"  }\n" + 
-			"}",
-			this.workingCopy.getSource());
-	} finally {
-		attachSource(this.jarRoot, sourceAttachmentPath.toString(), null);
-	}
-}
-
-/*
- * Ensures that types in a class file are not found by a search if the class file working copy is empty.
- */
-public void testWorkingCopy11() throws CoreException {
-	IPackageFragment pkg = this.jarRoot.getPackageFragment("workingcopy");
-	IClassFile clazz = pkg.getClassFile("X.class");
-	this.workingCopy = clazz.getWorkingCopy(null, null);
-	this.workingCopy.getBuffer().setContents(	"");
-	this.workingCopy.makeConsistent(null);
-	
-	IJavaScriptSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaScriptElement[] {pkg});
-	AbstractJavaSearchTests.JavaSearchResultCollector requestor = new AbstractJavaSearchTests.JavaSearchResultCollector();
-	search("*", IJavaScriptSearchConstants.TYPE, IJavaScriptSearchConstants.DECLARATIONS, scope, requestor);
-	assertSearchResults(
-		"lib.jar workingcopy.Y",
-		requestor);
-}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClassNameTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClassNameTests.java
deleted file mode 100644
index 8c93245..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClassNameTests.java
+++ /dev/null
@@ -1,1169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jsdt.core.tests.model;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.jsdt.core.*;
-import org.eclipse.wst.jsdt.internal.core.SourceType;
-
-/**
- * Test retrieving types by their name.
- */
-public class ClassNameTests extends ModifyingResourceTests {
-
-	static IJavaScriptProject TEST_PROJECT;
-	final static int SF_LENGTH = 5;
-	static int TESTS_COUNT;
-
-public ClassNameTests(String name) {
-	super(name);
-}
-
-static {
-//	org.eclipse.wst.jsdt.internal.core.NameLookup.VERBOSE = true;
-//	TESTS_NAMES = new String[] { "testFindSecondaryType_Bug72179" };
-//	TESTS_PREFIX = "testReconcile";
-}
-public static Test suite() {
-	Test suite = buildModelTestSuite(ClassNameTests.class);
-	TESTS_COUNT = suite.countTestCases();
-	return suite;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.wst.jsdt.core.tests.model.AbstractJavaModelTests#setUp()
- */
-protected void setUp() throws Exception {
-	super.setUp();
-	if (TEST_PROJECT == null) {
-		String[] sourceFolders = new String[SF_LENGTH];
-		for (int i=0; i<SF_LENGTH; i++) {
-			sourceFolders[i] = "src" + i;
-		}
-		TEST_PROJECT = createJavaProject("TestProject", sourceFolders, new String[] {"JCL_LIB"});
-		createFolder("/TestProject/src0/org/eclipse/jdt/core/test0");
-		createFile(
-			"/TestProject/src0/org/eclipse/jdt/core/test0/Foo.js", 
-			"package org.eclipse.wst.jsdt.core.test0;\n" +
-			"public class Foo {\n" +
-			"	class InFoo {}\n" +
-			"}\n" +
-			"class Secondary {\n" +
-			"	class InSecondary {}\n" +
-			"}\n"
-		);
-		createFile(
-			"/TestProject/src1/Foo.js", 
-			"public class Foo {\n" +
-			"	class InFoo {}\n" +
-			"}\n" +
-			"class Secondary {\n" +
-			"	class InSecondary {}\n" +
-			"}\n"
-		);
-		int length = SF_LENGTH - 1;
-		createFolder("/TestProject/src"+length+"/org/eclipse/jdt/core/test"+length);
-		createFile(
-			"/TestProject/src"+length+"/org/eclipse/jdt/core/test"+length+"/Foo.js", 
-			"package org.eclipse.wst.jsdt.core.test"+length+";\n" +
-			"public class Foo {\n" +
-			"}\n" +
-			"class Secondary {\n" +
-			"}\n"
-		);
-		createFile(
-			"/TestProject/src"+length+"/org/eclipse/jdt/core/test"+length+"/Test.js", 
-			"package org.eclipse.wst.jsdt.core.test"+length+";\n" +
-			"public class Test {\n" +
-			"	public static void main(String[] args) {\n" +
-			"		Secondary s = new Secondary();\n" +
-			"	}\n" +
-			"}\n"
-		);
-	}
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.wst.jsdt.core.tests.model.AbstractJavaModelTests#tearDown()
- */
-protected void tearDown() throws Exception {
-	TESTS_COUNT--;
-	if (TEST_PROJECT != null && TESTS_COUNT == 0) {
-		deleteResource(TEST_PROJECT.getProject());
-	}
-	super.tearDown();
-}
-
-protected void assertTypeFound(String typeName, String expectedResult) throws JavaScriptModelException {
-	assertNotNull("TEST_PROJECT should not be null!!!", TEST_PROJECT);
-	IType type = TEST_PROJECT.findType(typeName, new NullProgressMonitor());
-	assertTrue("type "+typeName+" should exist!", type != null && type.exists());
-	assertEquals("Expected type "+typeName+" NOT found!",
-		expectedResult,
-		((SourceType)type).toStringWithAncestors()
-	);
-}
-protected void assertTypeFound(String packageName, String typeName, String expectedResult) throws JavaScriptModelException {
-	assertNotNull("TEST_PROJECT should not be null!!!", TEST_PROJECT);
-	IType type = TEST_PROJECT.findType(packageName, typeName, new NullProgressMonitor());
-	assertTrue("type "+typeName+" should exist!", type != null && type.exists());
-	assertEquals("Expected type "+typeName+" NOT found!",
-		expectedResult,
-		((SourceType)type).toStringWithAncestors()
-	);
-}
-
-protected void assertTypeNotFound(String typeName) throws JavaScriptModelException {
-	assertNotNull("TEST_PROJECT should not be null!!!", TEST_PROJECT);
-	IType type = TEST_PROJECT.findType(typeName, new NullProgressMonitor());
-	assertNotNull("type "+typeName+" should NOT be null!", type);
-	assertFalse("type "+typeName+" should NOT exist!", type.exists());
-}
-protected void assertTypeNotFound(String packageName, String typeName) throws JavaScriptModelException {
-	assertNotNull("TEST_PROJECT should not be null!!!", TEST_PROJECT);
-	IType type = TEST_PROJECT.findType(packageName, typeName, new NullProgressMonitor());
-	assertNotNull("type "+typeName+" should NOT be null!", type);
-	assertFalse("type "+typeName+" should NOT exist!", type.exists());
-}
-
-protected void assertTypeUnknown(String typeName) throws JavaScriptModelException {
-	assertNotNull("TEST_PROJECT should not be null!!!", TEST_PROJECT);
-	IType type = TEST_PROJECT.findType(typeName, new NullProgressMonitor());
-	assertNull("type "+typeName+" should NOT be found!", type);
-}
-protected void assertTypeUnknown(String packageName, String typeName) throws JavaScriptModelException {
-	assertNotNull("TEST_PROJECT should not be null!!!", TEST_PROJECT);
-	IType type = TEST_PROJECT.findType(packageName, typeName, new NullProgressMonitor());
-	assertNull("type "+typeName+" should NOT be found!", type);
-}
-
-/**
- * Tests that a type in a jar with a name ending with $ can be retrieved.
- */
-public void testClassNameWithDollar() throws JavaScriptModelException, CoreException {
-	try {
-		byte[] tab = new byte[372];
-		tab[0]=80;
-		tab[1]=75;
-		tab[2]=3;
-		tab[3]=4;
-		tab[4]=20;
-		tab[5]=0;
-		tab[6]=8;
-		tab[7]=0;
-		tab[8]=8;
-		tab[9]=0;
-		tab[10]=-63;
-		tab[11]=88;
-		tab[12]=-102;
-		tab[13]=44;
-		tab[14]=0;
-		tab[15]=0;
-		tab[16]=0;
-		tab[17]=0;
-		tab[18]=0;
-		tab[19]=0;
-		tab[20]=0;
-		tab[21]=0;
-		tab[22]=0;
-		tab[23]=0;
-		tab[24]=0;
-		tab[25]=0;
-		tab[26]=11;
-		tab[27]=0;
-		tab[28]=0;
-		tab[29]=0;
-		tab[30]=112;
-		tab[31]=49;
-		tab[32]=47;
-		tab[33]=65;
-		tab[34]=36;
-		tab[35]=46;
-		tab[36]=99;
-		tab[37]=108;
-		tab[38]=97;
-		tab[39]=115;
-		tab[40]=115;
-		tab[41]=93;
-		tab[42]=78;
-		tab[43]=-63;
-		tab[44]=74;
-		tab[45]=-61;
-		tab[46]=64;
-		tab[47]=16;
-		tab[48]=125;
-		tab[49]=-45;
-		tab[50]=77;
-		tab[51]=-78;
-		tab[52]=53;
-		tab[53]=86;
-		tab[54]=91;
-		tab[55]=99;
-		tab[56]=127;
-		tab[57]=64;
-		tab[58]=-24;
-		tab[59]=-95;
-		tab[60]=21;
-		tab[61]=106;
-		tab[62]=-16;
-		tab[63]=-84;
-		tab[64]=8;
-		tab[65]=-91;
-		tab[66]=-48;
-		tab[67]=83;
-		tab[68]=48;
-		tab[69]=-121;
-		tab[70]=74;
-		tab[71]=-17;
-		tab[72]=-101;
-		tab[73]=-72;
-		tab[74]=-42;
-		tab[75]=45;
-		tab[76]=49;
-		tab[77]=43;
-		tab[78]=49;
-		tab[79]=-11;
-		tab[80]=-69;
-		tab[81]=-12;
-		tab[82]=84;
-		tab[83]=-16;
-		tab[84]=-32;
-		tab[85]=7;
-		tab[86]=-8;
-		tab[87]=81;
-		tab[88]=-30;
-		tab[89]=108;
-		tab[90]=12;
-		tab[91]=42;
-		tab[92]=-50;
-		tab[93]=-31;
-		tab[94]=61;
-		tab[95]=102;
-		tab[96]=-26;
-		tab[97]=-67;
-		tab[98]=121;
-		tab[99]=-13;
-		tab[100]=-15;
-		tab[101]=-7;
-		tab[102]=-10;
-		tab[103]=14;
-		tab[104]=-127;
-		tab[105]=41;
-		tab[106]=-122;
-		tab[107]=4;
-		tab[108]=-1;
-		tab[109]=-15;
-		tab[110]=60;
-		tab[111]=-98;
-		tab[112]=-115;
-		tab[113]=36;
-		tab[114]=-120;
-		tab[115]=48;
-		tab[116]=-40;
-		tab[117]=-88;
-		tab[118]=103;
-		tab[119]=21;
-		tab[120]=23;
-		tab[121]=-86;
-		tab[122]=92;
-		tab[123]=-57;
-		tab[124]=105;
-		tab[125]=-74;
-		tab[126]=-47;
-		tab[127]=121;
-		tab[128]=45;
-		tab[129]=33;
-		tab[130]=8;
-		tab[131]=-63;
-		tab[132]=-91;
-		tab[133]=41;
-		tab[134]=77;
-		tab[135]=125;
-		tab[136]=69;
-		tab[137]=16;
-		tab[138]=-29;
-		tab[139]=-55;
-		tab[140]=-118;
-		tab[141]=-32;
-		tab[142]=-51;
-		tab[143]=-19;
-		tab[144]=-83;
-		tab[145]=-18;
-		tab[146]=-63;
-		tab[147]=71;
-		tab[148]=16;
-		tab[149]=-62;
-		tab[150]=67;
-		tab[151]=-105;
-		tab[152]=-48;
-		tab[153]=79;
-		tab[154]=76;
-		tab[155]=-87;
-		tab[156]=-81;
-		tab[157]=-73;
-		tab[158]=15;
-		tab[159]=-103;
-		tab[160]=-82;
-		tab[161]=110;
-		tab[162]=84;
-		tab[163]=86;
-		tab[164]=104;
-		tab[165]=66;
-		tab[166]=-108;
-		tab[167]=-40;
-		tab[168]=92;
-		tab[169]=21;
-		tab[170]=43;
-		tab[171]=85;
-		tab[172]=25;
-		tab[173]=-41;
-		tab[174]=-73;
-		tab[175]=67;
-		tab[176]=-81;
-		tab[177]=-66;
-		tab[178]=55;
-		tab[179]=79;
-		tab[180]=4;
-		tab[181]=-103;
-		tab[182]=52;
-		tab[183]=121;
-		tab[184]=23;
-		tab[185]=124;
-		tab[186]=-18;
-		tab[187]=-50;
-		tab[188]=90;
-		tab[189]=-62;
-		tab[190]=112;
-		tab[191]=60;
-		tab[192]=73;
-		tab[193]=126;
-		tab[194]=99;
-		tab[195]=-105;
-		tab[196]=117;
-		tab[197]=101;
-		tab[198]=-54;
-		tab[199]=-75;
-		tab[200]=91;
-		tab[201]=46;
-		tab[202]=-46;
-		tab[203]=-76;
-		tab[204]=-117;
-		tab[205]=1;
-		tab[206]=33;
-		tab[207]=92;
-		tab[208]=-38;
-		tab[209]=109;
-		tab[210]=-107;
-		tab[211]=-21;
-		tab[212]=-123;
-		tab[213]=113;
-		tab[214]=55;
-		tab[215]=-28;
-		tab[216]=108;
-		tab[217]=116;
-		tab[218]=-26;
-		tab[219]=-60;
-		tab[220]=56;
-		tab[221]=65;
-		tab[222]=-121;
-		tab[223]=-61;
-		tab[224]=93;
-		tab[225]=117;
-		tab[226]=64;
-		tab[227]=-18;
-		tab[228]=23;
-		tab[229]=70;
-		tab[230]=-55;
-		tab[231]=93;
-		tab[232]=-52;
-		tab[233]=76;
-		tab[234]=-52;
-		tab[235]=-2;
-		tab[236]=-23;
-		tab[237]=14;
-		tab[238]=123;
-		tab[239]=-81;
-		tab[240]=-51;
-		tab[241]=58;
-		tab[242]=100;
-		tab[243]=12;
-		tab[244]=-102;
-		tab[245]=-95;
-		tab[246]=-64;
-		tab[247]=62;
-		tab[248]=99;
-		tab[249]=-17;
-		tab[250]=91;
-		tab[251]=-64;
-		tab[252]=124;
-		tab[253]=-64;
-		tab[254]=76;
-		tab[255]=56;
-		tab[256]=68;
-		tab[257]=-65;
-		tab[258]=53;
-		tab[259]=79;
-		tab[260]=91;
-		tab[261]=-77;
-		tab[262]=-120;
-		tab[263]=-114;
-		tab[264]=94;
-		tab[265]=-2;
-		tab[266]=89;
-		tab[267]=-125;
-		tab[268]=63;
-		tab[269]=86;
-		tab[270]=-15;
-		tab[271]=99;
-		tab[272]=-115;
-		tab[273]=26;
-		tab[274]=-43;
-		tab[275]=-15;
-		tab[276]=23;
-		tab[277]=80;
-		tab[278]=75;
-		tab[279]=7;
-		tab[280]=8;
-		tab[281]=122;
-		tab[282]=-92;
-		tab[283]=103;
-		tab[284]=15;
-		tab[285]=-20;
-		tab[286]=0;
-		tab[287]=0;
-		tab[288]=0;
-		tab[289]=78;
-		tab[290]=1;
-		tab[291]=0;
-		tab[292]=0;
-		tab[293]=80;
-		tab[294]=75;
-		tab[295]=1;
-		tab[296]=2;
-		tab[297]=20;
-		tab[298]=0;
-		tab[299]=20;
-		tab[300]=0;
-		tab[301]=8;
-		tab[302]=0;
-		tab[303]=8;
-		tab[304]=0;
-		tab[305]=-63;
-		tab[306]=88;
-		tab[307]=-102;
-		tab[308]=44;
-		tab[309]=122;
-		tab[310]=-92;
-		tab[311]=103;
-		tab[312]=15;
-		tab[313]=-20;
-		tab[314]=0;
-		tab[315]=0;
-		tab[316]=0;
-		tab[317]=78;
-		tab[318]=1;
-		tab[319]=0;
-		tab[320]=0;
-		tab[321]=11;
-		tab[322]=0;
-		tab[323]=0;
-		tab[324]=0;
-		tab[325]=0;
-		tab[326]=0;
-		tab[327]=0;
-		tab[328]=0;
-		tab[329]=0;
-		tab[330]=0;
-		tab[331]=0;
-		tab[332]=0;
-		tab[333]=0;
-		tab[334]=0;
-		tab[335]=0;
-		tab[336]=0;
-		tab[337]=0;
-		tab[338]=0;
-		tab[339]=112;
-		tab[340]=49;
-		tab[341]=47;
-		tab[342]=65;
-		tab[343]=36;
-		tab[344]=46;
-		tab[345]=99;
-		tab[346]=108;
-		tab[347]=97;
-		tab[348]=115;
-		tab[349]=115;
-		tab[350]=80;
-		tab[351]=75;
-		tab[352]=5;
-		tab[353]=6;
-		tab[354]=0;
-		tab[355]=0;
-		tab[356]=0;
-		tab[357]=0;
-		tab[358]=1;
-		tab[359]=0;
-		tab[360]=1;
-		tab[361]=0;
-		tab[362]=57;
-		tab[363]=0;
-		tab[364]=0;
-		tab[365]=0;
-		tab[366]=37;
-		tab[367]=1;
-		tab[368]=0;
-		tab[369]=0;
-		tab[370]=0;
-		tab[371]=0;
-		IJavaScriptProject javaProject = createJavaProject("P", new String[] {"src"});
-		IFile jarFile = createFile("P/lib.jar", tab);
-		javaProject.setRawIncludepath(new IIncludePathEntry[] {JavaScriptCore.newLibraryEntry(jarFile.getFullPath(), null, null, false)}, new NullProgressMonitor());
-		javaProject.findType("p1.A$");
-	} catch (CoreException e) {
-		e.printStackTrace();
-		assertTrue(false);
-	} finally {
-		deleteProject("P");
-	}
-}
-/**
- * Tests that a member type can be retrived using a dot qualified name.
- */
-public void testFindTypeWithDot() throws JavaScriptModelException, CoreException {
-	try {
-		IJavaScriptProject javaProject = createJavaProject("P", new String[] {""});
-		this.createFolder("/P/p");
-		this.createFile(
-			"/P/p/X.js", 
-			"package p;\n" +
-			"public class X {\n" +
-			"  public class Y {\n" +
-			"  }\n" +
-			"}"
-		);
-		IType type = javaProject.findType("p.X.Y");
-		assertEquals(
-			"Unexpected type found",
-			"class Y [in X [in X.java [in p [in <project root> [in P]]]]]",
-			type == null ? "null" : type.toString()
-		);
-	} finally {
-		deleteProject("P");
-	}
-}
-
-/**
- * Tests that a type in a jar with a name ending with $ can be retrieved.
- */
-public void testSearchTypeNameInJars() throws JavaScriptModelException, CoreException {
-	try {
-		byte[] tab = new byte[478];
-		tab[0]=80;
-		tab[1]=75;
-		tab[2]=3;
-		tab[3]=4;
-		tab[4]=20;
-		tab[5]=0;
-		tab[6]=8;
-		tab[7]=0;
-		tab[8]=8;
-		tab[9]=0;
-		tab[10]=19;
-		tab[11]=87;
-		tab[12]=-95;
-		tab[13]=44;
-		tab[14]=0;
-		tab[15]=0;
-		tab[16]=0;
-		tab[17]=0;
-		tab[18]=0;
-		tab[19]=0;
-		tab[20]=0;
-		tab[21]=0;
-		tab[22]=0;
-		tab[23]=0;
-		tab[24]=0;
-		tab[25]=0;
-		tab[26]=9;
-		tab[27]=0;
-		tab[28]=0;
-		tab[29]=0;
-		tab[30]=112;
-		tab[31]=49;
-		tab[32]=47;
-		tab[33]=112;
-		tab[34]=50;
-		tab[35]=47;
-		tab[36]=112;
-		tab[37]=51;
-		tab[38]=47;
-		tab[39]=3;
-		tab[40]=0;
-		tab[41]=80;
-		tab[42]=75;
-		tab[43]=7;
-		tab[44]=8;
-		tab[45]=0;
-		tab[46]=0;
-		tab[47]=0;
-		tab[48]=0;
-		tab[49]=2;
-		tab[50]=0;
-		tab[51]=0;
-		tab[52]=0;
-		tab[53]=0;
-		tab[54]=0;
-		tab[55]=0;
-		tab[56]=0;
-		tab[57]=80;
-		tab[58]=75;
-		tab[59]=3;
-		tab[60]=4;
-		tab[61]=20;
-		tab[62]=0;
-		tab[63]=8;
-		tab[64]=0;
-		tab[65]=8;
-		tab[66]=0;
-		tab[67]=19;
-		tab[68]=87;
-		tab[69]=-95;
-		tab[70]=44;
-		tab[71]=0;
-		tab[72]=0;
-		tab[73]=0;
-		tab[74]=0;
-		tab[75]=0;
-		tab[76]=0;
-		tab[77]=0;
-		tab[78]=0;
-		tab[79]=0;
-		tab[80]=0;
-		tab[81]=0;
-		tab[82]=0;
-		tab[83]=16;
-		tab[84]=0;
-		tab[85]=0;
-		tab[86]=0;
-		tab[87]=112;
-		tab[88]=49;
-		tab[89]=47;
-		tab[90]=112;
-		tab[91]=50;
-		tab[92]=47;
-		tab[93]=112;
-		tab[94]=51;
-		tab[95]=47;
-		tab[96]=88;
-		tab[97]=46;
-		tab[98]=99;
-		tab[99]=108;
-		tab[100]=97;
-		tab[101]=115;
-		tab[102]=115;
-		tab[103]=93;
-		tab[104]=79;
-		tab[105]=-53;
-		tab[106]=78;
-		tab[107]=-61;
-		tab[108]=64;
-		tab[109]=12;
-		tab[110]=28;
-		tab[111]=55;
-		tab[112]=-81;
-		tab[113]=-110;
-		tab[114]=6;
-		tab[115]=8;
-		tab[116]=-3;
-		tab[117]=3;
-		tab[118]=110;
-		tab[119]=60;
-		tab[120]=-44;
-		tab[121]=-82;
-		tab[122]=10;
-		tab[123]=71;
-		tab[124]=16;
-		tab[125]=23;
-		tab[126]=36;
-		tab[127]=78;
-		tab[128]=81;
-		tab[129]=57;
-		tab[130]=20;
-		tab[131]=69;
-		tab[132]=-67;
-		tab[133]=110;
-		tab[134]=-62;
-		tab[135]=-74;
-		tab[136]=108;
-		tab[137]=-107;
-		tab[138]=102;
-		tab[139]=-93;
-		tab[140]=52;
-		tab[141]=-27;
-		tab[142]=-65;
-		tab[143]=56;
-		tab[144]=33;
-		tab[145]=113;
-		tab[146]=-32;
-		tab[147]=3;
-		tab[148]=-8;
-		tab[149]=40;
-		tab[150]=-124;
-		tab[151]=55;
-		tab[152]=-115;
-		tab[153]=0;
-		tab[154]=117;
-		tab[155]=37;
-		tab[156]=-49;
-		tab[157]=-56;
-		tab[158]=-10;
-		tab[159]=-116;
-		tab[160]=-19;
-		tab[161]=-3;
-		tab[162]=-6;
-		tab[163]=-2;
-		tab[164]=-8;
-		tab[165]=-124;
-		tab[166]=-125;
-		tab[167]=17;
-		tab[168]=78;
-		tab[169]=8;
-		tab[170]=97;
-		tab[171]=53;
-		tab[172]=17;
-		tab[173]=-43;
-		tab[174]=-107;
-		tab[175]=-88;
-		tab[176]=-82;
-		tab[177]=-59;
-		tab[178]=60;
-		tab[179]=0;
-		tab[180]=17;
-		tab[181]=-30;
-		tab[182]=-107;
-		tab[183]=124;
-		tab[184]=-107;
-		tab[185]=-94;
-		tab[186]=-112;
-		tab[187]=-27;
-		tab[188]=82;
-		tab[189]=60;
-		tab[190]=102;
-		tab[191]=43;
-		tab[192]=-107;
-		tab[193]=55;
-		tab[194]=1;
-		tab[195]=28;
-		tab[196]=-126;
-		tab[197]=127;
-		tab[198]=-85;
-		tab[199]=75;
-		tab[200]=-35;
-		tab[201]=-36;
-		tab[202]=17;
-		tab[203]=-100;
-		tab[204]=-77;
-		tab[205]=-13;
-		tab[206]=-108;
-		tab[207]=-32;
-		tab[208]=-34;
-		tab[209]=-101;
-		tab[210]=103;
-		tab[211]=21;
-		tab[212]=-63;
-		tab[213]=-125;
-		tab[214]=31;
-		tab[215]=-62;
-		tab[216]=69;
-		tab[217]=-97;
-		tab[218]=112;
-		tab[219]=-100;
-		tab[220]=-24;
-		tab[221]=82;
-		tab[222]=77;
-		tab[223]=-73;
-		tab[224]=-21;
-		tab[225]=76;
-		tab[226]=-43;
-		tab[227]=79;
-		tab[228]=50;
-		tab[229]=43;
-		tab[230]=20;
-		tab[231]=97;
-		tab[232]=-104;
-		tab[233]=-104;
-		tab[234]=92;
-		tab[235]=22;
-		tab[236]=-87;
-		tab[237]=-84;
-		tab[238]=-75;
-		tab[239]=-51;
-		tab[240]=-69;
-		tab[241]=-94;
-		tab[242]=-37;
-		tab[243]=-68;
-		tab[244]=-24;
-		tab[245]=13;
-		tab[246]=33;
-		tab[247]=74;
-		tab[248]=-2;
-		tab[249]=-106;
-		tab[250]=-34;
-		tab[251]=-16;
-		tab[252]=-52;
-		tab[253]=-123;
-		tab[254]=49;
-		tab[255]=124;
-		tab[256]=-56;
-		tab[257]=-52;
-		tab[258]=108;
-		tab[259]=-21;
-		tab[260]=92;
-		tab[261]=61;
-		tab[262]=104;
-		tab[263]=43;
-		tab[264]=-12;
-		tab[265]=-25;
-		tab[266]=99;
-		tab[267]=123;
-		tab[268]=7;
-		tab[269]=78;
-		tab[270]=-47;
-		tab[271]=-29;
-		tab[272]=5;
-		tab[273]=-10;
-		tab[274]=-11;
-		tab[275]=64;
-		tab[276]=118;
-		tab[277]=31;
-		tab[278]=99;
-		tab[279]=-64;
-		tab[280]=-103;
-		tab[281]=96;
-		tab[282]=38;
-		tab[283]=102;
-		tab[284]=-17;
-		tab[285]=-30;
-		tab[286]=29;
-		tab[287]=7;
-		tab[288]=111;
-		tab[289]=109;
-		tab[290]=59;
-		tab[291]=100;
-		tab[292]=-12;
-		tab[293]=-37;
-		tab[294]=-94;
-		tab[295]=-125;
-		tab[296]=1;
-		tab[297]=99;
-		tab[298]=-76;
-		tab[299]=19;
-		tab[300]=48;
-		tab[301]=31;
-		tab[302]=-74;
-		tab[303]=3;
-		tab[304]=-114;
-		tab[305]=126;
-		tab[306]=-51;
-		tab[307]=-105;
-		tab[308]=28;
-		tab[309]=-74;
-		tab[310]=71;
-		tab[311]=-5;
-		tab[312]=70;
-		tab[313]=-9;
-		tab[314]=-97;
-		tab[315]=-111;
-		tab[316]=58;
-		tab[317]=35;
-		tab[318]=-1;
-		tab[319]=-83;
-		tab[320]=85;
-		tab[321]=-59;
-		tab[322]=63;
-		tab[323]=80;
-		tab[324]=75;
-		tab[325]=7;
-		tab[326]=8;
-		tab[327]=-99;
-		tab[328]=105;
-		tab[329]=77;
-		tab[330]=-38;
-		tab[331]=-36;
-		tab[332]=0;
-		tab[333]=0;
-		tab[334]=0;
-		tab[335]=53;
-		tab[336]=1;
-		tab[337]=0;
-		tab[338]=0;
-		tab[339]=80;
-		tab[340]=75;
-		tab[341]=1;
-		tab[342]=2;
-		tab[343]=20;
-		tab[344]=0;
-		tab[345]=20;
-		tab[346]=0;
-		tab[347]=8;
-		tab[348]=0;
-		tab[349]=8;
-		tab[350]=0;
-		tab[351]=19;
-		tab[352]=87;
-		tab[353]=-95;
-		tab[354]=44;
-		tab[355]=0;
-		tab[356]=0;
-		tab[357]=0;
-		tab[358]=0;
-		tab[359]=2;
-		tab[360]=0;
-		tab[361]=0;
-		tab[362]=0;
-		tab[363]=0;
-		tab[364]=0;
-		tab[365]=0;
-		tab[366]=0;
-		tab[367]=9;
-		tab[368]=0;
-		tab[369]=0;
-		tab[370]=0;
-		tab[371]=0;
-		tab[372]=0;
-		tab[373]=0;
-		tab[374]=0;
-		tab[375]=0;
-		tab[376]=0;
-		tab[377]=0;
-		tab[378]=0;
-		tab[379]=0;
-		tab[380]=0;
-		tab[381]=0;
-		tab[382]=0;
-		tab[383]=0;
-		tab[384]=0;
-		tab[385]=112;
-		tab[386]=49;
-		tab[387]=47;
-		tab[388]=112;
-		tab[389]=50;
-		tab[390]=47;
-		tab[391]=112;
-		tab[392]=51;
-		tab[393]=47;
-		tab[394]=80;
-		tab[395]=75;
-		tab[396]=1;
-		tab[397]=2;
-		tab[398]=20;
-		tab[399]=0;
-		tab[400]=20;
-		tab[401]=0;
-		tab[402]=8;
-		tab[403]=0;
-		tab[404]=8;
-		tab[405]=0;
-		tab[406]=19;
-		tab[407]=87;
-		tab[408]=-95;
-		tab[409]=44;
-		tab[410]=-99;
-		tab[411]=105;
-		tab[412]=77;
-		tab[413]=-38;
-		tab[414]=-36;
-		tab[415]=0;
-		tab[416]=0;
-		tab[417]=0;
-		tab[418]=53;
-		tab[419]=1;
-		tab[420]=0;
-		tab[421]=0;
-		tab[422]=16;
-		tab[423]=0;
-		tab[424]=0;
-		tab[425]=0;
-		tab[426]=0;
-		tab[427]=0;
-		tab[428]=0;
-		tab[429]=0;
-		tab[430]=0;
-		tab[431]=0;
-		tab[432]=0;
-		tab[433]=0;
-		tab[434]=0;
-		tab[435]=0;
-		tab[436]=57;
-		tab[437]=0;
-		tab[438]=0;
-		tab[439]=0;
-		tab[440]=112;
-		tab[441]=49;
-		tab[442]=47;
-		tab[443]=112;
-		tab[444]=50;
-		tab[445]=47;
-		tab[446]=112;
-		tab[447]=51;
-		tab[448]=47;
-		tab[449]=88;
-		tab[450]=46;
-		tab[451]=99;
-		tab[452]=108;
-		tab[453]=97;
-		tab[454]=115;
-		tab[455]=115;
-		tab[456]=80;
-		tab[457]=75;
-		tab[458]=5;
-		tab[459]=6;
-		tab[460]=0;
-		tab[461]=0;
-		tab[462]=0;
-		tab[463]=0;
-		tab[464]=2;
-		tab[465]=0;
-		tab[466]=2;
-		tab[467]=0;
-		tab[468]=117;
-		tab[469]=0;
-		tab[470]=0;
-		tab[471]=0;
-		tab[472]=83;
-		tab[473]=1;
-		tab[474]=0;
-		tab[475]=0;
-		tab[476]=0;
-		tab[477]=0;
-		IJavaScriptProject javaProject = createJavaProject("P1", new String[] {"src"});
-		IFile jarFile = createFile("P1/lib.jar", tab);
-		javaProject.setRawIncludepath(new IIncludePathEntry[] {JavaScriptCore.newLibraryEntry(jarFile.getFullPath(), null, null, false)}, new NullProgressMonitor());
-		assertNotNull(javaProject.findType("p1.p2.p3.X"));
-	} catch(JavaScriptModelException e) {
-		e.printStackTrace();
-		assertTrue(false);
-	} catch (CoreException e) {
-		e.printStackTrace();
-		assertTrue(false);
-	} finally {
-		deleteProject("P1");
-	}
-}
-
-/**
- * Bug 36032: JavaProject.findType() fails to find second type in source file
- * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=36032"
- */
-public void testFindSecondaryType_Exist01() throws JavaScriptModelException, CoreException {
-	int length = SF_LENGTH - 1;
-	assertTypeFound(
-		"org.eclipse.wst.jsdt.core.test"+length+".Foo",
-		"Foo [in Foo.java [in org.eclipse.wst.jsdt.core.test"+length+" [in src"+length+" [in TestProject]]]]"
-	);
-}
-public void testFindSecondaryType_Exist02() throws JavaScriptModelException, CoreException {
-	int length = SF_LENGTH - 1;
-	assertTypeFound(
-		"org.eclipse.wst.jsdt.core.test"+length+".Secondary",
-		"Secondary [in Foo.java [in org.eclipse.wst.jsdt.core.test"+length+" [in src"+length+" [in TestProject]]]]"
-	);
-}
-public void testFindSecondaryType_Exist03() throws JavaScriptModelException, CoreException {
-	assertTypeFound(
-		"org.eclipse.wst.jsdt.core.test0.Foo.InFoo",
-		"InFoo [in Foo [in Foo.java [in org.eclipse.wst.jsdt.core.test0 [in src0 [in TestProject]]]]]"
-	);
-}
-public void testFindSecondaryType_Exist04() throws JavaScriptModelException, CoreException {
-	assertTypeFound(
-		"org.eclipse.wst.jsdt.core.test0.Secondary.InSecondary",
-		"InSecondary [in Secondary [in Foo.java [in org.eclipse.wst.jsdt.core.test0 [in src0 [in TestProject]]]]]"
-	);
-}
-public void testFindSecondaryType_Exist05() throws JavaScriptModelException, CoreException {
-	assertTypeFound(
-		"Foo",
-		"Foo [in Foo.java [in <default> [in src1 [in TestProject]]]]"
-	);
-}
-public void testFindSecondaryType_Exist06() throws JavaScriptModelException, CoreException {
-	assertTypeFound(
-		"Secondary",
-		"Secondary [in Foo.java [in <default> [in src1 [in TestProject]]]]"
-	);
-}
-// duplicate bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=72179
-public void testFindSecondaryType_Bug72179() throws JavaScriptModelException, CoreException {
-	try {
-		IJavaScriptProject javaProject = createJavaProject("P", new String[] {""});
-		createFolder("/P/p1");
-		createFile(
-			"/P/p1/jc.js", 
-			"package p1;\n" +
-			"class jc008{}\n" +
-			"class jc009{}\n" +
-			"class jc010 extends jc009 {\n" +
-			"	jc008 a;\n" +
-			"}\n"
-		);
-		IType type = javaProject.findType("p1", "jc008", new NullProgressMonitor());
-		assertTrue("type 'jc008' should exist!", type != null && type.exists());
-		assertEquals("Expected type 'jc008' NOT found!",
-			"class jc008 [in jc.java [in p1 [in <project root> [in P]]]]",
-			type.toString()
-		);
-		type = javaProject.findType("p1", "jc009", new NullProgressMonitor());
-		assertTrue("type 'jc009' should exist!", type != null && type.exists());
-		assertEquals("Expected type 'jc009' NOT found!",
-			"class jc009 [in jc.java [in p1 [in <project root> [in P]]]]",
-			type.toString()
-		);
-		type = javaProject.findType("p1", "jc010", new NullProgressMonitor());
-		assertTrue("type 'jc010' should exist!", type != null && type.exists());
-		assertEquals("Expected type 'jc010' NOT found!",
-			"class jc010 [in jc.java [in p1 [in <project root> [in P]]]]\n" +
-			"  jc008 a",
-			type.toString()
-		);
-	} finally {
-		deleteProject("P");
-	}
-}
-public void testFindSecondaryType_NotFound01() throws JavaScriptModelException, CoreException {
-	assertTypeUnknown("test.Foo");
-}
-public void testFindSecondaryType_NotFound02() throws JavaScriptModelException, CoreException {
-	assertTypeUnknown("InFoo");
-}
-public void testFindSecondaryType_NotFound03() throws JavaScriptModelException, CoreException {
-	assertTypeUnknown("InSecondary");
-}
-public void testFindSecondaryType_NotFound04() throws JavaScriptModelException, CoreException {
-	assertTypeUnknown("Foo.inFoo");
-}
-public void testFindSecondaryType_NotFound05() throws JavaScriptModelException, CoreException {
-	assertTypeUnknown("Secondary.inBar");
-}
-public void testFindSecondaryType_Unknown01() throws JavaScriptModelException, CoreException {
-	assertTypeUnknown("Unknown");
-}
-public void testFindSecondaryType_Unknown02() throws JavaScriptModelException, CoreException {
-	assertTypeUnknown("Foo.Unknown");
-}
-public void testFindSecondaryType_Unknown03() throws JavaScriptModelException, CoreException {
-	assertTypeUnknown("org.eclipse.wst.jsdt.core.test.Unknown");
-}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathInitializerTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathInitializerTests.java
deleted file mode 100644
index f9fe958..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathInitializerTests.java
+++ /dev/null
@@ -1,1306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.jsdt.core.*;
-import org.eclipse.wst.jsdt.core.compiler.CharOperation;
-import org.eclipse.wst.jsdt.internal.core.JavaModelManager;
-import org.eclipse.wst.jsdt.internal.core.JavaModelStatus;
-import org.eclipse.wst.jsdt.internal.core.UserLibraryJsGlobalScopeContainer;
-import org.eclipse.wst.jsdt.internal.core.UserLibraryManager;
-
-import junit.framework.Test;
-
-public class ClasspathInitializerTests extends ModifyingResourceTests {
-	
-public static class DefaultVariableInitializer implements VariablesInitializer.ITestInitializer {
-	Map variableValues;
-	
-	/*
-	 * values is [<var name>, <var value>]*
-	 */
-	public DefaultVariableInitializer(String[] values) {
-		variableValues = new HashMap();
-		for (int i = 0; i < values.length; i+=2) {
-			variableValues.put(values[i], new Path(values[i+1]));
-		}
-	}
-	
-	public void initialize(String variable) throws JavaScriptModelException {
-		if (variableValues == null) return;
-		JavaScriptCore.setIncludepathVariable(
-			variable, 
-			(IPath)variableValues.get(variable), 
-			null);
-	}
-}
-
-public static class DefaultContainerInitializer implements ContainerInitializer.ITestInitializer {
-	
-	public static class DefaultContainer implements IJsGlobalScopeContainer {
-		char[][] libPaths;
-		public DefaultContainer(char[][] libPaths) {
-			this.libPaths = libPaths;
-		}
-		/**
-		 * @deprecated Use {@link #getIncludepathEntries()} instead
-		 */
-		public IIncludePathEntry[] getClasspathEntries() {
-			return getIncludepathEntries();
-		}
-		public IIncludePathEntry[] getIncludepathEntries() {
-			int length = this.libPaths.length;
-			IIncludePathEntry[] entries = new IIncludePathEntry[length];
-			for (int j = 0; j < length; j++) {
-			    IPath path = new Path(new String(this.libPaths[j]));
-			    if (path.segmentCount() == 1) {
-			        entries[j] = JavaScriptCore.newProjectEntry(path);
-			    } else {
-					entries[j] = JavaScriptCore.newLibraryEntry(path, null, null);
-			    }
-			}
-			return entries;
-		}
-		public String getDescription() {
-			return "Test container";
-		}
-		public int getKind() {
-			return IJsGlobalScopeContainer.K_APPLICATION;
-		}
-		public IPath getPath() {
-			return new Path("org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER");
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer#resolvedLibraryImport(java.lang.String)
-		 */
-		public String[] resolvedLibraryImport(String a) {
-			return new String[] {a};
-		}
-	}
-	
-	Map containerValues;
-	CoreException exception;
-	
-	/*
-	 * values is [<project name>, <lib path>[,<lib path>]* ]*
-	 */
-	public DefaultContainerInitializer(String[] values) {
-		containerValues = new HashMap();
-		for (int i = 0; i < values.length; i+=2) {
-			final String projectName = values[i];
-			final char[][] libPaths = CharOperation.splitOn(',', values[i+1].toCharArray());
-			containerValues.put(
-				projectName, 
-				newContainer(libPaths)
-			);
-		}
-	}
-	protected DefaultContainer newContainer(final char[][] libPaths) {
-		return new DefaultContainer(libPaths);
-	}
-	public boolean allowFailureContainer() {
-		return true;
-	}
-	public void initialize(IPath containerPath, IJavaScriptProject project) throws CoreException {
-		if (containerValues == null) return;
-		try {
-			JavaScriptCore.setJsGlobalScopeContainer(
-				containerPath, 
-				new IJavaScriptProject[] {project},
-				new IJsGlobalScopeContainer[] {(IJsGlobalScopeContainer)containerValues.get(project.getElementName())}, 
-				null);
-		} catch (CoreException e) {
-			this.exception = e;
-			throw e;
-		}
-	}
-}
-// Simple container initializer, which keeps setting container to null
-// (30920 - stackoverflow when setting container to null)
-public class NullContainerInitializer implements ContainerInitializer.ITestInitializer {
-	public boolean hasRun = false;
-	public boolean allowFailureContainer() {
-		return false; // allow the initializer to run again
-	}
-	public void initialize(IPath containerPath, IJavaScriptProject project) throws CoreException {
-		hasRun = true;
-		JavaScriptCore.setJsGlobalScopeContainer(
-			containerPath, 
-			new IJavaScriptProject[] {project}, 
-			new IJsGlobalScopeContainer[] { null }, 
-			null);
-	}
-}
-
-public ClasspathInitializerTests(String name) {
-	super(name);
-}
-public static Test suite() {
-	return buildModelTestSuite(ClasspathInitializerTests.class);
-}
-// Use this static initializer to specify subset for tests
-// All specified tests which do not belong to the class are skipped...
-static {
-	// Names of tests to run: can be "testBugXXXX" or "BugXXXX")
-//		TESTS_NAMES = new String[] { "testContainerInitializer12" };
-	// Numbers of tests to run: "test<number>" will be run for each number of this array
-//		TESTS_NUMBERS = new int[] { 2, 12 };
-	// Range numbers of tests to run: all tests between "test<first>" and "test<last>" will be run for { first, last }
-//		TESTS_RANGE = new int[] { 16, -1 };
-}
-protected void tearDown() throws Exception {
-	// Cleanup caches
-	JavaModelManager manager = JavaModelManager.getJavaModelManager();
-	manager.containers = new HashMap(5);
-	manager.variables = new HashMap(5);
-
-	super.tearDown();
-}
-public void testContainerInitializer01() throws CoreException {
-	try {
-		createProject("P1");
-		createFile("/P1/lib.jar", "");
-		ContainerInitializer.setInitializer(new DefaultContainerInitializer(new String[] {"P2", "/P1/lib.jar"}));
-		IJavaScriptProject p2 = createJavaProject(
-				"P2", 
-				new String[] {}, 
-				new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-		IPackageFragmentRoot root = p2.getPackageFragmentRoot(getFile("/P1/lib.jar"));
-		assertTrue("/P1/lib.jar should exist", root.exists());
-	} finally {
-		stopDeltas();
-		deleteProject("P1");
-		deleteProject("P2");
-	}
-}
-public void testContainerInitializer02() throws CoreException {
-	try {
-		createProject("P1");
-		createFile("/P1/lib.jar", "");
-		ContainerInitializer.setInitializer(new DefaultContainerInitializer(new String[] {"P2", "/P1/lib.jar"}));
-		IJavaScriptProject p2 = createJavaProject(
-				"P2", 
-				new String[] {}, 
-				new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-				
-		// simulate state on startup
-		simulateExitRestart();
-		
-		startDeltas();
-		p2.getResolvedIncludepath(true);
-		
-		assertDeltas(
-			"Unexpected delta on startup", 
-			""
-		);
-	} finally {
-		stopDeltas();
-		deleteProject("P1");
-		deleteProject("P2");
-	}
-}
-public void testContainerInitializer03() throws CoreException {
-	try {
-		createProject("P1");
-		createFile("/P1/lib.jar", "");
-		ContainerInitializer.setInitializer(new DefaultContainerInitializer(new String[] {"P2", "/P1/lib.jar"}));
-		createJavaProject(
-				"P2", 
-				new String[] {}, 
-				new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-				
-		// change value of TEST_CONTAINER
-		createFile("/P1/lib2.jar", "");
-		ContainerInitializer.setInitializer(new DefaultContainerInitializer(new String[] {"P2", "/P1/lib2.jar"}));
-
-		// simulate state on startup
-		simulateExitRestart();
-		
-		startDeltas();
-		getJavaProject("P2").getResolvedIncludepath(true);
-		
-		assertDeltas(
-			"Unexpected delta on startup", 
-			"P2[*]: {CHILDREN}\n" + 
-			"	/P1/lib.jar[*]: {REMOVED FROM CLASSPATH}\n" + 
-			"	/P1/lib2.jar[*]: {ADDED TO CLASSPATH}"
-		);
-	} finally {
-		stopDeltas();
-		deleteProject("P1");
-		deleteProject("P2");
-	}
-}
-/* Ensure that initializer is not callled when resource tree is locked.
- * (regression test for bug 29585 Core Exception as resource tree is locked initializing classpath container)
- */
-public void testContainerInitializer04() throws CoreException {
-	try {
-		createProject("P1");
-		createFile("/P1/lib.jar", "");
-		DefaultContainerInitializer initializer = new DefaultContainerInitializer(new String[] {"P2", "/P1/lib.jar"});
-		ContainerInitializer.setInitializer(initializer);
-		createJavaProject(
-				"P2", 
-				new String[] {""}, 
-				new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-				
-		// simulate state on startup
-		simulateExitRestart();
-		
-		startDeltas();
-		createFile("/P2/X.js", "public class X {}");
-		
-		assertEquals("Should not get exception", null, initializer.exception);
-		
-		assertDeltas(
-			"Unexpected delta on startup", 
-			"P2[*]: {CHILDREN}\n" + 
-			"	<project root>[*]: {CHILDREN}\n" + 
-			"		<default>[*]: {CHILDREN}\n" + 
-			"			X.java[+]: {}"
-		);
-	} finally {
-		stopDeltas();
-		deleteProject("P1");
-		deleteProject("P2");
-	}
-}
-/* 
- * 30920 - Stack overflow when container resolved to null
- */
-public void testContainerInitializer05() throws CoreException {
-	try {
-		NullContainerInitializer nullInitializer = new NullContainerInitializer();
-		ContainerInitializer.setInitializer(nullInitializer);
-		createJavaProject(
-				"P1", 
-				new String[] {""}, 
-				new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-				
-		// simulate state on startup
-		simulateExitRestart();
-		
-		startDeltas();
-
-		// will trigger classpath resolution (with null container value)
-		createFile("/P1/X.js", "public class X {}");
-		assertDeltas(
-			"Unexpected delta on startup", 
-			"P1[*]: {CHILDREN}\n" + 
-			"	<project root>[*]: {CHILDREN}\n" + 
-			"		<default>[*]: {CHILDREN}\n" + 
-			"			X.java[+]: {}"
-		);
-		assertTrue("initializer did not run", nullInitializer.hasRun);
-		
-		// next cp resolution request will rerun the initializer
-		waitForAutoBuild();
-		nullInitializer.hasRun = false; // reset		
-		getJavaProject("P1").getResolvedIncludepath(true);
-		assertTrue("initializer did not run", nullInitializer.hasRun); // initializer should have run again (since keep setting to null)
-
-		// assigning new (non-null) value to container
-		waitForAutoBuild();
-		createFile("/P1/lib.jar", "");
-		ContainerInitializer.setInitializer(new DefaultContainerInitializer(new String[] {"P1", "/P1/lib.jar"}));
-		clearDeltas();
-		getJavaProject("P1").getResolvedIncludepath(true);
-		assertDeltas(
-			"Unexpected delta after setting container", 
-			"P1[*]: {CHILDREN}\n" + 
-			"	lib.jar[*]: {ADDED TO CLASSPATH}"
-		);
-
-	} catch (StackOverflowError e) {
-		e.printStackTrace();
-		assertTrue("stack overflow assigning container", false);
-	} finally {
-		stopDeltas();
-		deleteProject("P1");
-	}
-}
-/*
- * Ensures that running the initializer during a reconcile operation just after workspace startup
- * doesn't throw a NPE
- * (regression test for bug 48818 NPE in delta processor)
-  */
-public void testContainerInitializer06() throws CoreException {
-    IJavaScriptUnit workingCopy = null;
-	try {
-		createProject("P1");
-		ContainerInitializer.setInitializer(new DefaultContainerInitializer(new String[] {"P2", ""}));
-		createJavaProject(
-				"P2", 
-				new String[] {"src"}, 
-				new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-		createFile(
-			"/P2/src/X,java",
-			"public class X {\n" +
-			"}"
-		);
-				
-		// change value of TEST_CONTAINER
-		ContainerInitializer.setInitializer(new DefaultContainerInitializer(new String[] {"P2", "/P1"}));
-
-		// simulate state on startup
-		simulateExitRestart();
-		
-		startDeltas();
-		workingCopy = getCompilationUnit("/P2/src/X.js");
-		workingCopy.becomeWorkingCopy(null);
-		
-		assertDeltas(
-			"Unexpected delta on startup", 
-			"P2[*]: {CHILDREN}\n" + 
-			"	src[*]: {CHILDREN}\n" + 
-			"		<default>[*]: {CHILDREN}\n" + 
-			"			[Working copy] X.java[+]: {PRIMARY WORKING COPY}"
-		);
-	} finally {
-		stopDeltas();
-		if (workingCopy != null) workingCopy.discardWorkingCopy();
-		deleteProject("P1");
-		deleteProject("P2");
-	}
-}
-/*
- * Ensure that an OperationCanceledException goes through
- * (regression test for bug 59363 Should surface cancellation exceptions)
- */
-public void testContainerInitializer07() throws CoreException {
-	try {
-		boolean gotException = false;
-		try {
-			ContainerInitializer.setInitializer(new DefaultContainerInitializer(new String[] {"P1", "/P1/lib.jar"}) {
-				public void initialize(IPath containerPath, IJavaScriptProject project) throws CoreException {
-					throw new OperationCanceledException("test");
-				}});
-			IJavaScriptProject p1 = createJavaProject(
-					"P1", 
-					new String[] {}, 
-					new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-			p1.getResolvedIncludepath(true);
-		} catch (OperationCanceledException e) {
-			gotException = true;
-		}
-		assertTrue("Should get an OperationCanceledException", gotException);
-	} finally {
-		stopDeltas();
-		deleteProject("P1");
-	}
-}
-/*
- * Ensure that the stack doesn't blow up if initializer is missbehaving
- * (regression test for bug 61052 Flatten cp container initialization)
- */
-public void testContainerInitializer08() throws CoreException {
-	final int projectLength = 10;
-	final String[] projects = new String[projectLength];
-	for (int i = 0; i < projectLength; i++) {
-		projects[i] = "P" + i;
-	}
-	try {
-		String[] projectRefs = new String[(projectLength-1) * 2];
-		for (int i = 0; i < projectLength-1; i++) {
-			projectRefs[i*2] = "P" + i;
-			projectRefs[(i*2)+1] = "/P" + i + "/test.jar";
-		}
-		ContainerInitializer.setInitializer(new DefaultContainerInitializer(projectRefs) {
-			void foo(int n) {
-				if (n > 0) {
-					foo(n-1);
-					return;
-				}
-				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-				for (int i = 0; i < projectLength-1; i++) {
-					try {
-						JavaScriptCore.create(root.getProject(projects[i])).getResolvedIncludepath(true);
-					} catch (JavaScriptModelException e) {
-						// project doesn't exist: ignore
-					}
-				}
-			}
-			public void initialize(IPath containerPath, IJavaScriptProject project) throws CoreException {
-				foo(500);
-				super.initialize(containerPath, project);
-			}
-		});
-		JavaScriptCore.run(new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				for (int i = 0; i < projectLength; i++) {
-					createProject(projects[i]);
-					editFile(
-						"/" + projects[i] + "/.project",
-						"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-						"<projectDescription>\n" + 
-						"	<name>" + projects[i] + "</name>\n" + 
-						"	<comment></comment>\n" + 
-						"	<projects>\n" + 
-						(i == 0 ? "" : "<project>" + projects[i-1] + "</project>\n") +
-						"	</projects>\n" + 
-						"	<buildSpec>\n" + 
-						"		<buildCommand>\n" + 
-						"			<name>org.eclipse.wst.jsdt.core.javabuilder</name>\n" + 
-						"			<arguments>\n" + 
-						"			</arguments>\n" + 
-						"		</buildCommand>\n" + 
-						"	</buildSpec>\n" + 
-						"	<natures>\n" + 
-						"		<nature>org.eclipse.wst.jsdt.core.javanature</nature>\n" + 
-						"	</natures>\n" + 
-						"</projectDescription>"
-					);
-					createFile(
-						"/" + projects[i] + "/.classpath",
-						"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-						"<classpath>\n" +
-						(i == 0 ? "" : "<classpathentry kind=\"src\" path=\"/" + projects[i-1] + "\"/>\n") +					 
-						"	<classpathentry kind=\"con\" path=\"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER\"/>\n" +
-						"	<classpathentry kind=\"output\" path=\"\"/>\n" +
-						"</classpath>"
-					);
-				}
-			}
-		}, null);
-		getJavaProject("P0").getResolvedIncludepath(true);
-	} finally {
-		stopDeltas();
-		deleteProjects(projects);
-	}
-}
-/*
- * Ensure that a StackOverFlowError is not thrown if the initializer asks for the resolved classpath
- * that is being resolved.
- * (regression test for bug 61040 Should add protect for reentrance to #getResolvedClasspath)
- */
-public void testContainerInitializer09() throws CoreException {
-	try {
-		ClasspathInitializerTests.DefaultContainerInitializer initializer = new ClasspathInitializerTests.DefaultContainerInitializer(new String[] {"P1", "/P1/lib.jar"}) {
-			protected DefaultContainer newContainer(char[][] libPaths) {
-				return new DefaultContainer(libPaths) {
-					/**
-					 * @deprecated Use {@link #getIncludepathEntries()} instead
-					 */
-					public IIncludePathEntry[] getClasspathEntries() {
-						return getIncludepathEntries();
-					}
-
-					public IIncludePathEntry[] getIncludepathEntries() {
-						try {
-							getJavaProject("P1").getResolvedIncludepath(true);
-						} catch (JavaScriptModelException e) {
-							// project doesn't exist: ignore
-						}
-						return super.getIncludepathEntries();
-					}
-				};
-			}
-		};
-		ContainerInitializer.setInitializer(initializer);
-		JavaScriptCore.run(new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				createProject("P1");
-				editFile(
-					"/P1/.project",
-					"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-					"<projectDescription>\n" + 
-					"	<name>P1</name>\n" + 
-					"	<comment></comment>\n" + 
-					"	<projects>\n" + 
-					"	</projects>\n" + 
-					"	<buildSpec>\n" + 
-					"		<buildCommand>\n" + 
-					"			<name>org.eclipse.wst.jsdt.core.javabuilder</name>\n" + 
-					"			<arguments>\n" + 
-					"			</arguments>\n" + 
-					"		</buildCommand>\n" + 
-					"	</buildSpec>\n" + 
-					"	<natures>\n" + 
-					"		<nature>org.eclipse.wst.jsdt.core.javanature</nature>\n" + 
-					"	</natures>\n" + 
-					"</projectDescription>"
-				);
-				createFile(
-					"/P1/.classpath",
-					"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-					"<classpath>\n" +
-					"	<classpathentry kind=\"con\" path=\"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER\"/>\n" +
-					"	<classpathentry kind=\"output\" path=\"\"/>\n" +
-					"</classpath>"
-				);
-			}
-		}, null);
-		getJavaProject("P1").getResolvedIncludepath(true);
-	} finally {
-		stopDeltas();
-		ContainerInitializer.setInitializer(null);
-		deleteProject("P1");
-	}
-}
-/*
- * Ensure that creating a Java project initializes a container and refreshes the external jar at the same time
- * without throwing a ConcurrentModificationException
- * (regression test for bug 63534 ConcurrentModificationException after "catching up")
- */
-public void testContainerInitializer10() throws CoreException {
-	class LogListener implements ILogListener {
-    	IStatus log;
-        public void logging(IStatus status, String plugin) {
-            this.log = status;
-        }
-	}
-	LogListener listener = new LogListener();
-	try {
-		Platform.addLogListener(listener);
-		final IJavaScriptProject p1 = createJavaProject("P1");
-		final IJavaScriptProject p2 = createJavaProject("P2");
-		ContainerInitializer.setInitializer(new DefaultContainerInitializer(new String[] {"P3", "/P1"}) {
-	        public void initialize(IPath containerPath, IJavaScriptProject project) throws CoreException {
-	            super.initialize(containerPath, project);
-	            getJavaModel().refreshExternalArchives(new IJavaScriptElement[] {p1}, null);
-	        }
-		});
-		getWorkspace().run(new IWorkspaceRunnable() {
-            public void run(IProgressMonitor monitor) throws CoreException {
-                p2.setRawIncludepath(new IIncludePathEntry[] {JavaScriptCore.newSourceEntry(new Path("/P2/src"))}, null);
-				createProject("P3");
-                editFile(
-                	"/P3/.project",
-                	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-                	"<projectDescription>\n" + 
-                	"	<name>P3</name>\n" + 
-                	"	<comment></comment>\n" + 
-                	"	<projects>\n" + 
-                	"	</projects>\n" + 
-                	"	<buildSpec>\n" + 
-                	"		<buildCommand>\n" + 
-                	"			<name>org.eclipse.wst.jsdt.core.javabuilder</name>\n" + 
-                	"			<arguments>\n" + 
-                	"			</arguments>\n" + 
-                	"		</buildCommand>\n" + 
-                	"	</buildSpec>\n" + 
-                	"	<natures>\n" + 
-                	"		<nature>org.eclipse.wst.jsdt.core.javanature</nature>\n" + 
-                	"	</natures>\n" + 
-                	"</projectDescription>\n"
-                );
-                createFile(
-                	"/P3/.classpath",
-                	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-                	"<classpath>\n" + 
-                	"	<classpathentry kind=\"src\" path=\"\"/>\n" + 
-                	"	<classpathentry kind=\"var\" path=\"JCL_LIB\"/>\n" + 
-                	"	<classpathentry kind=\"con\" path=\"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER\"/>\n" + 
-                	"	<classpathentry kind=\"output\" path=\"\"/>\n" + 
-                	"</classpath>"
-                );
-             }
-        }, null);
-		
-		assertEquals("Should not get any exception in log", null, listener.log);
-	} finally {
-	    Platform.removeLogListener(listener);
-		deleteProject("P1");
-		deleteProject("P2");
-		deleteProject("P3");
-	}
-}
-/*
- * Ensure that a classpath initializer is not run on shutdown
- * (regression test for bug 93941 Classpath initialization on shutdown)
- */
-public void testContainerInitializer11() throws CoreException {
-	boolean hasExited = false;
-	try {
-		ContainerInitializer.setInitializer(null);
-		createJavaProject(
-			"P", 
-			new String[] {}, 
-			new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-		simulateExitRestart();
-		ClasspathInitializerTests.DefaultContainerInitializer initializer = new ClasspathInitializerTests.DefaultContainerInitializer(new String[] {}) {
-			public void initialize(IPath containerPath,IJavaScriptProject project) throws CoreException {
-				assertTrue("Should not initialize container on shutdown", false);
-			}
-		};
-		ContainerInitializer.setInitializer(initializer);
-		simulateExit();
-		hasExited = true;
-	} finally {
-		ContainerInitializer.setInitializer(null);
-		if (hasExited)
-			simulateRestart();
-		deleteProject("P");
-	}
-}
-
-/*
- * Ensure that the initializer is removed from the cache when the project is deleted
- * (regression test for bug 116072 cached classpath containers not removed when project deleted)
- */
-public void testContainerInitializer12() throws CoreException {
-	try {
-		ContainerInitializer.setInitializer(new DefaultContainerInitializer(new String[] {"P1", "/P1/lib.jar"}));
-		IJavaScriptProject project =  createJavaProject(
-			"P1", 
-			new String[] {}, 
-			new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-		createFile("/P1/lib.jar", "");
-		IPackageFragmentRoot root = project.getPackageFragmentRoot(getFile("/P1/lib.jar"));
-		assertTrue("/P1/lib.jar should exist", root.exists());
-		deleteProject("P1");
-		
-		class Initializer extends DefaultContainerInitializer {
-			boolean initialized;
-			public Initializer(String[] args) {
-				super(args);
-			}
-			public void initialize(IPath containerPath, IJavaScriptProject p) throws CoreException {
-				super.initialize(containerPath, p);
-				this.initialized = true;
-			}
-		}
-		Initializer initializer = new Initializer(new String[] {"P1", "/P1/lib.jar"});
-		ContainerInitializer.setInitializer(initializer);
-		createJavaProject(
-			"P1", 
-			new String[] {}, 
-			new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-		createFile("/P1/lib.jar", "");
-		assertTrue("/P1/lib.jar should exist", root.exists());
-		assertTrue("Should have been initialized", initializer.initialized);
-	} finally {
-		stopDeltas();
-		deleteProject("P1");
-	}
-}
-
-/* 
- * Ensures that no resource deta is reported if a container that was not initialized is initialized with null
- * (regression test for bug 149043 Unresolvable classpath container leads to lots of scheduled jobs)
- */
-public void testContainerInitializer13() throws CoreException {
-	IResourceChangeListener listener = new IResourceChangeListener() {
-		StringBuffer buffer = new StringBuffer();
-		public void resourceChanged(IResourceChangeEvent event) {
-			this.buffer.append(event.getDelta().findMember(new Path("/P1")));
-		}
-		public String toString() {
-			return this.buffer.toString();
-		}
-	};
-	try {
-		NullContainerInitializer nullInitializer = new NullContainerInitializer();
-		ContainerInitializer.setInitializer(nullInitializer);
-		IJavaScriptProject project = createJavaProject(
-				"P1", 
-				new String[] {}, 
-				new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-				
-		// simulate state on startup
-		simulateExitRestart();
-		
-		getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE);
-		
-		// force resolution of container
-		project.findPackageFragmentRoots(project.getRawIncludepath()[0]);
-
-		assertEquals(
-			"Unexpected resource delta on startup", 
-			"",
-			listener.toString()
-		);
-	} finally {
-		getWorkspace().removeResourceChangeListener(listener);
-		deleteProject("P1");
-	}
-}
-
-/*
- * Ensures that a misbehaving container (that initializes another project than the one asked for) doesn't cause
- * the container to be initialized again
- * (regression test for bug 160005 Add protection about misbehaving container initializer)
- */
-public void testContainerInitializer14() throws CoreException {
-	try {
-		createProject("P1");
-		createFile("/P1/lib.jar", "");
-		class Container extends DefaultContainerInitializer {
-			int initializeCount = 0;
-			Container(String[] values) {
-				super(values);
-			}
-			public void initialize(IPath containerPath, IJavaScriptProject project) 	throws CoreException {
-				this.initializeCount++;
-				super.initialize(containerPath, getJavaProject("P1"));
-			}
-		}
-		Container container = new Container(new String[] {"P2", "/P1/lib.jar"});
-		ContainerInitializer.setInitializer(container);
-		IJavaScriptProject p2 = createJavaProject(
-				"P2", 
-				new String[] {}, 
-				new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-		p2.getResolvedIncludepath(true);
-		assertEquals("Unexpected number of initalizations", 1, container.initializeCount);
-	} finally {
-		stopDeltas();
-		deleteProject("P1");
-		deleteProject("P2");
-	}
-}
-
-/*
- * Ensures that if a container is misbehaving (it doesn't initialize a project when asked for),
- * then the resulting container's classpath is not null
- * (regression test for bug 161846 Expanding a java project with invalid classpath container entries in Project Explorer causes CPU to stay at 100%)
- */
-public void testContainerInitializer15() throws CoreException {
-	try {
-		class Container extends DefaultContainerInitializer {
-			Container(String[] values) {
-				super(values);
-			}
-			public void initialize(IPath containerPath, IJavaScriptProject project) 	throws CoreException {
-			}
-		}
-		Container container = new Container(new String[] {"P1", "/P1/lib.jar"});
-		ContainerInitializer.setInitializer(container);
-		IJavaScriptProject p1 = createJavaProject(
-				"P1", 
-				new String[] {}, 
-				new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-		IJsGlobalScopeContainer JsGlobalScopeContainer = JavaScriptCore.getJsGlobalScopeContainer(new Path("org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"), p1);
-		assertClasspathEquals(JsGlobalScopeContainer.getIncludepathEntries(), "");
-	} finally {
-		stopDeltas();
-		deleteProject("P1");
-	}
-}
-/*
- * Ensure that an initializer cannot return a project entry that points to the project of the container (cycle).
- */
-public void testContainerInitializer16() throws CoreException {
-	try {
-		ContainerInitializer.setInitializer(new DefaultContainerInitializer(new String[] {"P1", "/P1"}));
-		JavaScriptModelException exception = null;
-		try {
-			IJavaScriptProject p1 = createJavaProject(
-				"P1", 
-				new String[] {}, 
-				new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"});
-			p1.getResolvedIncludepath(true);
-		} catch (JavaScriptModelException e) {
-			exception = e;
-		}
-		assertExceptionEquals(
-			"Unexpected expection", 
-			"Project cannot reference itself: P1", 
-			exception);
-	} finally {
-		stopDeltas();
-		deleteProject("P1");
-	}
-}
-public void testVariableInitializer01() throws CoreException {
-	try {
-		createProject("P1");
-		createFile("/P1/lib.jar", "");
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] {"TEST_LIB", "/P1/lib.jar"}));
-		IJavaScriptProject p2 = createJavaProject("P2", new String[] {}, new String[] {"TEST_LIB"});
-		IPackageFragmentRoot root = p2.getPackageFragmentRoot(getFile("/P1/lib.jar"));
-		assertTrue("/P1/lib.jar should exist", root.exists());
-	} finally {
-		deleteProject("P1");
-		deleteProject("P2");
-		VariablesInitializer.reset();
-	}
-}
-public void testVariableInitializer02() throws CoreException {
-	try {
-		createProject("P1");
-		createFile("/P1/lib.jar", "");
-		createFile("/P1/src.zip", "");
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] {
-			"TEST_LIB", "/P1/lib.jar",
-			"TEST_SRC", "/P1/src.zip",
-			"TEST_ROOT", "src",
-		}));
-		IJavaScriptProject p2 = createJavaProject("P2", new String[] {}, new String[] {"TEST_LIB,TEST_SRC,TEST_ROOT"});
-		IPackageFragmentRoot root = p2.getPackageFragmentRoot(getFile("/P1/lib.jar"));
-		assertEquals("Unexpected source attachment path", "/P1/src.zip", root.getSourceAttachmentPath().toString());
-		assertEquals("Unexpected source attachment root path", "src", root.getSourceAttachmentRootPath().toString());
-	} finally {
-		deleteProject("P1");
-		deleteProject("P2");
-		VariablesInitializer.reset();
-	}
-}
-public void testVariableInitializer03() throws CoreException {
-	try {
-		createProject("P1");
-		createFile("/P1/lib.jar", "");
-		createFile("/P1/src.zip", "");
-		String[] variableValues = new String[] {
-			"TEST_LIB", "/P1/lib.jar",
-			"TEST_SRC", "/P1/src.zip",
-			"TEST_ROOT", "src",
-		};
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(variableValues));
-		createJavaProject("P2", new String[] {}, new String[] {"TEST_LIB,TEST_SRC,TEST_ROOT"});
-
-		// simulate state on startup
-		simulateExitRestart();
-		
-		startDeltas();
-		//JavaModelManager.CP_RESOLVE_VERBOSE=true;		
-		getJavaProject("P2").getResolvedIncludepath(true);
-		
-		assertDeltas(
-			"Unexpected delta on startup", 
-			""
-		);
-	} finally {
-		//JavaModelManager.CP_RESOLVE_VERBOSE=false;		
-		stopDeltas();
-		deleteProject("P1");
-		deleteProject("P2");
-		VariablesInitializer.reset();
-	}
-}
-public void testVariableInitializer04() throws CoreException {
-	try {
-		final StringBuffer buffer = new StringBuffer();
-		VariablesInitializer.setInitializer(new VariablesInitializer.ITestInitializer() {
-			public void initialize(String variable) throws JavaScriptModelException {
-				buffer.append("Initializing " + variable + "\n");
-				IPath path = new Path(variable.toLowerCase());
-				buffer.append("Setting variable " + variable + " to " + path + "\n");
-				JavaScriptCore.setIncludepathVariable(variable, path, null);
-			}
-		});
-		createJavaProject("P", new String[] {}, new String[] {"TEST_LIB,TEST_SRC,TEST_ROOT"});
-		assertEquals(
-			"Initializing TEST_LIB\n" +
-			"Setting variable TEST_LIB to test_lib\n",
-			buffer.toString());
-	} finally {
-		deleteProject("P");
-		VariablesInitializer.reset();
-	}
-}
-public void testVariableInitializer05() throws CoreException {
-	try {
-		final StringBuffer buffer = new StringBuffer();
-		VariablesInitializer.setInitializer(new VariablesInitializer.ITestInitializer() {
-			public void initialize(String variable) throws JavaScriptModelException {
-				buffer.append("Initializing " + variable + "\n");
-				IPath path = new Path(variable.toLowerCase());
-				JavaScriptCore.getIncludepathVariable("TEST_SRC");
-				buffer.append("Setting variable " + variable + " to " + path + "\n");
-				JavaScriptCore.setIncludepathVariable(variable, path, null);
-			}
-		});
-		createJavaProject("P", new String[] {}, new String[] {"TEST_LIB,TEST_SRC,TEST_ROOT"});
-		assertEquals(
-			"Initializing TEST_LIB\n" +
-			"Initializing TEST_SRC\n" +
-			"Setting variable TEST_SRC to test_src\n" +
-			"Setting variable TEST_LIB to test_lib\n",
-			buffer.toString());
-	} finally {
-		deleteProject("P");
-		VariablesInitializer.reset();
-	}
-}
-/*
- * Ensures that if the initializer doesn't initialize a variable, it can be
- * initialized later on.
- */
-public void testVariableInitializer06() throws CoreException {
-	try {
-		final StringBuffer buffer = new StringBuffer();
-		VariablesInitializer.setInitializer(new VariablesInitializer.ITestInitializer() {
-			public void initialize(String variable) {
-				// do nothing
-				buffer.append("Ignoring request to initialize");
-			}
-		});
-		IPath path = JavaScriptCore.getIncludepathVariable("TEST_SRC");
-		assertEquals(
-			"Unexpected value of TEST_SRC after initializer was called",
-			null,
-			path);
-		IPath varValue = new Path("src.zip");
-		JavaScriptCore.setIncludepathVariable("TEST_SRC", varValue, null);
-		path = JavaScriptCore.getIncludepathVariable("TEST_SRC");
-		assertEquals(
-			"Unexpected value of TEST_SRC after setting it",
-			varValue,
-			path);
-	} finally {
-		VariablesInitializer.reset();
-	}
-}
-public void testVariableInitializer07() throws CoreException {
-	try {
-		createProject("P1");
-		createFile("/P1/lib.jar", "");
-		createFile("/P1/src.zip", "");
-		String[] variableValues = new String[] {
-			"TEST_LIB", "/P1/lib.jar",
-			"TEST_SRC", "/P1/src.zip",
-			"TEST_ROOT", "src",
-		};
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(variableValues));
-		createJavaProject("P2", new String[] {}, new String[] {"TEST_LIB,TEST_SRC,TEST_ROOT"});
-
-		// change value of TEST_LIB
-		createFile("/P1/lib2.jar", "");
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] {
-			"TEST_LIB", "/P1/lib2.jar",
-			"TEST_SRC", "/P1/src.zip",
-			"TEST_ROOT", "src",
-		}));
-
-		// simulate state on startup
-		simulateExitRestart();
-		
-		startDeltas();
-		//JavaModelManager.CP_RESOLVE_VERBOSE=true;		
-		getJavaProject("P2").getResolvedIncludepath(true);
-		
-		assertDeltas(
-			"Unexpected delta on startup", 
-			"P2[*]: {CHILDREN}\n" + 
-			"	/P1/lib.jar[*]: {REMOVED FROM CLASSPATH}\n" + 
-			"	/P1/lib2.jar[*]: {ADDED TO CLASSPATH}"
-		);
-	} finally {
-		//JavaModelManager.CP_RESOLVE_VERBOSE=false;		
-		stopDeltas();
-		deleteProject("P1");
-		deleteProject("P2");
-		VariablesInitializer.reset();
-	}
-}
-/*
- * Ensure that an OperationCanceledException goes through
- * (regression test for bug 59363 Should surface cancellation exceptions)
- */
-
-public void testVariableInitializer08() throws CoreException {
-	try {
-		boolean gotException = false;
-		try {
-			VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] {"TEST_LIB", "/P1/lib.jar"}) {
-				public void initialize(String variable) throws JavaScriptModelException {
-					throw new OperationCanceledException("test");
-				}
-			});
-			IJavaScriptProject p1 = createJavaProject("P1", new String[] {}, new String[] {"TEST_LIB"});
-			p1.getResolvedIncludepath(true);
-		} catch (OperationCanceledException e) {
-			gotException = true;
-		}
-		assertTrue("Should get an OperationCanceledException", gotException);
-	} finally {
-		deleteProject("P1");
-		VariablesInitializer.reset();
-	}
-}
-
-/*
- * Ensure that removing a classpath variable while initializing it doesn't throw a StackOverFlowError
- * (regression test for bug 112609 StackOverflow when initializing Java Core)
- */
-public void testVariableInitializer09() throws CoreException {
-	try {
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] {"TEST_LIB", "/P1/lib.jar"}) {
-			public void initialize(String variable) throws JavaScriptModelException {
-				JavaScriptCore.removeIncludepathVariable("TEST_LIB", null);
-			}
-		});
-		IJavaScriptProject p1 = createJavaProject("P1", new String[] {}, new String[] {"TEST_LIB"});
-		IIncludePathEntry[] resolvedClasspath = p1.getResolvedIncludepath(true);
-		assertClasspathEquals(
-			resolvedClasspath, 
-			""
-		);
-	} finally {
-		deleteProject("P1");
-		VariablesInitializer.reset();
-	}
-}
-/*
- * Ensures that not initializing a classpath variable and asking for its value returns null
- * (regression test for bug 113110 TestFailures in DebugSuite)
- */
-public void testVariableInitializer10() throws CoreException {
-	try {
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] {"TEST_LIB", "/P1/lib.jar"}) {
-			public void initialize(String variable) throws JavaScriptModelException {
-				// don't initialize
-			}
-		});
-		// force resolution
-		JavaScriptCore.getIncludepathVariable("TEST_LIB");
-		// second call should still be null
-		assertEquals("TEST_LIB should be null", null, JavaScriptCore.getIncludepathVariable("TEST_LIB"));
-	} finally {
-		deleteProject("P1");
-		VariablesInitializer.reset();
-	}
-}
-/**
- * Bug 125965: [prefs] "Export/Import preferences" should let user to choose wich preference to export/import
- * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=125965"
- */
-public void testVariableInitializer11() throws CoreException {
-	try {
-		// Create initializer
-		String varName = "TEST_LIB";
-		String initialValue = "/P1/lib.jar";
-		String newValue = "/tmp/file.jar";
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] {varName, initialValue}));
-		assertEquals("JavaScriptCore classpath value should have been initialized", JavaScriptCore.getIncludepathVariable(varName).toString(), initialValue);
-		
-		// Modify preference
-		JavaModelManager manager = JavaModelManager.getJavaModelManager();
-		IEclipsePreferences preferences = manager.getInstancePreferences();
-		preferences.put(JavaModelManager.CP_VARIABLE_PREFERENCES_PREFIX+varName, newValue);
-	
-		// verify that JavaScriptCore preferences have been reset
-		assertEquals("JavaScriptCore classpath value should be unchanged", JavaScriptCore.getIncludepathVariable(varName).toString(), initialValue);
-		assertEquals("JavaScriptCore preferences value should be unchanged", preferences.get(varName, "X"), initialValue);
-	} finally {
-		VariablesInitializer.reset();
-	}
-}
-
-/**
- * @bug 138599: [model][classpath] Need a way to mark a classpath variable as deprecated
- * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=138599"
- */
-public void testVariableInitializerDeprecated() throws CoreException {
-	try {
-		// Create initializer
-		String varName = "TEST_DEPRECATED";
-		String filePath = "/P1/lib.jar";
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] {varName, filePath}));
-		assertEquals("JavaScriptCore classpath value should have been initialized", JavaScriptCore.getIncludepathVariable(varName).toString(), filePath);
-		
-		// Verify that Classpath Variable is deprecated
-		assertEquals("JavaScriptCore classpath variable should be deprecated", "Test deprecated flag", JavaScriptCore.getIncludepathVariableDeprecationMessage(varName));
-
-		// Create project
-		IJavaScriptProject project = createJavaProject("P1");
-		createFile("/P1/lib.jar", "");
-		IIncludePathEntry variable = JavaScriptCore.newVariableEntry(new Path("TEST_DEPRECATED"), null, null);
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspathEntry(project, variable, false);
-		assertStatus("Classpath variable 'TEST_DEPRECATED' in project P1 is deprecated: 'Test deprecated flag'", status);
-		assertFalse("Status should not be OK", status.isOK());
-		assertEquals("Status should have WARNING severity", IStatus.WARNING, status.getSeverity());
-		assertEquals("Status should have deprecated code", IJavaScriptModelStatusConstants.DEPRECATED_VARIABLE, status.getCode());
-	} finally {
-		VariablesInitializer.reset();
-		deleteProject("P1");
-	}
-}
-public void testVariableInitializerUnboundAndDeprecated() throws CoreException {
-	try {
-		// Create initializer
-		String varName = "TEST_DEPRECATED";
-		String filePath = "/P1/lib.jar";
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] {varName, filePath}));
-		assertEquals("JavaScriptCore classpath value should have been initialized", JavaScriptCore.getIncludepathVariable(varName).toString(), filePath);
-		
-		// Verify that Classpath Variable is deprecated
-		assertEquals("JavaScriptCore classpath variable should be deprecated", "Test deprecated flag", JavaScriptCore.getIncludepathVariableDeprecationMessage(varName));
-
-		// Create project
-		IJavaScriptProject project = createJavaProject("P1");
-		IIncludePathEntry variable = JavaScriptCore.newVariableEntry(new Path("TEST_DEPRECATED"), null, null);
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspathEntry(project, variable, false);
-		assertStatus("Project P1 is missing required library: 'lib.jar'", status);
-		assertFalse("Status should not be OK", status.isOK());
-		assertEquals("Status should have WARNING severity", IStatus.ERROR, status.getSeverity());
-		assertEquals("Status should have deprecated code", IJavaScriptModelStatusConstants.INVALID_INCLUDEPATH, status.getCode());
-	} finally {
-		VariablesInitializer.reset();
-		deleteProject("P1");
-	}
-}
-
-/**
- * @bug 156226: [model][classpath] Allow classpath variable to be marked as non modifiable
- * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=156226"
- */
-public void testVariableInitializerReadOnly() throws CoreException {
-	try {
-		// Create initializer
-		String varName = "TEST_READ_ONLY";
-		String path = "/P1/lib.jar";
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] { varName, path }));
-		assertEquals("JavaScriptCore classpath value should have been initialized", JavaScriptCore.getIncludepathVariable(varName).toString(), path);
-
-		// verify that Classpath Variable is read-only
-		assertTrue("JavaScriptCore classpath variable should be read-only", JavaScriptCore.isIncludepathVariableReadOnly(varName));
-
-		// Create project
-		IJavaScriptProject project = createJavaProject("P1");
-		createFile("/P1/lib.jar", "");
-		IIncludePathEntry variable = JavaScriptCore.newVariableEntry(new Path("TEST_READ_ONLY"), null, null);
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspathEntry(project, variable, false);
-		assertStatus("OK", status);
-		assertTrue("Status should be OK", status.isOK());
-		assertEquals("Status should be VERIFIED_OK", JavaModelStatus.VERIFIED_OK, status);
-	} finally {
-		VariablesInitializer.reset();
-		deleteProject("P1");
-	}
-}
-public void testVariableInitializerDeprecatedAndReadOnly() throws CoreException {
-	try {
-		// Create initializer
-		String varName = "TEST_DEPRECATED_READ_ONLY";
-		String path = "/P1/lib.jar";
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] { varName, path }));
-		assertEquals("JavaScriptCore classpath value should have been initialized", JavaScriptCore.getIncludepathVariable(varName).toString(), path);
-
-		// verify that Classpath Variable is read-only
-		assertEquals("JavaScriptCore classpath variable should be deprecated", "A deprecated and read-only initializer", JavaScriptCore.getIncludepathVariableDeprecationMessage(varName));
-		assertTrue("JavaScriptCore classpath variable should be read-only", JavaScriptCore.isIncludepathVariableReadOnly(varName));
-
-		// Create project
-		IJavaScriptProject project = createJavaProject("P1");
-		createFile("/P1/lib.jar", "");
-		IIncludePathEntry variable = JavaScriptCore.newVariableEntry(new Path("TEST_DEPRECATED_READ_ONLY"), null, null);
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspathEntry(project, variable, false);
-		assertStatus("Classpath variable 'TEST_DEPRECATED_READ_ONLY' in project P1 is deprecated: 'A deprecated and read-only initializer'", status);
-		assertFalse("Status should not be OK", status.isOK());
-		assertEquals("Status should have WARNING severity", IStatus.WARNING, status.getSeverity());
-		assertEquals("Status should have deprecated code", IJavaScriptModelStatusConstants.DEPRECATED_VARIABLE, status.getCode());
-	} finally {
-		VariablesInitializer.reset();
-		deleteProject("P1");
-	}
-}
-
-/**
- * @bug 172207: [model] Marker for deprecated classpath variable should always have WARNING severity
- * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=172207"
- */
-public void testVariableInitializerBug172207() throws CoreException {
-	try {
-		// Create initializer
-		String varName = "TEST_DEPRECATED_READ_ONLY";
-		String path = "/P1/lib.jar";
-		VariablesInitializer.setInitializer(new DefaultVariableInitializer(new String[] { varName, path }));
-		assertEquals("JavaScriptCore classpath value should have been initialized", JavaScriptCore.getIncludepathVariable(varName).toString(), path);
-
-		// verify that Classpath Variable is read-only
-		assertEquals("JavaScriptCore classpath variable should be deprecated", "A deprecated and read-only initializer", JavaScriptCore.getIncludepathVariableDeprecationMessage(varName));
-		assertTrue("JavaScriptCore classpath variable should be read-only", JavaScriptCore.isIncludepathVariableReadOnly(varName));
-
-		// Create project
-		IJavaScriptProject project = createJavaProject("P1");
-		createFile("/P1/lib.jar", "");
-		IIncludePathEntry variable = JavaScriptCore.newVariableEntry(new Path("TEST_DEPRECATED_READ_ONLY"), null, null);
-		IIncludePathEntry[] entries = project.getRawIncludepath();
-		int length = entries.length;
-		System.arraycopy(entries, 0, entries = new IIncludePathEntry[length+1], 0, length);
-		entries[length] = variable;
-		project.setRawIncludepath(entries, null);
-
-		// verify markers
-		waitForAutoBuild();
-		IMarker[] markers = project.getProject().findMarkers(IJavaScriptModelMarker.BUILDPATH_PROBLEM_MARKER, false, IResource.DEPTH_ZERO);
-		sortMarkers(markers);
-		assertMarkers("Unexpected marker(s)",
-			"Classpath variable 'TEST_DEPRECATED_READ_ONLY' in project P1 is deprecated: 'A deprecated and read-only initializer'",
-			markers);
-		assertEquals("Marker on deprecated variable should be a WARNING", IMarker.SEVERITY_WARNING, markers[0].getAttribute(IMarker.SEVERITY, -1));
-	} finally {
-		VariablesInitializer.reset();
-		deleteProject("P1");
-	}
-}
-
-/**
- * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=61872"
- */
-public void testUserLibraryInitializer1() throws CoreException {
-	try {
-		// Create new user library "SWT"
-		JsGlobalScopeContainerInitializer initializer= JavaScriptCore.getJsGlobalScopeContainerInitializer(JavaScriptCore.USER_LIBRARY_CONTAINER_ID);
-		String libraryName = "SWT";
-		IPath containerPath = new Path(JavaScriptCore.USER_LIBRARY_CONTAINER_ID);
-		UserLibraryJsGlobalScopeContainer containerSuggestion = new UserLibraryJsGlobalScopeContainer(libraryName);
-		initializer.requestJsGlobalScopeContainerUpdate(containerPath.append(libraryName), null, containerSuggestion);
-
-		// Create java project
-		createJavaProject("p61872");
-		IFile jarFile = createFile("/p61872/swt.jar", "");
-		IFile srcFile = createFile("/p61872/swtsrc.zip", "");
-
-		// Modify user library
-		Preferences preferences = JavaScriptCore.getPlugin().getPluginPreferences();
-		String propertyName = UserLibraryManager.CP_USERLIBRARY_PREFERENCES_PREFIX+"SWT";
-		StringBuffer propertyValue = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<userlibrary systemlibrary=\"false\" version=\"1\">\r\n<archive");
-		String jarFullPath = getWorkspaceRoot().getLocation().append(jarFile.getFullPath()).toString();
-		propertyValue.append(" path=\""+jarFullPath);
-		propertyValue.append("\"/>\r\n</userlibrary>\r\n");
-		preferences.setValue(propertyName, propertyValue.toString());
-		JavaScriptCore.getPlugin().savePluginPreferences();
-
-		// Modify project classpath
-		editFile(
-			"/p61872/.classpath",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-			"<classpath>\n" +
-			"	<classpathentry kind=\"con\" path=\"org.eclipse.wst.jsdt.USER_LIBRARY/SWT\"/>\n" +
-			"	<classpathentry kind=\"output\" path=\"\"/>\n" +
-			"</classpath>"
-		);
-
-		// Verify 
-		IIncludePathEntry[] entries = getJavaProject("p61872").getResolvedIncludepath(true);
-		assertEquals("Invalid entries number in resolved classpath for project p61872!", 1, entries.length);
-		assertEquals("Invalid path for project 61872 classpath entry!", jarFullPath.toLowerCase(), entries[0].getPath().toString().toLowerCase());
-		assertNull("Project 61872 classpath entry should not have any source attached!", entries[0].getSourceAttachmentPath());
-
-		// Modify user library
-		propertyValue = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<userlibrary systemlibrary=\"false\" version=\"1\">\r\n<archive");
-		String srcFullPath = getWorkspaceRoot().getLocation().append(srcFile.getFullPath()).toString();
-		propertyValue.append(" sourceattachment=\""+srcFullPath);
-		propertyValue.append("\" path=\""+jarFullPath);
-		propertyValue.append("\"/>\r\n</userlibrary>\r\n");
-		preferences.setValue(propertyName, propertyValue.toString());
-		JavaScriptCore.getPlugin().savePluginPreferences();
-
-		// Verify 
-		entries = getJavaProject("p61872").getResolvedIncludepath(true);
-		assertEquals("Invalid entries number in resolved classpath for project p61872!", 1, entries.length);
-		assertEquals("Invalid path for project 61872 classpath entry!", jarFullPath.toLowerCase(), entries[0].getPath().toString().toLowerCase());
-		assertEquals("Invalid source attachement path for project 61872 classpath entry!", srcFullPath.toLowerCase(), entries[0].getSourceAttachmentPath().toString().toLowerCase());
-	} finally {
-		deleteProject("p61872");
-	}
-}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathTests.java
deleted file mode 100644
index 7c936a0..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathTests.java
+++ /dev/null
@@ -1,3032 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Map;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-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.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-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.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.core.IAccessRule;
-import org.eclipse.wst.jsdt.core.IIncludePathAttribute;
-import org.eclipse.wst.jsdt.core.IIncludePathEntry;
-import org.eclipse.wst.jsdt.core.IJavaScriptElementDelta;
-import org.eclipse.wst.jsdt.core.IJavaScriptModelMarker;
-import org.eclipse.wst.jsdt.core.IJavaScriptModelStatus;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.core.IPackageFragmentRoot;
-import org.eclipse.wst.jsdt.core.JavaScriptConventions;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.tests.util.Util;
-import org.eclipse.wst.jsdt.internal.core.ClasspathEntry;
-import org.eclipse.wst.jsdt.internal.core.JavaModelManager;
-import org.eclipse.wst.jsdt.internal.core.JavaProject;
-
-public class ClasspathTests extends ModifyingResourceTests {
-
-	public class TestContainer implements IJsGlobalScopeContainer {
-		IPath path;
-		IIncludePathEntry[] entries;
-		TestContainer(IPath path, IIncludePathEntry[] entries){
-			this.path = path;
-			this.entries = entries;
-		}
-		public IPath getPath() { return this.path; }
-		/**
-		 * @deprecated Use {@link #getIncludepathEntries()} instead
-		 */
-		public IIncludePathEntry[] getClasspathEntries() {
-			return getIncludepathEntries();
-		}
-		public IIncludePathEntry[] getIncludepathEntries() { return this.entries;	}
-		public String getDescription() { return this.path.toString(); 	}
-		public int getKind() { return 0; }
-		/* (non-Javadoc)
-		 * @see org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer#resolvedLibraryImport(java.lang.String)
-		 */
-		public String[] resolvedLibraryImport(String a) {
-			return new String[] {a};
-		}
-	}
-
-public ClasspathTests(String name) {
-	super(name);
-}
-// Use this static initializer to specify subset for tests
-// All specified tests which do not belong to the class are skipped...
-static {
-	// Names of tests to run: can be "testBugXXXX" or "BugXXXX")
-//	TESTS_PREFIX = "testClasspathDuplicateExtraAttribute";
-//	TESTS_NAMES = new String[] {"testClasspathValidation42"};
-//	TESTS_NUMBERS = new int[] { 23, 28, 38 };
-//	TESTS_RANGE = new int[] { 21, 38 };
-}
-public static Test suite() {
-	return buildModelTestSuite(ClasspathTests.class);
-}
-public void setUpSuite() throws Exception {
-	super.setUpSuite();
-	
-	setupExternalJCL("jclMin");
-}
-protected void assertCycleMarkers(IJavaScriptProject project, IJavaScriptProject[] p, int[] expectedCycleParticipants) throws CoreException {
-	waitForAutoBuild();
-	StringBuffer expected = new StringBuffer("{");
-	int expectedCount = 0;
-	StringBuffer computed = new StringBuffer("{");			
-	int computedCount = 0;
-	for (int j = 0; j < p.length; j++){
-		int markerCount = this.numberOfCycleMarkers(p[j]);
-		if (markerCount > 0){
-			if (computedCount++ > 0) computed.append(", ");
-			computed.append(p[j].getElementName());
-			//computed.append(" (" + markerCount + ")");
-		}
-		markerCount = expectedCycleParticipants[j];
-		if (markerCount > 0){
-			if (expectedCount++ > 0) expected.append(", ");
-			expected.append(p[j].getElementName());
-			//expected.append(" (" + markerCount + ")");
-		}
-	}
-	expected.append("}");
-	computed.append("}");
-	assertEquals("Invalid cycle detection after setting classpath for: "+project.getElementName(), expected.toString(), computed.toString());
-}
-private void assertEncodeDecodeEntry(String projectName, String expectedEncoded, IIncludePathEntry entry) {
-	IJavaScriptProject project = getJavaProject(projectName);
-	String encoded = project.encodeIncludepathEntry(entry);
-	assertSourceEquals(
-		"Unexpected encoded entry",
-		expectedEncoded,
-		encoded);
-	IIncludePathEntry decoded = project.decodeIncludepathEntry(encoded);
-	assertEquals(
-		"Unexpected decoded entry",
-		entry,
-		decoded);
-}
-protected File createFile(File parent, String name, String content) throws IOException {
-	File file = new File(parent, name);
-	FileOutputStream out = new FileOutputStream(file);
-	out.write(content.getBytes());
-	out.close();
-	/*
-	 * Need to change the time stamp to realize that the file has been modified
-	 */
-	file.setLastModified(System.currentTimeMillis() + 2000);
-	return file;
-}
-protected File createFolder(File parent, String name) {
-	File file = new File(parent, name);
-	file.mkdirs();
-	return file;
-}
-protected int numberOfCycleMarkers(IJavaScriptProject javaProject) throws CoreException {
-	IMarker[] markers = javaProject.getProject().findMarkers(IJavaScriptModelMarker.BUILDPATH_PROBLEM_MARKER, false, IResource.DEPTH_ZERO);
-	int result = 0;
-	for (int i = 0, length = markers.length; i < length; i++) {
-		IMarker marker = markers[i];
-		String cycleAttr = (String)marker.getAttribute(IJavaScriptModelMarker.CYCLE_DETECTED);
-		if (cycleAttr != null && cycleAttr.equals("true")){ //$NON-NLS-1$
-			result++;
-		}
-	}
-	return result;
-}
-
-/**
- * Add an entry to the classpath for a non-existent root. Then create
- * the root and ensure that it comes alive.
- */
-public void testAddRoot1() throws CoreException {
-	IJavaScriptProject project = this.createJavaProject("P", new String[] {"src"});
-	IIncludePathEntry[] originalCP= project.getRawIncludepath();
-
-	try {
-		IIncludePathEntry newEntry= JavaScriptCore.newSourceEntry(project.getProject().getFullPath().append("extra"));
-
-		IIncludePathEntry[] newCP= new IIncludePathEntry[originalCP.length + 1];
-		System.arraycopy(originalCP, 0 , newCP, 0, originalCP.length);
-		newCP[originalCP.length]= newEntry;
-
-		project.setRawIncludepath(newCP, null);
-
-		// now create the actual resource for the root and populate it
-		project.getProject().getFolder("extra").create(false, true, null);
-
-		IPackageFragmentRoot newRoot= getPackageFragmentRoot("P", "extra");
-		assertTrue("New root should now be visible", newRoot != null);
-	} finally {
-		// cleanup  
-		this.deleteProject("P");
-	}
-}
-
-/*
- * Adds an entry to the classpath for a non-existent root. Then creates
- * the root and ensures that the marker is removed.
- * (regression test for bug 161581 Adding a missing folder doesn't remove classpath marker)
- */
-public void testAddRoot2() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P", new String[] {});
-		project.setRawIncludepath(createClasspath("P", new String[] {"/P/src", ""}), null);
-		waitForAutoBuild();
-
-		// now create the actual resource for the root
-		project.getProject().getFolder("src").create(false, true, null);
-		assertMarkers("Unexpected markers", "", project);
-	} finally {
-		// cleanup  
-		this.deleteProject("P");
-	}
-}
-
-/**
- * Ensures that the reordering external resources in the classpath
- * generates the correct deltas.
- */
-public void testClasspathChangeExternalResources() throws CoreException {
-	try {
-		IJavaScriptProject proj = this.createJavaProject("P", new String[] {"src"});
-
-		IIncludePathEntry[] newEntries = new IIncludePathEntry[2];
-		newEntries[0] = JavaScriptCore.newLibraryEntry(getSystemJsPath(), null, null, false);
-		newEntries[1] = JavaScriptCore.newLibraryEntry(getExternalJCLSourcePath(), null, null, false);
-		setClasspath(proj, newEntries);
-		startDeltas();
-		IIncludePathEntry[] swappedEntries = new IIncludePathEntry[2];
-		swappedEntries[0] = newEntries[1];
-		swappedEntries[1] = newEntries[0];
-		setClasspath(proj, swappedEntries);
-		assertDeltas(
-			"Unexpected delta",
-			"P[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" + 
-			"	"+  getSystemJsPathString() +"[*]: {REORDERED}\n" + 
-			"	"+  getExternalJCLSourcePathString() +"[*]: {REORDERED}\n" + 
-			"	ResourceDelta(/P/.settings)[*]"
-		);
-	} finally {
-		stopDeltas();
-		this.deleteProject("P");
-	}
-}
-
-/*
- * Test classpath corruption (23977)
- */
-public void testClasspathCorruption() throws CoreException {
-	try {
-		JavaProject p1 = (JavaProject)this.createJavaProject("P1", new String[]{""}, new String[]{}, new String[]{});
-		this.createJavaProject("P2", new String[]{""}, new String[]{}, new String[]{});
-		this.createFile("P2/foo.txt", "not a project");
-		String newCPContent = 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n"
-			+"<classpath>	\n"
-			+"	<classpathentry kind=\"src\" path=\"\"/>	\n"
-			+"	<classpathentry kind=\"src\" path=\"/P2/foo.txt\"/>	\n" // corruption here: target isn't a project
-			+"</classpath>	\n";
-
-		IFile fileRsc = p1.getProject().getFile(JavaProject.SHARED_PROPERTIES_DIRECTORY + "/" + JavaProject.CLASSPATH_FILENAME);
-		fileRsc.setContents(new ByteArrayInputStream(newCPContent.getBytes()), true, false, null);
-
-		p1.close();
-		JavaModelManager.PerProjectInfo perProjectInfo = JavaModelManager.getJavaModelManager().getPerProjectInfo(p1.getProject(), true/*create if missing*/);
-		perProjectInfo.setClasspath(null, null, null, null, null, null, null);
-
-		// shouldn't fail 
-		p1.getExpandedClasspath();
-
-		// if could reach that far, then all is fine
-		
-	} catch(ClassCastException e){
-		assertTrue("internal ClassCastException on corrupted classpath file", false);
-	} finally {
-		// cleanup  
-		this.deleteProject("P1");
-		this.deleteProject("P2");
-	}
-}
-
-/*
- * Test classpath read for non-javascript project or javascript project not opened yet (40658)
- */
-public void testClasspathFileRead() throws CoreException {
-	try {
-		final IProject proj = this.createProject("P1");
-		String newCPContent = 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n"
-			+"<classpath>	\n"
-			+"	<classpathentry kind=\"src\" path=\"src\"/>	\n"
-			+"</classpath>	\n";
-
-		this.createFolder("/P1/.settings/");
-		this.createFile("/P1/.settings/"+JavaProject.CLASSPATH_FILENAME, newCPContent);
-		final IJavaScriptProject jproj = JavaScriptCore.create(proj);
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-			workspace.run(new IWorkspaceRunnable() {
-				public void run(IProgressMonitor monitor)	{
-
-					IIncludePathEntry[] entries = jproj.readRawIncludepath(); // force to read classpath
-					IIncludePathEntry entry = entries[0];
-					assertEquals("first classpath entry should have been read", "/P1/src", entry.getPath().toString());
-				}
-			}, null);	
-	} finally {
-		// cleanup  
-		this.deleteProject("P1");
-	}
-}
-
-/*
- * Test classpath forced reload (20931) and new way to read classpath file (40658)
- */
-public void testClasspathForceReload() throws CoreException {
-	try {
-		final JavaProject p1 = (JavaProject)this.createJavaProject("P1", new String[]{""}, new String[]{}, new String[]{});
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-			workspace.run(new IWorkspaceRunnable() {
-				public void run(IProgressMonitor monitor)	throws CoreException {
-
-					p1.getRawIncludepath(); // force to read classpath
-					createFolder("P1/src");
-					String newCPContent = 
-						"<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n"
-						+"<classpath>	\n"
-						+"	<classpathentry kind=\"src\" path=\"src\"/>	\n"
-						+"</classpath>	\n";
-
-					IFile fileRsc = p1.getProject().getFile(JavaProject.SHARED_PROPERTIES_DIRECTORY + "/" + JavaProject.CLASSPATH_FILENAME);
-					fileRsc.setContents(new ByteArrayInputStream(newCPContent.getBytes()), true, false, null);
-					
-					p1.close();
-					IIncludePathEntry[] entries = p1.readRawIncludepath(); // force to read classpath
-					assertEquals("source location should not have been refreshed", "/P1", entries[0].getPath().toString());
-				}
-			}, null);	
-	} finally {
-		// cleanup  
-		this.deleteProject("P1");
-	}
-}
-
-/**
- * Ensures that the setting the classpath with a library entry
- * changes the kind of the root from K_SOURCE to K_BINARY.
- */
-public void testClasspathCreateLibraryEntry() throws CoreException {
-	try {
-		IJavaScriptProject proj = this.createJavaProject("P", new String[] {"src"});
-		this.createFile("P/src/X.js", "function X() {}");
-	
-		IFolder rootFolder = proj.getProject().getFolder(new Path("src"));
-		IPackageFragmentRoot root = proj.getPackageFragmentRoot(rootFolder);
-		
-		assertEquals(
-			"Unexpected root kind 1", 
-			IPackageFragmentRoot.K_SOURCE,
-			root.getKind());
-		IPackageFragment pkg = root.getPackageFragment("");
-		assertEquals(
-			"Unexpected numbers of compilation units",
-			1,
-			pkg.getJavaScriptUnits().length);
-			
-		this.setClasspath(
-			proj, 
-			new IIncludePathEntry[] {
-				JavaScriptCore.newLibraryEntry(rootFolder.getFullPath(), null, null, false)
-			});
-		assertEquals(
-			"Unexpected root kind 2", 
-			IPackageFragmentRoot.K_BINARY,
-			root.getKind());
-		assertEquals(
-			"Unexpected numbers of compilation units",
-			0,
-			pkg.getJavaScriptUnits().length);
-
-		//ensure that the new kind has been persisted in the classpath file
-		proj.close();
-		assertEquals(
-			"Unexpected root kind 3", 
-			IPackageFragmentRoot.K_BINARY,
-			root.getKind());
-
-	} finally {
-		this.deleteProject("P");
-	}
-}
-
-/**
- * Tests the cross project classpath setting
- */
-public void testClasspathCrossProject() throws CoreException {
-	IJavaScriptProject project = this.createJavaProject("P1", new String[] {""});
-	this.createJavaProject("P2", new String[] {});
-	try {
-		startDeltas();
-		IPackageFragmentRoot oldRoot= getPackageFragmentRoot("P1", "");
- 		IIncludePathEntry projectEntry= JavaScriptCore.newProjectEntry(new Path("/P2"), false);
-		IIncludePathEntry[] newClasspath= new IIncludePathEntry[]{projectEntry};
-		project.setRawIncludepath(newClasspath, null);
-		project.getAllPackageFragmentRoots();
-		IJavaScriptElementDelta removedDelta= getDeltaFor(oldRoot, true);
-		assertDeltas(
-			"Unexpected delta", 
-			"<project root>[*]: {REMOVED FROM CLASSPATH}", 
-			removedDelta);
-	} finally {
-		stopDeltas();
-		this.deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-/**
- * Delete a root and ensure the classpath is not updated (i.e. entry isn't removed).
- */
-public void testClasspathDeleteNestedRoot() throws CoreException {
-	IJavaScriptProject project = this.createJavaProject("P", new String[] {"nested/src"}, new String[] {});
-	IPackageFragmentRoot root= getPackageFragmentRoot("P", "nested/src");
-	IIncludePathEntry[] originalCP= project.getRawIncludepath();
-
-	// delete the root
-	deleteResource(root.getUnderlyingResource());
-
-	IIncludePathEntry[] newCP= project.getRawIncludepath();
-
-	try {
-		// should still be an entry for the "src" folder
-		assertTrue("classpath should not have been updated", 
-			newCP.length == 2 &&
-			newCP[0].equals(originalCP[0]) &&
-			newCP[1].equals(originalCP[1]));
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/*
- * Test classpath diamond (23979)
- */
-public void testClasspathDiamond() throws CoreException {
-	try {
-		this.createJavaProject("P1", new String[]{""});
-		this.createJavaProject("P2", new String[]{""}, new String[]{}, new String[]{"/P1"});
-		this.createJavaProject("P3", new String[]{""}, new String[]{}, new String[]{"/P1", "/P2"});
-		IJavaScriptProject p4 = this.createJavaProject("P4", new String[]{""}, new String[]{}, new String[]{"/P2", "/P3"});
-	
-		assertTrue("Should not detect cycle", !p4.hasIncludepathCycle(null));
-		
-	} finally {
-		// cleanup  
-		this.deleteProjects(new String[] {"P1", "P2", "P3", "P4"});
-	}
-}
- 
-/**
- * Delete a nested root's parent folder and ensure the classpath is
- * not updated (i.e. entry isn't removed).
- */
-public void testClasspathDeleteNestedRootParent() throws CoreException {
-	IJavaScriptProject project = this.createJavaProject("P", new String[] {"nested/src"}, new String[] {});
-	IPackageFragmentRoot root= getPackageFragmentRoot("P", "nested/src");
-	IIncludePathEntry[] originalCP= project.getRawIncludepath();
-
-	// delete the root's parent folder
-	IFolder folder= (IFolder)root.getUnderlyingResource().getParent();
-	deleteResource(folder);
-
-	IIncludePathEntry[] newCP= project.getRawIncludepath();
-
-	try {
-		
-		// should still be an entry for the "src" folder
-		assertTrue("classpath should not have been updated", 
-			newCP.length == 2 &&
-			newCP[0].equals(originalCP[0]) &&
-			newCP[1].equals(originalCP[1]));
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Test that a classpath entry for an external jar is externalized
- * properly.
- */
-public void testClasspathExternalize() throws CoreException {
-	try {
-		IJavaScriptProject project= this.createJavaProject("P", new String[] {}, new String[] {getSystemJsPathString()});
-		IIncludePathEntry[] classpath= project.getRawIncludepath();
-		IIncludePathEntry jar= null;
-		for (int i= 0; i < classpath.length; i++) {
-			if (classpath[i].getEntryKind() == IIncludePathEntry.CPE_LIBRARY) {
-				jar= classpath[i];
-				break;
-			}
-		}
-		project.close();
-		project.open(null);
-	
-		classpath= project.getRawIncludepath();
-		for (int i= 0; i < classpath.length; i++) {
-			if (classpath[i].getEntryKind() == IIncludePathEntry.CPE_LIBRARY) {
-				assertTrue("Paths must be the same", classpath[i].getPath().equals(jar.getPath()));
-				break;
-			}
-		}   
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Move a root and ensure the classpath is not updated (i.e. entry not renamed).
- */
-public void testClasspathMoveNestedRoot() throws CoreException {
-	IJavaScriptProject project = this.createJavaProject("P", new String[] {"nested/src"}, new String[] {});
-	IPackageFragmentRoot root= getPackageFragmentRoot("P", "nested/src");
-	IIncludePathEntry[] originalCP= project.getRawIncludepath();
-
-	// delete the root
-	IFolder folder= (IFolder)root.getUnderlyingResource();
-	IPath originalPath= folder.getFullPath();
-	IPath newPath= originalPath.removeLastSegments(1);
-	newPath= newPath.append(new Path("newsrc"));
-
-	startDeltas(); 
-	
-	folder.move(newPath, true, null);
-
-	IIncludePathEntry[] newCP= project.getRawIncludepath();
-
-	IPackageFragmentRoot newRoot= project.getPackageFragmentRoot(project.getProject().getFolder("nested").getFolder("newsrc")); 
-
-	try {
-		// entry for the "src" folder wasn't replaced
-		assertTrue("classpath not automatically updated", newCP.length == 2 &&
-			newCP[1].equals(originalCP[1]) &&
-			newCP[0].equals(originalCP[0]));
-
-		IJavaScriptElementDelta rootDelta = getDeltaFor(root, true);
-		IJavaScriptElementDelta projectDelta = getDeltaFor(newRoot.getParent(), true);
-		assertTrue("should get delta for moved root", rootDelta != null &&
-				rootDelta.getKind() == IJavaScriptElementDelta.REMOVED &&
-				rootDelta.getFlags() == 0);
-		assertTrue("should get delta indicating content changed for project", this.deltaContentChanged(projectDelta));
-	
-	} finally {
-		stopDeltas();
-		this.deleteProject("P");
-	}
-}
-
-/**
- * Move a parent of a nested root and ensure the classpath is not updated (i.e. entry not renamed).
- */
-public void testClasspathMoveNestedRootParent() throws CoreException {
-	try {
-		IJavaScriptProject project =this.createJavaProject("P", new String[] {"nested/src"}, new String[] {});
-		IPackageFragmentRoot root= getPackageFragmentRoot("P", "nested/src");
-		IIncludePathEntry[] originalCP= project.getRawIncludepath();
-	
-		// delete the root
-		IFolder folder= (IFolder)root.getUnderlyingResource().getParent();
-		IPath originalPath= folder.getFullPath();
-		IPath newPath= originalPath.removeLastSegments(1);
-		newPath= newPath.append(new Path("newsrc"));
-		folder.move(newPath, true, null);
-	
-		IIncludePathEntry[] newCP= project.getRawIncludepath();
-
-		// entry for the "src" folder wasn't replaced
-		// entry for the "src" folder should not be replaced
-		assertTrue("classpath should not automatically be updated", newCP.length == 2 &&
-			newCP[1].equals(originalCP[1]) &&
-			newCP[0].equals(originalCP[0]));
-
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Tests that nothing occurs when setting to the same classpath
- */
-public void testClasspathNoChanges() throws CoreException {
-	try {
-		IJavaScriptProject p = this.createJavaProject("P", new String[] {""});
-		IIncludePathEntry[] oldClasspath= p.getRawIncludepath();
-		startDeltas();
-		p.setRawIncludepath(oldClasspath, null);
-		assertDeltas("Unexpected delta", "");
-	} finally {
-		stopDeltas();
-		this.deleteProject("P");
-	}
-}
-/**
- * Ensures that the setting the classpath with a reordered classpath generates
- * the correct deltas.
- */
-public void testClasspathReordering() throws CoreException {
-	IJavaScriptProject proj = this.createJavaProject("P", new String[] {"src"}, new String[] {getSystemJsPathString()});
-	IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	IPackageFragmentRoot root = getPackageFragmentRoot("P", "src");
-	try {
-		IIncludePathEntry[] newEntries = new IIncludePathEntry[originalCP.length];
-		int index = originalCP.length - 1;
-		for (int i = 0; i < originalCP.length; i++) {
-			newEntries[index] = originalCP[i];
-			index--;
-		}
-		startDeltas();
-		setClasspath(proj, newEntries);
-		assertTrue("should be one delta - two roots reordered", this.deltaListener.deltas.length == 1);
-		IJavaScriptElementDelta d = null;
-		assertTrue("root should be reordered in the classpath", (d = getDeltaFor(root, true)) != null
-			&& (d.getFlags() & IJavaScriptElementDelta.F_REORDER) > 0);
-	} finally {
-		stopDeltas();
-		this.deleteProject("P");
-	}
-}
-
-/**
- * Should detect duplicate entries on the classpath
- */ 
-public void testClasspathValidation01() throws CoreException {
-	try {
-		IJavaScriptProject proj = this.createJavaProject("P", new String[] {"src"});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = newCP[0];
-		
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"should have detected duplicate entries on the classpath", 
-			"Include path contains duplicate entry: \'src\' for project P",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-
-/**
- * Should detect nested source folders on the classpath
- */ 
-public void testClasspathValidation02() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {"src"});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newSourceEntry(new Path("/P"));
-		
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"should have detected nested source folders on the classpath", 
-			"Cannot nest \'P/src\' inside \'P\'. To enable the nesting exclude \'src/\' from \'P\'",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-
-/**
- * Should detect library folder nested inside source folder on the classpath
- */ 
-public void testClasspathValidation03() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {"src"});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newLibraryEntry(new Path("/P/src/lib"), null, null);
-		
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"should have detected library folder nested inside source folder on the classpath", 
-			"Cannot nest \'P/src/lib\' inside \'P/src\'. To enable the nesting exclude \'lib/\' from \'P/src\'",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-
-public void testClasspathValidation04() throws CoreException {
-	
-	IJavaScriptProject[] p = null;
-	try {
-
-		p = new IJavaScriptProject[]{
-			this.createJavaProject("P0", new String[] {"src0"}),
-			this.createJavaProject("P1", new String[] {"src1"}),
-		};
-
-		JavaScriptCore.setIncludepathVariable("var", new Path("/P1"), null);
-		
-		IIncludePathEntry[] newClasspath = new IIncludePathEntry[]{
-			JavaScriptCore.newSourceEntry(new Path("/P0/src0")),
-			JavaScriptCore.newVariableEntry(new Path("var/src1"), null, null),
-		};
-				
-		// validate classpath
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(p[0], newClasspath);
-		assertStatus(
-			"should not detect external source folder through a variable on the classpath", 
-			"OK",
-			status);
-
-	} finally {
-		this.deleteProjects(new String[] {"P0", "P1"});
-	}
-}
-
-public void testClasspathValidation05() throws CoreException {
-	
-	IJavaScriptProject[] p = null;
-	try {
-
-		p = new IJavaScriptProject[]{
-			this.createJavaProject("P0", new String[] {"src0", "src1"}),
-			this.createJavaProject("P1", new String[] {"src1"}),
-		};
-
-		JavaScriptCore.setJsGlobalScopeContainer(
-		new Path("container/default"), 
-			new IJavaScriptProject[]{ p[0] },
-			new IJsGlobalScopeContainer[] {
-				new TestContainer(new Path("container/default"),
-					new IIncludePathEntry[]{
-						JavaScriptCore.newSourceEntry(new Path("/P0/src0")),
-						JavaScriptCore.newVariableEntry(new Path("var/src1"), null, null) }) 
-			}, 
-			null);
-		
-		IIncludePathEntry[] newClasspath = new IIncludePathEntry[]{
-			JavaScriptCore.newSourceEntry(new Path("/P0/src1")),
-			JavaScriptCore.newContainerEntry(new Path("container/default")),
-		};
-				
-		// validate classpath
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(p[0], newClasspath);
-		assertStatus(
-			"should not have detected external source folder through a container on the classpath", 
-			"OK",
-			status);
-
-		// validate classpath entry
-		status = JavaScriptConventions.validateClasspathEntry(p[0], newClasspath[1], true);
-		assertStatus(
-			"should have detected external source folder through a container on the classpath", 
-			"Invalid classpath container: \'container/default\' in project P0",
-			status);
-
-	} finally {
-		this.deleteProjects(new String[] {"P0", "P1"});
-	}
-}
-
-public void testClasspathValidation06() throws CoreException {
-	
-	IJavaScriptProject[] p = null;
-	try {
-
-		p = new IJavaScriptProject[]{
-			this.createJavaProject("P0", new String[] {"src"}),
-		};
-
-		// validate classpath entry
-		IIncludePathEntry[] newClasspath = new IIncludePathEntry[]{
-			JavaScriptCore.newSourceEntry(new Path("/P0")),
-			JavaScriptCore.newSourceEntry(new Path("/P0/src")),
-		};
-				
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(p[0], newClasspath);
-		assertStatus(
-			"should have detected nested source folder", 
-			"Cannot nest \'P0/src\' inside \'P0\'. To enable the nesting exclude \'src/\' from \'P0\'",
-			status);
-	} finally {
-		this.deleteProject("P0");
-	}
-}
-/**
- * Should allow nested source folders on the classpath as long as the outer
- * folder excludes the inner one.
- */ 
-public void testClasspathValidation07() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {"src"});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newSourceEntry(new Path("/P"), new IPath[] {new Path("src/")});
-		
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"should have allowed nested source folders with exclusion on the classpath", 
-			"OK",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Should allow a nested binary folder in a source folder on the classpath as
- * long as the outer folder excludes the inner one.
- */ 
-public void testClasspathValidation08() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {}, new String[] {"lib"});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newSourceEntry(new Path("/P"), new IPath[] {new Path("lib/")});
-		
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"should have allowed nested lib folders with exclusion on the classpath", 
-			"OK",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Should not allow nested source folders on the classpath if exclusion filter has no trailing slash.
- */ 
-public void testClasspathValidation15() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {"src"});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newSourceEntry(new Path("/P"), new IPath[] {new Path("**/src")});
-		
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"End exclusion filter \'src\' with / to fully exclude \'P/src\'",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Should detect source folder nested inside library folder on the classpath
- */ 
-public void testClasspathValidation19() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {}, new String[] {"lib"});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newSourceEntry(new Path("/P/lib/src"));
-		
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"should have detected library folder nested inside source folder on the classpath", 
-			"Cannot nest \'P/lib/src\' inside library \'P/lib\'",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Should not allow exclusion patterns if project preference disallow them
- */
-public void testClasspathValidation21() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newSourceEntry(new Path("/P/src"), new IPath[]{new Path("**/src")}, null);
-		
-		Map options = new Hashtable(5);
-		options.put(JavaScriptCore.CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS, JavaScriptCore.DISABLED);
-		proj.setOptions(options);
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"Inclusion or exclusion patterns are disabled in project P, cannot selectively include or exclude from entry: \'src\'",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * @bug 159325: Any idea why ClasspathEntry checks for string object reference instead of equals
- * @test Ensure that validation is correctly done even for other strings than JavaScriptCore constants...
- * 	Note that it's needed to change JavaScriptCore options as "ignore" is the default value and set option
- * 	to this value on java project will just remove it instead of putting another string object...
- * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=159325"
- */
-public void testClasspathValidation27_Bug159325_project() throws CoreException {
-	Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-	try {
-		IJavaScriptProject proj1 =  this.createJavaProject("P1", new String[] {});
-		proj1.setOption(JavaScriptCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaScriptCore.VERSION_1_4);
-
-		Hashtable options = JavaScriptCore.getOptions();
-		options.put(JavaScriptCore.CORE_INCOMPATIBLE_JDK_LEVEL, JavaScriptCore.WARNING);
-		JavaScriptCore.setOptions(options);
-		IJavaScriptProject proj2 =  this.createJavaProject("P2", new String[] {});
-		proj2.setOption(JavaScriptCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaScriptCore.VERSION_1_1);
-		proj2.setOption(JavaScriptCore.CORE_INCOMPATIBLE_JDK_LEVEL, new String("ignore".toCharArray()));
-
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspathEntry(proj2, JavaScriptCore.newProjectEntry(new Path("/P1")), false);
-		assertStatus("OK", status);
-	} finally {
-		JavaScriptCore.setOptions(javaCoreOptions);
-		this.deleteProjects(new String[]{"P1", "P2"});
-	}
-}
-public void testClasspathValidation27_Bug159325_lib() throws CoreException {
-	Hashtable javaCoreOptions = JavaScriptCore.getOptions();
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P1", new String[] {});
-		proj.setOption(JavaScriptCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaScriptCore.VERSION_1_1);
-
-		Hashtable options = JavaScriptCore.getOptions();
-		options.put(JavaScriptCore.CORE_INCOMPATIBLE_JDK_LEVEL, JavaScriptCore.WARNING);
-		JavaScriptCore.setOptions(options);
-		proj.setOption(JavaScriptCore.CORE_INCOMPATIBLE_JDK_LEVEL, new String("ignore".toCharArray()));
-
-		IIncludePathEntry library = JavaScriptCore.newLibraryEntry(new Path(getExternalJCLPathString(JavaScriptCore.VERSION_1_5)), null, null, ClasspathEntry.NO_ACCESS_RULES, null, false);
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspathEntry(proj, library, false);
-		assertStatus("OK", status);
-	} finally {
-		JavaScriptCore.setOptions(javaCoreOptions);
-		this.deleteProjects(new String[]{"P1", "P2"});
-	}
-}
-/**
- * Should not allow nested source folders on the classpath if the outer
- * folder includes the inner one.
- */ 
-public void testClasspathValidation34() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {"src"});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newSourceEntry(new Path("/P"), new IPath[] {new Path("src/")}, new IPath[0], null);
-		
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"should not have allowed nested source folders with inclusion on the classpath", 
-			"Cannot nest \'P/src\' inside \'P\'. To enable the nesting exclude \'src/\' from \'P\'",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-
-/**
- * Should not allow a nested binary folder in a source folder on the classpath
- * if the outer folder includes the inner one.
- */ 
-public void testClasspathValidation35() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {}, new String[] {"lib"});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newSourceEntry(new Path("/P"), new IPath[] {new Path("lib/")}, new Path[0], null);
-		
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"should not have allowed nested lib folders with inclusion on the classpath", 
-			"Cannot nest \'P/lib\' inside \'P\'. To enable the nesting exclude \'lib/\' from \'P\'",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-
-/**
- * Should allow nested source folders on the classpath if inclusion filter has no trailing slash.
- */ 
-public void testClasspathValidation36() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {"src"});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newSourceEntry(new Path("/P"), new IPath[] {new Path("**/src")}, new Path[0], null);
-		
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"OK",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Should not allow inclusion patterns if project preference disallow them
- */
-public void testClasspathValidation37() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {});
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newSourceEntry(new Path("/P/src"), new IPath[]{new Path("**/src")}, new Path[0], null);
-		
-		Map options = new Hashtable(5);
-		options.put(JavaScriptCore.CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS, JavaScriptCore.DISABLED);
-		proj.setOptions(options);
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"Inclusion or exclusion patterns are disabled in project P, cannot selectively include or exclude from entry: \'src\'",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/*
- * Should detect nested source folders on the classpath and indicate the preference if disabled
- * (regression test for bug 122615 validate classpath propose to exlude a source folder even though exlusion patterns are disabled)
- */ 
-public void testClasspathValidation42() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {"src"});
-		proj.setOption(JavaScriptCore.CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS, JavaScriptCore.DISABLED);
-		IIncludePathEntry[] originalCP = proj.getRawIncludepath();
-	
-		IIncludePathEntry[] newCP = new IIncludePathEntry[originalCP.length+1];
-		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
-		newCP[originalCP.length] = JavaScriptCore.newSourceEntry(new Path("/P"));
-		
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspath(proj, newCP);
-		
-		assertStatus(
-			"should have detected nested source folders on the classpath", 
-			"Cannot nest \'P/src\' inside \'P\'. To allow the nesting enable use of exclusion patterns in the preferences of project \'P\' and exclude \'src/\' from \'P\'",
-			status);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Setting the classpath with two entries specifying the same path
- * should fail.
- */
-public void testClasspathWithDuplicateEntries() throws CoreException {
-	try {
-		IJavaScriptProject project =  this.createJavaProject("P", new String[] {"src"});
-		IIncludePathEntry[] cp= project.getRawIncludepath();
-		IIncludePathEntry[] newCp= new IIncludePathEntry[cp.length *2];
-		System.arraycopy(cp, 0, newCp, 0, cp.length);
-		System.arraycopy(cp, 0, newCp, cp.length, cp.length);
-		try {
-			project.setRawIncludepath(newCp, null);
-		} catch (JavaScriptModelException jme) {
-			return;
-		}
-		assertTrue("Setting the classpath with two entries specifying the same path should fail", false);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Bug 94404: [model] Disallow classpath attributes with same key
- * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=94404"
- */
-public void testClasspathDuplicateExtraAttribute() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P1", new String[] {});
-		IIncludePathAttribute[] extraAttributes = new IIncludePathAttribute[2];
-		extraAttributes[0] = JavaScriptCore.newIncludepathAttribute("javadoc_location", "http://www.sample-url.org/doc/");
-		extraAttributes[1] = JavaScriptCore.newIncludepathAttribute("javadoc_location", "d:/tmp");
-
-		// Verify container entry validation
-		IIncludePathEntry container = JavaScriptCore.newContainerEntry(new Path("JRE_CONTAINER"), ClasspathEntry.NO_ACCESS_RULES, extraAttributes, false);
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspathEntry(proj, container, false);
-		assertStatus(
-			"Duplicate extra attribute: \'javadoc_location\' in classpath entry \'JRE_CONTAINER\' for project 'P1'",
-			status);
-
-		// Verify library entry validation
-		IIncludePathEntry library = JavaScriptCore.newLibraryEntry(new Path(getSystemJsPathString()), null, null, ClasspathEntry.NO_ACCESS_RULES, extraAttributes, false);
-		status = JavaScriptConventions.validateClasspathEntry(proj, library, false);
-		assertStatus(
-			"Duplicate extra attribute: \'javadoc_location\' in classpath entry \'"+getExternalJCLPath("")+"\' for project 'P1'",
-			status);
-
-		// Verify project entry validation
-		createJavaProject("P2");
-		IIncludePathEntry projectEntry = JavaScriptCore.newProjectEntry(new Path("/P2"), ClasspathEntry.NO_ACCESS_RULES, false, extraAttributes, false);
-		status = JavaScriptConventions.validateClasspathEntry(proj, projectEntry, false);
-		assertStatus(
-			"Duplicate extra attribute: \'javadoc_location\' in classpath entry \'/P2\' for project 'P1'",
-			status);
-
-		// Verify source entry validation
-		createFolder("/P1/src");
-		IIncludePathEntry sourceEntry = JavaScriptCore.newSourceEntry(new Path("/P1/src"), new IPath[0], new IPath[0], null, extraAttributes);
-		status = JavaScriptConventions.validateClasspathEntry(proj, sourceEntry, false);
-		assertStatus(
-			"Duplicate extra attribute: \'javadoc_location\' in classpath entry \'src\' for project 'P1'",
-			status);
-
-		// Verify variable entry validation
-		IIncludePathEntry variable = JavaScriptCore.newVariableEntry(new Path("JCL_LIB"), new Path("JCL_SRC"), null, ClasspathEntry.NO_ACCESS_RULES, extraAttributes, false);
-		status = JavaScriptConventions.validateClasspathEntry(proj, variable, false);
-		assertStatus(
-			"Duplicate extra attribute: \'javadoc_location\' in classpath entry \'"+getExternalJCLPath("")+"\' for project 'P1'",
-			status);
-	} finally {
-		this.deleteProject("P1");
-		this.deleteProject("P2");
-	}
-}
-
-/**
- * Adding an entry to the classpath for a library that does not exist
- * should not break the model. The classpath should contain the
- * entry, but the root should not appear in the children.
- */
-public void testClasspathWithNonExistentLibraryEntry() throws CoreException {
-	try {
-		IJavaScriptProject project=  this.createJavaProject("P", new String[] {"src"});
-		IIncludePathEntry[] originalPath= project.getRawIncludepath();
-		IPackageFragmentRoot[] originalRoots= project.getPackageFragmentRoots();
-	
-		IIncludePathEntry[] newPath= new IIncludePathEntry[originalPath.length + 1];
-		System.arraycopy(originalPath, 0, newPath, 0, originalPath.length);
-	
-		IIncludePathEntry newEntry= JavaScriptCore.newLibraryEntry(new Path("c:/nothing/nozip.jar").makeAbsolute(), null, null, false);
-		newPath[originalPath.length]= newEntry;
-	
-		project.setRawIncludepath(newPath, null);
-
-		IIncludePathEntry[] getPath= project.getRawIncludepath();
-		assertTrue("should be the same length", getPath.length == newPath.length);
-		for (int i= 0; i < getPath.length; i++) {
-			assertTrue("entries should be the same", getPath[i].equals(newPath[i]));
-		}
-
-		IPackageFragmentRoot[] newRoots= project.getPackageFragmentRoots();
-		assertTrue("Should be the same number of roots", originalRoots.length == newRoots.length);
-		for (int i= 0; i < newRoots.length; i++) {
-			assertTrue("roots should be the same", originalRoots[i].equals(newRoots[i]));
-		}
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Adding an entry to the classpath for a project that does not exist
- * should not break the model. The classpath should contain the
- * entry, but the root should not appear in the children.
- */
-public void testClasspathWithNonExistentProjectEntry() throws CoreException {
-	try {
-		IJavaScriptProject project= this.createJavaProject("P", new String[] {"src"});
-		IIncludePathEntry[] originalPath= project.getRawIncludepath();
-		IPackageFragmentRoot[] originalRoots= project.getPackageFragmentRoots();
-	
-		IIncludePathEntry[] newPath= new IIncludePathEntry[originalPath.length + 1];
-		System.arraycopy(originalPath, 0, newPath, 0, originalPath.length);
-	
-		IIncludePathEntry newEntry= JavaScriptCore.newProjectEntry(new Path("/NoProject"), false);
-		newPath[originalPath.length]= newEntry;
-	
-		project.setRawIncludepath(newPath, null);
-	
-		IIncludePathEntry[] getPath= project.getRawIncludepath();
-		assertTrue("should be the same length", getPath.length == newPath.length);
-		for (int i= 0; i < getPath.length; i++) {
-			assertTrue("entries should be the same", getPath[i].equals(newPath[i]));
-		}
-	
-		IPackageFragmentRoot[] newRoots= project.getPackageFragmentRoots();
-		assertTrue("Should be the same number of roots", originalRoots.length == newRoots.length);
-		for (int i= 0; i < newRoots.length; i++) {
-			assertTrue("roots should be the same", originalRoots[i].equals(newRoots[i]));
-		}
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Adding an entry to the classpath for a folder that does not exist
- * should not break the model. The classpath should contain the
- * entry, but the root should not appear in the children.
- */
-public void testClasspathWithNonExistentSourceEntry() throws CoreException {
-	try {
-		IJavaScriptProject project= this.createJavaProject("P", new String[] {"src"});
-		IIncludePathEntry[] originalPath= project.getRawIncludepath();
-		IPackageFragmentRoot[] originalRoots= project.getPackageFragmentRoots();
-
-		IIncludePathEntry[] newPath= new IIncludePathEntry[originalPath.length + 1];
-		System.arraycopy(originalPath, 0, newPath, 0, originalPath.length);
-
-		IIncludePathEntry newEntry= JavaScriptCore.newSourceEntry(new Path("/P/moreSource"));
-		newPath[originalPath.length]= newEntry;
-
-		project.setRawIncludepath(newPath, null);
-
-		IIncludePathEntry[] getPath= project.getRawIncludepath();
-		assertTrue("should be the same length", getPath.length == newPath.length);
-		for (int i= 0; i < getPath.length; i++) {
-			assertTrue("entries should be the same", getPath[i].equals(newPath[i]));
-		}
-
-		IPackageFragmentRoot[] newRoots= project.getPackageFragmentRoots();
-		assertTrue("Should be the same number of roots", originalRoots.length == newRoots.length);
-		for (int i= 0; i < newRoots.length; i++) {
-			assertTrue("roots should be the same", originalRoots[i].equals(newRoots[i]));
-		}
-	} finally {
-		this.deleteProject("P");
-	}
-}
-
-/**
- * Ensure that cycle are properly reported.
- */
-public void testCycleReport() throws CoreException {
-
-	try {
-		IJavaScriptProject p1 = this.createJavaProject("P1", new String[] {""});
-		IJavaScriptProject p2 = this.createJavaProject("P2", new String[] {""});
-		IJavaScriptProject p3 = this.createJavaProject("P3", new String[] {""}, new String[] {}, new String[] {"/P2"});
-	
-		// Ensure no cycle reported
-		IJavaScriptProject[] projects = { p1, p2, p3 };
-		int cycleMarkerCount = 0;
-		for (int i = 0; i < projects.length; i++){
-			cycleMarkerCount += this.numberOfCycleMarkers(projects[i]);
-		}
-		assertTrue("Should have no cycle markers", cycleMarkerCount == 0);
-	
-		// Add cycle
-		IIncludePathEntry[] originalP1CP= p1.getRawIncludepath();
-		IIncludePathEntry[] originalP2CP= p2.getRawIncludepath();
-
-		// Add P1 as a prerequesite of P2
-		int length = originalP2CP.length;
-		IIncludePathEntry[] newCP= new IIncludePathEntry[length + 1];
-		System.arraycopy(originalP2CP, 0 , newCP, 0, length);
-		newCP[length]= JavaScriptCore.newProjectEntry(p1.getProject().getFullPath(), false);
-		p2.setRawIncludepath(newCP, null);
-
-		// Add P3 as a prerequesite of P1
-		length = originalP1CP.length;
-		newCP= new IIncludePathEntry[length + 1];
-		System.arraycopy(originalP1CP, 0 , newCP, 0, length);
-		newCP[length]= JavaScriptCore.newProjectEntry(p3.getProject().getFullPath(), false);
-		p1.setRawIncludepath(newCP, null);
-
-		waitForAutoBuild(); // wait for cycle markers to be created
-		cycleMarkerCount = 0;
-		for (int i = 0; i < projects.length; i++){
-			cycleMarkerCount += numberOfCycleMarkers(projects[i]);
-		}
-		assertEquals("Unexpected number of projects involved in a classpath cycle", 3, cycleMarkerCount);
-		
-	} finally {
-		// cleanup  
-		deleteProjects(new String[] {"P1", "P2", "P3"});
-	}
-}
-/**
- * Ensures that the default classpath locations are correct.
- * The default classpath should be the root of the project.
- */
-public void testDefaultClasspathLocation() throws CoreException {
-	try {
-		IJavaScriptProject project = this.createJavaProject("P", new String[] {""});
-		IIncludePathEntry[] classpath = project.getRawIncludepath();
-		assertTrue("Incorrect default classpath; to many entries", classpath.length == 2);
-		assertTrue("Incorrect default classpath: " + classpath[0], classpath[0].getPath().equals(project.getUnderlyingResource().getFullPath()));
-	} finally {
-		this.deleteProject("P");
-	}
-}
-
-/**
- * Setting the classpath to empty should result in no entries,
- * and a delta with removed roots.
- */
-public void testEmptyClasspath() throws CoreException {
-	IJavaScriptProject project = this.createJavaProject("P", new String[] {""});
-	try {
-		startDeltas();
-		setClasspath(project, new IIncludePathEntry[] {});
-		IIncludePathEntry[] cp= project.getRawIncludepath();
-		assertTrue("classpath should have no entries", cp.length == 0);
-
-		// ensure the deltas are correct
-		assertDeltas(
-			"Unexpected delta",
-			"P[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" + 
-			"	<project root>[*]: {REMOVED FROM CLASSPATH}\n" + 
-			"  D:\\WTPDevelopment\\junit-workspace\\.metadata\\.plugins\\org.eclipse.wst.jsdt.core\\libraries\\system.js[*]: {REORDERED}\n" +
-			"	ResourceDelta(/P/.settings)[*]"
-		);
-	} finally {
-		stopDeltas();
-		this.deleteProject("P");
-	}
-}
-/*
- * Ensures that a source folder that contains character that must be encoded can be written.
- * (regression test for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=70193)
- */
-public void testEncoding() throws CoreException {
-	try {
-		createJavaProject("P", new String[] {"src\u3400"});
-		IFile file = getFile("/P/.settings/.jsdtscope");
-		String encodedContents = new String (org.eclipse.wst.jsdt.internal.core.util.Util.getResourceContentsAsCharArray(file, "UTF-8"));
-		encodedContents = Util.convertToIndependantLineDelimiter(encodedContents);
-		assertEquals(
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-			"<classpath>\n" +
-			"	<classpathentry kind=\"src\" path=\"src\u3400\"/>\n" +
-			" <classpathentry kind=\"con\" path=\"org.eclipse.wst.jsdt.launching.JRE_CONTAINER\"/>\n" +
-			"	<classpathentry kind=\"output\" path=\"\"/>\n" +
-			"</classpath>\n",
-			encodedContents);
-	} finally {
-		deleteProject("P");
-	}
-}
-/*
- * Ensures that a source classpath entry can be encoded and decoded.
- */
-public void testEncodeDecodeEntry01() {
-	assertEncodeDecodeEntry(
-		"P", 
-		"<classpathentry kind=\"src\" path=\"src\"/>\n", 
-		JavaScriptCore.newSourceEntry(new Path("/P/src"))
-	);
-}
-/*
- * Ensures that a source classpath entry with all possible attributes can be encoded and decoded.
- */
-public void testEncodeDecodeEntry02() {
-	assertEncodeDecodeEntry(
-		"P", 
-		"<classpathentry excluding=\"**/X.js\" including=\"**/Y.js\" kind=\"src\" output=\"bin\" path=\"src\">\n" + 
-		"	<attributes>\n" + 
-		"		<attribute name=\"attrName\" value=\"some value\"/>\n" + 
-		"	</attributes>\n" + 
-		"</classpathentry>\n",
-		JavaScriptCore.newSourceEntry(
-			new Path("/P/src"), 
-			new IPath[] {new Path("**/Y.js")},
-			new IPath[] {new Path("**/X.js")},
-			new Path("/P/bin"),
-			new IIncludePathAttribute[] {JavaScriptCore.newIncludepathAttribute("attrName", "some value")})
-	);
-}
-/*
- * Ensures that a project classpath entry can be encoded and decoded.
- */
-public void testEncodeDecodeEntry03() {
-	assertEncodeDecodeEntry(
-		"P1", 
-		"<classpathentry kind=\"src\" path=\"/P2\"/>\n",
-		JavaScriptCore.newProjectEntry(new Path("/P2"))
-	);
-}
-/*
- * Ensures that a library classpath entry can be encoded and decoded.
- */
-public void testEncodeDecodeEntry04() {
-	assertEncodeDecodeEntry(
-		"P", 
-		"<classpathentry exported=\"true\" kind=\"lib\" path=\"lib.jar\" rootpath=\"root\" sourcepath=\"src.zip\">\n" + 
-		"	<attributes>\n" + 
-		"		<attribute name=\"attr1\" value=\"val1\"/>\n" + 
-		"	</attributes>\n" + 
-		"	<accessrules>\n" + 
-		"		<accessrule kind=\"accessible\" pattern=\"**/A*.js\"/>\n" + 
-		"	</accessrules>\n" + 
-		"</classpathentry>\n",
-		JavaScriptCore.newLibraryEntry(
-			new Path("/P/lib.jar"),
-			new Path("/P/src.zip"),
-			new Path("root"),
-			new IAccessRule[] {JavaScriptCore.newAccessRule(new Path("**/A*.js"), IAccessRule.K_ACCESSIBLE)},
-			new IIncludePathAttribute[] {JavaScriptCore.newIncludepathAttribute("attr1", "val1")},
-			true)
-	);
-}
-/*
- * Ensures that a library classpath entry can be encoded and decoded.
- */
-public void testEncodeDecodeEntry05() {
-	assertEncodeDecodeEntry(
-		"P", 
-		"<classpathentry exported=\"true\" kind=\"lib\" path=\"lib.jar\" rootpath=\"root\" sourcepath=\"src.zip\">\n" + 
-		"	<attributes>\n" + 
-		"		<attribute name=\"attr1\" value=\"val1\"/>\n" + 
-		"	</attributes>\n" + 
-		"	<accessrules>\n" + 
-		"		<accessrule ignoreifbetter=\"true\" kind=\"accessible\" pattern=\"**/A*.js\"/>\n" + 
-		"	</accessrules>\n" + 
-		"</classpathentry>\n",
-		JavaScriptCore.newLibraryEntry(
-			new Path("/P/lib.jar"),
-			new Path("/P/src.zip"),
-			new Path("root"),
-			new IAccessRule[] {JavaScriptCore.newAccessRule(new Path("**/A*.js"), IAccessRule.K_ACCESSIBLE | IAccessRule.IGNORE_IF_BETTER)},
-			new IIncludePathAttribute[] {JavaScriptCore.newIncludepathAttribute("attr1", "val1")},
-			true)
-	);
-}
-/**
- * Ensures that adding an empty classpath container
- * generates the correct deltas.
- */
-public void testEmptyContainer() throws CoreException {
-	try {
-		IJavaScriptProject proj = createJavaProject("P", new String[] {});
-
-		startDeltas();
-
-		// create container
-		JavaScriptCore.setJsGlobalScopeContainer(
-			new Path("container/default"), 
-			new IJavaScriptProject[]{ proj },
-			new IJsGlobalScopeContainer[] {
-				new TestContainer(
-					new Path("container/default"),
-					new IIncludePathEntry[] {}) 
-			}, 
-			null);
-
-		// set P's classpath with this container
-		IIncludePathEntry container = JavaScriptCore.newContainerEntry(new Path("container/default"), true);
-		proj.setRawIncludepath(new IIncludePathEntry[] {container}, null);
-
-		assertDeltas(
-			"Unexpected delta",
-			"P[*]: {CONTENT | CLASSPATH CHANGED}\n" + 
-			"   D:\\WTPDevelopment\\junit-workspace\\.metadata\\.plugins\\org.eclipse.wst.jsdt.core\\libraries\\system.js[*]: {REORDERED}\n" +
-			"	ResourceDelta(/P/.classpath)[*]"
-		);
-	} finally {
-		stopDeltas();
-		this.deleteProject("P");
-	}
-}
-/*
- * Ensure that a .classpath with an empty inclusion pattern is correctly handled
- * (regression test for bug 105581 Creating a Java project from existing source fails because of "Unhandled event loop exception":)
- */
-public void testEmptyInclusionPattern() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P", new String[] {""});
-		project.open(null);
-		editFile(
-			"/P/.settings/.jsdtscope",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"  <classpathentry including=\"X.java|\" kind=\"src\" path=\"\"/>\n" + 
-			"  <classpathentry kind=\"output\" path=\"bin\"/>\n" + 
-			"</classpath>"
-		);
-		project.getProject().close(null);
-		project.getProject().open(null);
-		project.getPackageFragmentRoot(project.getProject()).open(null);
-		IIncludePathEntry[] classpath = project.getRawIncludepath();
-		assertClasspathEquals(
-			classpath, 
-			"/P[CPE_SOURCE][K_SOURCE][isExported:false][including:X.java]"
-		);
-	} finally {
-		deleteProject("P");
-	}
-}
-/**
- * Exporting a container should make it visible to its dependent project.
- * (regression test for bug 21749 Exported libraries and source folders)
- */
-public void testExportContainer() throws CoreException {
-	try {
-		IJavaScriptProject p1 = this.createJavaProject("P1", new String[] {""});
-
-		// create container
-		JavaScriptCore.setJsGlobalScopeContainer(
-			new Path("container/default"), 
-			new IJavaScriptProject[]{ p1 },
-			new IJsGlobalScopeContainer[] {
-				new TestContainer(
-					new Path("container/default"),
-					new IIncludePathEntry[] {
-						JavaScriptCore.newLibraryEntry(getExternalJCLPath(""), null, null)
-					}) 
-			}, 
-			null);
-
-		// set P1's classpath with this container
-		IIncludePathEntry container = JavaScriptCore.newContainerEntry(new Path("container/default"), true);
-		p1.setRawIncludepath(new IIncludePathEntry[] {container}, null);
-		
-		// create dependent project P2
-		IJavaScriptProject  p2 = this.createJavaProject("P2", new String[] {}, new String[] {}, new String[] {"/P1"});
-		IIncludePathEntry[] classpath = ((JavaProject)p2).getExpandedClasspath();
-		
-		// ensure container is exported to P2
-		assertEquals("Unexpected number of classpath entries", 2, classpath.length);
-		assertEquals("Unexpected first entry", "/P1", classpath[0].getPath().toString());
-		assertEquals("Unexpected second entry", getSystemJsPathString(), classpath[1].getPath().toOSString());
-	} finally {
-		this.deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-/*
- * Ensures that setting 0 extra classpath attributes generates the correct .classpath file.
- */
-public void testExtraAttributes1() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P");
-		IIncludePathEntry entry = JavaScriptCore.newSourceEntry(new Path("/P"), new IPath[0], new IPath[0], null, new IIncludePathAttribute[] {});
-		project.setRawIncludepath(new IIncludePathEntry[] {entry}, null);
-		String contents = new String (org.eclipse.wst.jsdt.internal.core.util.Util.getResourceContentsAsCharArray(getFile("/P/.settings/.jsdtscope")));
-		assertSourceEquals(
-			"Unexpected content", 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"\"/>\n" + 
-			"	<classpathentry kind=\"output\" path=\"\"/>\n" + 
-			"</classpath>\n",
-			contents);
-	} finally {
-		deleteProject("P");
-	}
-}
-/*
- * Ensures that setting 1 extra classpath attributes generates the correct .classpath file.
- */
-public void testExtraAttributes2() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P");
-		IIncludePathAttribute attribute = JavaScriptCore.newIncludepathAttribute("foo", "some value");
-		IIncludePathEntry entry = JavaScriptCore.newSourceEntry(new Path("/P"), new IPath[0], new IPath[0], null, new IIncludePathAttribute[] {attribute});
-		project.setRawIncludepath(new IIncludePathEntry[] {entry}, null);
-		String contents = new String (org.eclipse.wst.jsdt.internal.core.util.Util.getResourceContentsAsCharArray(getFile("/P/.settings/.jsdtscope")));
-		assertSourceEquals(
-			"Unexpected content", 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"\">\n" + 
-			"		<attributes>\n" + 
-			"			<attribute name=\"foo\" value=\"some value\"/>\n" + 
-			"		</attributes>\n" + 
-			"	</classpathentry>\n" + 
-			"	<classpathentry kind=\"output\" path=\"\"/>\n" + 
-			"</classpath>\n",
-			contents);
-	} finally {
-		deleteProject("P");
-	}
-}
-/*
- * Ensures that setting 2 extra classpath attributes generates the correct .classpath file.
- */
-public void testExtraAttributes3() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P");
-		IIncludePathAttribute attribute1 = JavaScriptCore.newIncludepathAttribute("foo", "some value");
-		IIncludePathAttribute attribute2 = JavaScriptCore.newIncludepathAttribute("bar", "other value");
-		IIncludePathEntry entry = JavaScriptCore.newSourceEntry(new Path("/P"), new IPath[0], new IPath[0], null, new IIncludePathAttribute[] {attribute1, attribute2});
-		project.setRawIncludepath(new IIncludePathEntry[] {entry}, null);
-		String contents = new String (org.eclipse.wst.jsdt.internal.core.util.Util.getResourceContentsAsCharArray(getFile("/P/.settings/.jsdtscope")));
-		assertSourceEquals(
-			"Unexpected content", 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"\">\n" + 
-			"		<attributes>\n" + 
-			"			<attribute name=\"foo\" value=\"some value\"/>\n" + 
-			"			<attribute name=\"bar\" value=\"other value\"/>\n" + 
-			"		</attributes>\n" + 
-			"	</classpathentry>\n" + 
-			"	<classpathentry kind=\"output\" path=\"\"/>\n" + 
-			"</classpath>\n",
-			contents);
-	} finally {
-		deleteProject("P");
-	}
-}
-/*
- * Ensures that extra classpath attributes in a .classpath file are correctly read.
- */
-public void testExtraAttributes4() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P");
-		editFile(
-			"/P/.settings/.jsdtscope",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"\">\n" + 
-			"		<attributes>\n" + 
-			"			<attribute value=\"some value\" name=\"foo\"/>\n" + 
-			"		</attributes>\n" + 
-			"	</classpathentry>\n" + 
-			"	<classpathentry kind=\"output\" path=\"\"/>\n" + 
-			"</classpath>\n"
-		);
-		assertClasspathEquals(
-			project.getRawIncludepath(),
-			"/P[CPE_SOURCE][K_SOURCE][isExported:false][attributes:foo=some value]"
-		);
-	} finally {
-		deleteProject("P");
-	}
-}
-/**
- * Test IJavaScriptProject.hasClasspathCycle(IIncludePathEntry[]).
- */
-public void testHasClasspathCycle() throws CoreException {
-	try {
-		IJavaScriptProject p1 = this.createJavaProject("P1", new String[] {""});
-		IJavaScriptProject p2 = this.createJavaProject("P2", new String[] {""});
-		this.createJavaProject("P3", new String[] {""}, new String[] {}, new String[] {"/P1"});
-	
-		IIncludePathEntry[] originalP1CP= p1.getRawIncludepath();
-		IIncludePathEntry[] originalP2CP= p2.getRawIncludepath();
-	
-		// Ensure no cycle reported
-		assertTrue("P1 should not have a cycle", !p1.hasIncludepathCycle(originalP1CP));
-
-		// Ensure that adding NervousTest as a prerequesite of P2 doesn't report a cycle
-		int length = originalP2CP.length;
-		IIncludePathEntry[] newCP= new IIncludePathEntry[length + 1];
-		System.arraycopy(originalP2CP, 0 , newCP, 0, length);
-		newCP[length]= JavaScriptCore.newProjectEntry(p1.getProject().getFullPath(), false);
-		assertTrue("P2 should not have a cycle", !p2.hasIncludepathCycle(newCP));
-		p2.setRawIncludepath(newCP, null);
-
-		// Ensure that adding P3 as a prerequesite of P1 reports a cycle
-		length = originalP1CP.length;
-		newCP= new IIncludePathEntry[length + 1];
-		System.arraycopy(originalP1CP, 0 , newCP, 0, length);
-		newCP[length]= JavaScriptCore.newProjectEntry(p2.getProject().getFullPath(), false);
-		assertTrue("P3 should have a cycle", p2.hasIncludepathCycle(newCP));
-
-		// Ensure a cycle is not reported through markers
-		IWorkspace workspace = getJavaModel().getWorkspace();
-		IMarker[] markers = workspace.getRoot().findMarkers(IJavaScriptModelMarker.TRANSIENT_PROBLEM, true, 1);
-		boolean hasCycleMarker = false;
-		for (int i = 0; i < markers.length; i++){
-			if (markers[i].getAttribute(IJavaScriptModelMarker.CYCLE_DETECTED) != null) {
-				hasCycleMarker = true;
-				break;
-			}
-		}
-	assertTrue("Should have no cycle markers", !hasCycleMarker);
-		
-	} finally {
-		// cleanup  
-		this.deleteProjects(new String[] {"P1", "P2", "P3"});
-	}
-}
-/**
- * Ensures that a marker is created if editing the .classpath results in an invalid classpath.
- */
-public void testInvalidClasspath1() throws CoreException {
-	try {
-		IJavaScriptProject project = this.createJavaProject("P", new String[] {"src"});
-		this.editFile(
-			"/P/.settings/.jsdtscope",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-			"<classpath>\n" +
-			"    <classpathentry kind=\"src\" path=\"src\"/\n" + // missing closing >
-			"    <classpathentry kind=\"output\" path=\"bin\"/>\n" +
-			"</classpath>"
-		);
-		assertMarkers(
-			"Unexpected markers",
-			"XML format error in \'.classpath\' file of project P: Bad format",
-			project);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Ensures that a marker is created if editing the .classpath results in an invalid classpath.
- */
-public void testInvalidClasspath2() throws CoreException {
-	try {
-		IJavaScriptProject javaProject = this.createJavaProject("P", new String[] {"src"});
-		this.editFile(
-			"/P/.settings/.jsdtscope",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-			"<classpath>\n" +
-			"    <classpathentry kind=\"src1\" path=\"src\"/>\n" + // invalid kind: src1
-			"    <classpathentry kind=\"output\" path=\"bin\"/>\n" +
-			"</classpath>"
-		);
-		assertMarkers(
-			"Unexpected markers",
-			"Illegal entry in \'.classpath\' of project P file: Unknown kind: \'src1\'",
-			javaProject);
-			
-		// Verify that error marker is not removed after build
-		// (regression test for bug 42366: Classpath validation error message removed while rebuilding a project.)
-		IProject project = javaProject.getProject();
-		project.build(IncrementalProjectBuilder.FULL_BUILD, null);
-		waitForAutoBuild();
-		assertMarkers(
-			"Unexpected markers",
-			"Illegal entry in \'.classpath\' of project P file: Unknown kind: \'src1\'",
-			javaProject);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-
-/*
- * Ensures that a non existing source folder cannot be put on the classpath.
- * (regression test for bug 66512 Invalid classpath entry not rejected)
- */
-public void testInvalidSourceFolder() throws CoreException {
-	try {
-		createJavaProject("P1");
-		IJavaScriptProject proj = createJavaProject("P2", new String[] {}, new String[] {}, new String[] {"/P1/src1/src2"});
-		assertMarkers(
-			"Unexpected markers",
-			"Project P2 is missing required source folder: \'/P1/src1/src2\'",
-			proj);
-	} finally {
-		deleteProject("P1");
-		deleteProject("P2");
-	}
-}
-/**
- * Ensures that only one marker is created if building a project that is
- * missing its .classpath file multiple times.
- * (regression test for bug 39877 Rebuild All generates extra "Unable to read classpath" entry.)
- */
-public void testMissingClasspath() throws CoreException {
-	try {
-		IJavaScriptProject javaProject = createJavaProject("P");
-		IProject project = javaProject.getProject();
-		project.close(null);
-		deleteFile(new File(project.getLocation().toOSString(), ".settings/.jsdtscope"));
-		waitForAutoBuild();
-		project.open(null);
-		waitForAutoBuild();
-		project.build(IncrementalProjectBuilder.FULL_BUILD, null);
-		waitForAutoBuild();
-		project.build(IncrementalProjectBuilder.FULL_BUILD, null);
-		waitForAutoBuild();
-		assertMarkers(
-			"Unexpected markers",
-			"Unable to read \'.jsdtscope\' file of project P",
-			javaProject);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/**
- * Test that a marker is added when a project as a missing project in its classpath.
- */
-public void testMissingPrereq1() throws CoreException {
-	try {
-		IJavaScriptProject javaProject = this.createJavaProject("A", new String[] {});
-		IIncludePathEntry[] classpath = 
-			new IIncludePathEntry[] {
-				JavaScriptCore.newProjectEntry(new Path("/B"))
-			};
-		javaProject.setRawIncludepath(classpath, null);
-		this.assertMarkers(
-			"Unexpected markers",
-			"Project A is missing required Java project: \'B\'",
-			javaProject);
-	} finally {
-		this.deleteProject("A");
-	}
-}
-/**
- * Test that a marker is added when a project as a missing project in its classpath.
- */
-public void testMissingPrereq2() throws CoreException {
-	try {
-		IJavaScriptProject javaProject = 
-			this.createJavaProject(
-				"A", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {"/B"});
-		this.assertMarkers(
-			"Unexpected markers",
-			"Project A is missing required Java project: \'B\'",
-			javaProject);
-	} finally {
-		this.deleteProject("A");
-	}
-}
-/**
- * Test that a marker indicating a missing project is removed when the project is added.
- */
-public void testMissingPrereq3() throws CoreException {
-	try {
-		IJavaScriptProject javaProject = 
-			this.createJavaProject(
-				"A", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {"/B"});
-		this.createJavaProject("B", new String[] {});
-		this.assertMarkers("Unexpected markers", "", javaProject);
-	} finally {
-		this.deleteProjects(new String[] {"A", "B"});
-	}
-}
-/**
- * Test that a marker indicating a cycle is removed when a project in the cycle is deleted
- * and replaced with a missing prereq marker.
- * (regression test for bug 15168 circular errors not reported)
- */
-public void testMissingPrereq4() throws CoreException {
-	try {
-		IJavaScriptProject projectA =
-			this.createJavaProject(
-				"A", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {"/B"});
-		IJavaScriptProject projectB =
-			this.createJavaProject(
-				"B", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {"/A"});
-		this.assertMarkers(
-			"Unexpected markers for project A",
-			"A cycle was detected in the include path of project: A",
-			projectA);
-		this.assertMarkers(
-			"Unexpected markers for project B",
-			"A cycle was detected in the include path of project: B",
-			projectB);
-		
-		// delete project B	
-		this.deleteProject("B");
-		this.assertMarkers(
-			"Unexpected markers for project A after deleting of project B",
-			"Project A is missing required Java project: \'B\'",
-			projectA);
-			
-		// add project B back
-		projectB =
-			this.createJavaProject(
-				"B", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {"/A"});
-		this.assertMarkers(
-			"Unexpected markers for project A after adding project B back",
-			"A cycle was detected in the build path of project: A",
-			projectA);
-		this.assertMarkers(
-			"Unexpected markers for project B after adding project B back",
-			"A cycle was detected in the build path of project: B",
-			projectB);
-
-	} finally {
-		this.deleteProjects(new String[] {"A", "B"});
-	}
-}
-/**
- * Setting the classpath to null should be the same as using the
- * default classpath.
- */
-public void testNullClasspath() throws CoreException {
-	try {
-		IJavaScriptProject project = this.createJavaProject("P", new String[] {""});
-		setClasspath(project, null);
-		IIncludePathEntry[] cp= project.getRawIncludepath();
-		assertTrue("classpath should have one root entry", cp.length == 1 && cp[0].getPath().equals(project.getUnderlyingResource().getFullPath()));
-	} finally {
-		this.deleteProject("P");
-	}
-}
-
-/*
- * Ensures that setting the 'combineAccessRules' flag to false on a project entry generates the correct .classpath file.
- */
-public void testCombineAccessRules1() throws CoreException {
-	try {
-		createJavaProject("P1");
-		IJavaScriptProject project = createJavaProject("P2");
-		IIncludePathEntry entry = JavaScriptCore.newProjectEntry(new Path("/P1"), (IAccessRule[]) null, false/*don't combine*/, new IIncludePathAttribute[] {}, false);
-		project.setRawIncludepath(new IIncludePathEntry[] {entry}, null);
-		String contents = new String (org.eclipse.wst.jsdt.internal.core.util.Util.getResourceContentsAsCharArray(getFile("/P2/.settings/.jsdtscope")));
-		assertSourceEquals(
-			"Unexpected content", 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry combineaccessrules=\"false\" kind=\"src\" path=\"/P1\"/>\n" + 
-			"	<classpathentry kind=\"output\" path=\"\"/>\n" + 
-			"</classpath>\n",
-			contents);
-	} finally {
-		deleteProject("P1");
-		deleteProject("P2");
-	}
-}
-
-/*
- * Ensures that setting the 'combineAccessRules' flag to true on a project entry generates the correct .classpath file.
- */
-public void testCombineAccessRules2() throws CoreException {
-	try {
-		createJavaProject("P1");
-		IJavaScriptProject project = createJavaProject("P2");
-		IIncludePathEntry entry = JavaScriptCore.newProjectEntry(new Path("/P1"), (IAccessRule[]) null, true/*combine*/, new IIncludePathAttribute[] {}, false);
-		project.setRawIncludepath(new IIncludePathEntry[] {entry}, null);
-		String contents = new String (org.eclipse.wst.jsdt.internal.core.util.Util.getResourceContentsAsCharArray(getFile("/P2/.settings/.jsdtscope")));
-		assertSourceEquals(
-			"Unexpected content", 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"/P1\"/>\n" + 
-			"	<classpathentry kind=\"output\" path=\"\"/>\n" + 
-			"</classpath>\n",
-			contents);
-	} finally {
-		deleteProject("P1");
-		deleteProject("P2");
-	}
-}
-
-/*
- * Ensures that 'combineAccessRules' flag in a .classpath file is correctly read.
- */
-public void testCombineAccessRules3() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P2");
-		editFile(
-			"/P2/.settings/.jsdtscope",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" combineaccessrules=\"false\" path=\"/P1\"/>\n" + 
-			"	<classpathentry kind=\"output\" path=\"\"/>\n" + 
-			"</classpath>\n"
-		);
-		assertClasspathEquals(
-			project.getRawIncludepath(),
-			"/P1[CPE_PROJECT][K_SOURCE][isExported:false][combine access rules:false]"
-		);
-	} finally {
-		deleteProject("P2");
-	}
-}
-
-/*
- * Ensures that the absence of 'combineAccessRules' flag in a .classpath file is correctly handled.
- */
-public void testCombineAccessRules4() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P2");
-		editFile(
-			"/P2/.settings/.jsdtscope",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"/P1\"/>\n" + 
-			"	<classpathentry kind=\"output\" path=\"\"/>\n" + 
-			"</classpath>\n"
-		);
-		assertClasspathEquals(
-			project.getRawIncludepath(),
-			"/P1[CPE_PROJECT][K_SOURCE][isExported:false][combine access rules:true]"
-		);
-	} finally {
-		deleteProject("P2");
-	}
-}
-
-/*
- * Ensures that the absence of 'combineAccessRules' flag in a .classpath file is correctly handled.
- */
-public void testCombineAccessRules5() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P2");
-		editFile(
-			"/P2/.settings/.jsdtscope",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"src\"/>\n" + 
-			"	<classpathentry kind=\"output\" path=\"bin\"/>\n" + 
-			"</classpath>\n"
-		);
-		assertClasspathEquals(
-			project.getRawIncludepath(),
-			"/P2/src[CPE_SOURCE][K_SOURCE][isExported:false]"
-		);
-	} finally {
-		deleteProject("P2");
-	}
-}
-
-public void testCycleDetection() throws CoreException {
-	
-	int max = 5;
-	IJavaScriptProject[] p = new IJavaScriptProject[max];
-	String[] projectNames = new String[max];
-	try {
-		for (int i = 0; i < max; i++) {
-			projectNames[i] = "P"+i;
-			p[i] = this.createJavaProject(projectNames[i], new String[] {""});
-		}
-
-		IIncludePathEntry[][] extraEntries = new IIncludePathEntry[][]{ 
-			{ JavaScriptCore.newProjectEntry(p[1].getPath()), JavaScriptCore.newProjectEntry(p[3].getPath()) },
-			{ JavaScriptCore.newProjectEntry(p[2].getPath()), JavaScriptCore.newProjectEntry(p[3].getPath()) },
-			{ JavaScriptCore.newProjectEntry(p[1].getPath()) }, 
-			{ JavaScriptCore.newProjectEntry(p[4].getPath())}, 
-			{ JavaScriptCore.newProjectEntry(p[3].getPath()), JavaScriptCore.newProjectEntry(p[0].getPath()) } 
-		}; 
-
-		int[][] expectedCycleParticipants = new int[][] {
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[0]
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[1]
-			{ 0, 1, 1, 0, 0 }, // after setting CP p[2]
-			{ 0, 1, 1, 0, 0 }, // after setting CP p[3]
-			{ 1, 1, 1, 1, 1 }, // after setting CP p[4]
-		};
-		
-		for (int i = 0; i < p.length; i++){
-
-			// append project references			
-			IIncludePathEntry[] oldClasspath = p[i].getRawIncludepath();
-			IIncludePathEntry[] newClasspath = new IIncludePathEntry[oldClasspath.length+extraEntries[i].length];
-			System.arraycopy(oldClasspath, 0 , newClasspath, 0, oldClasspath.length);
-			for (int j = 0; j < extraEntries[i].length; j++){
-				newClasspath[oldClasspath.length+j] = extraEntries[i][j];
-			}			
-			// set classpath
-			p[i].setRawIncludepath(newClasspath, null);
-
-			// check cycle markers
-			this.assertCycleMarkers(p[i], p, expectedCycleParticipants[i]);
-		}
-		//this.startDeltas();
-		
-	} finally {
-		this.deleteProjects(projectNames);
-	}
-}
-
-public void testCycleDetectionThroughContainers() throws CoreException {
-	
-	int max = 5;
-	IJavaScriptProject[] p = new IJavaScriptProject[max];
-	String[] projectNames = new String[max];
-	try {
-		for (int i = 0; i < max; i++) {
-			projectNames[i] = "P"+i;
-			p[i] = this.createJavaProject(projectNames[i], new String[] {""});
-		}
-
-		IJsGlobalScopeContainer[] containers = new IJsGlobalScopeContainer[]{ 
-			new TestContainer(
-				new Path("container0/default"), 
-				new IIncludePathEntry[]{ JavaScriptCore.newProjectEntry(p[3].getPath()) }),
-			new TestContainer(
-				new Path("container1/default"), 
-				new IIncludePathEntry[]{ JavaScriptCore.newProjectEntry(p[1].getPath()) }),
-			new TestContainer(
-				new Path("container2/default"), 
-				new IIncludePathEntry[]{ JavaScriptCore.newProjectEntry(p[4].getPath()) }),
-		};
-
-		IIncludePathEntry[][] extraEntries = new IIncludePathEntry[][]{ 
-			{ JavaScriptCore.newProjectEntry(p[1].getPath()), JavaScriptCore.newContainerEntry(containers[0].getPath()) },
-			{ JavaScriptCore.newProjectEntry(p[2].getPath()), JavaScriptCore.newProjectEntry(p[3].getPath()) },
-			{ JavaScriptCore.newContainerEntry(containers[1].getPath()) }, 
-			{ JavaScriptCore.newContainerEntry(containers[2].getPath())}, 
-			{ JavaScriptCore.newProjectEntry(p[3].getPath()), JavaScriptCore.newProjectEntry(p[0].getPath()) } 
-		}; 
-
-		int[][] expectedCycleParticipants = new int[][] {
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[0]
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[1]
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[2]
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[3]
-			{ 1, 1, 1, 1, 1 }, // after setting CP p[4]
-		};
-		
-		for (int i = 0; i < p.length; i++){
-
-			// append project references			
-			IIncludePathEntry[] oldClasspath = p[i].getRawIncludepath();
-			IIncludePathEntry[] newClasspath = new IIncludePathEntry[oldClasspath.length+extraEntries[i].length];
-			System.arraycopy(oldClasspath, 0 , newClasspath, 0, oldClasspath.length);
-			for (int j = 0; j < extraEntries[i].length; j++){
-				newClasspath[oldClasspath.length+j] = extraEntries[i][j];
-			}			
-			// set classpath
-			p[i].setRawIncludepath(newClasspath, null);
-
-			// update container paths
-			if (i == p.length - 1){
-				JavaScriptCore.setJsGlobalScopeContainer(
-					containers[0].getPath(),
-					new IJavaScriptProject[]{ p[0] },
-					new IJsGlobalScopeContainer[] { containers[0] },
-					null);
-
-				JavaScriptCore.setJsGlobalScopeContainer(
-					containers[1].getPath(),
-					new IJavaScriptProject[]{ p[2] },
-					new IJsGlobalScopeContainer[] { containers[1] },
-					null);
-
-				JavaScriptCore.setJsGlobalScopeContainer(
-					containers[2].getPath(),
-					new IJavaScriptProject[]{ p[3] },
-					new IJsGlobalScopeContainer[] { containers[2] },
-					null);
-			}
-			
-			// check cycle markers
-			this.assertCycleMarkers(p[i], p, expectedCycleParticipants[i]);
-		}
-		//this.startDeltas();
-		
-	} finally {
-		//this.stopDeltas();
-		this.deleteProjects(projectNames);
-	}
-}
-public void testCycleDetectionThroughContainerVariants() throws CoreException {
-	
-	int max = 5;
-	IJavaScriptProject[] p = new IJavaScriptProject[max];
-	String[] projectNames = new String[max];
-	try {
-		for (int i = 0; i < max; i++) {
-			projectNames[i] = "P"+i;
-			p[i] = this.createJavaProject(projectNames[i], new String[] {""});
-		}
-
-		class LocalTestContainer implements IJsGlobalScopeContainer {
-			IPath path;
-			IIncludePathEntry[] entries;
-			LocalTestContainer(IPath path, IIncludePathEntry[] entries){
-				this.path = path;
-				this.entries = entries;
-			}
-			public IPath getPath() { return this.path; }
-			/**
-			 * @deprecated Use {@link #getIncludepathEntries()} instead
-			 */
-			public IIncludePathEntry[] getClasspathEntries() {
-				return getIncludepathEntries();
-			}
-			public IIncludePathEntry[] getIncludepathEntries() { return this.entries;	}
-			public String getDescription() { return null; 	}
-			public int getKind() { return 0; }
-			/* (non-Javadoc)
-			 * @see org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer#resolvedLibraryImport(java.lang.String)
-			 */
-			public String[] resolvedLibraryImport(String a) {
-				return new String[] {a};
-			}
-		}
-
-		IJsGlobalScopeContainer[] containers = new IJsGlobalScopeContainer[]{ 
-			new LocalTestContainer(
-				new Path("container0/default"), 
-				new IIncludePathEntry[]{ JavaScriptCore.newProjectEntry(p[3].getPath()) }),
-			new LocalTestContainer(
-				new Path("container0/default"), 
-				new IIncludePathEntry[]{ JavaScriptCore.newProjectEntry(p[1].getPath()) }),
-			new LocalTestContainer(
-				new Path("container0/default"), 
-				new IIncludePathEntry[]{ JavaScriptCore.newProjectEntry(p[4].getPath()) }),
-		};
-
-		IIncludePathEntry[][] extraEntries = new IIncludePathEntry[][]{ 
-			{ JavaScriptCore.newProjectEntry(p[1].getPath()), JavaScriptCore.newContainerEntry(containers[0].getPath()) },
-			{ JavaScriptCore.newProjectEntry(p[2].getPath()), JavaScriptCore.newProjectEntry(p[3].getPath()) },
-			{ JavaScriptCore.newContainerEntry(containers[1].getPath()) }, 
-			{ JavaScriptCore.newContainerEntry(containers[2].getPath())}, 
-			{ JavaScriptCore.newProjectEntry(p[3].getPath()), JavaScriptCore.newProjectEntry(p[0].getPath()) } 
-		}; 
-
-		int[][] expectedCycleParticipants = new int[][] {
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[0]
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[1]
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[2]
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[3]
-			{ 1, 1, 1, 1, 1 }, // after setting CP p[4]
-		};
-		
-		for (int i = 0; i < p.length; i++){
-
-			// append project references			
-			IIncludePathEntry[] oldClasspath = p[i].getRawIncludepath();
-			IIncludePathEntry[] newClasspath = new IIncludePathEntry[oldClasspath.length+extraEntries[i].length];
-			System.arraycopy(oldClasspath, 0 , newClasspath, 0, oldClasspath.length);
-			for (int j = 0; j < extraEntries[i].length; j++){
-				newClasspath[oldClasspath.length+j] = extraEntries[i][j];
-			}			
-			// set classpath
-			p[i].setRawIncludepath(newClasspath, null);
-
-			// update same container path for multiple projects
-			if (i == p.length - 1){
-				JavaScriptCore.setJsGlobalScopeContainer(
-					containers[0].getPath(),
-					new IJavaScriptProject[]{ p[0], p[2], p[3] },
-					new IJsGlobalScopeContainer[] { containers[0], containers[1], containers[2] },
-					null);
-			}
-			
-			// check cycle markers
-			this.assertCycleMarkers(p[i], p, expectedCycleParticipants[i]);
-		}
-		//this.startDeltas();
-		
-	} finally {
-		//this.stopDeltas();
-		this.deleteProjects(projectNames);
-	}
-}
-public void testCycleDetection2() throws CoreException {
-	
-	int max = 5;
-	IJavaScriptProject[] p = new IJavaScriptProject[max];
-	String[] projectNames = new String[max];
-	try {
-		for (int i = 0; i < max; i++) {
-			projectNames[i] = "P"+i;
-			p[i] = this.createJavaProject(projectNames[i], new String[] {""});
-		}
-
-		IIncludePathEntry[][] extraEntries = new IIncludePathEntry[][]{ 
-			{ JavaScriptCore.newProjectEntry(p[1].getPath()), JavaScriptCore.newProjectEntry(p[3].getPath()) },
-			{ JavaScriptCore.newProjectEntry(p[2].getPath()) },
-			{ JavaScriptCore.newProjectEntry(p[0].getPath()) }, 
-			{ JavaScriptCore.newProjectEntry(p[4].getPath())}, 
-			{ JavaScriptCore.newProjectEntry(p[0].getPath()) } 
-		}; 
-
-		int[][] expectedCycleParticipants = new int[][] {
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[0]
-			{ 0, 0, 0, 0, 0 }, // after setting CP p[1]
-			{ 1, 1, 1, 0, 0 }, // after setting CP p[2]
-			{ 1, 1, 1, 0, 0 }, // after setting CP p[3]
-			{ 1, 1, 1, 1, 1 }, // after setting CP p[4]
-		};
-		
-		for (int i = 0; i < p.length; i++){
-
-			// append project references			
-			IIncludePathEntry[] oldClasspath = p[i].getRawIncludepath();
-			IIncludePathEntry[] newClasspath = new IIncludePathEntry[oldClasspath.length+extraEntries[i].length];
-			System.arraycopy(oldClasspath, 0 , newClasspath, 0, oldClasspath.length);
-			for (int j = 0; j < extraEntries[i].length; j++){
-				newClasspath[oldClasspath.length+j] = extraEntries[i][j];
-			}			
-			// set classpath
-			p[i].setRawIncludepath(newClasspath, null);
-
-			// check cycle markers
-			this.assertCycleMarkers(p[i], p, expectedCycleParticipants[i]);
-		}
-		//this.startDeltas();
-		
-	} finally {
-		//this.stopDeltas();
-		this.deleteProjects(projectNames);
-	}
-}
-
-public void testCycleDetection3() throws CoreException {
-	
-	int max = 6;
-	IJavaScriptProject[] p = new IJavaScriptProject[max];
-	String[] projectNames = new String[max];
-	try {
-		for (int i = 0; i < max; i++) {
-			projectNames[i] = "P"+i;
-			p[i] = this.createJavaProject(projectNames[i], new String[] {""});
-		}
-
-		IIncludePathEntry[][] extraEntries = new IIncludePathEntry[][]{ 
-			{ JavaScriptCore.newProjectEntry(p[2].getPath()), JavaScriptCore.newProjectEntry(p[4].getPath()) },
-			{ JavaScriptCore.newProjectEntry(p[0].getPath()) },
-			{ JavaScriptCore.newProjectEntry(p[3].getPath()) }, 
-			{ JavaScriptCore.newProjectEntry(p[1].getPath())}, 
-			{ JavaScriptCore.newProjectEntry(p[5].getPath()) }, 
-			{ JavaScriptCore.newProjectEntry(p[1].getPath()) } 
-		}; 
-
-		int[][] expectedCycleParticipants = new int[][] {
-			{ 0, 0, 0, 0, 0, 0 }, // after setting CP p[0]
-			{ 0, 0, 0, 0, 0, 0 }, // after setting CP p[1]
-			{ 0, 0, 0, 0, 0, 0 }, // after setting CP p[2]
-			{ 1, 1, 1, 1, 0, 0 }, // after setting CP p[3]
-			{ 1, 1, 1, 1, 0, 0 }, // after setting CP p[4]
-			{ 1, 1, 1, 1, 1 , 1}, // after setting CP p[5]
-		};
-		
-		for (int i = 0; i < p.length; i++){
-
-			// append project references			
-			IIncludePathEntry[] oldClasspath = p[i].getRawIncludepath();
-			IIncludePathEntry[] newClasspath = new IIncludePathEntry[oldClasspath.length+extraEntries[i].length];
-			System.arraycopy(oldClasspath, 0 , newClasspath, 0, oldClasspath.length);
-			for (int j = 0; j < extraEntries[i].length; j++){
-				newClasspath[oldClasspath.length+j] = extraEntries[i][j];
-			}			
-			// set classpath
-			p[i].setRawIncludepath(newClasspath, null);
-
-			// check cycle markers
-			this.assertCycleMarkers(p[i], p, expectedCycleParticipants[i]);
-		}
-		//this.startDeltas();
-		
-	} finally {
-		//this.stopDeltas();
-		this.deleteProjects(projectNames);
-	}
-}
-/*
- * Ensures that a cycle is detected if introduced during a post-change event.
- * (regression test for bug 113051 No classpath marker produced when cycle through PDE container)
- */
-public void testCycleDetection4() throws CoreException {
-	IResourceChangeListener listener = new IResourceChangeListener() {
-		boolean containerNeedUpdate = true;
-		public void resourceChanged(IResourceChangeEvent event) {
-			if (containerNeedUpdate) {
-				TestContainer container = new TestContainer(
-					new Path("org.eclipse.wst.jsdt.core.tests.model.container/default"), 
-					new IIncludePathEntry[] { JavaScriptCore.newProjectEntry(new Path("/P1")) });
-				try {
-					JavaScriptCore.setJsGlobalScopeContainer(container.getPath(), new IJavaScriptProject[] {getJavaProject("P2")}, new IJsGlobalScopeContainer[] {container}, null);
-				} catch (JavaScriptModelException e) {
-					e.printStackTrace();
-				}
-				containerNeedUpdate = false;
-			}
-		}
-	};
-	try {
-		IJavaScriptProject p1 = createJavaProject("P1", new String[] {}, new String[] {}, new String[] {"/P2"});
-		TestContainer container = new TestContainer(
-			new Path("org.eclipse.wst.jsdt.core.tests.model.container/default"), 
-			new IIncludePathEntry[] {});
-		IJavaScriptProject p2 = createJavaProject("P2", new String[] {}, new String[] {container.getPath().toString()});
-		JavaScriptCore.setJsGlobalScopeContainer(container.getPath(), new IJavaScriptProject[] {p2}, new IJsGlobalScopeContainer[] {container}, null);
-		waitForAutoBuild();
-		getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE);
-		createFile("/P1/test.txt", "");
-		assertCycleMarkers(p1, new IJavaScriptProject[] {p1, p2}, new int[] {1, 1});
-	} finally {
-		getWorkspace().removeResourceChangeListener(listener);
-		deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-public void testPerfDenseCycleDetection1() throws CoreException {
-	// each project prereqs all other projects
-	denseCycleDetection(5);
-}
-public void testPerfDenseCycleDetection2() throws CoreException {
-	// each project prereqs all other projects
-	denseCycleDetection(10);
-}
-public void testPerfDenseCycleDetection3() throws CoreException {
-	// each project prereqs all other projects
-	denseCycleDetection(20);
-}
-/*
- * Create projects and set classpaths in one batch
- */
-public void testNoCycleDetection1() throws CoreException {
-
-	// each project prereqs all the previous ones
-	noCycleDetection(5, false, false);
-	noCycleDetection(10, false, false);
-	noCycleDetection(20, false, false);
-
-	// each project prereqs all the next ones
-	noCycleDetection(5, true, false);
-	noCycleDetection(10, true, false);
-	noCycleDetection(20, true, false);
-}
-/*
- * Create projects first, then set classpaths
- */
-public void testNoCycleDetection2() throws CoreException {
-
-	// each project prereqs all the previous ones
-	noCycleDetection(5, false, true);
-	noCycleDetection(10, false, true);
-	noCycleDetection(20, false, true);
-
-	// each project prereqs all the next ones
-	noCycleDetection(5, true, true);
-	noCycleDetection(10, true, true);
-	noCycleDetection(20, true, true);
-}
-/*
- * Ensures that the .classpath file is not written to disk when setting the raw classpath with no resource change.
- */
-public void testNoResourceChange01() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P", new String[] {"src1"});
-		IIncludePathEntry[] newClasspath = createClasspath("P", new String[] {"/P/src2", ""});
-		project.setRawIncludepath(newClasspath, false/*cannot modify resources*/, null/*no progress*/);
-		String contents = new String (org.eclipse.wst.jsdt.internal.core.util.Util.getResourceContentsAsCharArray(getFile("/P/.settings/.jsdtscope")));
-		assertSourceEquals(
-			"Unexpected content", 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"src1\"/>\n" + 
-			"   <classpathentry kind=\"con\" path=\"org.eclipse.wst.jsdt.launching.JRE_CONTAINER\"/>\n" +
-			"	<classpathentry kind=\"output\" path=\"\"/>\n" + 
-			"</classpath>\n",
-			contents);
-	} finally {
-		deleteProject("P");
-	}
-}
-/*
- * Ensures that the in-memory classpath is correct when setting the raw classpath with no resource change.
- */
-public void testNoResourceChange02() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P", new String[] {"src1"});
-		IIncludePathEntry[] newClasspath = createClasspath("P", new String[] {"/P/src2", ""});
-		project.setRawIncludepath(newClasspath, false/*cannot modify resources*/, null/*no progress*/);
-		assertClasspathEquals(
-			project.getRawIncludepath(),
-			"/P/src2[CPE_SOURCE][K_SOURCE][isExported:false]"
-		);
-	} finally {
-		deleteProject("P");
-	}
-}
-/*
- * Ensures that a compilation unit on the old classpath doesn't exist after setting a new raw classpath with no resource change.
- */
-public void testNoResourceChange03() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P", new String[] {"src1"});
-		createFile(
-			"/P/src1/X.js",
-			"public class X {\n" +
-			"}"
-		);
-		IJavaScriptUnit cu = getCompilationUnit("/P/src1/X.js");
-		cu.open(null);
-		IIncludePathEntry[] newClasspath = createClasspath("P", new String[] {"/P/src2", ""});
-		project.setRawIncludepath(newClasspath, false/*cannot modify resources*/, null/*no progress*/);
-		assertFalse("Compilation unit should not exist", cu.exists());
-	} finally {
-		deleteProject("P");
-	}
-}
-/*
- * Ensures that the delta is correct when setting a new raw classpath with no resource change.
- */
-public void testNoResourceChange04() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P", new String[] {"src1"});
-		createFolder("/P/src2");
-		IIncludePathEntry[] newClasspath = createClasspath("P", new String[] {"/P/src2", ""});
-		startDeltas();
-		project.setRawIncludepath(newClasspath, false/*cannot modify resources*/, null/*no progress*/);
-		assertDeltas(
-			"Unexpected delta",
-			"P[*]: {CHILDREN | CLASSPATH CHANGED}\n" + 
-			"	src1[*]: {REMOVED FROM CLASSPATH}\n" + 
-			"	src2[*]: {ADDED TO CLASSPATH}"
-		);
-	} finally {
-		stopDeltas();
-		deleteProject("P");
-	}
-}
-/*
- * Ensures that the in-memory output is correct when setting the output with no resource change.
- */
-public void testNoResourceChange05() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P", new String[] {"src1"});
-		project.setRawIncludepath(project.getRawIncludepath(), false/*cannot modify resources*/, null/*no progress*/);
-		IIncludePathEntry[] entries = project.readRawIncludepath(); // force to read classpath
-		assertEquals(
-			"/P/src2",
-			entries[0].getPath().toString());
-	} finally {
-		deleteProject("P");
-	}
-}
-/**
- * Ensures that a duplicate entry created by editing the .classpath is detected.
- * (regression test for bug 24498 Duplicate entries on classpath cause CP marker to no longer refresh)
- */
-public void testDuplicateEntries() throws CoreException {
-	try {
-		IJavaScriptProject project = this.createJavaProject("P", new String[] {"src"});
-		this.editFile(
-			"/P/.settings/.jsdtscope",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-			"<classpath>\n" +
-			"    <classpathentry kind=\"src\" path=\"src\"/>\n" +
-			"    <classpathentry kind=\"src\" path=\"src\"/>\n" +
-			"    <classpathentry kind=\"output\" path=\"bin\"/>\n" +
-			"</classpath>"
-		);
-		assertMarkers(
-			"Unexpected markers",
-			"Build path contains duplicate entry: \'src\' for project P",
-			project);
-	} finally {
-		this.deleteProject("P");
-	}
-}
-private void denseCycleDetection(final int numberOfParticipants) throws CoreException {
-	
-	final IJavaScriptProject[] projects = new IJavaScriptProject[numberOfParticipants];
-	final String[] projectNames  = new String[numberOfParticipants];
-	final int[] allProjectsInCycle = new int[numberOfParticipants];
-
-	try {
-		JavaScriptCore.run(new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				for (int i = 0; i < numberOfParticipants; i++){
-					projectNames[i] = "P"+i;
-					projects[i] = createJavaProject(projectNames[i], new String[]{""});
-					allProjectsInCycle[i] = 1;
-				}		
-				for (int i = 0; i < numberOfParticipants; i++){
-					IIncludePathEntry[] extraEntries = new IIncludePathEntry[numberOfParticipants-1];
-					int index = 0;
-					for (int j = 0; j < numberOfParticipants; j++){
-						if (i == j) continue;
-						extraEntries[index++] = JavaScriptCore.newProjectEntry(projects[j].getPath());
-					}
-					// append project references			
-					IIncludePathEntry[] oldClasspath = projects[i].getRawIncludepath();
-					IIncludePathEntry[] newClasspath = new IIncludePathEntry[oldClasspath.length+extraEntries.length];
-					System.arraycopy(oldClasspath, 0 , newClasspath, 0, oldClasspath.length);
-					for (int j = 0; j < extraEntries.length; j++){
-						newClasspath[oldClasspath.length+j] = extraEntries[j];
-					}			
-					// set classpath
-					projects[i].setRawIncludepath(newClasspath, null);
-				}
-			}
-		}, 
-		null);
-		
-		for (int i = 0; i < numberOfParticipants; i++){
-			// check cycle markers
-			this.assertCycleMarkers(projects[i], projects, allProjectsInCycle);
-		}
-		
-	} finally {
-		this.deleteProjects(projectNames);
-	}
-}
-/*
- * When using forward references, all projects prereq all of the ones which have a greater index, 
- * e.g. P0, P1, P2:  P0 prereqs {P1, P2}, P1 prereqs {P2}, P2 prereqs {}
- * When no using forward references (i.e. backward refs), all projects prereq projects with smaller index
- * e.g. P0, P1, P2:  P0 prereqs {}, P1 prereqs {P0}, P2 prereqs {P0, P1}
- */
-private void noCycleDetection(final int numberOfParticipants, final boolean useForwardReferences, final boolean createProjectsFirst) throws CoreException {
-	
-	final IJavaScriptProject[] projects = new IJavaScriptProject[numberOfParticipants];
-	final String[] projectNames  = new String[numberOfParticipants];
-	final int[] allProjectsInCycle = new int[numberOfParticipants];
-	
-	final long[] start = new long[1];
-	final long[] time = new long[1];
-	
-	try {
-		if (createProjectsFirst) {
-			JavaScriptCore.run(new IWorkspaceRunnable() {
-				public void run(IProgressMonitor monitor) throws CoreException {
-					for (int i = 0; i < numberOfParticipants; i++){
-						projectNames[i] = "P"+i;
-						projects[i] = createJavaProject(projectNames[i], new String[]{""});
-						allProjectsInCycle[i] = 0;
-					}
-				}
-			},
-			null);
-		}
-		JavaScriptCore.run(new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				if (!createProjectsFirst) {
-					for (int i = 0; i < numberOfParticipants; i++){
-						projectNames[i] = "P"+i;
-						projects[i] = createJavaProject(projectNames[i], new String[]{""});
-						allProjectsInCycle[i] = 0;
-					}		
-				}
-				for (int i = 0; i < numberOfParticipants; i++){
-					IIncludePathEntry[] extraEntries = new IIncludePathEntry[useForwardReferences ? numberOfParticipants - i -1 : i];
-					int index = 0;
-					for (int j = useForwardReferences ? i+1 : 0; 
-						useForwardReferences ? (j < numberOfParticipants) : (j < i); 
-						j++){
-						extraEntries[index++] = JavaScriptCore.newProjectEntry(projects[j].getPath());
-					}
-					// append project references			
-					IIncludePathEntry[] oldClasspath = projects[i].getRawIncludepath();
-					IIncludePathEntry[] newClasspath = new IIncludePathEntry[oldClasspath.length+extraEntries.length];
-					System.arraycopy(oldClasspath, 0 , newClasspath, 0, oldClasspath.length);
-					for (int j = 0; j < extraEntries.length; j++){
-						newClasspath[oldClasspath.length+j] = extraEntries[j];
-					}			
-					// set classpath
-					long innerStart = System.currentTimeMillis(); // time spent in individual CP setting
-					projects[i].setRawIncludepath(newClasspath, null);
-					time[0] += System.currentTimeMillis() - innerStart;
-				}
-				start[0] = System.currentTimeMillis(); // time spent in delta refresh
-			}
-		}, 
-		null);
-		time[0] += System.currentTimeMillis()-start[0];
-		//System.out.println("No cycle check ("+numberOfParticipants+" participants) : "+ time[0]+" ms, "+ (useForwardReferences ? "forward references" : "backward references") + ", " + (createProjectsFirst ? "two steps (projects created first, then classpaths are set)" : "one step (projects created and classpaths set in one batch)"));
-		
-		for (int i = 0; i < numberOfParticipants; i++){
-			// check cycle markers
-			this.assertCycleMarkers(projects[i], projects, allProjectsInCycle);
-		}
-		
-	} finally {
-		this.deleteProjects(projectNames);
-	}
-}
-
-/*
- * test for bug 32690
- * simulate checkout of project with invalid classpath
- */
-public void testNestedSourceFolders() throws CoreException, IOException {
-	try {
-		// create project using Platform/Resources API
-		final IProject project = getProject("P");
-		IWorkspaceRunnable create = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				project.create(null, null);
-				project.open(null);
-			}
-		};
-		getWorkspace().run(create, null);
-		
-		// create folders src and src/src2 using java.io API
-		File pro = project.getLocation().toFile();
-		File src = createFolder(pro, "src");
-		createFolder(src, "src2");
-		
-		// create .project using java.io API
-		createFile(pro, ".project", 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-			"<projectDescription>\n" +
-			"	<name>org.eclipse.wst.jsdt.core</name>\n" +
-			"	<comment></comment>\n" +
-			"	<projects>\n" +
-			"	</projects>\n" +
-			"	<buildSpec>\n" +
-			"		<buildCommand>\n" +
-			"			<name>org.eclipse.wst.jsdt.core.javabuilder</name>\n" +
-			"			<arguments>\n" +
-			"			</arguments>\n" +
-			"		</buildCommand>\n" +
-			"	</buildSpec>\n" +
-			"	<natures>\n" +
-			"		<nature>org.eclipse.wst.jsdt.core.javanature</nature>\n" +
-			"	</natures>\n" +
-			"</projectDescription>");
-
-		// create .classpath using java.io API
-		createFile(pro, ".classpath",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-			"<classpath>\n" +
-			"    <classpathentry kind=\"src\" path=\"src\"/>\n" +
-			"    <classpathentry kind=\"src\" path=\"src/src2\"/>\n" +
-			"    <classpathentry kind=\"output\" path=\"bin\"/>\n" +
-			"</classpath>"
-		);
-
-		// refresh
-		project.refreshLocal(IResource.DEPTH_INFINITE, null);
-		
-		assertMarkers(
-			"Unexpected markers",
-			"Cannot nest \'P/src/src2\' inside \'P/src\'. To enable the nesting exclude \'src2/\' from \'P/src\'",
-			JavaScriptCore.create(project));
-	} finally {
-		deleteProject("P");
-	}
-}
-/*
- * Ensures that no problems are reported for an optional source entry with no corresponding folder.
- */
-public void testOptionalEntry1() throws CoreException {
-	try {
-		IJavaScriptProject javaProject = this.createJavaProject("A", new String[] {});
-		IIncludePathAttribute attribute = JavaScriptCore.newIncludepathAttribute(IIncludePathAttribute.OPTIONAL, "true");
-		IIncludePathEntry[] classpath = 
-			new IIncludePathEntry[] {
-				JavaScriptCore.newSourceEntry(new Path("/A/src"), new IPath[0], new IPath[0], new Path("/A/bin"), new IIncludePathAttribute[] {attribute})
-			};
-		javaProject.setRawIncludepath(classpath, null);
-		assertMarkers(
-			"Unexpected markers",
-			"",
-			javaProject);
-	} finally {
-		this.deleteProject("A");
-	}
-}
-/*
- * Ensures that no problems are reported for an optional libary entry with no corresponding folder.
- */
-public void testOptionalEntry2() throws CoreException {
-	try {
-		IJavaScriptProject javaProject = this.createJavaProject("A", new String[] {});
-		IIncludePathAttribute attribute = JavaScriptCore.newIncludepathAttribute(IIncludePathAttribute.OPTIONAL, "true");
-		IIncludePathEntry[] classpath = 
-			new IIncludePathEntry[] {
-				JavaScriptCore.newLibraryEntry(new Path("/A/lib"), null, null, null, new IIncludePathAttribute[] {attribute}, false)
-			};
-		javaProject.setRawIncludepath(classpath, null);
-		assertMarkers(
-			"Unexpected markers",
-			"",
-			javaProject);
-	} finally {
-		this.deleteProject("A");
-	}
-}
-/*
- * Ensures that no problems are reported for an optional project entry with no corresponding project.
- */
-public void testOptionalEntry3() throws CoreException {
-	try {
-		IJavaScriptProject javaProject = this.createJavaProject("A", new String[] {});
-		IIncludePathAttribute attribute = JavaScriptCore.newIncludepathAttribute(IIncludePathAttribute.OPTIONAL, "true");
-		IIncludePathEntry[] classpath = 
-			new IIncludePathEntry[] {
-				JavaScriptCore.newProjectEntry(new Path("/B"), null/*no access rules*/, false/*don't combine access rule*/, new IIncludePathAttribute[] {attribute}, false/*not exported*/)
-			};
-		javaProject.setRawIncludepath(classpath, null);
-		assertMarkers(
-			"Unexpected markers",
-			"",
-			javaProject);
-	} finally {
-		this.deleteProject("A");
-	}
-}
-
-/**
- * Ensure classpath is refreshed when project is replaced (43670)
- */
-public void testReplaceProject() throws CoreException {
-	try {
-		final IJavaScriptProject javaProject = createJavaProject("P", new String[] {"src"});
-
-		ResourcesPlugin.getWorkspace().run(
-			new IWorkspaceRunnable() {
-				public void run(IProgressMonitor monitor) throws CoreException {
-					IProjectDescription descr = javaProject.getProject().getDescription();
-					descr.setComment("dummy"); // ensure it is changed
-					javaProject.getProject().setDescription(descr, monitor);
-					editFile(
-						"/P/.settings/.jsdtscope",
-						"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-						"<classpath>\n" +
-						"    <classpathentry kind=\"src\" path=\"src2\"/>\n" +
-						"</classpath>"
-					);
-				}
-			},
-			null);
-		IIncludePathEntry[] classpath = javaProject.getRawIncludepath();
-		assertEquals("classpath should have been refreshed", new Path("/P/src2"), classpath[0].getPath());
-	} finally {
-		deleteProject("P");
-	}
-}
-
-/*
- * Ensures that unknown classpath attributes in a .classpath file are not lost when read and rewritten.
- * (regression test for bug 101425 Classpath persistence should be resilient with unknown attributes)
- */
-public void testUnknownAttributes() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P");
-		editFile(
-			"/P/.settings/.jsdtscope",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry unknown=\"test\" kind=\"src\" path=\"src1\"/>\n" + 
-			"	<classpathentry kind=\"src\" path=\"src2\"/>\n" + 
-			"	<classpathentry kind=\"output\" path=\"bin\"/>\n" + 
-			"</classpath>\n"
-		);
-		IIncludePathEntry[] classpath = project.getRawIncludepath();
-		
-		// swap 2 entries
-		IIncludePathEntry src1 = classpath[0];
-		classpath[0] = classpath[1];
-		classpath[1] = src1;
-		project.setRawIncludepath(classpath, null);
-		
-		// check that .classpath has correct content
-		String contents = new String (org.eclipse.wst.jsdt.internal.core.util.Util.getResourceContentsAsCharArray(getFile("/P/.settings/.jsdtscope")));
-		assertSourceEquals(
-			"Unexpected content", 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"src2\"/>\n" + 
-			"	<classpathentry kind=\"src\" path=\"src1\" unknown=\"test\"/>\n" + 
-			"	<classpathentry kind=\"output\" path=\"bin\"/>\n" + 
-			"</classpath>\n",
-			contents);		
-	} finally {
-		deleteProject("P");
-	}
-}
-
-/*
- * Ensures that unknown classpath elements in a .classpath file are not lost when read and rewritten.
- * (regression test for bug 101425 Classpath persistence should be resilient with unknown attributes)
- */
-public void testUnknownElements1() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P");
-		editFile(
-			"/P/.settings/.jsdtscope",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"src1\">\n" + 
-			"		<unknown>\n" +
-			"			<test kind=\"\"/>\n" +
-			"		</unknown>\n" +
-			"	</classpathentry>\n" +
-			"	<classpathentry kind=\"src\" path=\"src2\"/>\n" + 
-			"	<classpathentry kind=\"output\" path=\"bin\"/>\n" + 
-			"</classpath>\n"
-		);
-		IIncludePathEntry[] classpath = project.getRawIncludepath();
-		
-		// swap 2 entries
-		IIncludePathEntry src1 = classpath[0];
-		classpath[0] = classpath[1];
-		classpath[1] = src1;
-		project.setRawIncludepath(classpath, null);
-		
-		// check that .classpath has correct content
-		String contents = new String (org.eclipse.wst.jsdt.internal.core.util.Util.getResourceContentsAsCharArray(getFile("/P/.settings/.jsdtscope")));
-		assertSourceEquals(
-			"Unexpected content", 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"src2\"/>\n" + 
-			"	<classpathentry kind=\"src\" path=\"src1\">\n" + 
-			"		<unknown>\n" +
-			"			<test kind=\"\"/>\n" +
-			"		</unknown>\n" +
-			"	</classpathentry>\n" +
-			"	<classpathentry kind=\"output\" path=\"bin\"/>\n" + 
-			"</classpath>\n",			
-			contents);		
-	} finally {
-		deleteProject("P");
-	}
-}
-
-/*
- * Ensures that unknown classpath elements in a .classpath file are not lost when read and rewritten.
- * (regression test for bug 101425 Classpath persistence should be resilient with unknown attributes)
- */
-public void testUnknownElements2() throws CoreException {
-	try {
-		IJavaScriptProject project = createJavaProject("P");
-		editFile(
-			"/P/.settings/.jsdtscope",
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" unknownattribute=\"abcde\" path=\"src1\">\n" + 
-			"		<unknown1>\n" +
-			"			<test kind=\"1\"/>\n" +
-			"			<test kind=\"2\"/>\n" +
-			"		</unknown1>\n" +
-			"		<unknown2 attribute2=\"\">\n" +
-			"			<test>\n" +
-			"				<other a=\"b\"/>\n" +
-			"			</test>\n" +
-			"		</unknown2>\n" +
-			"	</classpathentry>\n" +
-			"	<classpathentry kind=\"src\" path=\"src2\"/>\n" + 
-			"	<classpathentry kind=\"output\" path=\"bin\"/>\n" + 
-			"</classpath>\n"
-		);
-		IIncludePathEntry[] classpath = project.getRawIncludepath();
-		
-		// swap 2 entries
-		IIncludePathEntry src1 = classpath[0];
-		classpath[0] = classpath[1];
-		classpath[1] = src1;
-		project.setRawIncludepath(classpath, null);
-		
-		// check that .classpath has correct content
-		String contents = new String (org.eclipse.wst.jsdt.internal.core.util.Util.getResourceContentsAsCharArray(getFile("/P/.settings/.jsdtscope")));
-		assertSourceEquals(
-			"Unexpected content", 
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-			"<classpath>\n" + 
-			"	<classpathentry kind=\"src\" path=\"src2\"/>\n" + 
-			"	<classpathentry kind=\"src\" path=\"src1\" unknownattribute=\"abcde\">\n" + 
-			"		<unknown1>\n" + 
-			"			<test kind=\"1\"/>\n" + 
-			"			<test kind=\"2\"/>\n" + 
-			"		</unknown1>\n" + 
-			"		<unknown2 attribute2=\"\">\n" + 
-			"			<test>\n" + 
-			"				<other a=\"b\"/>\n" + 
-			"			</test>\n" + 
-			"		</unknown2>\n" + 
-			"	</classpathentry>\n" + 
-			"	<classpathentry kind=\"output\" path=\"bin\"/>\n" + 
-			"</classpath>\n",
-			contents);		
-	} finally {
-		deleteProject("P");
-	}
-}
-
-/**
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55992
- * Check that Assert.AssertionFailedException exception is well catched
- * 	a) when verifying a classpath entry
- * 	b) when verifying whole classpath
- */
-public void testBug55992a() throws CoreException {
-	try {
-		IJavaScriptProject proj =  this.createJavaProject("P", new String[] {});
-	
-		IPath path = getExternalJCLPath("");
-		IPath sourceAttachmentPath = new Path("jclMin.zip");
-		JavaScriptCore.setIncludepathVariables(
-			new String[] {"TEST_LIB", "TEST_SRC"},
-			new IPath[] {path, sourceAttachmentPath},
-			null);
-
-		ClasspathEntry cp = new ClasspathEntry(
-			IPackageFragmentRoot.K_SOURCE,
-			IIncludePathEntry.CPE_VARIABLE,
-			new Path("TEST_LIB"),
-			ClasspathEntry.INCLUDE_ALL, 
-			ClasspathEntry.EXCLUDE_NONE, 
-			new Path("TEST_SRC"),
-			null,
-			null, // specific output folder
-			false,
-			(IAccessRule[]) null,
-			false,
-			ClasspathEntry.NO_EXTRA_ATTRIBUTES);
-		IJavaScriptModelStatus status = JavaScriptConventions.validateClasspathEntry(proj, cp, false);
-		assertEquals(
-			"assertion failed: Source attachment path \'jclMin.zip\' for IIncludePathEntry must be absolute",
-			status.getMessage());
-	} finally {
-		this.deleteProject("P");
-	}
-}
-/*
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=61214
- */
-public void testRemoveDuplicates() throws CoreException {
-	try {
-		IJavaScriptProject p1 = this.createJavaProject("P1", new String[] {""});
-		IIncludePathEntry[] p1ClasspathEntries = new IIncludePathEntry[]{JavaScriptCore.newLibraryEntry(getExternalJCLPath(""), null, null, true)};
-		setClasspath(p1, p1ClasspathEntries);
-		IJavaScriptProject  p2 = this.createJavaProject("P2", new String[] {""});
-		IIncludePathEntry[] p2ClasspathEntries = new IIncludePathEntry[]{
-				JavaScriptCore.newProjectEntry(new Path("/P1")),
-				JavaScriptCore.newLibraryEntry(getExternalJCLPath(""), null, null, false)
-		};
-		setClasspath(p2, p2ClasspathEntries);
-	
-		IIncludePathEntry[] classpath = ((JavaProject)p2).getExpandedClasspath();
-		assertEquals("Unexpected number of classpath entries", 2, classpath.length);
-		assertEquals("Unexpected first entry", "/P1", classpath[0].getPath().toString());
-		assertEquals("Unexpected second entry", getSystemJsPathString(), classpath[1].getPath().toOSString());
-	} finally {
-		this.deleteProjects(new String[] {"P1", "P2"});
-	}
-}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CodeCorrectionTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CodeCorrectionTests.java
deleted file mode 100644
index 23577a3..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CodeCorrectionTests.java
+++ /dev/null
@@ -1,731 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.jsdt.core.CorrectionEngine;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IJavaScriptModelMarker;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.compiler.IProblem;
-import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchConstants;
-import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchScope;
-import org.eclipse.wst.jsdt.core.search.SearchEngine;
-import org.eclipse.wst.jsdt.core.search.SearchPattern;
-import org.eclipse.wst.jsdt.core.search.TypeNameRequestor;
-
-public class CodeCorrectionTests extends AbstractJavaModelTests {
-	public static boolean fgDebug = false;
-	public static boolean fgSpecific = false;
-
-	public CodeCorrectionTests(String name) {
-		super(name);
-	}
-
-	private IMarker[] getMarkers(IJavaScriptUnit unit) {
-		try {
-			IResource resource = unit.getCorrespondingResource();
-			return resource.findMarkers(
-					IJavaScriptModelMarker.JAVASCRIPT_MODEL_PROBLEM_MARKER,
-					true, IResource.DEPTH_INFINITE);
-		} catch (CoreException e) {
-		}
-		return new IMarker[0];
-	}
-
-	private IMarker getMarker(IJavaScriptUnit unit, String message)
-			throws CoreException {
-		IMarker[] markers = getMarkers(unit);
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			if (message.equals(marker.getAttribute(IMarker.MESSAGE))) {
-				return marker;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Return the project names to load in the solution when an independent test
-	 * suite is being run.
-	 */
-	public static String[] getProjectNames() {
-		return new String[] { "Compiler", "CodeCorrection" };
-	}
-
-	public void setUpSuite() throws Exception {
-		super.setUpSuite();
-
-		IJavaScriptProject project = setUpJavaProject("CodeCorrection");
-
-		// dummy query for waiting until the indexes are ready
-		SearchEngine engine = new SearchEngine();
-		IJavaScriptSearchScope scope = SearchEngine
-				.createJavaSearchScope(new IJavaScriptElement[] { project });
-		try {
-			engine.searchAllTypeNames(null, SearchPattern.R_EXACT_MATCH,
-					"!@$#!@".toCharArray(), SearchPattern.R_PATTERN_MATCH
-							| SearchPattern.R_CASE_SENSITIVE,
-					IJavaScriptSearchConstants.CLASS, scope,
-					new TypeNameRequestor() {
-						public void acceptType(int modifiers,
-								char[] packageName, char[] simpleTypeName,
-								char[][] enclosingTypeNames, String path) {
-						}
-					}, IJavaScriptSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
-					null);
-		} catch (CoreException e) {
-		}
-		// do a full build to create markers
-		JavaScriptCore.setOptions(JavaScriptCore.getDefaultOptions());
-		try {
-			getWorkspace().getRoot().getProject("CodeCorrection").build(
-					IncrementalProjectBuilder.FULL_BUILD, null);
-			waitForAutoBuild();
-		} catch (CoreException e) {
-			assertTrue("building failed", false);
-		}
-	}
-
-	public void tearDownSuite() throws Exception {
-		deleteProject("CodeCorrection");
-
-		super.tearDownSuite();
-	}
-
-	public static Test suite() {
-		return buildModelTestSuite(CodeCorrectionTests.class);
-		/*
-		 * Suite suite = new Suite(CodeCorrectionTests.class.getName()); if
-		 * (fgSpecific) { suite.addTest(new
-		 * CodeCorrectionTests("testCorrectMethod1"));
-		 * 
-		 * return suite; } suite.addTest(new
-		 * CodeCorrectionTests("testCorrectFieldType1")); suite.addTest(new
-		 * CodeCorrectionTests("testCorrectFieldType2")); suite.addTest(new
-		 * CodeCorrectionTests("testCorrectFieldType3")); suite.addTest(new
-		 * CodeCorrectionTests("testCorrectLocalVariableType1"));
-		 * suite.addTest(new
-		 * CodeCorrectionTests("testCorrectLocalVariableType2"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectImport1"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectImport2"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectImport3"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectSuperClass1"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectSuperClass2"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectSuperInterface1"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectSuperInterface2"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectException1"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectException2"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectMethod1"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectMethod2"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectField1"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectField2"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectLocalVariable1"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectArgument1"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectReturnType1"));
-		 * suite.addTest(new CodeCorrectionTests("testCorrectReturnType2"));
-		 * suite.addTest(new CodeCorrectionTests("testWarningTokens"));
-		 * 
-		 * return suite;
-		 */
-	}
-
-	public void testCorrectFieldType1() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectFieldType1.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "dddz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "ddd\n" + "ddd.eee",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectFieldType2() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectFieldType2.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "AClassz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "AClass\n" + "AClass2",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectFieldType3() throws CoreException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectFieldType3.js");
-		IMarker marker = getMarker(cu, "AClassz cannot be resolved to a type");
-		assertTrue("Marker not found", marker != null);
-		try {
-			engine.computeCorrections(marker, null, 0, requestor);
-		} catch (CoreException e) {
-		}
-
-		String src = cu.getSource();
-		String error = "AClassz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "AClass\n" + "AClass2",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectLocalVariableType1() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectLocalVariableType1.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "dddz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "ddd\n" + "ddd.eee",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectLocalVariableType2() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectLocalVariableType2.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "AClassz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "AClass\n" + "AClass2",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectImport1() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectImport1.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "dddz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "ddd\n" + "ddd.eee",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectImport2() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectImport2.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "dddz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "ddd\n" + "ddd.eee",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectImport3() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectImport3.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "AClassz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "AClass\n" + "AClass2",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectSuperClass1() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectSuperClass1.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "dddz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "ddd\n" + "ddd.eee",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectSuperClass2() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectSuperClass2.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "AClassz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "AClass\n" + "AClass2",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectSuperInterface1() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectSuperInterface1.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "cccz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "ccc\n" + "cccInterface",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectSuperInterface2() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectSuperInterface2.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "AListenerz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "AListener", requestor
-				.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", "" + start,
-				requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", "" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectException1() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectException1.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "bbbz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "bbb\n" + "bbb.ccc",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectException2() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectException2.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "AnExceptionz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "AnException", requestor
-				.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", "" + start,
-				requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", "" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectMethod1() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectMethod1.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "bar";
-		int start = src.lastIndexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have one suggestion", "bar0", requestor
-				.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", "" + start,
-				requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", "" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectMethod2() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectMethod2.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "bar";
-		int start = src.lastIndexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have one suggestion", "bar0", requestor
-				.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", "" + start,
-				requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", "" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectField1() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectField1.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "bar";
-		int start = src.lastIndexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have one suggestion", "bar0", requestor
-				.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", "" + start,
-				requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", "" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectField2() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectField2.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "bar";
-		int start = src.lastIndexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have one suggestion", "bar0", requestor
-				.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", "" + start,
-				requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", "" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectLocalVariable1() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectLocalVariable1.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "bar";
-		int start = src.lastIndexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have one suggestion", "bar0", requestor
-				.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", "" + start,
-				requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", "" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectArgument1() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectArgument1.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "bar";
-		int start = src.lastIndexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have one suggestion", "bar0", requestor
-				.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", "" + start,
-				requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", "" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectReturnType1() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectReturnType1.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "dddz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "ddd\n" + "ddd.eee",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testCorrectReturnType2() throws JavaScriptModelException {
-		CorrectionEngine engine = new CorrectionEngine(JavaScriptCore
-				.getOptions());
-		CodeCorrectionTestsRequestor requestor = new CodeCorrectionTestsRequestor();
-		IJavaScriptUnit cu = getCompilationUnit("CodeCorrection", "src", "",
-				"CorrectReturnType2.js");
-		IMarker[] markers = getMarkers(cu);
-		assertTrue("should have one problem", markers.length == 1);
-		engine.computeCorrections(markers[0], null, 0, requestor);
-
-		String src = cu.getSource();
-		String error = "AClassz";
-		int start = src.indexOf(error);
-		int end = start + error.length();
-
-		assertEquals("should have two suggestions", "AClass\n" + "AClass2",
-				requestor.getSuggestions());
-		assertEquals("a start of a suggestion is not correct", start + "\n"
-				+ start, requestor.getStarts());
-		assertEquals("a end of a suggestion is not correct", end + "\n" + end,
-				requestor.getEnds());
-	}
-
-	public void testWarningTokens() {
-		assertNull("assertIdentifier is a valid token for @SuppressWarnings",
-				CorrectionEngine
-						.getWarningToken(IProblem.UseAssertAsAnIdentifier));
-		assertEquals("wrong token", "deprecation", CorrectionEngine
-				.getWarningToken(IProblem.UsingDeprecatedConstructor));
-		assertEquals("wrong token", "deprecation", CorrectionEngine
-				.getWarningToken(IProblem.OverridingDeprecatedMethod));
-		assertEquals("wrong token", "deprecation", CorrectionEngine
-				.getWarningToken(IProblem.UsingDeprecatedType));
-		assertEquals("wrong token", "deprecation", CorrectionEngine
-				.getWarningToken(IProblem.UsingDeprecatedMethod));
-		assertEquals("wrong token", "deprecation", CorrectionEngine
-				.getWarningToken(IProblem.UsingDeprecatedField));
-		assertEquals("wrong token", "finally", CorrectionEngine
-				.getWarningToken(IProblem.FinallyMustCompleteNormally));
-		assertEquals("wrong token", "hiding", CorrectionEngine
-				.getWarningToken(IProblem.FieldHidingLocalVariable));
-		assertEquals("wrong token", "hiding", CorrectionEngine
-				.getWarningToken(IProblem.FieldHidingField));
-		assertEquals("wrong token", "hiding", CorrectionEngine
-				.getWarningToken(IProblem.LocalVariableHidingLocalVariable));
-		assertEquals("wrong token", "hiding", CorrectionEngine
-				.getWarningToken(IProblem.LocalVariableHidingField));
-		assertEquals("wrong token", "hiding", CorrectionEngine
-				.getWarningToken(IProblem.ArgumentHidingLocalVariable));
-		assertEquals("wrong token", "hiding", CorrectionEngine
-				.getWarningToken(IProblem.ArgumentHidingField));
-		assertEquals("wrong token", "hiding", CorrectionEngine
-				.getWarningToken(IProblem.MaskedCatch));
-		assertEquals("wrong token", "nls", CorrectionEngine
-				.getWarningToken(IProblem.NonExternalizedStringLiteral));
-		assertEquals("wrong token", "unused", CorrectionEngine
-				.getWarningToken(IProblem.LocalVariableIsNeverUsed));
-		assertEquals("wrong token", "unused", CorrectionEngine
-				.getWarningToken(IProblem.ArgumentIsNeverUsed));
-		assertEquals("wrong token", "unused", CorrectionEngine
-				.getWarningToken(IProblem.UnusedPrivateConstructor));
-		assertEquals("wrong token", "unused", CorrectionEngine
-				.getWarningToken(IProblem.UnusedPrivateMethod));
-		assertEquals("wrong token", "unused", CorrectionEngine
-				.getWarningToken(IProblem.UnusedPrivateField));
-		assertEquals("wrong token", "unused", CorrectionEngine
-				.getWarningToken(IProblem.UnusedPrivateType));
-		assertEquals("wrong token", "unused", CorrectionEngine
-				.getWarningToken(IProblem.UnusedMethodDeclaredThrownException));
-		assertEquals(
-				"wrong token",
-				"unused",
-				CorrectionEngine
-						.getWarningToken(IProblem.UnusedConstructorDeclaredThrownException));
-		assertEquals("wrong token", "static-access", CorrectionEngine
-				.getWarningToken(IProblem.IndirectAccessToStaticMethod));
-		assertEquals("wrong token", "static-access", CorrectionEngine
-				.getWarningToken(IProblem.IndirectAccessToStaticField));
-		assertEquals("wrong token", "static-access", CorrectionEngine
-				.getWarningToken(IProblem.IndirectAccessToStaticType));
-		assertEquals("wrong token", "static-access", CorrectionEngine
-				.getWarningToken(IProblem.NonStaticAccessToStaticMethod));
-		assertEquals("wrong token", "static-access", CorrectionEngine
-				.getWarningToken(IProblem.NonStaticAccessToStaticField));
-		assertEquals("wrong token", "synthetic-access", CorrectionEngine
-				.getWarningToken(IProblem.NeedToEmulateFieldReadAccess));
-		assertEquals("wrong token", "synthetic-access", CorrectionEngine
-				.getWarningToken(IProblem.NeedToEmulateFieldWriteAccess));
-		assertEquals("wrong token", "synthetic-access", CorrectionEngine
-				.getWarningToken(IProblem.NeedToEmulateMethodAccess));
-		assertEquals("wrong token", "synthetic-access", CorrectionEngine
-				.getWarningToken(IProblem.NeedToEmulateConstructorAccess));
-		assertEquals("wrong token", "unqualified-field-access",
-				CorrectionEngine
-						.getWarningToken(IProblem.UnqualifiedFieldAccess));
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CodeCorrectionTestsRequestor.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CodeCorrectionTestsRequestor.java
deleted file mode 100644
index 3174482..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CodeCorrectionTestsRequestor.java
+++ /dev/null
@@ -1,118 +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.jsdt.core.tests.model;
-
-import java.util.*;
-
-import org.eclipse.wst.jsdt.core.ICorrectionRequestor;
-
-public class CodeCorrectionTestsRequestor implements ICorrectionRequestor {
-	private class Suggestion {
-		public String text;
-		public int start;
-		public int end;
-		public Suggestion(char[] text, int start, int end){
-			this.text = new String(text);
-			this.start = start;
-			this.end = end;
-		}
-	}
-	
-	class SuggestionComparator implements Comparator {
-		public int compare(Object o1,Object o2) {
-			Suggestion s1 = (Suggestion)o1;
-			Suggestion s2 = (Suggestion)o2;
-			
-			int result = s1.text.compareTo(s2.text);
-			if(result == 0) {
-				result = s1.start - s2.start;
-				if(result == 0) {
-					result = s1.end - s2.end;	
-				}
-			}
-			return result;
-		}
-	}
-	
-	
-	private Vector fSuggestions = new Vector(5);
-	
-	public void acceptClass(char[] packageName,char[] className,char[] correctionName,int modifiers,int correctionStart,int correctionEnd){
-		fSuggestions.addElement(new Suggestion(correctionName, correctionStart, correctionEnd));
-	}
-	
-	public void acceptField(char[] declaringTypePackageName,char[] declaringTypeName,char[] name,char[] typePackageName,char[] typeName,char[] correctionName,int modifiers,int correctionStart,int correctionEnd){
-		fSuggestions.addElement(new Suggestion(correctionName, correctionStart, correctionEnd));
-	}
-	
-	public void acceptInterface(char[] packageName,char[] interfaceName,char[] correctionName,int modifiers,int correctionStart,int correctionEnd){
-		fSuggestions.addElement(new Suggestion(correctionName, correctionStart, correctionEnd));
-	}
-	
-	public void acceptLocalVariable(char[] name,char[] typePackageName,char[] typeName,int modifiers,int correctionStart,int correctionEnd){
-		fSuggestions.addElement(new Suggestion(name, correctionStart, correctionEnd));
-	}
-	
-	public void acceptMethod(char[] declaringTypePackageName,char[] declaringTypeName,char[] selector,char[][] parameterPackageNames,char[][] parameterTypeNames,char[][] parameterNames,char[] returnTypePackageName,char[] returnTypeName,char[] correctionName,int modifiers,int correctionStart,int correctionEnd){
-		fSuggestions.addElement(new Suggestion(correctionName, correctionStart, correctionEnd));
-	}
-	
-	public void acceptPackage(char[] packageName,char[] correctionName,int correctionStart,int correctionEnd){
-		fSuggestions.addElement(new Suggestion(correctionName, correctionStart, correctionEnd));
-	}
-	
-	public String getSuggestions(){
-		Suggestion[] suggestions = getSortedSuggestions();
-		
-		StringBuffer result = new StringBuffer();
-		for (int i = 0; i < suggestions.length; i++) {
-			if(i != 0)
-				result.append('\n');
-				
-			result.append(suggestions[i].text);
-		}
-		return result.toString();
-	}
-	
-	public String getStarts(){
-		Suggestion[] suggestions = getSortedSuggestions();
-		
-		StringBuffer result = new StringBuffer();
-		for (int i = 0; i < suggestions.length; i++) {
-			if(i != 0)
-				result.append('\n');
-				
-			result.append(suggestions[i].start);
-		}
-		return result.toString();
-	}
-	
-	public String getEnds(){
-		Suggestion[] suggestions = getSortedSuggestions();
-		
-		StringBuffer result = new StringBuffer();
-		for (int i = 0; i < suggestions.length; i++) {
-			if(i != 0)
-				result.append('\n');
-				
-			result.append(suggestions[i].end);
-		}
-		return result.toString();
-	}
-	
-	private Suggestion[] getSortedSuggestions(){
-		Object[] unsorted = fSuggestions.toArray();
-		Suggestion[] sorted = new Suggestion[unsorted.length];
-		System.arraycopy(unsorted, 0, sorted, 0, unsorted.length);
-		Arrays.sort(sorted, new SuggestionComparator());
-		return sorted;
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CodeSnippetParsingUtilTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CodeSnippetParsingUtilTests.java
deleted file mode 100644
index bd185b6..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CodeSnippetParsingUtilTests.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.core.IPackageFragmentRoot;
-import org.eclipse.wst.jsdt.core.IProblemRequestor;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.LibrarySuperType;
-import org.eclipse.wst.jsdt.core.WorkingCopyOwner;
-import org.eclipse.wst.jsdt.core.compiler.IProblem;
-import org.eclipse.wst.jsdt.core.dom.AST;
-import org.eclipse.wst.jsdt.internal.core.JavaProject;
-import org.eclipse.wst.jsdt.launching.JavaRuntime;
-
-public class CodeSnippetParsingUtilTests extends TestCase {
-	public static Test suite() {
-		return new TestSuite(CodeSnippetParsingUtilTests.class);
-	}
-
-	/**
-	 * 
-	 */
-	public CodeSnippetParsingUtilTests() {
-	}
-
-	/**
-	 * @param name
-	 */
-	public CodeSnippetParsingUtilTests(String name) {
-		super(name);
-	}
-
-	public void testErrorDetection() throws JavaScriptModelException, CoreException {
-		String projectName = ".jsValidation";
-		String fileName = "snippet.js";
-		String contents = "var params = \"someBadString\".substring(1,2,3,4);\nparahnas.shift();";
-
-		// Create the JavaScript project
-		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projectName);
-		description.setNatureIds(new String[]{JavaScriptCore.NATURE_ID});
-		IProject iProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-		iProject.create(description, new NullProgressMonitor());
-		iProject.open(null);
-
-		// Setup the JavaScript project
-		IJavaScriptProject project = JavaScriptCore.create(iProject);
-		project.setRawIncludepath(null, new NullProgressMonitor());
-		LibrarySuperType superType = new LibrarySuperType(new Path(JavaRuntime.DEFAULT_SUPER_TYPE_LIBRARY), project, JavaRuntime.DEFAULT_SUPER_TYPE);
-		((JavaProject) project).setCommonSuperType(superType);
-
-		// Now create the IJavascriptUnit, and fill in its contents
-		IPackageFragmentRoot root = project.getPackageFragmentRoot(iProject);
-		IPackageFragment packageFragment = root.getPackageFragment(IPackageFragment.DEFAULT_PACKAGE_NAME);
-		IJavaScriptUnit javaScriptUnit = packageFragment.getJavaScriptUnit(fileName);
-
-		final List problems = new ArrayList();
-		final IProblemRequestor requestor = new IProblemRequestor() {
-			public void acceptProblem(IProblem problem) {
-//				System.err.println(problem.getMessage());
-				problems.add(problem);
-			}
-
-			public boolean isActive() {
-				return true;
-			}
-
-			public void beginReporting() {
-				problems.clear();
-			}
-
-			public void endReporting() {
-			}
-		};
-		WorkingCopyOwner owner = new WorkingCopyOwner() {
-			public IProblemRequestor getProblemRequestor(IJavaScriptUnit workingCopy) {
-				return requestor;
-			}
-		};
-
-		/*
-		 * Using a "working copy" allows us to not have to create the file on
-		 * disk
-		 */
-		IJavaScriptUnit workingCopy = javaScriptUnit.getWorkingCopy(owner, null);
-		workingCopy.getBuffer().setContents(contents);
-
-		/*
-		 * Reconcile the working copy. Any problems found will be reported to
-		 * the IProblemRequestor from the given WorkingCopyOwner.
-		 */
-		workingCopy.reconcile(AST.JLS3, true, true, owner, new NullProgressMonitor());
-
-		// Clean up
-		workingCopy.discardWorkingCopy();
-
-		assertFalse("no problems found", problems.isEmpty());
-	}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompilationUnitTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompilationUnitTests.java
deleted file mode 100644
index 880e784..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompilationUnitTests.java
+++ /dev/null
@@ -1,1422 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.jsdt.internal.core.*;
-import org.eclipse.wst.jsdt.internal.core.util.Util;
-import org.eclipse.wst.jsdt.core.*;
-
-import junit.framework.Test;
-
-public class CompilationUnitTests extends ModifyingResourceTests {
-	IJavaScriptUnit cu;
-	IJavaScriptUnit workingCopy;
-	IJavaScriptProject testProject;
-	
-public CompilationUnitTests(String name) {
-	super(name);
-}
-public void setUpSuite() throws Exception {
-	super.setUpSuite();
-	
-	this.testProject = createJavaProject("P", new String[] {"src"}, new String[] {getSystemJsPathString()}, "bin", "1.5");
-	createFolder("/P/src/p");
-	createFile(
-		"/P/src/p/X.js",
-		"\n\n" + 	// package now includes comment (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=93880)
-						// => need some empty line at beginning to be able to have cu without any other element (see testGetElementAt())
-		"/* some comment */" +
-		"  var f1=1;\n" +
-		"  /** @deprecated\n */" +
-		"  var f2;\n" +
-		"  var f3;\n" +
-		"  var f4;\n" +
-		"  var f5, f6, f7;\n" +
-		"  // @Deprecated\n" +
-		"  var f8;\n" +
-		"  function foo( y) {\n" +
-		"  }\n" +
-		"  function bar() {\n" +
-		"  }\n" +
-		"  /** @deprecated\n */" +
-		"  function fred() {\n" +
-		"  }\n" +
-		"  // @Deprecated\n" +
-		"  function fred2() {\n" +
-		"  }\n" +
-		""
-	);
-	this.cu = getCompilationUnit("/P/src/p/X.js");
-}
-
-// Use this static initializer to specify subset for tests
-// All specified tests which do not belong to the class are skipped...
-static {
-//	TESTS_PREFIX = "testGetChildren";
-//	TESTS_NAMES = new String[] { "testDefaultFlag1" };
-//	TESTS_NUMBERS = new int[] { 13 };
-//	TESTS_RANGE = new int[] { 16, -1 };
-}
-public static Test suite() {
-	return buildModelTestSuite(CompilationUnitTests.class);
-}
-protected void tearDown() throws Exception {
-	if (this.workingCopy != null)
-		this.workingCopy.discardWorkingCopy();
-	super.tearDown();
-}
-public void tearDownSuite() throws Exception {
-	this.deleteProject("P");
-	super.tearDownSuite();
-}
-/**
- * Create working copy and compute problems.
- * 
- * Note that in this case, a complete parse of javadoc comment is performed
- * (ie. done with checkDocComment = true) instead of a "light" parse when
- * problems are not computed.
- * 
- * See JavaScriptUnit#buildStructure() line with comment: // disable javadoc parsing if not computing problems, not resolving and not creating ast
- * and org.eclipse.wst.jsdt.internal.compiler.parser.JavadocParser#checkDeprecation(int)
- */
-private IJavaScriptUnit createWorkingCopyComputingProblems(String source) throws JavaScriptModelException {
-	this.workingCopy = getWorkingCopy("/P/src/p/Y.js", source, true);
-	return this.workingCopy;
-}
-
-
-public void test00Class() throws CoreException {
-	try {
-		
-		String source =
-			"MyClass.prototype.someMethod = MyClass_someMethod;\n" + 
-			"function MyClass()\n" + 
-			"{\n" + 
-			"this.field1=0;\n" + 
-			"}\n" + 
-			"function MyClass_someMethod()\n" + 
-			"{\n" + 
-			"}";
-		createFile("/P/src/X.js", source);
-		final IJavaScriptUnit compilationUnit = getCompilationUnit("/P/src/X.js");
-		IType type = compilationUnit.getType("MyClass");
-		assertTrue("Type not defined", type.exists());
-		
-		IField[] fields= type.getFields();
-		assertEquals("Wrong number of fields returned",  1, fields.length);
-		assertEquals("Incorrect name for the  field", "field1", fields[0].getElementName());
-		assertTrue("Field should exist " , fields[0].exists());
-
-		IFunction[] methods= type.getFunctions();
-		assertEquals("Wrong number of methods returned",  2, methods.length);
-		assertEquals("Incorrect name for the  method", "someMethod", methods[0].getElementName());
-		assertTrue("Field should exist " ,methods[0].exists());
-
-		
-	} finally {
-		deleteFile("/P/src/X.js");
-	}
-}
-
-
-
-
-
-/**
- * Calls methods that do nothing to ensure code coverage
- */
-public void testCodeCoverage() throws JavaScriptModelException {
-	this.cu.discardWorkingCopy();
-	this.cu.restore();
-}
-/**
- * Ensures <code>commitWorkingCopy(boolean, IProgressMonitor)</code> throws the correct 
- * <code>JavaScriptModelException</code> for a <code>JavaScriptUnit</code>.
- */
-public void testCommitWorkingCopy() {
-	try {
-		this.cu.commitWorkingCopy(false, null);
-	} catch (JavaScriptModelException jme) {
-		assertTrue("Incorrect status for committing a JavaScriptUnit", jme.getStatus().getCode() == IJavaScriptModelStatusConstants.INVALID_ELEMENT_TYPES);
-		return;
-	}
-	assertTrue("A compilation unit should throw an exception is a commit is attempted", false);
-}
-
-/*
- * Ensure that the deprecated flag is correctly reported
- * (regression test fo bug 23207 Flags.isDeprecated(IFunction.getFlags()) doesn't work)
- */
-//public void testDeprecatedFlag01() throws JavaScriptModelException {
-//	IType type = this.cu.getType("X");
-//	assertTrue("Type X should not be deprecated", !Flags.isDeprecated(type.getFlags()));
-//}
-//
-/*
- * Ensure that the deprecated flag is correctly reported
- * (regression test fo bug 23207 Flags.isDeprecated(IFunction.getFlags()) doesn't work)
- */
-//public void testDeprecatedFlag02() throws JavaScriptModelException {
-//	IType type = this.cu.getType("I");
-//	assertTrue("Type I should be deprecated", Flags.isDeprecated(type.getFlags()));
-//}
-
-/*
- * Ensure that the deprecated flag is correctly reported
- * (regression test fo bug 23207 Flags.isDeprecated(IFunction.getFlags()) doesn't work)
- */
-public void testDeprecatedFlag03() throws JavaScriptModelException {
-	IField field = this.cu.getField("f1");
-	assertTrue("Field f1 should not be deprecated", !Flags.isDeprecated(field.getFlags()));
-}
-
-/*
- * Ensure that the deprecated flag is correctly reported
- * (regression test fo bug 23207 Flags.isDeprecated(IFunction.getFlags()) doesn't work)
- */
-public void testDeprecatedFlag04() throws JavaScriptModelException {
-	IField field = this.cu.getField("f2");
-	assertTrue("Field f2 should be deprecated", Flags.isDeprecated(field.getFlags()));
-}
-
-/*
- * Ensure that the deprecated flag is correctly reported
- * (regression test fo bug 23207 Flags.isDeprecated(IFunction.getFlags()) doesn't work)
- */
-public void testDeprecatedFlag05() throws JavaScriptModelException {
-	IFunction method = this.cu.getFunction("bar", new String[]{});
-	assertTrue("Method bar should not be deprecated", !Flags.isDeprecated(method.getFlags()));
-}
-
-/*
- * Ensure that the deprecated flag is correctly reported
- * (regression test fo bug 23207 Flags.isDeprecated(IFunction.getFlags()) doesn't work)
- */
-public void testDeprecatedFlag06() throws JavaScriptModelException {
-	IFunction method = this.cu.getFunction("fred", new String[]{});
-	assertTrue("Method fred should be deprecated", Flags.isDeprecated(method.getFlags()));
-}
-
-/*
- * Ensure that the deprecated flag is correctly reported
- * (regression test fo bug 89807 Outliner should recognize @Deprecated annotation)
- */
-public void testDeprecatedFlag07() throws JavaScriptModelException {
-	IType type = this.cu.getType("I3");
-	assertTrue("Type I3 should be deprecated", Flags.isDeprecated(type.getFlags()));
-}
-
-/*
- * Ensure that the deprecated flag is correctly reported
- * (regression test fo bug 89807 Outliner should recognize @Deprecated annotation)
- */
-public void testDeprecatedFlag08() throws JavaScriptModelException {
-	IField field = this.cu.getType("X").getField("f8");
-	assertTrue("Field f8 should be deprecated", Flags.isDeprecated(field.getFlags()));
-}
-
-/*
- * Ensure that the deprecated flag is correctly reported
- * (regression test fo bug 89807 Outliner should recognize @Deprecated annotation)
- */
-public void testDeprecatedFlag09() throws JavaScriptModelException {
-	IFunction method = this.cu.getType("X").getFunction("fred2", new String[0]);
-	assertTrue("Method fred2 should be deprecated", Flags.isDeprecated(method.getFlags()));
-}
-
-/*
- * Ensures that the categories for a class are correct.
- */
-public void testGetCategories01() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"/**\n" +
-		" * @category test\n" +
-		" */\n" +
-		"public class Y {\n" +
-		"}"
-	);
-	String[] categories = this.workingCopy.getType("Y").getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test\n",
-		categories);
-}
-
-/*
- * Ensures that the categories for an interface are correct.
- */
-public void testGetCategories02() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"/**\n" +
-		" * @category test\n" +
-		" */\n" +
-		"public interface Y {\n" +
-		"}"
-	);
-	String[] categories = workingCopy.getType("Y").getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test\n",
-		categories);
-}
-
-/*
- * Ensures that the categories for an enumeration type are correct.
- */
-public void testGetCategories03() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"/**\n" +
-		" * @category test\n" +
-		" */\n" +
-		"public enum Y {\n" +
-		"}"
-	);
-	String[] categories = workingCopy.getType("Y").getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test\n",
-		categories);
-}
-
-/*
- * Ensures that the categories for an annotation type type are correct.
- */
-public void testGetCategories04() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"/**\n" +
-		" * @category test\n" +
-		" */\n" +
-		"public @interface Y {\n" +
-		"}"
-	);
-	String[] categories = workingCopy.getType("Y").getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test\n",
-		categories);
-}
-
-/*
- * Ensures that the categories for a method are correct.
- */
-public void testGetCategories05() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = workingCopy.getType("Y").getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test\n",
-		categories);
-}
-
-/*
- * Ensures that the categories for a constructor are correct.
- */
-public void testGetCategories06() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  public Y() {}\n" +
-		"}"
-	);
-	String[] categories = workingCopy.getType("Y").getFunction("Y", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test\n",
-		categories);
-}
-
-/*
- * Ensures that the categories for a field are correct.
- */
-public void testGetCategories07() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  int field;\n" +
-		"}"
-	);
-	String[] categories = workingCopy.getType("Y").getField("field").getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test\n",
-		categories);
-}
-
-/*
- * Ensures that the categories for a member type are correct.
- */
-public void testGetCategories08() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  class Member {}\n" +
-		"}"
-	);
-	String[] categories = workingCopy.getType("Y").getType("Member").getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test\n",
-		categories);
-}
-
-/*
- * Ensures that the categories for an element that has no categories is empty.
- */
-public void testGetCategories09() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"  */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = workingCopy.getType("Y").getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"",
-		categories);
-}
-
-/*
- * Ensures that the categories for an element that has multiple category tags is correct.
- */
-public void testGetCategories10() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category test1\n" +
-		"   * @category test2\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = workingCopy.getType("Y").getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test1\n" +
-		"test2\n",
-		categories);
-}
-
-/*
- * Ensures that the categories for an element that has multiple categories for one category tag is correct.
- */
-public void testGetCategories11() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category test1 test2\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = workingCopy.getType("Y").getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test1\n" +
-		"test2\n",
-		categories);
-}
-public void testGetCategories12() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category test1 test2\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = this.workingCopy.getType("Y").getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test1\n" +
-		"test2\n",
-		categories);
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=125676
-public void testGetCategories13() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category " +
-		"	 *		test\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = this.workingCopy.getType("Y").getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"",
-		categories);
-}
-public void testGetCategories14() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category" +
-		"	 *		test\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = this.workingCopy.getType("Y").getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"",
-		categories);
-}
-public void testGetCategories15() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category test1" +
-		"	 *		test2\n" +
-		"   */\n" +
-		"  void foo() {}\n" +
-		"}"
-	);
-	String[] categories = this.workingCopy.getType("Y").getFunction("foo", new String[0]).getCategories();
-	assertStringsEqual(
-		"Unexpected categories",
-		"test1\n",
-		categories);
-}
-
-/*
- * Ensures that the children of a type for a given category are correct.
- */
-public void testGetChildrenForCategory01() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  int field;\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  void foo1() {}\n" +
-		"  /**\n" +
-		"   * @category test\n" +
-		"   */\n" +
-		"  void foo2() {}\n" +
-		"  /**\n" +
-		"   * @category other\n" +
-		"   */\n" +
-		"  void foo3() {}\n" +
-		"}"
-	);
-	IJavaScriptElement[] children = workingCopy.getType("Y").getChildrenForCategory("test");
-	assertElementsEqual(
-		"Unexpected children",
-		"field [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]\n" + 
-		"foo1() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]\n" + 
-		"foo2() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]",
-		children);
-}
-
-/*
- * Ensures that the children of a type for a given category are correct.
- */
-public void testGetChildrenForCategory02() throws CoreException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category test1 test2\n" +
-		"   */\n" +
-		"  class Member {}\n" +
-		"  /**\n" +
-		"   * @category test1\n" +
-		"   */\n" +
-		"  void foo1() {}\n" +
-		"  /**\n" +
-		"   * @category test2\n" +
-		"   */\n" +
-		"  void foo2() {}\n" +
-		"}"
-	);
-	IJavaScriptElement[] children = workingCopy.getType("Y").getChildrenForCategory("test1");
-	assertElementsEqual(
-		"Unexpected children",
-		"Member [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]\n" + 
-		"foo1() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]",
-		children);
-}
-public void testGetChildrenForCategory03() throws CoreException, IOException {
-	createWorkingCopyComputingProblems(
-		"package p;\n" +
-		"public class Y {\n" +
-		"  /**\n" +
-		"   * @category fields test all\n" +
-		"   */\n" +
-		"  int field;\n" +
-		"  /**\n" +
-		"   * @category methods test all\n" +
-		"   */\n" +
-		"  void foo1() {}\n" +
-		"  /**\n" +
-		"   * @category methods test all\n" +
-		"   */\n" +
-		"  void foo2() {}\n" +
-		"  /**\n" +
-		"   * @category methods other all\n" +
-		"   */\n" +
-		"  void foo3() {}\n" +
-		"}"
-	);
-	IJavaScriptElement[] tests  = this.workingCopy.getType("Y").getChildrenForCategory("test");
-	assertElementsEqual(
-		"Unexpected children",
-		"field [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]\n" + 
-		"foo1() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]\n" + 
-		"foo2() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]",
-		tests);
-	IJavaScriptElement[] methods = this.workingCopy.getType("Y").getChildrenForCategory("methods");
-	assertElementsEqual(
-		"Unexpected children",
-		"foo1() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]\n" + 
-		"foo2() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]\n" + 
-		"foo3() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]",
-		methods);
-	IJavaScriptElement[] others = this.workingCopy.getType("Y").getChildrenForCategory("other");
-	assertElementsEqual(
-		"Unexpected children",
-		"foo3() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]",
-		others);
-	IJavaScriptElement[] all = this.workingCopy.getType("Y").getChildrenForCategory("all");
-	assertElementsEqual(
-		"Unexpected children",
-		"field [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]\n" + 
-		"foo1() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]\n" + 
-		"foo2() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]\n" + 
-		"foo3() [in Y [in [Working copy] Y.js [in p [in src [in P]]]]]",
-		all);
-}
-
-/**
- * Ensures <code>getContents()</code> returns the correct value
- * for a <code>JavaScriptUnit</code> that is not present
- */
-public void testGetContentsForNotPresent() {
-	CompilationUnit compilationUnit = (CompilationUnit)getCompilationUnit("/P/src/p/Absent.js");
-	
-	assertSourceEquals("Unexpected contents for non present cu", "", new String(compilationUnit.getContents()));
-}
-/**
- * Tests Java element retrieval via source position 
- */
-public void testGetElementAt() throws JavaScriptModelException {
-	IField field = this.cu.getField( "f2");
-	ISourceRange sourceRange= field.getSourceRange();
-	//ensure that we are into the body of the type
-	IJavaScriptElement element= 
-		this.cu.getElementAt(sourceRange.getOffset() + field.getElementName().length() + 1);
-	assertTrue("Should have found a type", element instanceof IField);
-	assertEquals(
-		"Should have found f2",
-		"f2",
-		element.getElementName());
-	//ensure that null is returned if there is no element other than the compilation
- 	//unit itself at the given position
- 	element= this.cu.getElementAt(this.cu.getSourceRange().getOffset() + 1);
- 	assertEquals("Should have not found any element", null, element);
-}
-///**
-// * Tests import declararion retrieval via source position.
-// * (regression test for bug 14331 IJavaScriptUnit.getElementAt dos not find import decl)
-// */
-//public void testGetElementAt2() throws JavaScriptModelException {
-//	IImportContainer container = this.cu.getImportContainer();
-//	ISourceRange sourceRange= container.getSourceRange();
-//	//ensure that we are inside the import container
-//	IJavaScriptElement element= this.cu.getElementAt(sourceRange.getOffset() + 1);
-//	assertTrue("Should have found an import", element instanceof IImportDeclaration);
-//	assertEquals(
-//		"Import not found",
-//		"p2.*",
-//		 element.getElementName());
-//}
-/*
- * Ensures that the right field is returnd in a muti-declaration field.
- */
-public void testGetElementAt3() throws JavaScriptModelException {
-	int fieldPos = this.cu.getSource().indexOf("f5");
-	IJavaScriptElement element= this.cu.getElementAt(fieldPos);
-	assertEquals(
-		"Unexpected field found",
-		this.cu.getField("f5"),
-		 element);
-}
-/*
- * Ensures that the right field is returnd in a muti-declaration field.
- */
-public void testGetElementAt4() throws JavaScriptModelException {
-	int fieldPos = this.cu.getSource().indexOf("f6");
-	IJavaScriptElement element= this.cu.getElementAt(fieldPos);
-	assertEquals(
-		"Unexpected field found",
-		this.cu.getField("f6"),
-		 element);
-}
-/*
- * Ensures that the right field is returnd in a muti-declaration field.
- */
-public void testGetElementAt5() throws JavaScriptModelException {
-	int fieldPos = this.cu.getSource().indexOf("f7");
-	IJavaScriptElement element= this.cu.getElementAt(fieldPos);
-	assertEquals(
-		"Unexpected field found",
-		this.cu.getField("f7"),
-		 element);
-}
-/*
- * Ensures that the right field is returned in a muti-declaration field.
- */
-public void testGetElementAt6() throws JavaScriptModelException {
-	int fieldPos = this.cu.getSource().indexOf("var f5");
-	IJavaScriptElement element= this.cu.getElementAt(fieldPos);
-	assertEquals(
-		"Unexpected field found",
-		this.cu.getField("f5"),
-		element);
-}
-///*
-// * Ensures that the right type is returnd if an annotation type as a comment in its header.
-// */
-//public void testGetElementAt7() throws JavaScriptModelException {
-//	int fieldPos = this.cu.getSource().indexOf("Annot");
-//	IJavaScriptElement element= this.cu.getElementAt(fieldPos);
-//	assertEquals(
-//		"Unexpected type found",
-//		this.cu.getType("Annot"),
-//		element);
-//}
-/**
- * Ensures that correct number of fields with the correct names, modifiers, signatures
- * and declaring types exist in a type.
- */
-public void testGetFields() throws JavaScriptModelException {
-//	IType type = this.cu.getType("X");
-	IField[] fields= this.cu.getFields();
-	String[] fieldNames = new String[] {"f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8"};
-	String[] flags = new String[] {"public", "protected", "private", "", "", "", "", ""};
-	String[] signatures = new String[] {"I", "QObject;", "QX;", "Qjava.lang.String;", "I", "I", "I", "I"};
-	assertEquals("Wrong number of fields returned",  fieldNames.length, fields.length);
-	for (int i = 0; i < fields.length; i++) {
-		assertEquals("Incorrect name for the " + i + " field", fieldNames[i], fields[i].getElementName());
-//		String mod= Flags.toString(fields[i].getFlags());
-//		assertEquals("Unexpected modifier for " + fields[i].getElementName(), flags[i], mod);
-//		assertEquals("Unexpected type signature for " + fields[i].getElementName(), signatures[i], fields[i].getTypeSignature());
-//		assertEquals("Unexpected declaring type for " + fields[i].getElementName(), type, fields[i].getDeclaringType());
-		assertTrue("Field should exist " + fields[i], fields[i].exists());
-	}
-}
-///**
-// * Ensure that import declaration handles are returned from the
-// * compilation unit.
-// * Checks non-existant handle, on demand and not.
-// */
-//public void testGetImport() {
-//	IImportDeclaration imprt = this.cu.getImport("java.lang");
-//	assertTrue("Import should not exist " + imprt, !imprt.exists());
-//	
-//	imprt = this.cu.getImport("p2.*");
-//	assertTrue("Import should exist " + imprt, imprt.exists());
-//	
-//	imprt = this.cu.getImport("p3.Z");
-//	assertTrue("Import should exist " + imprt, imprt.exists());
-//}
-///**
-// * Ensures that correct number of imports with the correct names
-// * exist in "GraphicsTest" compilation unit.
-// */
-//public void testGetImports() throws JavaScriptModelException {
-//	IImportDeclaration[] imprts = this.cu.getImports();
-//	IImportContainer container= this.cu.getImportContainer();
-//	String[] importNames = new String[] {"p2.*", "p3.Z"};
-//
-//	assertEquals("Wrong number of imports returned", importNames.length, imprts.length);
-//	for (int i = 0; i < imprts.length; i++) {
-//		assertTrue("Incorrect name for the type in this position: " + imprts[i].getElementName(), imprts[i].getElementName().equals(importNames[i]));
-//		assertTrue("Import does not exist " + imprts[i], imprts[i].exists());
-//		if (i == 0) {
-//			assertTrue("Import is not on demand " + imprts[i], imprts[i].isOnDemand());
-//			assertTrue("Import should be non-static " + imprts[i], imprts[i].getFlags() == Flags.AccDefault);
-//		} else {
-//			assertTrue("Import is on demand " + imprts[i], !imprts[i].isOnDemand());
-//			assertTrue("Import should be non-static " + imprts[i], imprts[i].getFlags() == Flags.AccDefault);
-//		}
-//		assertTrue("Container import does not equal import", container.getImport(imprts[i].getElementName()).equals(imprts[i]));
-//	}
-//
-//	assertTrue("Import container must exist and have children", container.exists() && container.hasChildren());
-//	ISourceRange containerRange= container.getSourceRange();
-//	assertEquals(
-//		"Offset container range not correct", 
-//		imprts[0].getSourceRange().getOffset(),
-//		containerRange.getOffset());
-//	assertEquals(
-//		"Length container range not correct",
-//		imprts[imprts.length-1].getSourceRange().getOffset() + imprts[imprts.length-1].getSourceRange().getLength(),
-//		containerRange.getOffset() + containerRange.getLength());
-//	assertSourceEquals("Source not correct", 
-//		"import p2.*;\n" +
-//		"import p3.Z;",
-//		container.getSource());
-//	
-//}
-/**
- * Ensure that type handles are returned from the
- * compilation unit for an inner type.
- */
-//public void testGetInnerTypes() throws JavaScriptModelException {
-//	IType type1 = cu.getType("X");
-//	assertTrue("X type should have children", type1.hasChildren());
-//	assertTrue("X type superclass name should be null", type1.getSuperclassName() == null);
-//	String[] superinterfaceNames= type1.getSuperInterfaceNames();
-//	assertEquals("X type should have one superinterface", 1, superinterfaceNames.length);
-//	assertEquals("Unexpected super interface name", "Runnable", superinterfaceNames[0]);
-//	assertEquals("Fully qualified name of the type is incorrect", "p.X", type1.getFullyQualifiedName());
-//	IType type2 = type1.getType("Inner");
-//	superinterfaceNames = type2.getSuperInterfaceNames();
-//	assertEquals("X$Inner type should not have a superinterface", 0, superinterfaceNames.length);
-//	assertEquals("Fully qualified name of the inner type is incorrect", "p.X$Inner", type2.getFullyQualifiedName());
-//	assertEquals("Declaring type of the inner type is incorrect", type1, type2.getDeclaringType());
-//	IType type3 = type2.getType("InnerInner");
-//	assertTrue("InnerInner type should not have children", !type3.hasChildren());
-//}
-/*
- * Ensures that the key for a top level type is correct
- */
-public void testGetKey1() {
-//	IType type = this.cu.getType("X");
-//	assertEquals("Lp/X;", type.getKey());
-	IField type = this.cu.getField("f2");
-	assertEquals("Up/X.js;.f2", type.getKey());
-}
-/*
- * Ensures that the key for a member type is correct
- */
-public void testGetKey2() {
-	IType type = this.cu.getType("X").getType("Inner");
-	assertEquals("Lp/X$Inner;", type.getKey());
-}
-/*
- * Ensures that the key for a secondary type is correct
- */
-public void testGetKey3() {
-	IType type = this.cu.getType("I");
-	assertEquals("Lp/X~I;", type.getKey());
-}
-/*
- * Ensures that the key for an anonymous type is correct
- */
-public void testGetKey4() {
-	IType type = this.cu.getType("X").getFunction("foo", new String[0]).getType("", 1);
-	assertEquals("Lp/X$1;", type.getKey());
-}
-/**
- * Ensures that a method has the correct return type, parameters and exceptions.
- */
-public void testGetMethod1() throws JavaScriptModelException {
-//	IType type = this.cu.getType("X");
-	IFunction foo = this.cu.getFunction("foo", new String[]{null});
-//	String[] exceptionTypes= foo.getExceptionTypes();
-//	assertEquals("Wrong number of exception types", 1, exceptionTypes.length);
-//	assertEquals("Unxepected exception type", "QIOException;", exceptionTypes[0]);
-//	assertEquals("Wrong return type", "V", foo.getReturnType());
-	String[] parameterNames = foo.getParameterNames();
-	assertEquals("Wrong number of parameter names", 1, parameterNames.length);
-	assertEquals("Unexpected parameter name", "y", parameterNames[0]);
-}
-///**
-// * Ensures that a method has the correct AccVarargs flag set.
-// */
-//public void testGetMethod2() throws JavaScriptModelException {
-//	IType type = this.cu.getType("X");
-//	IFunction method = type.getMethod("testIsVarArgs", new String[]{"QString;", "[QObject;"});
-//	assertTrue("Should have the AccVarargs flag set", Flags.isVarargs(method.getFlags()));
-//}
-///**
-// * Ensures that a constructor has the correct AccVarargs flag set.
-// * (regression test for bug 77422 [1.5] ArrayIndexOutOfBoundsException with vararg constructor of generic superclass)
-// */
-//public void testGetMethod3() throws JavaScriptModelException {
-//	IType type = this.cu.getType("X");
-//	IFunction method = type.getMethod("X", new String[]{"[QString;"});
-//	assertTrue("Should have the AccVarargs flag set", Flags.isVarargs(method.getFlags()));
-//}
-/**
- * Ensures that correct number of methods with the correct names and modifiers
- * exist in a type.
- */
-public void testGetMethods() throws JavaScriptModelException {
-//	IType type = this.cu.getType("X");
-	IFunction[] methods= this.cu.getFunctions();
-	String[] methodNames = new String[] {"foo", "bar", "fred", "fred2"};
-	String[] flags = new String[] {"public", "protected static", "private", "private"};
-	assertEquals("Wrong number of methods returned", methodNames.length, methods.length);
-	for (int i = 0; i < methods.length; i++) {
-		assertEquals("Incorrect name for the " + i + " method", methodNames[i], methods[i].getElementName());
-		int modifiers = methods[i].getFlags() & ~Flags.AccVarargs;
-//		String mod= Flags.toString(modifiers);
-//		assertEquals("Unexpected modifier for " + methods[i].getElementName(), flags[i], mod);
-		assertTrue("Method does not exist " + methods[i], methods[i].exists());
-	}
-}
-///**
-// * Ensures that correct modifiers are reported for a method in an interface.
-// */
-//public void testCheckInterfaceMethodModifiers() throws JavaScriptModelException {
-//	IType type = this.cu.getType("I");
-//	IFunction method = type.getMethod("run", new String[0]);
-//	String expectedModifiers = "";
-//	String modifiers = Flags.toString(method.getFlags() & ~Flags.AccVarargs);
-//	assertEquals("Expected modifier for " + method.getElementName(), expectedModifiers, modifiers);
-//}
-///*
-// * Ensures that IType#getSuperInterfaceTypeSignatures() is correct for a source type.
-// */
-//public void testGetSuperInterfaceTypeSignatures() throws JavaScriptModelException {
-//	IType type = this.cu.getType("Y");
-//	assertStringsEqual(
-//		"Unexpected signatures", 
-//		"QI2<QE;>;\n",
-//		type.getSuperInterfaceTypeSignatures());
-//}
-/**
- * Ensure that the same element is returned for the primary element of a
- * compilation unit.
- */
-public void testGetPrimary() {
-	IJavaScriptElement primary = this.cu.getPrimaryElement();
-	assertEquals("Primary element for a compilation unit should be the same", this.cu, primary);
-	primary = this.cu.getPrimary();
-	assertEquals("Primary for a compilation unit should be the same", this.cu, primary);
-	
-}
-///////*
-////// * Ensures that the occurrence count for an initializer is correct
-////// */
-//////public void testGetOccurrenceCount01() {
-//////	IInitializer initializer = this.cu.getType("X").getInitializer(2);
-//////	assertEquals("Unexpected occurrence count", 2, initializer.getOccurrenceCount());
-//////}
-/////*
-//// * Ensures that the occurrence count for an anonymous type is correct
-//// */
-////public void testGetOccurrenceCount02() {
-////	IType type = this.cu.getType("X").getMethod("foo", new String[]{"QY;"}).getType("", 3);
-////	assertEquals("Unexpected occurrence count", 3, type.getOccurrenceCount());
-////}
-///**
-// * Ensures that correct number of package declarations with the correct names
-// * exist a compilation unit.
-// */
-//public void testGetPackages() throws JavaScriptModelException {
-//	IPackageDeclaration[] packages = this.cu.getPackageDeclarations();
-//	String packageName = "p";
-//	assertEquals("Wrong number of packages returned", 1, packages.length);
-//	assertEquals("Wrong package declaration returned: ", packageName, packages[0].getElementName());
-//}
-/**
- * Ensure that type handles are returned from the
- * compilation unit.
- * Checks non-existant handle and existing handles.
- */
-public void testGetType() {
-	IField type = this.cu.getField("someType");
-	assertTrue("Type should not exist " + type, !type.exists());
-	
-	type = this.cu.getField("f2");
-	assertTrue("Type should exist " + type, type.exists());
-	
-//	type = this.cu.getType("I"); // secondary type
-//	assertTrue("Type should exist " + type, type.exists());
-}
-///**
-// * Ensures that correct number of types with the correct names and modifiers
-// * exist in a compilation unit.
-// */
-//public void testGetTypes() throws JavaScriptModelException {
-//	IType[] types = this.cu.getTypes();
-//	String[] typeNames = new String[] {"X", "I", "I2", "I3", "Y", "Colors", "Annot"};
-//	String[] flags = new String[] {"public", "", "", "", "", "", ""};
-//	boolean[] isClass = new boolean[] {true, false, false, false, true, false, false};
-//	boolean[] isInterface = new boolean[] {false, true, true, true, false, false, true};
-//	boolean[] isAnnotation = new boolean[] {false, false, false, false, false, false, true};
-//	boolean[] isEnum = new boolean[] {false, false, false, false, false, true, false};
-//	String[] superclassName = new String[] {null, null, null, null, null, null, null};
-//	String[] superclassType = new String[] {null, null, null, null, null, null, null};
-//	String[][] superInterfaceNames = new String[][] {
-//			new String[] {"Runnable"}, new String[0], new String[0], new String[0], new String[] {"I2<E>"}, new String[0], new String[0]
-//	};
-//	String[][] superInterfaceTypes = new String[][] {
-//			new String[] {"QRunnable;"}, new String[0], new String[0], new String[0], new String[] {"QI2<QE;>;"}, new String[0], new String[0]
-//	};
-//	String[][] formalTypeParameters = new String[][] {
-//		new String[0], new String[0], new String[] {"E"}, new String[0], new String[] {"E"}, new String[0], new String[0]
-//	};
-//	
-//	assertEquals("Wrong number of types returned", typeNames.length, types.length);
-//	for (int i = 0; i < types.length; i++) {
-//		assertEquals("Incorrect name for the " + i + " type", typeNames[i], types[i].getElementName());
-//		String mod= Flags.toString(types[i].getFlags());
-//		assertEquals("Unexpected modifier for " + types[i].getElementName(), flags[i], mod);
-//		assertTrue("Type does not exist " + types[i], types[i].exists());
-//		assertEquals("Incorrect isClass for the " + i + " type", isClass[i], types[i].isClass());
-//		assertEquals("Incorrect isInterface for the " + i + " type", isInterface[i], types[i].isInterface());
-//		assertEquals("Incorrect isAnnotation for the " + i + " type", isAnnotation[i], types[i].isAnnotation());
-//		assertEquals("Incorrect isEnum for the " + i + " type", isEnum[i], types[i].isEnum());
-//		assertEquals("Incorrect superclassName for the " + i + " type", superclassName[i], types[i].getSuperclassName());
-//		assertEquals("Incorrect superclassType for the " + i + " type", superclassType[i], types[i].getSuperclassTypeSignature());
-//		assertEquals("Incorrect superInterfaceNames for the " + i + " type", superInterfaceNames[i].length, types[i].getSuperInterfaceNames().length);
-//		assertEquals("Incorrect superInterfaceTypes for the " + i + " type", superInterfaceTypes[i].length, types[i].getSuperInterfaceTypeSignatures().length);
-//		assertEquals("Incorrect formalTypeParameters for the " + i + " type", formalTypeParameters[i].length, types[i].getTypeParameters().length);
-//	}
-//}
-/**
- * Ensures that a compilation unit has children.
- */
-public void testHasChildren() throws JavaScriptModelException {
-	this.cu.close();
-	assertTrue("A closed compilation unit should have children", this.cu.hasChildren());
-	this.cu.getChildren();
-	assertTrue("The compilation unit should have children", this.cu.hasChildren());
-}
-/**
- * Ensures that a compilation unit's resource has not changed.
- */
-public void testHasResourceChanged() {
-	assertTrue(
-		"A compilation unit's resource should not have changed", 
-		!this.cu.hasResourceChanged());
-}
-///*
-// * Ensures that hasChildren doesn't return true for an import container that doesn't exist
-// * (regression test for bug 76761 [model] ImportContainer.hasChildren() should not return true
-// */
-//public void testImportContainerHasChildren() throws JavaScriptModelException {
-//	IImportContainer importContainer = getCompilationUnit("/Test/DoesNotExist.js").getImportContainer();
-//	boolean gotException = false;
-//	try {
-//		importContainer.hasChildren();
-//	} catch (JavaScriptModelException e) {
-//		gotException = e.isDoesNotExist();
-//	}
-//	assertTrue("Should get a not present exception", gotException);
-//}
-///*
-// * Ensures that isEnumConstant returns true for a field representing an enum constant.
-// */
-//public void testIsEnumConstant1() throws JavaScriptModelException {
-//	IField field = this.cu.getType("Colors").getField("BLUE");
-//	assertTrue("Colors#BLUE should be an enum constant", field.isEnumConstant());
-//}
-///*
-// * Ensures that isEnumConstant returns false for a field that is not representing an enum constant.
-// */
-//public void testIsEnumConstant2() throws JavaScriptModelException {
-//	IField field = this.cu.getType("X").getField("f1");
-//	assertTrue("X#f1 should not be an enum constant", !field.isEnumConstant());
-//}
-/*
- * Ensure that the utility method Util.#getNameWithoutJavaLikeExtension(String) works as expected
- * (regression test for bug 107735 StringIndexOutOfBoundsException in Util.getNameWithoutJavaLikeExtension())
- */
-public void testNameWithoutJavaLikeExtension() {
-	String name = Util.getNameWithoutJavaLikeExtension("Test.aj");
-	assertEquals("Unepected name without extension", "Test.aj", name);
-}
-/**
- * Ensures that a compilation unit that does not exist responds
- * false to #exists() and #isOpen()
- */
-public void testNotPresent1() {
-	IJavaScriptUnit compilationUnit = ((IPackageFragment)this.cu.getParent()).getJavaScriptUnit("DoesNotExist.js");
-	assertTrue("CU should not be open", !compilationUnit.isOpen());
-	assertTrue("CU should not exist", !compilationUnit.exists());
-	assertTrue("CU should still not be open", !compilationUnit.isOpen());
-}
-///**
-// * Ensures that a compilation unit that does not exist
-// * (because it is a child of a jar package fragment)
-// * responds false to #exists() and #isOpen()
-// * (regression test for PR #1G2RKD2)
-// */
-//public void testNotPresent2() throws CoreException {
-//	IJavaScriptUnit compilationUnit = getPackageFragment("P", getExternalJCLPathString(), "java.lang").getCompilationUnit("DoesNotExist.js");
-//	assertTrue("CU should not be open", !compilationUnit.isOpen());
-//	assertTrue("CU should not exist", !compilationUnit.exists());
-//	assertTrue("CU should still not be open", !compilationUnit.isOpen());
-//}
-
-/*
- * Ensure that the absence of visibility flags is correctly reported as package default
- * (regression test fo bug 127213 Flags class missing methods)
- */
-public void testPackageDefaultFlag1() throws JavaScriptModelException {
-	IField field = this.cu.getField("f4");
-	assertTrue("X#f4 should be package default", Flags.isPackageDefault(field.getFlags()));
-}
-
-///*
-// * Ensure that the presence of a visibility flags is correctly reported as non package default
-// * (regression test fo bug 127213 Flags class missing methods)
-// */
-//public void testPackageDefaultFlag2() throws JavaScriptModelException {
-//	IType type = this.cu.getType("X");
-//	assertTrue("X should not be package default", !Flags.isPackageDefault(type.getFlags()));
-//}
-
-/*
- * Ensure that the presence of a visibility flags as well as the deprecated flag is correctly reported as non package default
- * (regression test fo bug 127213 Flags class missing methods)
- */
-public void testPackageDefaultFlag3() throws JavaScriptModelException {
-	IField field = this.cu.getType("X").getField("f2");
-	assertTrue("X#f2 should not be package default", !Flags.isPackageDefault(field.getFlags()));
-}
-
-/*
- * Ensure that the absence of a visibility flags and the presence of the deprecated flag is correctly reported as package default
- * (regression test fo bug 127213 Flags class missing methods)
- */
-public void testPackageDefaultFlag4() throws JavaScriptModelException {
-	IType type = this.cu.getType("I");
-	assertTrue("X should be package default", Flags.isPackageDefault(type.getFlags()));
-}
-
-/**
- * Ensures that the "structure is known" flag is set for a valid compilation unit. 
- */
-public void testStructureKnownForCU() throws JavaScriptModelException {
-	assertTrue("Structure is unknown for valid CU", this.cu.isStructureKnown());
-}
-/**
- *  Ensures that the "structure is unknown" flag is set for a non valid compilation unit. 
- */
-public void testStructureUnknownForCU() throws CoreException {
-	try {
-		this.createFile(
-			"/P/src/p/Invalid.js",
-			"@#D(03");
-		IJavaScriptUnit badCU = getCompilationUnit("/P/src/p/Invalid.js");
-		assertTrue("Structure is known for an invalid CU", !badCU.isStructureKnown());
-	} finally {
-		this.deleteFile("/P/src/p/Invalid.js");
-	}
-}
-
-///*
-// * Ensure that the super flags is correctly reported
-// * (regression test fo bug 127213 Flags class missing methods)
-// */
-//public void testSuperFlag1() throws JavaScriptModelException {
-//	assertTrue("Should contain super flag", Flags.isSuper(Flags.AccSuper));
-//}
-//
-///*
-// * Ensure that the super flags is correctly reported
-// * (regression test fo bug 127213 Flags class missing methods)
-// */
-//public void testSuperFlag2() throws JavaScriptModelException {
-//	assertTrue("Should not contain super flag", !Flags.isSuper(Flags.AccDefault));
-//}
-
-///*
-// * Verify fix for bug 73884: [1.5] Unexpected error for class implementing generic interface
-// * (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=73884)
-// */
-//public void testBug73884() throws CoreException {
-//	try {
-//		String cuSource = 
-//			"package p;\n" +
-//			"public interface I<T> {\n" +
-//			"}";
-//		createFile("/P/src/p/I.js", cuSource);
-//		ITypeParameter[] typeParameters = getCompilationUnit("/P/src/p/I.js").getType("I").getTypeParameters();
-//		assertTypeParametersEqual(
-//			"T\n",
-//			typeParameters);
-//	} finally {
-//		deleteFile("/P/src/p/I.js");
-//	}
-//}
-
-///*
-// * Ensure that the type parameters for a type are correct.
-// */
-//public void testTypeParameter1() throws CoreException {
-//	createWorkingCopy(
-//		"package p;\n" +
-//		"public class Y<T> {\n" +
-//		"}"
-//	);
-//	ITypeParameter[] typeParameters = workingCopy.getType("Y").getTypeParameters();
-//	assertTypeParametersEqual(
-//		"T\n",
-//		typeParameters);
-//}
-//
-///*
-// * Ensure that the type parameters for a type are correct.
-// */
-//public void testTypeParameter2() throws CoreException {
-//	createWorkingCopy(
-//		"package p;\n" +
-//		"public class Y<T, U> {\n" +
-//		"}"
-//	);
-//	ITypeParameter[] typeParameters = workingCopy.getType("Y").getTypeParameters();
-//	assertTypeParametersEqual(
-//		"T\n" +
-//		"U\n",
-//		typeParameters);
-//}
-//
-///*
-// * Ensure that the type parameters for a type are correct.
-// */
-//public void testTypeParameter3() throws CoreException {
-//	createWorkingCopy(
-//		"package p;\n" +
-//		"public class Y<T extends List> {\n" +
-//		"}"
-//	);
-//	ITypeParameter[] typeParameters = workingCopy.getType("Y").getTypeParameters();
-//	assertTypeParametersEqual(
-//		"T extends List\n",
-//		typeParameters);
-//}
-//
-///*
-// * Ensure that the type parameters for a type are correct.
-// */
-//public void testTypeParameter4() throws CoreException {
-//	createWorkingCopy(
-//		"package p;\n" +
-//		"public class Y<T extends List & Runnable & Comparable> {\n" +
-//		"}"
-//	);
-//	ITypeParameter[] typeParameters = workingCopy.getType("Y").getTypeParameters();
-//	assertTypeParametersEqual(
-//		"T extends List & Runnable & Comparable\n",
-//		typeParameters);
-//}
-//
-///*
-// * Ensure that the type parameters for a method are correct.
-// * (regression test for bug 75658 [1.5] SourceElementParser do not compute correctly bounds of type parameter)
-// */
-//public void testTypeParameter5() throws CoreException {
-//	createWorkingCopy(
-//		"package p;\n" +
-//		"public class Y {\n" +
-//		"  <T extends List, U extends X & Runnable> void foo() {\n" +
-//		"  }\n" +
-//		"}"
-//	);
-//	ITypeParameter[] typeParameters = workingCopy.getType("Y").getMethod("foo", new String[]{}).getTypeParameters();
-//	assertTypeParametersEqual(
-//		"T extends List\n" + 
-//		"U extends X & Runnable\n",
-//		typeParameters);
-//}
-//
-///*
-// * Verify fix for bug 78275: [recovery] NPE in GoToNextPreviousMemberAction with syntax error
-// * (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=78275)
-// */
-//public void testBug78275() throws CoreException {
-//	try {
-//		String cuSource = 
-//			"	function a() {\n" + 
-//			"	     }\n" + 
-//			"	}\n" + 
-//			"	function m() {}\n" + 
-//			"";
-//		createFile("/P/src/X.js", cuSource);
-//		IType type = getCompilationUnit("/P/src/X.js").getType("X");
-//		IInitializer[] initializers = type.getInitializers();
-//		assertEquals("Invalid number of initializers", 1, initializers.length);
-//		assertTrue("Invalid length for initializer", initializers[0].getSourceRange().getLength() > 0);
-//	} finally {
-//		deleteFile("/P/src/X.js");
-//	}
-//}
-public void test110172() throws CoreException {
-	try {
-		String source =
-			"	 /**\n" +
-			"	  * Javadoc for field f \n" +
-			"	  */\n" +
-			"	var f;\n" +
-			"	\n" +
-			"	/**\n" +
-			"	 * Javadoc for method foo\n" +
-			"	 */\n" +
-			"	function foo( i,  l,  s) {\n" +
-			"	}\n" +
-			"	\n" +
-			"	/**\n" +
-			"	 * Javadoc for member type A\n" +
-			"	 */\n" +
-			"	\n" +
-			"	/**\n" +
-			"	 * Javadoc for f3\n" +
-			"	 */\n" +
-			"	/*\n" +
-			"	 * Not a javadoc comment\n" +
-			"	 */\n" +
-			"	/**\n" +
-			"	 * Real javadoc for f3\n" +
-			"	 */\n" +
-			"	var f3;\n" +
-			"	\n" +
-			"	var f2;\n" +
-			"	\n" +
-			"	function foo2() {\n" +
-			"	}\n" +
-			"	\n" +
-			"\n" +
-			"";
-		createFile("/P/src/X.js", source);
-//		IType type = getCompilationUnit("/P/src/X.js").getType("X");
-		IJavaScriptElement[] members = getCompilationUnit("/P/src/X.js").getChildren();
-		final int length = members.length;
-		assertEquals("Wrong number", 5, length);
-		for (int i = 0; i < length; i++) {
-			final IJavaScriptElement element = members[i];
-			assertTrue(element instanceof IMember);
-			final ISourceRange javadocRange = ((IMember) element).getJSdocRange();
-			final String elementName = element.getElementName();
-			if ("f".equals(elementName)) {
-				assertNotNull("No javadoc source range", javadocRange);
-				final int start = javadocRange.getOffset();
-				final int end = javadocRange.getLength() + start - 1;
-				String javadocSource = source.substring(start, end);
-				assertTrue("Wrong javadoc", javadocSource.indexOf("field f") != -1);
-			} else if ("foo".equals(elementName)) {
-				assertNotNull("No javadoc source range", javadocRange);
-				final int start = javadocRange.getOffset();
-				final int end = javadocRange.getLength() + start - 1;
-				String javadocSource = source.substring(start, end);
-				assertTrue("Wrong javadoc", javadocSource.indexOf("method foo") != -1);
-			} else if ("A".equals(elementName)) {
-				assertNotNull("No javadoc source range", javadocRange);
-				final int start = javadocRange.getOffset();
-				final int end = javadocRange.getLength() + start - 1;
-				String javadocSource = source.substring(start, end);
-				assertTrue("Wrong javadoc", javadocSource.indexOf("member type A") != -1);
-			} else if ("X".equals(elementName)) {
-				// need treatment for the two constructors
-				assertTrue("Not an IFunction", element instanceof IFunction);
-				IFunction method = (IFunction) element;
-				switch(method.getNumberOfParameters()) {
-					case 0 :
-						assertNull("Has a javadoc source range", javadocRange);
-						break;
-					case 1:
-						assertNotNull("No javadoc source range", javadocRange);
-						final int start = javadocRange.getOffset();
-						final int end = javadocRange.getLength() + start - 1;
-						String javadocSource = source.substring(start, end);
-						assertTrue("Wrong javadoc", javadocSource.indexOf("constructor") != -1);
-				}
-			} else if ("f3".equals(elementName)) {
-				assertNotNull("No javadoc source range", javadocRange);
-				final int start = javadocRange.getOffset();
-				final int end = javadocRange.getLength() + start - 1;
-				String javadocSource = source.substring(start, end);
-				assertTrue("Wrong javadoc", javadocSource.indexOf("Real") != -1);
-			} else if ("f2".equals(elementName)) {
-				assertNull("Has a javadoc source range", javadocRange);
-			} else if ("foo2".equals(elementName)) {
-				assertNull("Has a javadoc source range", javadocRange);
-			} else if ("B".equals(elementName)) {
-				assertNull("Has a javadoc source range", javadocRange);
-			} else if (element instanceof IInitializer) {
-				IInitializer initializer = (IInitializer) element;
-				if (Flags.isStatic(initializer.getFlags())) {
-					assertNotNull("No javadoc source range", javadocRange);
-					final int start = javadocRange.getOffset();
-					final int end = javadocRange.getLength() + start - 1;
-					String javadocSource = source.substring(start, end);
-					assertTrue("Wrong javadoc", javadocSource.indexOf("initializer") != -1);
-				} else {
-					assertNull("Has a javadoc source range", javadocRange);
-				}
-			}
-		}
-	} finally {
-		deleteFile("/P/src/X.js");
-	}
-}
-public void test120902() throws CoreException {
-	try {
-		String source =
-			"/**\r\n" + 
-			" * Toy\r\n" + 
-			" */\r\n" + 
-			"function foo() {\r\n" +
-			"}";
-		createFile("/P/src/X.js", source);
-		final IJavaScriptUnit compilationUnit = getCompilationUnit("/P/src/X.js");
-		IFunction type = compilationUnit.getFunction("foo",null);
-		ISourceRange javadocRange = type.getJSdocRange();
-		assertNotNull("No source range", javadocRange);
-		compilationUnit.getBuffer().setContents("");
-		try {
-			javadocRange = type.getJSdocRange();
-			assertNull("Got a source range", javadocRange);
-		} catch (ArrayIndexOutOfBoundsException e) {
-			assertFalse("Should not happen", true);
-		}		
-	} finally {
-		deleteFile("/P/src/X.js");
-	}
-}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionContextTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionContextTests.java
deleted file mode 100644
index e76d77b..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionContextTests.java
+++ /dev/null
@@ -1,3385 +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.jsdt.core.tests.model;
-
-
-import org.eclipse.wst.jsdt.internal.codeassist.RelevanceConstants;
-import org.eclipse.wst.jsdt.core.*;
-
-import junit.framework.*;
-
-public class CompletionContextTests extends AbstractJavaModelCompletionTests implements RelevanceConstants {
-
-public CompletionContextTests(String name) {
-	super(name);
-}
-public void setUpSuite() throws Exception {
-	if (COMPLETION_PROJECT == null)  {
-		COMPLETION_PROJECT = setUpJavaProject("Completion", "1.4");
-	} else {
-		setUpProjectCompliance(COMPLETION_PROJECT, "1.4");
-	}
-	super.setUpSuite();
-}
-
-public static Test suite() {
-	return buildModelTestSuite(CompletionContextTests.class);
-}
-public void test0001() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0001/X.js",
-		"function X(){\n" + 
-		"  ZZZZ\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0002() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0002/X.js",
-		"function X() {\n" + 
-		"  ZZZZ\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0003() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0003/X.js",
-		"function X() {\n" + 
-		"  ZZZZ\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0004() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0004/X.js",
-		"function X() {\n" + 
-		"  /**/\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("/**/") + "/**/".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("/**/") + "/**/".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-//public void test0005() throws JavaScriptModelException {
-//	this.workingCopies = new IJavaScriptUnit[1];
-//	this.workingCopies[0] = getWorkingCopy(
-//		"/Completion/src3/test0005/X.js",
-//		"package test0005;\n" + 
-//		"public class X {\n" + 
-//		"  ZZZZ foo()\n" + 
-//		"}");
-//	
-//	String str = this.workingCopies[0].getSource();
-//	int tokenStart = str.lastIndexOf("ZZZZ");
-//	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-//	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-//
-//	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-//
-//	assertResults(
-//		"completion offset="+(cursorLocation)+"\n" +
-//		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-//		"completion token=\"ZZZZ\"\n" +
-//		"completion token kind=TOKEN_KIND_NAME\n" +
-//		"expectedTypesSignatures=null\n" +
-//		"expectedTypesKeys=null",
-//		result.context);
-//}
-//public void test0006() throws JavaScriptModelException {
-//	this.workingCopies = new IJavaScriptUnit[1];
-//	this.workingCopies[0] = getWorkingCopy(
-//		"/Completion/src3/test0006/X.js",
-//		"package test0006;\n" + 
-//		"public class X {\n" + 
-//		"  ZZZZ foo()\n" + 
-//		"}");
-//	
-//	String str = this.workingCopies[0].getSource();
-//	int tokenStart = str.lastIndexOf("ZZZZ");
-//	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-//	int cursorLocation = str.lastIndexOf("ZZZZ");
-//
-//	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-//
-//	assertResults(
-//		"completion offset="+(cursorLocation)+"\n" +
-//		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-//		"completion token=\"\"\n" +
-//		"completion token kind=TOKEN_KIND_NAME\n" +
-//		"expectedTypesSignatures=null\n" +
-//		"expectedTypesKeys=null",
-//		result.context);
-//}
-//public void test0007() throws JavaScriptModelException {
-//	this.workingCopies = new IJavaScriptUnit[1];
-//	this.workingCopies[0] = getWorkingCopy(
-//		"/Completion/src3/test0007/X.js",
-//		"package test0007;\n" + 
-//		"public class X {\n" + 
-//		"  ZZZZ foo()\n" + 
-//		"}");
-//	
-//	String str = this.workingCopies[0].getSource();
-//	int tokenStart = str.lastIndexOf("ZZZZ");
-//	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-//	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-//
-//	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-//	
-//	assertResults(
-//		"completion offset="+(cursorLocation)+"\n" +
-//		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-//		"completion token=\"ZZ\"\n" +
-//		"completion token kind=TOKEN_KIND_NAME\n" +
-//		"expectedTypesSignatures=null\n" +
-//		"expectedTypesKeys=null",
-//		result.context);
-//}
-public void test0008() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0008/X.js",
-		"  /**/ function foo()\n" + 
-		"");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("/**/") + "/**/".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("/**/") + "/**/".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-//public void test0009() throws JavaScriptModelException {
-//	this.workingCopies = new IJavaScriptUnit[1];
-//	this.workingCopies[0] = getWorkingCopy(
-//		"/Completion/src3/test0009/X.js",
-//		"package test0009;\n" + 
-//		"public class X {\n" + 
-//		"  void foo() {\n" + 
-//		"    ZZZZ\n" + 
-//		"  }\n" + 
-//		"}");
-//	
-//	String str = this.workingCopies[0].getSource();
-//	int tokenStart = str.lastIndexOf("ZZZZ");
-//	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-//	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-//
-//	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-//
-//	assertResults(
-//		"completion offset="+(cursorLocation)+"\n" +
-//		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-//		"completion token=\"ZZZZ\"\n" +
-//		"completion token kind=TOKEN_KIND_NAME\n" +
-//		"expectedTypesSignatures=null\n" +
-//		"expectedTypesKeys=null",
-//		result.context);
-//}
-public void test0010() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0010/X.js",
-		"package test0010;\n" + 
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0011() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0011/X.js",
-		"package test0011;\n" + 
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0012() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0012/X.js",
-		"package test0012;\n" + 
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    /**/\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("/**/") + "/**/".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("/**/") + "/**/".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0013() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0013/X.js",
-		"package test0013;\n" + 
-		"public class X extends ZZZZ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0014() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0014/X.js",
-		"package test0014;\n" + 
-		"public class X extends ZZZZ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0015() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0015/X.js",
-		"package test0015;\n" + 
-		"public class X extends ZZZZ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0016() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0016/X.js",
-		"package test0016;\n" + 
-		"public class X extends /**/ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("/**/") + "/**/".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("/**/") + "/**/".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0017() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src3/test0017/YYYY.js",
-		"package test0017;\n" + 
-		"public class YYYY {\n" + 
-		"  public class ZZZZ {\n" + 
-		"  }\n" + 
-		"}");
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0017/X.js",
-		"package test0017;\n" + 
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    YYYY.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0018() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src3/test0018/YYYY.js",
-		"package test0018;\n" + 
-		"public class YYYY {\n" + 
-		"  public class ZZZZ {\n" + 
-		"  }\n" + 
-		"}");
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0018/X.js",
-		"package test0018;\n" + 
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    YYYY.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0019() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src3/test0019/YYYY.js",
-		"package test0019;\n" + 
-		"public class YYYY {\n" + 
-		"  public class ZZZZ {\n" + 
-		"  }\n" + 
-		"}");
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0019/X.js",
-		"package test0019;\n" + 
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    YYYY.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0020() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src3/test0020/YYYY.js",
-		"package test0020;\n" + 
-		"public class YYYY {\n" + 
-		"  public class ZZZZ {\n" + 
-		"  }\n" + 
-		"}");
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0020/X.js",
-		"package test0020;\n" + 
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    YYYY.\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("YYYY.") + "YYYY.".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("YYYY.") + "YYYY.".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0021() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0021/X.js",
-		"package test0021;\n" + 
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    test0021.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0022() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0022/X.js",
-		"package test0022;\n" + 
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    test0022.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0023() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0023/X.js",
-		"package test0023;\n" + 
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    test0023.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0024() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0024/X.js",
-		"package test0024;\n" + 
-		"public class X {\n" + 
-		"  void foo() {\n" + 
-		"    test0024.\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("test0024.") + "test0024.".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("test0024.") + "test0024.".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0025() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0025/X.js",
-		"package test0025;\n" + 
-		"public class X {\n" + 
-		"  Object var;\n" + 
-		"  void foo() {\n" + 
-		"    var.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0026() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0026/X.js",
-		"package test0026;\n" + 
-		"public class X {\n" + 
-		"  Object var;\n" + 
-		"  void foo() {\n" + 
-		"    var.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0027() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0027/X.js",
-		"package test0027;\n" + 
-		"public class X {\n" + 
-		"  Object var;\n" + 
-		"  void foo() {\n" + 
-		"    var.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0028() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0028/X.js",
-		"package test0028;\n" + 
-		"public class X {\n" + 
-		"  Object var;\n" + 
-		"  void foo() {\n" + 
-		"    var.\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("var.") + "var.".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("var.") + "var.".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0029() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src3/test0029/YYYY.js",
-		"package test0029;\n" + 
-		"public class YYYY {\n" + 
-		"  public class ZZZZ {\n" + 
-		"  }\n" + 
-		"}");
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0029/X.js",
-		"package test0029;\n" + 
-		"public class X extends YYYY.ZZZZ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0030() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src3/test0030/YYYY.js",
-		"package test0030;\n" + 
-		"public class YYYY {\n" + 
-		"  public class ZZZZ {\n" + 
-		"  }\n" + 
-		"}");
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0030/X.js",
-		"package test0030;\n" + 
-		"public class X extends YYYY.ZZZZ {\n" + 
-		"}");
-	
-	
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0031() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src3/test0031/YYYY.js",
-		"package test0031;\n" + 
-		"public class YYYY {\n" + 
-		"  public class ZZZZ {\n" + 
-		"  }\n" + 
-		"}");
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0031/X.js",
-		"package test0031;\n" + 
-		"public class X extends YYYY.ZZZZ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0032() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src3/test0032/YYYY.js",
-		"package test0032;\n" + 
-		"public class YYYY {\n" + 
-		"  public class ZZZZ {\n" + 
-		"  }\n" + 
-		"}");
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0032/X.js",
-		"package test0032;\n" + 
-		"public class X extends YYYY. {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("YYYY.") + "YYYY.".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("YYYY.") + "YYYY.".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0033() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0033/X.js",
-		"package test0033;\n" + 
-		"public class X extends test0033.ZZZZ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0034() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0034/X.js",
-		"package test0034;\n" + 
-		"public class X extends test0034.ZZZZ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0035() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0035/X.js",
-		"package test0035;\n" + 
-		"public class X extends test0035.ZZZZ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0036() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0036/X.js",
-		"package test0036;\n" + 
-		"public class X extends test0036. {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("test0036.") + "test0036.".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("test0036.") + "test0036.".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0037() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0037/X.js",
-		"package test0037;\n" + 
-		"public class X {\n" + 
-		"  X ZZZZ;\n" + 
-		"  X foo(){\n" + 
-		"    foo().ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0038() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0038/X.js",
-		"package test0038;\n" + 
-		"public class X {\n" + 
-		"  X ZZZZ;\n" + 
-		"  X foo(){\n" + 
-		"    foo().ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0039() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0039/X.js",
-		"package test0039;\n" + 
-		"public class X {\n" + 
-		"  X ZZZZ;\n" + 
-		"  X foo(){\n" + 
-		"    foo().ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0040() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0040/X.js",
-		"package test0040;\n" + 
-		"public class X {\n" + 
-		"  X ZZZZ;\n" + 
-		"  X foo(){\n" + 
-		"    foo().\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("foo().") + "foo().".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("foo().") + "foo().".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0041() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0041/X.js",
-		"package test0041;\n" + 
-		"public class X {\n" + 
-		"  X ZZZZ;\n" + 
-		"  X foo(){\n" + 
-		"    int.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0042() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0042/X.js",
-		"package test0042;\n" + 
-		"public class X {\n" + 
-		"  X ZZZZ;\n" + 
-		"  X foo(){\n" + 
-		"    int.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0043() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0043/X.js",
-		"package test0043;\n" + 
-		"public class X {\n" + 
-		"  X ZZZZ;\n" + 
-		"  X foo(){\n" + 
-		"    int.ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0044() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0044/X.js",
-		"package test0044;\n" + 
-		"public class X {\n" + 
-		"  X ZZZZ;\n" + 
-		"  X foo(){\n" + 
-		"    int.\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("int.") + "int.".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("int.") + "int.".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0045() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0045/X.js",
-		"package test0045;\n" + 
-		"public class X {\n" + 
-		"  void ZZZZ(){\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0046() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0046/X.js",
-		"package test0046;\n" + 
-		"public class X {\n" + 
-		"  void ZZZZ(){\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0047() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0047/X.js",
-		"package test0047;\n" + 
-		"public class X {\n" + 
-		"  void ZZZZ(){\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0048() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0048/X.js",
-		"package test0048;\n" + 
-		"public class X {\n" + 
-		"  void (){\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("void ") + "void ".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("void ") + "void ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0049() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0049/X.js",
-		"package test0049;\n" + 
-		"public class X {\n" + 
-		"  int ZZZZ;\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0050() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0050/X.js",
-		"package test0050;\n" + 
-		"public class X {\n" + 
-		"  int ZZZZ;\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0051() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0051/X.js",
-		"package test0051;\n" + 
-		"public class X {\n" + 
-		"  int ZZZZ;\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0052() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0052/X.js",
-		"package test0052;\n" + 
-		"public class X {\n" + 
-		"  int ;\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("int ") + "int ".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("int ") + "int ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0053() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0053/X.js",
-		"package test0053;\n" + 
-		"public class X {\n" + 
-		"  {int ZZZZ;}\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0054() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0054/X.js",
-		"package test0054;\n" + 
-		"public class X {\n" + 
-		"  {int ZZZZ;}\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0055() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0055/X.js",
-		"package test0055;\n" + 
-		"public class X {\n" + 
-		"  {int ZZZZ;}\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0056() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0056/X.js",
-		"package test0056;\n" + 
-		"public class X {\n" + 
-		"  {int ;}\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("int ") + "int ".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("int ") + "int ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0057() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0057/X.js",
-		"package test0057;\n" + 
-		"public class X {\n" + 
-		"  void foo(int ZZZZ){}\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0058() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0058/X.js",
-		"package test0058;\n" + 
-		"public class X {\n" + 
-		"  void foo(int ZZZZ){}\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0059() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0059/X.js",
-		"package test0059;\n" + 
-		"public class X {\n" + 
-		"  void foo(int ZZZZ){}\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0060() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0060/X.js",
-		"package test0060;\n" + 
-		"public class X {\n" + 
-		"  void foo(int ){}\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("int ") + "int ".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("int ") + "int ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0061() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0061/X.js",
-		"package test0061;\n" + 
-		"public class X ZZZZ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0062() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0062/X.js",
-		"package test0062;\n" + 
-		"public class X ZZZZ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0063() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0063/X.js",
-		"package test0063;\n" + 
-		"public class X ZZZZ {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0064() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0064/X.js",
-		"package test0064;\n" + 
-		"public class X  {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("X ") + "X ".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("X ") + "X ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0065() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0065/X.js",
-		"package test0065;\n" + 
-		"ZZZZ\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0066() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0066/X.js",
-		"package test0066;\n" + 
-		"ZZZZ\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0067() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0067/X.js",
-		"package test0067;\n" + 
-		"ZZZZ\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0068() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0068/X.js",
-		"package test0068;\n" + 
-		"/**/\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("/**/") + "/**/".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("/**/") + "/**/".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0069() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0069/X.js",
-		"package test0069;\n" + 
-		"public class X {\n" + 
-		"  {\n" + 
-		"    do{\n" + 
-		"    } ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0070() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0070/X.js",
-		"package test0070;\n" + 
-		"public class X {\n" + 
-		"  {\n" + 
-		"    do{\n" + 
-		"    } ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0071() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0071/X.js",
-		"package test0071;\n" + 
-		"public class X {\n" + 
-		"  {\n" + 
-		"    do{\n" + 
-		"    } ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0072() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0072/X.js",
-		"package test0072;\n" + 
-		"public class X {\n" + 
-		"  {\n" + 
-		"    do{\n" + 
-		"    }/**/ \n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("/**/ ") + "/**/ ".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("/**/ ") + "/**/ ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0073() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0073/X.js",
-		"package ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0074() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0074/X.js",
-		"package ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0075() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0075/X.js",
-		"package ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0076() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0076/X.js",
-		"package \n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("package ") + "package ".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("package ") + "package ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0077() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0077/test/X.js",
-		"package test0077.ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0078() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0078/test/X.js",
-		"package test0078.ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0079() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0079/test/X.js",
-		"package test0079.ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0080() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0080/test/X.js",
-		"package test0080.\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("test0080.") + "test0080.".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("test0080.") + "test0080.".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0081() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0081/X.js",
-		"package test0081;\n" + 
-		"import ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0082() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0082/X.js",
-		"package test0082;\n" + 
-		"import ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0083() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0083/X.js",
-		"package test0083;\n" + 
-		"import ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0084() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0084/X.js",
-		"package test0084;\n" + 
-		"import \n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("import ") + "import ".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("import ") + "import ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0085() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0085/test/X.js",
-		"package test0085;\n" + 
-		"import test0085.ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0086() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0086/test/X.js",
-		"package test0086;\n" + 
-		"import test0086.ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0087() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0087/test/X.js",
-		"package test0087;\n" + 
-		"import test0087.ZZZZ;\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0088() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0084/test/X.js",
-		"package test0088;\n" + 
-		"import test0085.\n" + 
-		"public class X {\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("test0085.") + "test0085.".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("test0085.") + "test0085.".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0089() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0089/X.js",
-		"package test0089;\n" + 
-		"public class X {\n" + 
-		"  void foo(int a, int b) {\n" + 
-		"    this.foo(ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={I}\n" +
-		"expectedTypesKeys={I}",
-		result.context);
-}
-public void test0090() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0090/X.js",
-		"package test0090;\n" + 
-		"public class X {\n" + 
-		"  void foo(int a, int b) {\n" + 
-		"    this.foo(ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0091() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0091/X.js",
-		"package test0091;\n" + 
-		"public class X {\n" + 
-		"  void foo(int a, int b) {\n" + 
-		"    this.foo(ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={I}\n" +
-		"expectedTypesKeys={I}",
-		result.context);
-}
-public void test0092() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0092/X.js",
-		"package test0092;\n" + 
-		"public class X {\n" + 
-		"  void foo(int a, int b) {\n" + 
-		"    this.foo(\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("this.foo(") + "this.foo(".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("this.foo(") + "this.foo(".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0093() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0093/X.js",
-		"package test0093;\n" + 
-		"public class X {\n" + 
-		"  void foo(int a, int b) {\n" + 
-		"    this.foo(0,ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={I}\n" +
-		"expectedTypesKeys={I}",
-		result.context);
-}
-public void test0094() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0094/X.js",
-		"package test0094;\n" + 
-		"public class X {\n" + 
-		"  void foo(int a, int b) {\n" + 
-		"    this.foo(0,ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0095() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0095/X.js",
-		"package test0095;\n" + 
-		"public class X {\n" + 
-		"  void foo(int a, int b) {\n" + 
-		"    this.foo(0,ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={I}\n" +
-		"expectedTypesKeys={I}",
-		result.context);
-}
-public void test0096() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0096/X.js",
-		"package test0096;\n" + 
-		"public class X {\n" + 
-		"  void foo(int a, int b) {\n" + 
-		"    this.foo(0,\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("this.foo(0,") + "this.foo(0,".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("this.foo(0,") + "this.foo(0,".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0097() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0097/X.js",
-		"package test0097;\n" + 
-		"public class X {\n" + 
-		"  X(int a, int b) {}\n" +
-		"  void foo(int a, int b) {\n" + 
-		"    new X(ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={I}\n" +
-		"expectedTypesKeys={I}",
-		result.context);
-}
-public void test0098() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0098/X.js",
-		"package test0098;\n" + 
-		"public class X {\n" + 
-		"  X(int a, int b) {}\n" +
-		"  void foo(int a, int b) {\n" + 
-		"    new X(ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0099() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0099/X.js",
-		"package test0099;\n" + 
-		"public class X {\n" + 
-		"  X(int a, int b) {}\n" +
-		"  void foo(int a, int b) {\n" + 
-		"    new X(ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={I}\n" +
-		"expectedTypesKeys={I}",
-		result.context);
-}
-public void test0100() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0100/X.js",
-		"package test0100;\n" + 
-		"public class X {\n" + 
-		"  X(int a, int b) {}\n" +
-		"  void foo(int a, int b) {\n" + 
-		"    new X(\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("new X(") + "new X(".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("new X(") + "new X(".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0101() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0101/X.js",
-		"package test0101;\n" + 
-		"public class X {\n" + 
-		"  X(int a, int b) {}\n" +
-		"  void foo(int a, int b) {\n" + 
-		"    new X(0,ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={I}\n" +
-		"expectedTypesKeys={I}",
-		result.context);
-}
-public void test0102() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0102/X.js",
-		"package test0102;\n" + 
-		"public class X {\n" + 
-		"  X(int a, int b) {}\n" +
-		"  void foo(int a, int b) {\n" + 
-		"    new X(0,ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0103() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0103/X.js",
-		"package test0103;\n" + 
-		"public class X {\n" + 
-		"  X(int a, int b) {}\n" +
-		"  void foo(int a, int b) {\n" + 
-		"    new X(0,ZZZZ\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={I}\n" +
-		"expectedTypesKeys={I}",
-		result.context);
-}
-public void test0104() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0104/X.js",
-		"package test0104;\n" + 
-		"public class X {\n" + 
-		"  X(int a, int b) {}\n" +
-		"  void foo(int a, int b) {\n" + 
-		"    new X(0,\n" + 
-		"  }\n" + 
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("new X(0,") + "new X(0,".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("new X(0,") + "new X(0,".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0105() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0105/X.js",
-		"package test0105;\n" + 
-		"public class X {\n" + 
-		"  Object o = ZZZZ\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={Ljava.lang.Object;}\n" +
-		"expectedTypesKeys={Ljava/lang/Object;}",
-		result.context);
-}
-public void test0106() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0106/X.js",
-		"package test0106;\n" + 
-		"public class X {\n" + 
-		"  Object o = ZZZZ\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={Ljava.lang.Object;}\n" +
-		"expectedTypesKeys={Ljava/lang/Object;}",
-		result.context);
-}
-public void test0107() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0107/X.js",
-		"package test0107;\n" + 
-		"public class X {\n" + 
-		"  Object o = ZZZZ\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={Ljava.lang.Object;}\n" +
-		"expectedTypesKeys={Ljava/lang/Object;}",
-		result.context);
-}
-public void test0108() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0108/X.js",
-		"package test0108;\n" + 
-		"public class X {\n" + 
-		"  Object o = \n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("Object o = ") + "Object o = ".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("Object o = ") + "Object o = ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={Ljava.lang.Object;}\n" +
-		"expectedTypesKeys={Ljava/lang/Object;}",
-		result.context);
-}
-public void test0109() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0109/X.js",
-		"package test0109;\n" + 
-		"public class X {\n" + 
-		"  Object o = new ZZZZ\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={Ljava.lang.Object;}\n" +
-		"expectedTypesKeys={Ljava/lang/Object;}",
-		result.context);
-}
-public void test0110() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0110/X.js",
-		"package test0110;\n" + 
-		"public class X {\n" + 
-		"  Object o = new ZZZZ\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={Ljava.lang.Object;}\n" +
-		"expectedTypesKeys={Ljava/lang/Object;}",
-		result.context);
-}
-public void test0111() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0111/X.js",
-		"package test0111;\n" + 
-		"public class X {\n" + 
-		"  Object o = new ZZZZ\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={Ljava.lang.Object;}\n" +
-		"expectedTypesKeys={Ljava/lang/Object;}",
-		result.context);
-}
-public void test0112() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0112/X.js",
-		"package test0112;\n" + 
-		"public class X {\n" + 
-		"  Object o = new \n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("Object o = new ") + "Object o = new ".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("Object o = new ") + "Object o = new ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={Ljava.lang.Object;}\n" +
-		"expectedTypesKeys={Ljava/lang/Object;}",
-		result.context);
-}
-public void test0113() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0113/X.js",
-		"package test0113;\n" + 
-		"public class X {\n" + 
-		"  Object o = new Object() {\n" +
-		"    ZZZZ\n" +
-		"  };\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0114() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0114/X.js",
-		"package test0114;\n" + 
-		"public class X {\n" + 
-		"  Object o = new Object() {\n" +
-		"    ZZZZ\n" +
-		"  };\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ");
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0115() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0115/X.js",
-		"package test0115;\n" + 
-		"public class X {\n" + 
-		"  Object o = new Object() {\n" +
-		"    ZZZZ\n" +
-		"  };\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("ZZZZ");
-	int tokenEnd = tokenStart + "ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0116() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[2];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0116/X.js",
-		"package test0116;\n" + 
-		"public class X {\n" + 
-		"  Object o = new Object() {\n" +
-		"    /**/\n" +
-		"  };\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("/**/") + "/**/".length();
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("/**/") + "/**/".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0117() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0117/X.js",
-		"package test0117;\n" + 
-		"public class X {\n" + 
-		"  String s = \"ZZZZ\";\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("\"ZZZZ\"");
-	int tokenEnd = tokenStart + "\"ZZZZ\"".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_STRING_LITERAL\n" +
-		"expectedTypesSignatures={Ljava.lang.String;}\n" +
-		"expectedTypesKeys={Ljava/lang/String;}",
-		result.context);
-}
-public void test0118() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0118/X.js",
-		"package test0118;\n" + 
-		"public class X {\n" + 
-		"  String s = \"ZZZZ\";\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("\"ZZZZ\"");
-	int tokenEnd = tokenStart + "\"ZZZZ\"".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_STRING_LITERAL\n" +
-		"expectedTypesSignatures={Ljava.lang.String;}\n" +
-		"expectedTypesKeys={Ljava/lang/String;}",
-		result.context);
-}
-public void test0119() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0119/X.js",
-		"package test0119;\n" + 
-		"public class X {\n" + 
-		"  String s = \"ZZZZ\";\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("\"ZZZZ\"");
-	int tokenEnd = tokenStart + "\"ZZZZ\"".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_STRING_LITERAL\n" +
-		"expectedTypesSignatures={Ljava.lang.String;}\n" +
-		"expectedTypesKeys={Ljava/lang/String;}",
-		result.context);
-}
-public void test0120() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0120/X.js",
-		"package test0120;\n" + 
-		"public class X {\n" + 
-		"  String s = \"ZZZZ\";\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("\"ZZZZ\"");
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("\"ZZZZ") + "".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={Ljava.lang.String;}\n" +
-		"expectedTypesKeys={Ljava/lang/String;}",
-		result.context);
-}
-public void test0121() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0121/X.js",
-		"package test0121;\n" + 
-		"public class X {\n" + 
-		"  String s = \"ZZZZ\";\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int cursorLocation = str.lastIndexOf("\"ZZZZ\"") + "\"ZZZZ\"".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=[-1, -1]\n" +
-		"completion token=null\n" +
-		"completion token kind=TOKEN_KIND_UNKNOWN\n" +
-		"expectedTypesSignatures=null\n" +
-		"expectedTypesKeys=null",
-		result.context);
-}
-public void test0122() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0122/X.js",
-		"package test0122;\n" + 
-		"public class X {\n" + 
-		"  String s = \"\";\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("\"\"");
-	int tokenEnd = tokenStart + "\"\"".length() - 1;
-	int cursorLocation = str.lastIndexOf("\"\"") + "\"".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_STRING_LITERAL\n" +
-		"expectedTypesSignatures={Ljava.lang.String;}\n" +
-		"expectedTypesKeys={Ljava/lang/String;}",
-		result.context);
-}
-public void test0123() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0123/X.js",
-		"package test0123;\n" + 
-		"public class X {\n" + 
-		"  String s = \"ZZZZ\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("\"ZZZZ");
-	int tokenEnd = tokenStart + "\"ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_STRING_LITERAL\n" +
-		"expectedTypesSignatures={Ljava.lang.String;}\n" +
-		"expectedTypesKeys={Ljava/lang/String;}",
-		result.context);
-}
-public void test0124() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0124/X.js",
-		"package test0124;\n" + 
-		"public class X {\n" + 
-		"  String s = \"ZZZZ\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("\"ZZZZ");
-	int tokenEnd = tokenStart + "\"ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "ZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZ\"\n" +
-		"completion token kind=TOKEN_KIND_STRING_LITERAL\n" +
-		"expectedTypesSignatures={Ljava.lang.String;}\n" +
-		"expectedTypesKeys={Ljava/lang/String;}",
-		result.context);
-}
-public void test0125() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0125/X.js",
-		"package test0125;\n" + 
-		"public class X {\n" + 
-		"  String s = \"ZZZZ\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("\"ZZZZ");
-	int tokenEnd = tokenStart + "\"ZZZZ".length() - 1;
-	int cursorLocation = str.lastIndexOf("ZZZZ") + "".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_STRING_LITERAL\n" +
-		"expectedTypesSignatures={Ljava.lang.String;}\n" +
-		"expectedTypesKeys={Ljava/lang/String;}",
-		result.context);
-}
-public void test0126() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0126/X.js",
-		"package test0126;\n" + 
-		"public class X {\n" + 
-		"  String s = \"ZZZZ\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("\"ZZZZ");
-	int tokenEnd = tokenStart + "".length() - 1;
-	int cursorLocation = str.lastIndexOf("\"ZZZZ") + "".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_NAME\n" +
-		"expectedTypesSignatures={Ljava.lang.String;}\n" +
-		"expectedTypesKeys={Ljava/lang/String;}",
-		result.context);
-}
-public void test0127() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0127/X.js",
-		"package test0127;\n" + 
-		"public class X {\n" + 
-		"  String s = \"\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("\"");
-	int tokenEnd = tokenStart + "\"".length() - 1;
-	int cursorLocation = str.lastIndexOf("\"") + "\"".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"\"\n" +
-		"completion token kind=TOKEN_KIND_STRING_LITERAL\n" +
-		"expectedTypesSignatures={Ljava.lang.String;}\n" +
-		"expectedTypesKeys={Ljava/lang/String;}",
-		result.context);
-}
-public void test0128() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src3/test0127/X.js",
-		"package test0127;\n" + 
-		"public class X {\n" + 
-		"  String s0 = \"\n" +
-		"  String s = \"ZZZZ\"\n" +
-		"}");
-	
-	String str = this.workingCopies[0].getSource();
-	int tokenStart = str.lastIndexOf("\"ZZZZ\"");
-	int tokenEnd = tokenStart + "\"ZZZZ\"".length() - 1;
-	int cursorLocation = str.lastIndexOf("\"ZZZZ\"") + "\"ZZZZ".length();
-
-	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation);
-	
-	assertResults(
-		"completion offset="+(cursorLocation)+"\n" +
-		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
-		"completion token=\"ZZZZ\"\n" +
-		"completion token kind=TOKEN_KIND_STRING_LITERAL\n" +
-		"expectedTypesSignatures={Ljava.lang.String;}\n" +
-		"expectedTypesKeys={Ljava/lang/String;}",
-		result.context);
-}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionTests.java
deleted file mode 100644
index 0f4da53..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionTests.java
+++ /dev/null
@@ -1,13665 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import java.io.IOException;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.jsdt.core.*;
-import org.eclipse.wst.jsdt.internal.codeassist.CompletionEngine;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.eval.IEvaluationContext;
-import org.eclipse.wst.jsdt.internal.codeassist.RelevanceConstants;
-
-import junit.framework.*;
-
-public class CompletionTests extends AbstractJavaModelCompletionTests implements RelevanceConstants {
-
-static {
-//	TESTS_NAMES = new String[] { "testDeprecationCheck17"};
-}
-public static Test suite() {
-	return buildModelTestSuite(CompletionTests.class);
-}
-public CompletionTests(String name) {
-	super(name);
-}
-public void setUpSuite() throws Exception {
-	if (COMPLETION_PROJECT == null)  {
-		COMPLETION_PROJECT = setUpJavaProject("Completion");
-	} else {
-		setUpProjectCompliance(COMPLETION_PROJECT, "1.4");
-	}
-	super.setUpSuite();
-}
-public void tearDownSuite() throws Exception {
-	super.tearDownSuite();
-}
-
-public void test00() throws JavaScriptModelException {
-    this.wc = getWorkingCopy(
-            "/Completion/src/test/Test.js",
-			"MyClass.prototype.someMethod = MyClass_someMethod;"+ 
-			"function MyClass(){}"+
-			"function MyClass_someMethod(){}"+
-			"var myClassObj = new MyClass();\n"+
-			"myClassObj.someMethod();\n"+
-            "");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "someMethod";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-            "someMethod[FUNCTION_REF]{, Ltest.MyClass;, ()V, someMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME +  R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-            requestor.getResults());
-}
-
-
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=164311
-public void testBug164311() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"    public int zzzzzz;\n" + 
-		"    public void method1() {\n" + 
-		"        label : if (0> (10));\n" + 
-		"        zzz\n" + 
-		"    }\n" + 
-		"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "zzz";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"zzzzzz[FIELD_REF]{zzzzzz, Ltest.Test;, I, zzzzzz, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=164311
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=167750
-public void testBug164311_2() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;\n"+
-		"public class X {\n"+
-		"    public void zork() { \n"+
-		"    } \n"+
-		"    public void foo() { \n"+
-		"        this.foo(new Object(){\n"+
-		"            public void bar() {\n"+
-		"                if (zzz>(Integer)vvv.foo(i)) {\n"+
-		"                    return;\n"+
-		"                }\n"+
-		"                if (true) {\n"+
-		"                    return;\n"+
-		"                }\n"+
-		"                zor\n"+
-		"            }        \n"+    
-		"        });\n"+
-		"    }\n"+
-		"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "zor";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"zork[FUNCTION_REF]{zork(), Ltest.X;, ()V, zork, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=96213
-public void testBug96213() throws JavaScriptModelException {
-    this.wc = getWorkingCopy(
-            "/Completion/src/test/Test.js",
-            "  function toto( o) {\n"+
-            "    return null;\n"+
-            "  }\n"+
-            "  function titi( removed) {\n"+
-            "  }\n"+
-            "  function foo() {\n"+
-            "    var removed = 0;\n"+
-            "    toto(Test.vv).titi(removed);\n"+
-            "  }\n"+
-            "");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "removed";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-            "removed[LOCAL_VARIABLE_REF]{removed, null, Lsystem.js.Number;, removed, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME +  R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-            requestor.getResults());
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=99811
-public void testBug99811() throws JavaScriptModelException {
-	IJavaScriptUnit aType = null;
-    try {
-    	this.wc = getWorkingCopy(
-	            "/Completion/src/test/A.js",
-	            "public abstract class A implements I {}");
-    	
-	    aType = getWorkingCopy(
-	            "/Completion/src/test/I.js",
-	            "public interface I {\n"+
-	            "  public class M extends A {}\n"+
-	            "}");
-	
-	    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	    String str = this.wc.getSource();
-	    String completeBehind = "A";
-	    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults("", requestor.getResults());
-	} finally {
-		if(aType != null) {
-			aType.discardWorkingCopy();
-		}
-	}
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
-public void testCamelCaseField1() throws JavaScriptModelException {
-	this.oldOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldOptions);
-		options.put(JavaScriptCore.CODEASSIST_CAMEL_CASE_MATCH, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-		
-		this.workingCopies = new IJavaScriptUnit[1];
-		this.workingCopies[0] = getWorkingCopy(
-			"/Completion/src/camelcase/Test.js",
-			"package camelcase;"+
-			"public class Test {\n"+
-			"  int oneTwoThree;\n"+
-			"  int oTTField;\n"+
-			"  void foo() {\n"+
-			"    oTT\n"+
-			"  }\n"+
-			"}");
-	
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "oTT";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-				"oneTwoThree[FIELD_REF]{oneTwoThree, Lcamelcase.Test;, I, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"oTTField[FIELD_REF]{oTTField, Lcamelcase.Test;, I, oTTField, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	} finally {
-		JavaScriptCore.setOptions(oldOptions);
-	}
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
-public void testCamelCaseLocalVariable1() throws JavaScriptModelException {
-	this.oldOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldOptions);
-		options.put(JavaScriptCore.CODEASSIST_CAMEL_CASE_MATCH, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-		
-		this.workingCopies = new IJavaScriptUnit[1];
-		this.workingCopies[0] = getWorkingCopy(
-			"/Completion/src/camelcase/Test.js",
-			"package camelcase;"+
-			"public class Test {\n"+
-			"  void foo() {\n"+
-			"    int oneTwoThree;\n"+
-			"    int oTTLocal;\n"+
-			"    oTT\n"+
-			"  }\n"+
-			"}");
-	
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "oTT";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-				"oneTwoThree[LOCAL_VARIABLE_REF]{oneTwoThree, null, I, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"oTTLocal[LOCAL_VARIABLE_REF]{oTTLocal, null, I, oTTLocal, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	} finally {
-		JavaScriptCore.setOptions(oldOptions);
-	}
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
-public void testCamelCaseMethod1() throws JavaScriptModelException {
-	this.oldOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldOptions);
-		options.put(JavaScriptCore.CODEASSIST_CAMEL_CASE_MATCH, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-		
-	this.workingCopies = new IJavaScriptUnit[1];
-		this.workingCopies[0] = getWorkingCopy(
-			"/Completion/src/camelcase/Test.js",
-			"package camelcase;"+
-			"public class Test {\n"+
-			"  void oneTwoThree(){}\n"+
-			"  void oTTMethod(){}\n"+
-			"  void foo() {\n"+
-			"    oTT\n"+
-			"  }\n"+
-			"}");
-	
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "oTT";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-				"oneTwoThree[FUNCTION_REF]{oneTwoThree(), Lcamelcase.Test;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"oTTMethod[FUNCTION_REF]{oTTMethod(), Lcamelcase.Test;, ()V, oTTMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	} finally {
-		JavaScriptCore.setOptions(oldOptions);
-	}
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
-public void testCamelCaseMethodDeclaration1() throws JavaScriptModelException {
-	this.oldOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldOptions);
-		options.put(JavaScriptCore.CODEASSIST_CAMEL_CASE_MATCH, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-		
-		this.workingCopies = new IJavaScriptUnit[2];
-		this.workingCopies[0] = getWorkingCopy(
-			"/Completion/src/camelcase/Test.js",
-			"package camelcase;"+
-			"public class Test extends SuperClass {\n"+
-			"  oTT\n"+
-			"}");
-		
-		this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/camelcase/SuperClass.js",
-			"package camelcase;"+
-			"public class SuperClass {\n"+
-			"  public void oneTwoThree(){}\n"+
-			"  public void oTTMethod(){}\n"+
-			"}");
-	
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "oTT";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-				"oTT[POTENTIAL_METHOD_DECLARATION]{oTT, Lcamelcase.Test;, ()V, oTT, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-				"oneTwoThree[FUNCTION_DECLARATION]{public void oneTwoThree(), Lcamelcase.SuperClass;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"oTTMethod[FUNCTION_DECLARATION]{public void oTTMethod(), Lcamelcase.SuperClass;, ()V, oTTMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	} finally {
-		JavaScriptCore.setOptions(oldOptions);
-	}
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
-public void testCamelCaseType1() throws JavaScriptModelException {
-	this.oldOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldOptions);
-		options.put(JavaScriptCore.CODEASSIST_CAMEL_CASE_MATCH, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-		
-		this.workingCopies = new IJavaScriptUnit[3];
-		this.workingCopies[0] = getWorkingCopy(
-			"/Completion/src/camelcase/Test.js",
-			"package camelcase;"+
-			"public class Test {\n"+
-			"  FF\n"+
-			"}");
-	
-		this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/camelcase/FoFoFo.js",
-			"package camelcase;"+
-			"public class FoFoFo {\n"+
-			"}");
-		
-		this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/camelcase/FFFTest.js",
-			"package camelcase;"+
-			"public class FFFTest {\n"+
-			"}");
-	
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "FF";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	} finally {
-		JavaScriptCore.setOptions(oldOptions);
-	}
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
-public void testCamelCaseType2() throws JavaScriptModelException {
-	this.oldOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldOptions);
-		options.put(JavaScriptCore.CODEASSIST_CAMEL_CASE_MATCH, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-		
-		this.workingCopies = new IJavaScriptUnit[3];
-		this.workingCopies[0] = getWorkingCopy(
-			"/Completion/src/camelcase/Test.js",
-			"package camelcase;"+
-			"public class Test {\n"+
-			"  camelcase.FF\n"+
-			"}");
-	
-		this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/camelcase/FoFoFo.js",
-			"package camelcase;"+
-			"public class FoFoFo {\n"+
-			"}");
-		
-		this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/camelcase/FFFTest.js",
-			"package camelcase;"+
-			"public class FFFTest {\n"+
-			"}");
-	
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "FF";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
-				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	} finally {
-		JavaScriptCore.setOptions(oldOptions);
-	}
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
-public void testCamelCaseType3() throws JavaScriptModelException {
-	this.oldOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldOptions);
-		options.put(JavaScriptCore.CODEASSIST_CAMEL_CASE_MATCH, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-			
-		this.workingCopies = new IJavaScriptUnit[1];
-		this.workingCopies[0] = getWorkingCopy(
-			"/Completion/src/camelcase/Test.js",
-			"package camelcase;"+
-			"public class Test {\n"+
-			"  /**/FF\n"+
-			"}\n"+
-			"class FoFoFo {\n"+
-			"}\n"+
-			"class FFFTest {\n"+
-			"}");
-	
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "/**/FF";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	} finally {
-		JavaScriptCore.setOptions(oldOptions);
-	}
-}
-
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
-public void testCamelCaseType4() throws JavaScriptModelException {
-	this.oldOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldOptions);
-		options.put(JavaScriptCore.CODEASSIST_CAMEL_CASE_MATCH, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-		
-		this.workingCopies = new IJavaScriptUnit[3];
-		this.workingCopies[0] = getWorkingCopy(
-			"/Completion/src/camelcase/Test.js",
-			"package camelcase;"+
-			"public class Test {\n"+
-			"  FF\n"+
-			"}");
-	
-		this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/camelcase/Member1.js",
-			"package camelcase;"+
-			"public class Member1 {\n"+
-			"  public class FoFoFo {\n"+
-			"  }\n"+
-			"}");
-		
-		this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/camelcase/Member2.js",
-			"package camelcase;"+
-			"public class Member2 {\n"+
-			"  public class FFFTest {\n"+
-			"  }\n"+
-			"}");
-	
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "FF";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-				"Member1.FoFoFo[TYPE_REF]{camelcase.Member1.FoFoFo, camelcase, Lcamelcase.Member1$FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
-				"Member2.FFFTest[TYPE_REF]{camelcase.Member2.FFFTest, camelcase, Lcamelcase.Member2$FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	} finally {
-		JavaScriptCore.setOptions(oldOptions);
-	}
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
-public void testCamelCaseType5() throws JavaScriptModelException {
-	this.oldOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldOptions);
-		options.put(JavaScriptCore.CODEASSIST_CAMEL_CASE_MATCH, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-		
-		this.workingCopies = new IJavaScriptUnit[1];
-		this.workingCopies[0] = getWorkingCopy(
-			"/Completion/src/camelcase/Test.js",
-			"package camelcase;"+
-			"public class Test {\n"+
-			"  public class FoFoFo {\n"+
-			"    public class FFFTest {\n"+
-			"      FF\n"+
-			"    }\n"+
-			"  }\n"+
-			"}");
-	
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "FF";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test$FoFoFo$FFFTest;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-				"Test.FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.Test$FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"Test.FoFoFo.FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.Test$FoFoFo$FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	} finally {
-		JavaScriptCore.setOptions(oldOptions);
-	}
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef01() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[4];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws IZZAException, IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         throwing();\n" +
-		"      }\n" +
-		"      catch (IZZAException e) {\n" +
-		"         bar();\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-	
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/IZZAException.js",
-			"package test;"+
-			"public class IZZAException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/test/IZZBException.js",
-			"package test;"+
-			"public class IZZBException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[3] = getWorkingCopy(
-			"/Completion/src/test/IZZException.js",
-			"package test;"+
-			"public class IZZException extends Exception {\n" + 
-			"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef02() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[4];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws IZZAException, IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         throwing()\n" +
-		"      }\n" +
-		"      catch (IZZAException e) {\n" +
-		"         bar();\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-	
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/IZZAException.js",
-			"package test;"+
-			"public class IZZAException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/test/IZZBException.js",
-			"package test;"+
-			"public class IZZBException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[3] = getWorkingCopy(
-			"/Completion/src/test/IZZException.js",
-			"package test;"+
-			"public class IZZException extends Exception {\n" + 
-			"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef03() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[4];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws IZZAException, IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      #\n" +
-		"      try {\n" +
-		"         throwing();\n" +
-		"      }\n" +
-		"      catch (IZZAException e) {\n" +
-		"         bar();\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-	
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/IZZAException.js",
-			"package test;"+
-			"public class IZZAException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/test/IZZBException.js",
-			"package test;"+
-			"public class IZZBException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[3] = getWorkingCopy(
-			"/Completion/src/test/IZZException.js",
-			"package test;"+
-			"public class IZZException extends Exception {\n" + 
-			"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef04() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[4];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws test.p.IZZAException, test.p.IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         throwing();\n" +
-		"      }\n" +
-		"      catch (test.p.IZZAException e) {\n" +
-		"         bar();\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-	
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/p/IZZAException.js",
-			"package test.p;"+
-			"public class IZZAException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/test/p/IZZBException.js",
-			"package test.p;"+
-			"public class IZZBException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[3] = getWorkingCopy(
-			"/Completion/src/test/p/IZZException.js",
-			"package test.p;"+
-			"public class IZZException extends Exception {\n" + 
-			"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"IZZBException[TYPE_REF]{test.p.IZZBException, test.p, Ltest.p.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"IZZException[TYPE_REF]{test.p.IZZException, test.p, Ltest.p.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef05() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public class IZZAException extends Exception {}\n" +
-		"	public class IZZBException extends Exception {}\n" +
-		"	public class IZZException extends Exception {}\n" +
-		"	public void throwing() throws IZZAException, IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         throwing();\n" +
-		"      }\n" +
-		"      catch (IZZAException e) {\n" +
-		"         bar();\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"Test.IZZBException[TYPE_REF]{IZZBException, test, Ltest.Test$IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"Test.IZZException[TYPE_REF]{IZZException, test, Ltest.Test$IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef06() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"   public class Inner {\n" + 
-		"      public class IZZAException extends Exception {}\n" +
-		"      public class IZZBException extends Exception {}\n" +
-		"      public class IZZException extends Exception {}\n" +
-		"      public void throwing() throws IZZAException, IZZException {}\n" +
-		"      public void foo() {\n" +
-		"         try {\n" +
-		"            throwing();\n" +
-		"         }\n" +
-		"         catch (IZZAException e) {\n" +
-		"            bar();\n" +
-		"         }\n" +
-		"         catch (IZZ) {\n" +
-		"         }\n" +
-		"      }" +
-		"   }" +
-		"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"Test.Inner.IZZBException[TYPE_REF]{IZZBException, test, Ltest.Test$Inner$IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"Test.Inner.IZZException[TYPE_REF]{IZZException, test, Ltest.Test$Inner$IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef07() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"   void zork() {\n" + 
-		"      class IZZAException extends Exception {}\n" +
-		"      class IZZBException extends Exception {}\n" +
-		"      class IZZException extends Exception {}\n" +
-		"      class Local {\n" + 
-		"         public void throwing() throws IZZAException, IZZException {}\n" +
-		"         public void foo() {\n" +
-		"            try {\n" +
-		"               throwing();\n" +
-		"            }\n" +
-		"            catch (IZZAException e) {\n" +
-		"               bar();\n" +
-		"            }\n" +
-		"            catch (IZZ) {\n" +
-		"            }\n" +
-		"         }" +
-		"      }" +
-		"   }" +
-		"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"IZZBException[TYPE_REF]{IZZBException, test, LIZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"IZZException[TYPE_REF]{IZZException, test, LIZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef08() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[4];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws IZZAException, IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         throwing();\n" +
-		"      }\n" +
-		"      catch (IZZAException e) {\n" +
-		"         bar();\n" +
-		"      }\n" +
-		"      catch (/**/) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-	
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/IZZAException.js",
-			"package test;"+
-			"public class IZZAException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/test/IZZBException.js",
-			"package test;"+
-			"public class IZZBException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[3] = getWorkingCopy(
-			"/Completion/src/test/IZZException.js",
-			"package test;"+
-			"public class IZZException extends Exception {\n" + 
-			"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "/**/";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
-			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef09() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[5];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws IZZAException, IZZCException, IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         try {\n" +
-		"            throwing();\n" +
-		"         }\n" +
-		"         catch (IZZCException e) {\n" +
-		"            bar();\n" +
-		"         }\n" +
-		"      }\n" +
-		"      catch (IZZAException e) {\n" +
-		"         bar();\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-	
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/IZZAException.js",
-			"package test;"+
-			"public class IZZAException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/test/IZZBException.js",
-			"package test;"+
-			"public class IZZBException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[3] = getWorkingCopy(
-			"/Completion/src/test/IZZCException.js",
-			"package test;"+
-			"public class IZZCException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[4] = getWorkingCopy(
-			"/Completion/src/test/IZZException.js",
-			"package test;"+
-			"public class IZZException extends Exception {\n" + 
-			"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"IZZCException[TYPE_REF]{IZZCException, test, Ltest.IZZCException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef10() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[4];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws IZZAException, IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         throwing();\n" +
-		"      }\n" +
-		"      catch (IZZAException e) {\n" +
-		"         bar();\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-	
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/IZZAException.js",
-			"package test;"+
-			"public class IZZAException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/test/IZZBException.js",
-			"package test;"+
-			"public class IZZBException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[3] = getWorkingCopy(
-			"/Completion/src/test/IZZException.js",
-			"package test;"+
-			"public class IZZException extends IZZBException {\n" + 
-			"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
-			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-//IZZBException should not be proposed but to filter this proposal
-//we would need to know subclasses of IZZAException and it's currenlty too costly to compute
-public void testCatchClauseExceptionRef11() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[4];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws IZZAException, IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         throwing();\n" +
-		"      }\n" +
-		"      catch (IZZAException e) {\n" +
-		"         bar();\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-	
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/IZZAException.js",
-			"package test;"+
-			"public class IZZAException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/test/IZZBException.js",
-			"package test;"+
-			"public class IZZBException extends IZZAException {\n" + 
-			"}\n");
-	
-	this.workingCopies[3] = getWorkingCopy(
-			"/Completion/src/test/IZZException.js",
-			"package test;"+
-			"public class IZZException extends Exception {\n" + 
-			"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef12() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[4];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws IZZAException, IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         throwing();\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-	
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/IZZAException.js",
-			"package test;"+
-			"public class IZZAException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/test/IZZBException.js",
-			"package test;"+
-			"public class IZZBException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[3] = getWorkingCopy(
-			"/Completion/src/test/IZZException.js",
-			"package test;"+
-			"public class IZZException extends Exception {\n" + 
-			"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
-			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
-			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
-public void testCatchClauseExceptionRef13() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[4];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         throwing();\n" +
-		"      }\n" +
-		"      catch (IZZAException e) {\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-	
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/IZZAException.js",
-			"package test;"+
-			"public class IZZAException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/test/IZZBException.js",
-			"package test;"+
-			"public class IZZBException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[3] = getWorkingCopy(
-			"/Completion/src/test/IZZException.js",
-			"package test;"+
-			"public class IZZException extends IZZAException {\n" + 
-			"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-public void testCatchClauseExceptionRef14() throws JavaScriptModelException {
-	
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws IZZException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         throwing();\n" +
-		"      }\n" +
-		"      catch (IZZAException e) {\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}" +
-		"class IZZAException extends Exception {\n" + 
-		"}" +
-		"class IZZException extends Exception {\n" + 
-		"}\n");
-	
-	IJavaScriptProject project = this.workingCopies[0].getJavaScriptProject();
-	String visibilityCheck = project.getOption(JavaScriptCore.CODEASSIST_VISIBILITY_CHECK, true);
-	
-	try {
-		project.setOption(JavaScriptCore.CODEASSIST_VISIBILITY_CHECK, JavaScriptCore.ENABLED);
-		
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "(IZZ";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-				"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	} finally {
-		project.setOption(JavaScriptCore.CODEASSIST_VISIBILITY_CHECK, visibilityCheck);
-	}
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=173907
-public void testCatchClauseExceptionRef15() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[3];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"	public void throwing() throws IZZException, IZZAException {}\n" +
-		"	public void foo() {\n" +
-		"      try {\n" +
-		"         try {\n" +
-		"            throwing();\n" +
-		"         } finally {}\n" +
-		"      }\n" +
-		"      catch (IZZAException e) {\n" +
-		"      }\n" +
-		"      catch (IZZ) {\n" +
-		"      }\n" +
-		"   }" +
-		"}\n");
-	
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/IZZAException.js",
-			"package test;"+
-			"public class IZZAException extends Exception {\n" + 
-			"}\n");
-	
-	this.workingCopies[2] = getWorkingCopy(
-			"/Completion/src/test/IZZException.js",
-			"package test;"+
-			"public class IZZException extends Exception {\n" + 
-			"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "IZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-/*
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=65737
- */
-public void testCompletion2InterfacesWithSameMethod() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "Completion2InterfacesWithSameMethod.js");
-
-	String str = cu.getSource();
-	String completeBehind = "var.meth";
-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-			"element:method    completion:method()    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionAbstractMethod1() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionAbstractMethod1.js",
-            "public class CompletionAbstractMethod1 {\n" +
-            "	abstract class A {\n" +
-            "		abstract void foo();\n" +
-            "	}\n" +
-            "	class B extends A {\n" +
-            "		void foo{} {}\n" +
-            "		void bar() {\n" +
-            "			super.fo\n" +
-            "		}\n" +
-            "	}\n" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "fo";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "",
-            requestor.getResults());
-}
-public void testCompletionAbstractMethod2() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionAbstractMethod2.js",
-            "public class CompletionAbstractMethod2 {\n" +
-            "	abstract class A {\n" +
-            "		abstract void foo();\n" +
-            "	}\n" +
-            "	class B extends A {\n" +
-            "		void foo{} {}\n" +
-            "		void bar() {\n" +
-            "			this.fo\n" +
-            "		}\n" +
-            "	}\n" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "fo";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-           "foo[FUNCTION_REF]{foo(), LCompletionAbstractMethod2$A;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED) + "}",
-           requestor.getResults());
-}
-public void testCompletionAbstractMethod3() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionAbstractMethod3.js",
-            "public class CompletionAbstractMethod3 {\n" +
-            "	abstract class A {\n" +
-            "		abstract void foo();\n" +
-            "	}\n" +
-            "	class B extends A {\n" +
-            "		void bar() {\n" +
-            "			this.fo\n" +
-            "		}\n" +
-            "	}\n" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "fo";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-           "foo[FUNCTION_REF]{foo(), LCompletionAbstractMethod3$A;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
-           requestor.getResults());
-}
-public void testCompletionAbstractMethod4() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionAbstractMethod4.js",
-            "public class CompletionAbstractMethod1 {\n" +
-            "	class A {\n" +
-            "		void foo(){}\n" +
-            "	}\n" +
-            "	abstract class B extends A {\n" +
-            "		abstract void foo();\n" +
-            "	}\n" +
-            "	class C extends B {\n" +
-            "		void foo{} {}\n" +
-            "		void bar() {\n" +
-            "			super.fo\n" +
-            "		}\n" +
-            "	}\n" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "fo";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-           "",
-           requestor.getResults());
-}
-
-/*
-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25578
-*/
-public void testCompletionAbstractMethodRelevance1() throws JavaScriptModelException {
-	IJavaScriptUnit superClass = null;
-	try {
-		superClass = getWorkingCopy(
-	            "/Completion/src/CompletionAbstractSuperClass.js",
-	            "public abstract class CompletionAbstractSuperClass {\n"+
-	            "	public void foo1(){}\n"+
-	            "	public abstract void foo2();\n"+
-	            "	public void foo3(){}\n"+
-	            "}");
-		
-		this.wc = getWorkingCopy(
-	            "/Completion/src/CompletionAbstractMethodRelevance1.js",
-	            "public class CompletionAbstractMethodRelevance1 extends CompletionAbstractSuperClass {\n"+
-	            "	foo\n"+
-	            "}");
-	    
-	    
-	    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	    String str = this.wc.getSource();
-	    String completeBehind = "foo";
-	    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-			"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionAbstractMethodRelevance1;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
-			"foo1[FUNCTION_DECLARATION]{public void foo1(), LCompletionAbstractSuperClass;, ()V, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
-			"foo3[FUNCTION_DECLARATION]{public void foo3(), LCompletionAbstractSuperClass;, ()V, foo3, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
-			"foo2[FUNCTION_DECLARATION]{public void foo2(), LCompletionAbstractSuperClass;, ()V, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
-			requestor.getResults());
-	} finally {
-		if(superClass != null) {
-			superClass.discardWorkingCopy();
-		}
-	}
-}
-/*
-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25578
-*/
-public void testCompletionAbstractMethodRelevance2() throws JavaScriptModelException {
-	IJavaScriptUnit superClass = null;
-	try {
-		superClass = getWorkingCopy(
-	            "/Completion/src/CompletionSuperInterface.js",
-	            "public interface CompletionSuperInterface{\n"+
-	            "	public int eqFoo(int a,Object b);\n"+
-	            "}");
-		
-		this.wc = getWorkingCopy(
-	            "/Completion/src/CompletionAbstractMethodRelevance2.js",
-	            "public class CompletionAbstractMethodRelevance2 implements CompletionSuperInterface {\n"+
-	            "	eq\n"+
-	            "}");
-	    
-	    
-	    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	    String str = this.wc.getSource();
-	    String completeBehind = "eq";
-	    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-		assertResults(
-			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionAbstractMethodRelevance2;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
-			"equals[FUNCTION_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
-			"eqFoo[FUNCTION_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperInterface;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
-			requestor.getResults());
-	} finally {
-		if(superClass != null) {
-			superClass.discardWorkingCopy();
-		}
-	}
-}
-public void testCompletionAfterCase1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAfterCase1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "zz";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:zzz    completion:zzz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionAfterCase2() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAfterCase2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "zz";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:zzz    completion:zzz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionAfterSupercall1() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/CompletionAfterSupercall1.js",
-		"public class CompletionAfterSupercall1 extends CompletionAfterSupercall1_1 {\n" +
-		"	public void foo(){\n" +
-		"		super.foo\n" +
-		"	}\n" +
-		"}\n" +
-		"abstract class CompletionAfterSupercall1_1 extends CompletionAfterSupercall1_2 implements CompletionAfterSupercall1_3 {\n" +
-		"	\n" +
-		"}\n" +
-		"class CompletionAfterSupercall1_2 implements CompletionAfterSupercall1_3 {\n" +
-		"	public void foo(){}\n" +
-		"}\n" +
-		"interface CompletionAfterSupercall1_3 {\n" +
-		"	public void foo();\n" +
-		"}");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "super.foo";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"foo[FUNCTION_REF]{foo(), LCompletionAfterSupercall1_2;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC+ R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-public void testCompletionAfterSwitch() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAfterSwitch.js");
-
-	String str = cu.getSource();
-	String completeBehind = "bar";
-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-			"element:bar    completion:bar()    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_NAME+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionAllMemberTypes() throws JavaScriptModelException {
-    this.wc = getWorkingCopy(
-            "/Completion/src/test/CompletionAllMemberTypes.js",
-            "package test;\n" +
-            "public class CompletionAllMemberTypes {\n" +
-            "  class Member1 {\n" +
-            "    class Member2 {\n" +
-            "      class Member3 {\n" +
-            "      }\n" +
-            "    }\n" +
-            "    void foo(){\n" +
-            "      Member\n" +
-            "    }\n" +
-            "  \n}" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "Member";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-            "CompletionAllMemberTypes.Member1.Member2.Member3[TYPE_REF]{test.CompletionAllMemberTypes.Member1.Member2.Member3, test, Ltest.CompletionAllMemberTypes$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-            requestor.getResults());
-}
-public void testCompletionAllMemberTypes2() throws JavaScriptModelException {
-    this.wc = getWorkingCopy(
-            "/Completion/src/test/CompletionAllMemberTypes2.js",
-            "package test;\n" +
-            "public class CompletionAllMemberTypes2 {\n" +
-            "  class Member1 {\n" +
-            "    class Member5 {\n" +
-            "      class Member6 {\n" +
-            "      }\n" +
-            "    }\n" +
-            "    class Member2 {\n" +
-            "      class Member3 {\n" +
-            "        class Member4 {\n" +
-            "        }\n" +
-            "      }\n" +
-            "      void foo(){\n" +
-            "        Member\n" +
-            "      }\n" +
-            "    }\n" +
-            "  \n}" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "Member";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-            "CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-            requestor.getResults());
-}
-public void testCompletionAllMemberTypes3() throws JavaScriptModelException {
-    this.wc = getWorkingCopy(
-            "/Completion/src/test/CompletionAllMemberTypes2.js",
-            "package test;\n" +
-            "public interface CompletionAllMemberTypes2 {\n" +
-            "  interface Member1 {\n" +
-            "    interface Member5 {\n" +
-            "      interface Member6 {\n" +
-            "      }\n" +
-            "    }\n" +
-            "    interface Member2 {\n" +
-            "      interface Member3 {\n" +
-            "        interface Member4 {\n" +
-            "        }\n" +
-            "      }\n" +
-            "        Member\n" +
-            "    }\n" +
-            "  \n}" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "Member";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-            "Member[POTENTIAL_METHOD_DECLARATION]{Member, Ltest.CompletionAllMemberTypes2$Member1$Member2;, ()V, Member, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-            requestor.getResults());
-}
-public void testCompletionAllMemberTypes4() throws JavaScriptModelException {
-	IJavaScriptUnit anInterface = null;
-	try {
-		anInterface = getWorkingCopy(
-	            "/Completion/src/test/AnInterface.js",
-	            "package test;\n" +
-	            "public interface AnInterface {\n" +
-	            "  public interface Member1 {\n" +
-	            "    public interface Member5 {\n" +
-	            "      public interface Member6 {\n" +
-	            "      }\n" +
-	            "    }\n" +
-	            "    public interface Member2 {\n" +
-	            "      public interface Member3 {\n" +
-	            "        interface Member4 {\n" +
-	            "        }\n" +
-	            "      }\n" +
-	            "        Member\n" +
-	            "    }\n" +
-	            "  \n}" +
-	            "}");
-		
-	    this.wc = getWorkingCopy(
-	            "/Completion/src/test/CompletionAllMemberTypes2.js",
-	            "package test;\n" +
-	            "public class CompletionAllMemberTypes2 {\n" +
-	            "  class Member1 {\n" +
-	            "    class Member5 {\n" +
-	            "      class Member6 {\n" +
-	            "      }\n" +
-	            "    }\n" +
-	            "    class Member2 implements AnInterface {\n" +
-	            "      class Member3 {\n" +
-	            "        class Member4 {\n" +
-	            "        }\n" +
-	            "      }\n" +
-	            "      void foo(){\n" +
-	            "        Member\n" +
-	            "      }\n" +
-	            "    }\n" +
-	            "  \n}" +
-	            "}");
-	    
-	    
-	    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	    String str = this.wc.getSource();
-	    String completeBehind = "Member";
-	    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-    	assertResults(
-	            "AnInterface.Member1.Member2[TYPE_REF]{test.AnInterface.Member1.Member2, test, Ltest.AnInterface$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-				"AnInterface.Member1.Member2.Member3[TYPE_REF]{test.AnInterface.Member1.Member2.Member3, test, Ltest.AnInterface$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-				"AnInterface.Member1.Member2.Member3.Member4[TYPE_REF]{test.AnInterface.Member1.Member2.Member3.Member4, test, Ltest.AnInterface$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-				"AnInterface.Member1.Member5[TYPE_REF]{test.AnInterface.Member1.Member5, test, Ltest.AnInterface$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-				"AnInterface.Member1.Member5.Member6[TYPE_REF]{test.AnInterface.Member1.Member5.Member6, test, Ltest.AnInterface$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-				"CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-				"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-				"AnInterface.Member1[TYPE_REF]{Member1, test, Ltest.AnInterface$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-	            requestor.getResults());
-	} finally {
-		if(anInterface != null) {
-			anInterface.discardWorkingCopy();
-		}
-	}
-}
-
-public void testCompletionAllMemberTypes5() throws JavaScriptModelException {
-	IJavaScriptUnit aType = null;
-	Hashtable oldCurrentOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldCurrentOptions);
-		options.put(JavaScriptCore.CODEASSIST_VISIBILITY_CHECK, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-		
-		aType = getWorkingCopy(
-	            "/Completion/src/test/AType.js",
-	            "package test;\n" +
-	            "public class AType {\n" +
-	            "  public class Member1 {\n" +
-	            "    private class Member2 {\n" +
-	            "      public class Member3 {\n" +
-	            "        public class Member4 {\n" +
-	            "        }\n" +
-	            "      }\n" +
-	            "    }\n" +
-	            "  \n}" +
-	            "}");
-		
-	    this.wc = getWorkingCopy(
-	            "/Completion/src/test/CompletionAllMemberTypes5.js",
-	            "package test;\n" +
-	            "public class CompletionAllMemberTypes5 {\n" +
-	            "  void foo(){\n" +
-	            "    Member\n" +
-	            "  }\n" +
-	            "}");
-	    
-	    
-	    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	    String str = this.wc.getSource();
-	    String completeBehind = "Member";
-	    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-    	// AType.Member1.Member2.Member3 and AType.Member1.Member2.Member3.Member4 should not be proposed because they are not visible.
-    	// But visibility need modifiers of enclosing types to be computed. 
-    	assertResults(
-	            "AType.Member1[TYPE_REF]{test.AType.Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-				"AType.Member1.Member2.Member3[TYPE_REF]{test.AType.Member1.Member2.Member3, test, Ltest.AType$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-				"AType.Member1.Member2.Member3.Member4[TYPE_REF]{test.AType.Member1.Member2.Member3.Member4, test, Ltest.AType$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
-	            requestor.getResults());
-	} finally {
-		if(aType != null) {
-			aType.discardWorkingCopy();
-		}
-		JavaScriptCore.setOptions(oldCurrentOptions);
-	}
-}
-
-public void testCompletionAllMemberTypes6() throws JavaScriptModelException {
-	Hashtable oldCurrentOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldCurrentOptions);
-		options.put(JavaScriptCore.CODEASSIST_VISIBILITY_CHECK, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-		
-	    this.wc = getWorkingCopy(
-	            "/Completion/src/test/CompletionAllMemberTypes6.js",
-	            "package test;\n" +
-	            "class AType {\n" +
-	            "  public class Member1 {\n" +
-	            "    private class Member2 {\n" +
-	            "      public class Member3 {\n" +
-	            "      }\n" +
-	            "    }\n" +
-	            "  }\n" +
-	            "}\n" +
-	            "public class CompletionAllMemberTypes6 {\n" +
-	            "  void foo(){\n" +
-	            "    Member\n" +
-	            "  }\n" +
-	            "}");
-	    
-	    
-	    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	    String str = this.wc.getSource();
-	    String completeBehind = "Member";
-	    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-    	assertResults(
-	            "AType.Member1[TYPE_REF]{test.AType.Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
-	            requestor.getResults());
-	} finally {
-		JavaScriptCore.setOptions(oldCurrentOptions);
-	}
-}
-
-public void testCompletionAllMemberTypes7() throws JavaScriptModelException {
-	Hashtable oldCurrentOptions = JavaScriptCore.getOptions();
-	try {
-		Hashtable options = new Hashtable(oldCurrentOptions);
-		options.put(JavaScriptCore.CODEASSIST_VISIBILITY_CHECK, JavaScriptCore.ENABLED);
-		JavaScriptCore.setOptions(options);
-		
-	    this.wc = getWorkingCopy(
-	            "/Completion/src/test/AType.js",
-	            "package test;\n" +
-	            "class AType {\n" +
-	            "  public class Member1 {\n" +
-	            "    private class Member2 {\n" +
-	            "      public class Member3 {\n" +
-	            "      }\n" +
-	            "    }\n" +
-	            "  }\n" +
-	            "  void foo(){\n" +
-	            "    Member\n" +
-	            "  }\n" +
-	            "}");
-	    
-	    
-	    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	    String str = this.wc.getSource();
-	    String completeBehind = "Member";
-	    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-    	assertResults(
-	            "AType.Member1.Member2[TYPE_REF]{test.AType.Member1.Member2, test, Ltest.AType$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-				"AType.Member1.Member2.Member3[TYPE_REF]{test.AType.Member1.Member2.Member3, test, Ltest.AType$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-				"AType.Member1[TYPE_REF]{Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-	            requestor.getResults());
-	} finally {
-		JavaScriptCore.setOptions(oldCurrentOptions);
-	}
-}
-
-public void testCompletionAllocationExpressionIsParent1() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAllocationExpressionIsParent1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zz";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-public void testCompletionAllocationExpressionIsParent2() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionAllocationExpressionIsParent2.js",
-            "public class CompletionAllocationExpressionIsParent2 {\n" +
-            "	public class Inner {\n" +
-            "		public Inner(long i, long j){super();}\n" +
-            "		public Inner(Object i, Object j){super();}\n" +
-            "		\n" +
-            "	}\n" +
-            "	\n" +
-            "	long zzlong;\n" +
-            "	int zzint;\n" +
-            "	double zzdouble;\n" +
-            "	boolean zzboolean;\n" +
-            "	Object zzObject;\n" +
-            "	\n" +
-            "	void foo() {\n" +
-            "		this.new Inner(1, zz\n" +
-            "	}\n" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "zz";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent2;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent2;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent2;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent2;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent2;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
-            requestor.getResults());
-}
-
-public void testCompletionAllocationExpressionIsParent3() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionAllocationExpressionIsParent3.js",
-            "public class CompletionAllocationExpressionIsParent3 {\n" +
-            "	public class Inner {\n" +
-            "		public Inner(long i, long j){super();}\n" +
-            "		public Inner(Object i, Object j){super();}\n" +
-            "		\n" +
-            "	}\n" +
-            "	\n" +
-            "	long zzlong;\n" +
-            "	int zzint;\n" +
-            "	double zzdouble;\n" +
-            "	boolean zzboolean;\n" +
-            "	Object zzObject;\n" +
-            "	\n" +
-            "	void foo() {\n" +
-            "		new CompletionAllocationExpressionIsParent3().new Inner(1, zz\n" +
-            "	}\n" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "zz";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent3;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent3;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent3;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent3;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent3;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
-            requestor.getResults());
-}
-
-public void testCompletionAllocationExpressionIsParent4() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAllocationExpressionIsParent4.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zz";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionAllocationExpressionIsParent5() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAllocationExpressionIsParent5.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zz";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-public void testCompletionAllocationExpressionIsParent6() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionAllocationExpressionIsParent6.js",
-            "public class CompletionAllocationExpressionIsParent6 {\n" +
-            "	\n" +
-            "	long zzlong;\n" +
-            "	int zzint;\n" +
-            "	double zzdouble;\n" +
-            "	boolean zzboolean;\n" +
-            "	Object zzObject;\n" +
-            "	\n" +
-            "	void foo() {\n" +
-            "		new CompletionAllocation_ERROR_ExpressionIsParent6Plus().new Inner(1, zz\n" +
-            "	}\n" +
-            "}\n" +
-            "class CompletionAllocationExpressionIsParent6Plus {\n" +
-            "	public class Inner {\n" +
-            "		public Inner(long i, long j){\n" +
-            "			\n" +
-            "		}	\n" +
-            "	}	\n" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "zz";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent6;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent6;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent6;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent6;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-            "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent6;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
-            requestor.getResults());
-}
-
-public void testCompletionAmbiguousFieldName() throws JavaScriptModelException {
-
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAmbiguousFieldName.js");
-
-	String str = cu.getSource();
-	String completeBehind = "xBa";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"should have two completions", 
-		"element:xBar    completion:this.xBar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
-		"element:xBar    completion:xBar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionAmbiguousFieldName2() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionAmbiguousFieldName2.js",
-            "public class CompletionAmbiguousFieldName2 {\n"+
-            "	int xBar;\n"+
-            "	class classFoo {\n"+
-            "		public void foo(int xBar){\n"+
-            "			xBa\n"+
-            "		}\n"+
-            "	}\n"+
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "xBa";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "xBar[FIELD_REF]{CompletionAmbiguousFieldName2.this.xBar, LCompletionAmbiguousFieldName2;, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
-            "xBar[LOCAL_VARIABLE_REF]{xBar, null, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
-            requestor.getResults());
-}
-
-public void testCompletionAmbiguousFieldName3() throws JavaScriptModelException {
-
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAmbiguousFieldName3.js");
-
-	String str = cu.getSource();
-	String completeBehind = "xBa";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"should have two completions", 
-		"element:xBar    completion:ClassFoo.this.xBar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
-		"element:xBar    completion:xBar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-public void testCompletionAmbiguousFieldName4() throws JavaScriptModelException {
-
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAmbiguousFieldName4.js");
-
-	String str = cu.getSource();
-	String completeBehind = "xBa";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"should have one completion", 
-		"element:xBar    completion:xBar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-public void testCompletionAmbiguousType() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAmbiguousType.js");
-
-	String str = cu.getSource();
-	String completeBehind = "ABC";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"should have two completions", 
-		"element:ABC    completion:p1.ABC    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n" +
-		"element:ABC    completion:p2.ABC    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-public void testCompletionAmbiguousType2() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAmbiguousType2.js");
-
-	String str = cu.getSource();
-	String completeBehind = "ABC";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"should have two completions", 
-		"element:ABC    completion:ABC    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:ABC    completion:p2.ABC    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionArgumentName() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionArgumentName.js");
-
-	String str = cu.getSource();
-	String completeBehind = "ClassWithComplexName ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"should have two completions", 
-		"element:classWithComplexName    completion:classWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
-		"element:complexName2    completion:complexName2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
-		"element:name    completion:name    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
-		"element:withComplexName    completion:withComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionArrayAccess1() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionArrayAccess1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zzz";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:zzz1    completion:zzz1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-		"element:zzz2    completion:zzz2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE +R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=84690
-public void testCompletionArrayClone() throws JavaScriptModelException {
-    this.wc = getWorkingCopy(
-            "/Completion/src/test/CompletionArrayClone.js",
-            "package test;\n" +
-            "public class CompletionArrayClone {\n" +
-            "  public void foo() {\n" +
-            "    long[] var;\n" +
-            "    var.clon\n" +
-            "  }\n" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "clon";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "clone[FUNCTION_REF]{clone(), [J, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
-            requestor.getResults());
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=84690
-public void testCompletionArrayLength() throws JavaScriptModelException {
-    this.wc = getWorkingCopy(
-            "/Completion/src/test/CompletionArrayLength.js",
-            "package test;\n" +
-            "public class CompletionArrayLength {\n" +
-            "  public void foo() {\n" +
-            "    long[] var;\n" +
-            "    var.leng\n" +
-            "  }" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "leng";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "length[FIELD_REF]{length, [J, I, length, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
-            requestor.getResults());
-}
-
-public void testCompletionArraysCloneMethod() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionArraysCloneMethod.js");
-
-	String str = cu.getSource();
-	String completeBehind = ".cl";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionAssignmentInMethod1() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zz";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionAssignmentInMethod2() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod2.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zz";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionAssignmentInMethod3() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod3.js");
-
-	String str = cu.getSource();
-	String completeBehind = "Objec";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-public void testCompletionAssignmentInMethod4() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod4.js");
-
-	String str = cu.getSource();
-	String completeBehind = "Objec";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-public void testCompletionBasicAnonymousDeclaration1() throws JavaScriptModelException {
-	CompletionResult result = complete(
-			"/Completion/src3/test0000/CompletionBasicCompletionContext.js",
-			"public class CompletionBasicAnonymousDeclaration1 {\n"+
-			"	void foo() {\n"+
-			"		new Object(\n"+
-			"	}\n"+
-			"}",
-			"new Object(");
-	
-	assertResults(
-			"expectedTypesSignatures=null\n" +
-			"expectedTypesKeys=null",
-			result.context);
-	
-	assertResults(
-			"Object[ANONYMOUS_CLASS_DECLARATION]{, Ljava.lang.Object;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"Object[FUNCTION_REF<CONSTRUCTOR>]{, Ljava.lang.Object;, ()V, Object, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
-			result.proposals);
-}
-
-public void testCompletionBasicCompletionContext() throws JavaScriptModelException {
-	CompletionResult result = complete(
-			"/Completion/src3/test0000/CompletionBasicCompletionContext.js",
-			"package test0000;\n" +
-			"public class CompletionBasicCompletionContext {\n" +
-			"  void bar(String o) {\n" +
-			"    String zzz = null; \n" + 
-			"    o = zzz\n" + 
-			"  }\n" +
-			"}",
-			"zzz");
-	
-	assertResults(
-			"expectedTypesSignatures={Ljava.lang.String;}\n" +
-			"expectedTypesKeys={Ljava/lang/String;}",
-			result.context);
-	
-	assertResults(
-			"zzz[LOCAL_VARIABLE_REF]{zzz, null, Ljava.lang.String;, zzz, null, " + (R_DEFAULT + R_INTERESTING + R_CASE +  + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			result.proposals);
-}
-
-public void testCompletionBasicField1() throws JavaScriptModelException {
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicField1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zzvar";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertResults(
-			"zzvarzz[FIELD_REF]{zzvarzz, LCompletionBasicField1;, I, zzvarzz, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-public void testCompletionBasicKeyword1() throws JavaScriptModelException {
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicKeyword1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "whil";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertResults(
-			"while[KEYWORD]{while, null, null, while, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-public void testCompletionBasicLocalVariable1() throws JavaScriptModelException {
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicLocalVariable1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zzvar";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertResults(
-			"zzvarzz[LOCAL_VARIABLE_REF]{zzvarzz, null, I, zzvarzz, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-public void testCompletionBasicMethod1() throws JavaScriptModelException {
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicMethod1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zzfo";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertResults(
-			"zzfoo[FUNCTION_REF]{zzfoo(), LCompletionBasicMethod1;, ()V, zzfoo, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-public void testCompletionBasicMethodDeclaration1() throws JavaScriptModelException {
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicMethodDeclaration1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "equals";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertResults(
-			"equals[POTENTIAL_METHOD_DECLARATION]{equals, LCompletionBasicMethodDeclaration1;, ()V, equals, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"equals[FUNCTION_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-public void testCompletionBasicPackage1() throws JavaScriptModelException {
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicPackage1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "java.lan";
-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertResults(
-			"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-
-public void testCompletionBasicPotentialMethodDeclaration1() throws JavaScriptModelException {
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicPotentialMethodDeclaration1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zzpot";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertResults(
-			"zzpot[POTENTIAL_METHOD_DECLARATION]{zzpot, LCompletionBasicPotentialMethodDeclaration1;, ()V, zzpot, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-
-public void testCompletionBasicType1() throws JavaScriptModelException {
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicType1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "Objec";
-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertResults(
-			"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-public void testCompletionBasicVariableDeclaration1() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/CompletionBasicVariableDeclaration1.js",
-		"public class CompletionBasicVariableDeclaration1 {\n"+
-		"	public Object obj;\n"+
-		"}\n");
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "obj";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-	assertResults(
-		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
-		requestor.getResults());
-}
-
-public void testCompletionBinaryOperator1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBinaryOperator1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "var";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
-			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-
-public void testCompletionBinaryOperator2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBinaryOperator2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "var";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
-			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-
-
-public void testCompletionBinaryOperator3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBinaryOperator3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "var";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
-			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-
-
-/**
- * Ensures that completion is not case sensitive
- */
-public void testCompletionCaseInsensitive() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu = getCompilationUnit("Completion", "src", "", "CompletionCaseInsensitive.js");
-	
-	String str = cu.getSource();
-	String completeBehind = "Fiel";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-	
-	assertEquals("should have one class",
-		"element:field    completion:field    relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_STATIC + R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-/**
- * Complete a package in a case insensitive way
- */
-public void testCompletionCaseInsensitivePackage() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCaseInsensitivePackage.js");
-
-	String str = cu.getSource();
-	String completeBehind = "Ja";
-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
-	
-	cu.codeComplete(cursorLocation, requestor);
-	assertEquals(
-		"should have package completions",
-		"element:jarpack1    completion:jarpack1    relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED)+"\n" +
-		"element:jarpack2    completion:jarpack2    relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED)+"\n" +
-		"element:java    completion:java    relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"\n" +
-		"element:java.io    completion:java.io    relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"\n" +
-		"element:java.lang    completion:java.lang    relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-public void testCompletionCastIsParent1() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCastIsParent1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zz";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:zz00    completion:zz00    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz00M    completion:zz00M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz01    completion:zz01    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz01M    completion:zz01M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz02    completion:zz02    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz02M    completion:zz02M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz10    completion:zz10    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz10M    completion:zz10M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz11    completion:zz11    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz11M    completion:zz11M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz12    completion:zz12    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz12M    completion:zz12M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz20    completion:zz20    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz20M    completion:zz20M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz21    completion:zz21    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz21M    completion:zz21M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz22    completion:zz22    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zz22M    completion:zz22M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzOb    completion:zzOb    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzObM    completion:zzObM()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-public void testCompletionCastIsParent2() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCastIsParent2.js");
-
-	String str = cu.getSource();
-	String completeBehind = "xx";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:XX00    completion:XX00    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:XX01    completion:XX01    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:XX02    completion:XX02    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:XX10    completion:XX10    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:XX11    completion:XX11    relevance:"+(R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:XX12    completion:XX12    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:XX20    completion:XX20    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:XX21    completion:XX21    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:XX22    completion:XX22    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionCatchArgumentName() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/CompletionCatchArgumentName.js",
-		"public class CompletionCatchArgumentName {\n"+
-		"	public void foo(){\n"+
-		"		try{\n"+
-		"			\n"+
-		"		} catch (Exception ex)\n"+
-		"	}\n"+
-		"}\n");
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "ex";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-	assertResults(
-		"exception[VARIABLE_DECLARATION]{exception, null, Ljava.lang.Exception;, exception, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
-		requestor.getResults());
-}
-
-public void testCompletionCatchArgumentName2() throws JavaScriptModelException {
-	Hashtable options = JavaScriptCore.getOptions();
-	
-	Object argumentPrefixPreviousValue = options.get(JavaScriptCore.CODEASSIST_ARGUMENT_PREFIXES);
-	options.put(JavaScriptCore.CODEASSIST_ARGUMENT_PREFIXES,"arg"); //$NON-NLS-1$
-	Object localPrefixPreviousValue = options.get(JavaScriptCore.CODEASSIST_LOCAL_PREFIXES);
-	options.put(JavaScriptCore.CODEASSIST_LOCAL_PREFIXES,"loc"); //$NON-NLS-1$
-	
-	JavaScriptCore.setOptions(options);
-	
-	try {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCatchArgumentName2.js");
-	
-		String str = cu.getSource();
-		String completeBehind = "Exception ";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-	
-		assertEquals(
-			"element:exception    completion:exception    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
-			"element:locException    completion:locException    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX+ R_NON_RESTRICTED),
-			requestor.getResults());
-	} finally {
-		options.put(JavaScriptCore.CODEASSIST_ARGUMENT_PREFIXES,argumentPrefixPreviousValue);
-		options.put(JavaScriptCore.CODEASSIST_LOCAL_PREFIXES,localPrefixPreviousValue);
-		JavaScriptCore.setOptions(options);
-	}
-}
-
-public void testCompletionClassLiteralAfterAnonymousType1() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionClassLiteralAfterAnonymousType1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "double.";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionConditionalExpression1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConditionalExpression1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "var";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
-			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-
-public void testCompletionConditionalExpression2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConditionalExpression2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "var";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
-			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-
-public void testCompletionConditionalExpression3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConditionalExpression3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "var";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
-			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-
-
-/*
-* http://dev.eclipse.org/bugs/show_bug.cgi?id=24939
-*/
-public void testCompletionConstructorForAnonymousType() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConstructorForAnonymousType.js");
-
-	String str = cu.getSource();
-	String completeBehind = "TypeWithConstructor(";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:TypeWithConstructor    completion:    relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionEmptyToken1() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionEmptyToken1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zz";
-	// completion is just at start of 'zz'
-	int cursorLocation = str.lastIndexOf(completeBehind);
-	int start = cursorLocation;
-	int end = start + 4;
-	cu.codeComplete(cursorLocation, requestor);
-
-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-		assertEquals(
-			"element:clone    completion:clone()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:equals    completion:equals()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:finalize    completion:finalize()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:foo    completion:foo()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:getClass    completion:getClass()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:hashCode    completion:hashCode()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:notify    completion:notify()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:notifyAll    completion:notifyAll()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:toString    completion:toString()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:zzyy    completion:zzyy    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResultsWithPosition());
-	} else {
-		assertEquals(
-			"element:CompletionEmptyToken1    completion:CompletionEmptyToken1    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:clone    completion:clone()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:equals    completion:equals()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:finalize    completion:finalize()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:foo    completion:foo()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:getClass    completion:getClass()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:hashCode    completion:hashCode()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:notify    completion:notify()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:notifyAll    completion:notifyAll()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:toString    completion:toString()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:zzyy    completion:zzyy    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResultsWithPosition());
-	}
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=100808
-public void testCompletionEmptyToken2() throws JavaScriptModelException {
-    this.wc = getWorkingCopy(
-            "/Completion/src/testCompletionEmptyToken2/Test.js",
-            "package testCompletionEmptyToken2.");
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true);
-    
-    String str = this.wc.getSource();
-    String completeBehind = "testCompletionEmptyToken2.";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    int start = str.lastIndexOf(completeBehind);
-    int end = start + completeBehind.length();
-    
-    assertResults(
-            "expectedTypesSignatures=null\n"+
-            "expectedTypesKeys=null",
-            requestor.getContext());
-    
-	assertResults(
-            "testCompletionEmptyToken2[PACKAGE_REF]{testCompletionEmptyToken2, testCompletionEmptyToken2, null, null, null, ["+start+", "+end+"], " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
-            requestor.getResults());
-}
-
-/*
-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25221
-*/
-public void testCompletionEmptyTypeName1() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionEmptyTypeName1.js",
-            "public class CompletionEmptyTypeName1 {\n"+
-           "	void foo() {\n"+
-           "		A a = new \n"+
-           "	}\n"+
-           "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "new ";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-		assertResults(
-			"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
-			requestor.getResults());
-	} else {
-		assertResults(
-			"CompletionEmptyTypeName1[TYPE_REF]{CompletionEmptyTypeName1, , LCompletionEmptyTypeName1;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}\n"+
-			"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
-			requestor.getResults());
-	}
-}
-
-/*
-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25221
-*/
-public void testCompletionEmptyTypeName2() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionEmptyTypeName2.js");
-
-	String str = cu.getSource();
-	String completeBehind = " = ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-		assertEquals(
-			"element:a    completion:a    relevance:"+(R_DEFAULT + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
-			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-	} else {
-		assertEquals(
-			"element:A    completion:A    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:CompletionEmptyTypeName2    completion:CompletionEmptyTypeName2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:a    completion:a    relevance:"+(R_DEFAULT + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
-			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-	}
-}
-
-/*
-* http://dev.eclipse.org/bugs/show_bug.cgi?id=41643
-*/
-public void testCompletionEmptyTypeName3() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionEmptyTypeName3.js");
-
-	String str = cu.getSource();
-	String completeBehind = " = ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-		assertEquals(
-			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
-			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:x    completion:x    relevance:"+(R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
-			requestor.getResults());
-	} else {
-		assertEquals(
-			"element:CompletionEmptyTypeName2    completion:CompletionEmptyTypeName2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
-			"element:CompletionEmptyTypeName3    completion:CompletionEmptyTypeName3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:CompletionEmptyTypeName3.CompletionEmptyTypeName3_1    completion:CompletionEmptyTypeName3_1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:CompletionEmptyTypeName3_2    completion:CompletionEmptyTypeName3_2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
-			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-			"element:x    completion:x    relevance:"+(R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
-			requestor.getResults());
-	}
-}
-
-/**
- * Complete at end of file.
- */
-public void testCompletionEndOfCompilationUnit() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu = getCompilationUnit("Completion", "src", "", "CompletionEndOfCompilationUnit.js");
-	cu.codeComplete(cu.getSourceRange().getOffset() + cu.getSourceRange().getLength(), requestor);
-	assertEquals(
-		"should have two methods of 'foo'", 
-		"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED),
-		requestor.getResults());	
-}
-/*
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=66570
- */
-public void testCompletionExactNameCaseInsensitive() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionExactNameCaseInsensitive.js");
-
-	String str = cu.getSource();
-	String completeBehind = "(compleTionexactnamecaseInsensitive";
-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-			"element:CompletionExactNameCaseInsensitive    completion:CompletionExactNameCaseInsensitive    relevance:"+(R_DEFAULT + R_INTERESTING + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+ "\n" +
-			"element:CompletionExactNameCaseInsensitivePlus    completion:CompletionExactNameCaseInsensitivePlus    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-/*
-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25820
-*/
-public void testCompletionExpectedTypeIsNotValid() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionExpectedTypeIsNotValid.js");
-
-	String str = cu.getSource();
-	String completeBehind = "new U";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"",
-		requestor.getResults());
-}
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95505
-public void testCompletionExpectedTypeOnEmptyToken1() throws JavaScriptModelException {
-	IJavaScriptUnit aType = null;
-	try {
-		
-		aType = getWorkingCopy(
-	            "/Completion/src/test/AType.js",
-	            "package test;\n" +
-	            "public class AType{\n"+
-	            "}");
-		
-	    this.wc = getWorkingCopy(
-	            "/Completion/src/test/Test.js",
-	            "package test;\n" +
-	            "public class Test{\n"+
-	            "  void foo() {\n"+
-	            "    AType a = new \n"+
-	            "  }\n"+
-	            "}");
-	    
-	    
-	    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	    String str = this.wc.getSource();
-	    String completeBehind = "AType a = new ";
-	    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-	    assertResults(
-	            "expectedTypesSignatures={Ltest.AType;}\n"+
-	            "expectedTypesKeys={Ltest/AType;}",
-	            requestor.getContext());
-	    if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-			assertResults(
-		            "AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-		            requestor.getResults());
-	    } else {
-	    	assertResults(
-		            "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-					"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-		            requestor.getResults());
-	    }
-	} finally {
-		if(aType != null) {
-			aType.discardWorkingCopy();
-		}
-	}
-}
-
-
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95505
-public void testCompletionExpectedTypeOnEmptyToken3() throws JavaScriptModelException {
-	IJavaScriptUnit aType = null;
-	try {
-		aType = getWorkingCopy(
-	            "/Completion/src/test/AType.js",
-	            "package test;\n" +
-	            "public class AType{\n"+
-	            "}");
-		
-	    this.wc = getWorkingCopy(
-	            "/Completion/src/test/Test.js",
-	            "package test;\n" +
-	            "public class Test{\n"+
-	            "  void foo() {\n"+
-	            "    AType a = \n"+
-	            "  }\n"+
-	            "}");
-	    
-	    
-	    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	    requestor.setIgnored(CompletionProposal.METHOD_REF, true);
-	    requestor.setIgnored(CompletionProposal.FIELD_REF, true);
-	    requestor.setIgnored(CompletionProposal.LOCAL_VARIABLE_REF, true);
-	    
-	    String str = this.wc.getSource();
-	    String completeBehind = "AType a = ";
-	    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-	    assertResults(
-	            "expectedTypesSignatures={Ltest.AType;}\n"+
-	            "expectedTypesKeys={Ltest/AType;}",
-	            requestor.getContext());
-	    if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-			assertResults(
-		            "",
-		            requestor.getResults());
-	    } else {
-	    	assertResults(
-		            "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-					"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-		            requestor.getResults());
-	    }
-	} finally {
-		if(aType != null) {
-			aType.discardWorkingCopy();
-		}
-	}
-}
-
-
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95505
-public void testCompletionExpectedTypeOnEmptyToken4() throws JavaScriptModelException {
-	IJavaScriptUnit aType = null;
-	try {
-		aType = getWorkingCopy(
-	            "/Completion/src/test/AInterface.js",
-	            "package test;\n" +
-	            "public interface AInterface{\n"+
-	            "}");
-		
-	    this.wc = getWorkingCopy(
-	            "/Completion/src/test/Test.js",
-	            "package test;\n" +
-	            "public class Test{\n"+
-	            "  void foo() {\n"+
-	            "    AInterface a = new \n"+
-	            "  }\n"+
-	            "}");
-	    
-	    
-	    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	    
-	    String str = this.wc.getSource();
-	    String completeBehind = "AInterface a = new ";
-	    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-	
-	    assertResults(
-	            "expectedTypesSignatures={Ltest.AInterface;}\n"+
-	            "expectedTypesKeys={Ltest/AInterface;}",
-	            requestor.getContext());
-	    
-	    if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-			assertResults(
-		            "AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-		            requestor.getResults());
-	    } else {
-	    	assertResults(
-		            "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-					"AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-		            requestor.getResults());
-	    }
-	} finally {
-		if(aType != null) {
-			aType.discardWorkingCopy();
-		}
-	}
-}
-
-
-public void testCompletionFieldInitializer1() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zz";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-public void testCompletionFieldInitializer2() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer2.js");
-
-	String str = cu.getSource();
-	String completeBehind = "zz";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
-		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-public void testCompletionFieldInitializer3() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer3.js");
-
-	String str = cu.getSource();
-	String completeBehind = "Objec";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-public void testCompletionFieldInitializer4() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer4.js");
-
-	String str = cu.getSource();
-	String completeBehind = "Objec";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-public void testCompletionFieldName() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldName.js");
-
-	String str = cu.getSource();
-	String completeBehind = "ClassWithComplexName ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"should have two completions",
-		"element:classWithComplexName    completion:classWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
-		"element:complexName2    completion:complexName2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
-		"element:name    completion:name    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
-		"element:withComplexName    completion:withComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-/**
- * Complete the type "A" from "new A".
- */
-public void testCompletionFindClass() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionFindClass.js",
-            "public class CompletionFindClass {\n" +
-            "	private    A[] a;\n" +
-            "	public CompletionFindClass () {\n" +
-            "		this.a = new A\n" +
-            "	}\n" +
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "A";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-    		"ABC[TYPE_REF]{p1.ABC, p1, Lp1.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
-    		"ABC[TYPE_REF]{p2.ABC, p2, Lp2.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
-			"A3[TYPE_REF]{A3, , LA3;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
-			"A[TYPE_REF]{A, , LA;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
-            requestor.getResults());
-}
-
-
-/**
- * The same type must be find only once
- */
-public void testCompletionFindClass2() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindClass2.js");
-
-	String str = cu.getSource();
-	String completeBehind = "PX";
-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"should have one classe", 
-		"element:PX    completion:pack1.PX    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_QUALIFIED + R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-
-/**
- * Complete the type "Default" in the default package example.
- */
-public void testCompletionFindClassDefaultPackage() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionDefaultPackage.js");
-
-	String str = cu.getSource();
-	String completeBehind = "Def";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"should have one class", 
-		"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
-		requestor.getResults());	
-}
-
-
-/**
- * Complete the constructor "CompletionFindConstructor" from "new CompletionFindConstructor(".
- */
-public void testCompletionFindConstructor() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionFindConstructor.js",
-            "public class CompletionFindConstructor {\n"+
-            "	public CompletionFindConstructor (int i) {\n"+
-            "	}\n"+
-            "	publuc void foo(){\n"+
-            "		int x = 45;\n"+
-            "		new CompletionFindConstructor(i);\n"+
-            "	}\n"+
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    
-    String str = this.wc.getSource();
-    String completeBehind = "CompletionFindConstructor(";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "expectedTypesSignatures=null\n"+
-            "expectedTypesKeys=null",
-            requestor.getContext());
-    
-   assertResults(
-			"CompletionFindConstructor[ANONYMOUS_CLASS_DECLARATION]{, LCompletionFindConstructor;, (I)V, null, (i), "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
-			"CompletionFindConstructor[FUNCTION_REF<CONSTRUCTOR>]{, LCompletionFindConstructor;, (I)V, CompletionFindConstructor, (i), "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}",
-			requestor.getResults());
-}
-
-
-/**
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
- */
-public void testCompletionFindConstructor2() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionFindConstructor2.js",
-            "import zconstructors.*;\n"+
-            "public class CompletionFindConstructor2 {\n"+
-            "	Constructor2 c = new Constructor2();\n"+
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    
-    String str = this.wc.getSource();
-    String completeBehind = "Constructor2(";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "expectedTypesSignatures=null\n"+
-            "expectedTypesKeys=null",
-            requestor.getContext());
-    
-    assertEquals(
-			"Constructor2[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor2;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"Constructor2[FUNCTION_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor2;, ()V, Constructor2, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-/**
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
- */
-public void testCompletionFindConstructor3() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionFindConstructor3.js",
-            "import zconstructors.*;\n"+
-            "public class CompletionFindConstructor3 {\n"+
-            "	Constructor3 c = new Constructor3();\n"+
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    
-    String str = this.wc.getSource();
-    String completeBehind = "Constructor3(";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "expectedTypesSignatures=null\n"+
-            "expectedTypesKeys=null",
-            requestor.getContext());
-    
-    assertEquals(
-			"Constructor3[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor3;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"Constructor3[FUNCTION_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor3;, ()V, Constructor3, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-/**
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
- */
-public void testCompletionFindConstructor4() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionFindConstructor4.js",
-            "import zconstructors.*;\n"+
-            "public class CompletionFindConstructor4 {\n"+
-            "	Constructor4 c = new Constructor4();\n"+
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    
-    String str = this.wc.getSource();
-    String completeBehind = "Constructor4(";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "expectedTypesSignatures=null\n"+
-            "expectedTypesKeys=null",
-            requestor.getContext());
-    
-	assertEquals(
-			"Constructor4[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor4;, (I)V, null, (i), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"Constructor4[FUNCTION_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor4;, (I)V, Constructor4, (i), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-/**
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
- */
-public void testCompletionFindConstructor5() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionFindConstructor5.js",
-            "import zconstructors.*;\n"+
-            "public class CompletionFindConstructor5 {\n"+
-            "	Constructor5 c = new Constructor5();\n"+
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    
-    String str = this.wc.getSource();
-    String completeBehind = "Constructor5(";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-    assertResults(
-            "expectedTypesSignatures=null\n"+
-            "expectedTypesKeys=null",
-            requestor.getContext());
-    
-	assertEquals(
-			"Constructor5[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor5;, (I)V, null, (arg0), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"Constructor5[FUNCTION_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor5;, (I)V, Constructor5, (arg0), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-/**
- * Complete the exception "Exception" in a catch clause.
- */
-public void testCompletionFindExceptions1() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindException1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "Ex";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-	
-	assertEquals(
-		"should have one class", 
-		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED + R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-/**
- * Complete the exception "Exception" in a throws clause.
- */
-public void testCompletionFindExceptions2() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindException2.js");
-
-	String str = cu.getSource();
-	String completeBehind = "Ex";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"should have one class",
-		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED + R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-/**
- * Complete the field "var" from "va";
- */
-public void testCompletionFindField1() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindField1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "va";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-	
-	assertEquals(
-		"should have one field: 'var' and one variable: 'var'", 
-		"element:var    completion:this.var    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n"+
-		"element:var    completion:var    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
-		requestor.getResults());	
-}
-
-/**
- * Complete the field "var" from "this.va";
- */
-public void testCompletionFindField2() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindField2.js");
-
-	String str = cu.getSource();
-	String completeBehind = "va";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-	
-	assertEquals(
-		"should have 1 field of starting with 'va'",
-		"element:var    completion:var    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionFindField3() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindField3.js");
-
-	String str = cu.getSource();
-	String completeBehind = "b.ba";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:bar    completion:bar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-/**
- * Complete the import, "import pac"
- */
-public void testCompletionFindImport1() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionFindImport1.js",
-            "import pac\n"+
-            "\n"+
-            "public class CompletionFindImport1 {\n"+
-            "\n"+
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "pac";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-    
-	assertResults(
-			"pack[PACKAGE_REF]{pack.*;, pack, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
-			"pack1[PACKAGE_REF]{pack1.*;, pack1, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
-			"pack1.pack3[PACKAGE_REF]{pack1.pack3.*;, pack1.pack3, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
-			"pack2[PACKAGE_REF]{pack2.*;, pack2, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
-			requestor.getResults());
-}
-
-public void testCompletionFindImport2() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionFindImport2.js",
-            "import pack1.P\n"+
-            "\n"+
-            "public class CompletionFindImport2 {\n"+
-            "\n"+
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "pack1.P";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-    
-	assertResults(
-			"pack1.pack3[PACKAGE_REF]{pack1.pack3.*;, pack1.pack3, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n"+
-			"PX[TYPE_REF]{pack1.PX;, pack1, Lpack1.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
-			requestor.getResults());
-}
-
-/**
- * Complete the local variable "var";
- */
-public void testCompletionFindLocalVariable() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindLocalVariable.js");
-
-	String str = cu.getSource();
-	String completeBehind = "va";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-	assertEquals(
-		"should have one local variable of 'var'", 
-		"element:var    completion:var    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
-		requestor.getResults());	
-}
-
-public void testCompletionFindMemberType1() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionFindMemberType1.js",
-            "interface A1 {\n"+
-            "	class Inner1 {\n"+
-            "	}\n"+
-            "}\n"+
-            "interface B1 extends A1 {\n"+
-            "	class Inner1 {\n"+
-            "	}\n"+
-            "}\n"+
-            "public class CompletionFindMemberType1 {\n"+
-            "	public void foo() {\n"+
-            "		B1.Inner\n"+
-            "	}\n"+
-            "}");
-    
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "Inner";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-		"B1.Inner1[TYPE_REF]{Inner1, , LB1$Inner1;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) +"}",
-		requestor.getResults());
-}
-
-public void testCompletionFindMemberType2() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-            "/Completion/src/CompletionPrefixMethodName2.js",
-            "interface A2 {\n"+
-            "	class ZInner2{\n"+
-            "	}\n"+
-            "}\n"+
-            "interface B2 extends A2 {\n"+
-            "	class ZInner2 {\n"+
-            "	}\n"+
-            "}\n"+
-            "public class CompletionFindMemberType2 implements B2{\n"+
-            "	public void foo() {\n"+
-            "		ZInner\n"+
-            "	}\n"+
-            "}");
-    
-    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-    String str = this.wc.getSource();
-    String completeBehind = "ZInner";
-    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-		"B2.ZInner2[TYPE_REF]{ZInner2, , LB2$ZInner2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
-		requestor.getResults());
-}
-
-/**
- * Complete the method call "a.foobar" from "a.fooba";
- */
-public void testCompletionFindMethod1() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethod1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "fooba";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-	assertEquals(
-		"should have two methods of 'foobar'", 
-		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
-		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
-		requestor.getResults());		
-}
-/**
- * Too much Completion match on interface
- */
-public void testCompletionFindMethod2() throws JavaScriptModelException {
-	
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethod2.js");
-
-	String str = cu.getSource();
-	String completeBehind = "fooba";
-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"should have two completions", 
-		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
-		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
-		requestor.getResults());	
-}
-/**
- * Complete the method call "foobar" from "fooba";
- */
-public void testCompletionFindMethodInThis() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethodInThis.js");
-
-	String str = cu.getSource();
-	String completeBehind = "fooba";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-	assertEquals(
-		"should have one method of 'foobar'", 
-		"element:foobar    completion:foobar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
-		requestor.getResults());		
-}
-
-/**
- * Complete the method call "foobar" from "fooba".  The compilation
- * unit simulates typing in process; ie it has incomplete structure/syntax errors.
- */
-public void testCompletionFindMethodWhenInProcess() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethodInProcess.js");
-
-	String str = cu.getSource();
-	String completeBehind = "fooba";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-	assertEquals(
-		"should have a method of 'foobar'", 
-		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
-		requestor.getResults());
-	cu.close();
-}
-
-public void testCompletionFindSecondaryType1() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindSecondaryType1.js");
-
-	String str = cu.getSource();
-	String completeBehind = "/**/Secondary";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-		"element:SecondaryType1    completion:SecondaryType1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-		"element:SecondaryType2    completion:SecondaryType2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-/**
- * Complete the field "bar" from "this.ba"
- */
-public void testCompletionFindThisDotField() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindThisDotField.js");
-
-	String str = cu.getSource();
-	String completeBehind = "this.ba";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-	assertEquals(
-		"should have one result of 'bar'", 
-		"element:bar    completion:bar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
-		requestor.getResults());
-}
-
-public void testCompletionImportedType1() throws JavaScriptModelException {
-    this.workingCopies = new IJavaScriptUnit[2];
-    this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/imported/ZZZZ.js",
-		"package test.imported;"+
-		"public class ZZZZ {\n"+
-		"  \n"+
-		"}");
-		
-	this.workingCopies[1] = getWorkingCopy(
-			"/Completion/src/test/CompletionImportedType1.js",
-			"package test;"+
-			"public class CompletionImportedType1 {"+
-			"  ZZZ\n"+
-			"}");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[1].getSource();
-	String completeBehind = "ZZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[1].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType1;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"ZZZZ[TYPE_REF]{test.imported.ZZZZ, test.imported, Ltest.imported.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-public void testCompletionImportedType2() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[4];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/imported1/ZZZZ.js",
-		"package test.imported1;"+
-		"public class ZZZZ {\n"+
-		"  \n"+
-		"}");
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src/test/imported2/ZZZZ.js",
-		"package test.imported2;"+
-		"public class ZZZZ {\n"+
-		"  \n"+
-		"}");
-	this.workingCopies[2] = getWorkingCopy(
-		"/Completion/src/test/imported3/ZZZZ.js",
-		"package test.imported3;"+
-		"public class ZZZZ {\n"+
-		"  \n"+
-		"}");
-	
-	this.workingCopies[3] = getWorkingCopy(
-		"/Completion/src/test/CompletionImportedType2.js",
-		"package test;"+
-		"import test.imported1.*;"+
-		"import test.imported2.*;"+
-		"import test.imported3.*;"+
-		"public class CompletionImportedType2 {"+
-		"  ZZZ\n"+
-		"}");
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[3].getSource();
-	String completeBehind = "ZZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[3].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType2;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-			"ZZZZ[TYPE_REF]{test.imported2.ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-			"ZZZZ[TYPE_REF]{test.imported3.ZZZZ, test.imported3, Ltest.imported3.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-public void testCompletionImportedType3() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[4];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/imported1/ZZZZ.js",
-		"package test.imported1;"+
-		"public class ZZZZ {\n"+
-		"  \n"+
-		"}");
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src/test/imported2/ZZZZ.js",
-		"package test.imported2;"+
-		"public class ZZZZ {\n"+
-		"  \n"+
-		"}");
-	this.workingCopies[2] = getWorkingCopy(
-		"/Completion/src/test/imported3/ZZZZ.js",
-		"package test.imported3;"+
-		"public class ZZZZ {\n"+
-		"  \n"+
-		"}");
-	
-	this.workingCopies[3] = getWorkingCopy(
-		"/Completion/src/test/CompletionImportedType3.js",
-		"package test;"+
-		"import test.imported2.*;"+
-		"public class CompletionImportedType3 {"+
-		"  ZZZ\n"+
-			"}");
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[3].getSource();
-	String completeBehind = "ZZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[3].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType3;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-			"ZZZZ[TYPE_REF]{test.imported3.ZZZZ, test.imported3, Ltest.imported3.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-			"ZZZZ[TYPE_REF]{ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-public void testCompletionImportedType4() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[3];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/imported1/ZZZZ.js",
-		"package test.imported1;"+
-		"public class ZZZZ {\n"+
-		"  \n"+
-		"}");
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src/test/imported2/ZZZZ.js",
-		"package test.imported2;"+
-		"public class ZZZZ {\n"+
-		"  \n"+
-		"}");
-		
-	this.workingCopies[2] = getWorkingCopy(
-		"/Completion/src/test/CompletionImportedType4.js",
-		"package test;"+
-		"import test.imported1.*;"+
-		"public class CompletionImportedType4 {"+
-		"  ZZZ\n"+
-		"}");
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[2].getSource();
-	String completeBehind = "ZZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[2].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType4;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"ZZZZ[TYPE_REF]{test.imported2.ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-			"ZZZZ[TYPE_REF]{ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-public void testCompletionImportedType5() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[3];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/imported1/ZZZZ.js",
-		"package test.imported1;"+
-		"public class ZZZZ {\n"+
-		"  \n"+
-		"}");
-	this.workingCopies[1] = getWorkingCopy(
-		"/Completion/src/test/imported2/ZZZZ.js",
-		"package test.imported2;"+
-		"public class ZZZZ {\n"+
-		"  \n"+
-		"}");
-		
-	this.workingCopies[2] = getWorkingCopy(
-		"/Completion/src/test/CompletionImportedType5.js",
-		"package test;"+
-		"import test.imported2.*;"+
-		"public class CompletionImportedType5 {"+
-		"  ZZZ\n"+
-		"}");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[2].getSource();
-	String completeBehind = "ZZZ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[2].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType5;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
-			"ZZZZ[TYPE_REF]{ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends1() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends1.js",
-			"package test;\n" +
-			"public class CompletionInsideExtends1 extends  {\n" +
-			"  public class CompletionInsideExtends1Inner {}\n" +
-			"}\n" +
-			"class CompletionInsideExtends1TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "extends ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-		assertResults(
-				"",
-				requestor.getResults());
-	} else {
-		assertResults(
-				"CompletionInsideExtends1TopLevel[TYPE_REF]{CompletionInsideExtends1TopLevel, test, Ltest.CompletionInsideExtends1TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	}
-	
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends10() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends10.js",
-			"package test;\n" +
-			"public interface CompletionInsideExtends10 {\n" +
-			"  public interface CompletionInsideExtends10Inner extends CompletionInsideExtends{\n" +
-			"    public interface CompletionInsideExtends10InnerInner {\n" +
-			"    }\n" +
-			"  }\n" +
-			"}\n" +
-			"interface CompletionInsideExtends10TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "extends CompletionInsideExtends";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"CompletionInsideExtends10[TYPE_REF]{CompletionInsideExtends10, test, Ltest.CompletionInsideExtends10;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"CompletionInsideExtends10TopLevel[TYPE_REF]{CompletionInsideExtends10TopLevel, test, Ltest.CompletionInsideExtends10TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends11() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends11.js",
-			"package test;\n" +
-			"public class CompletionInsideExtends11 implements {\n" +
-			"  public class CompletionInsideExtends11Inner {\n" +
-			"  }\n" +
-			"}\n" +
-			"class CompletionInsideExtends11TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "implements ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-		assertResults(
-				"",
-				requestor.getResults());
-	} else {
-		assertResults(
-				"",
-				requestor.getResults());
-	}
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends12() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends12.js",
-			"package test;\n" +
-			"public class CompletionInsideExtends12 implements CompletionInsideExtends {\n" +
-			"  public class CompletionInsideExtends12Inner {\n" +
-			"  }\n" +
-			"}\n" +
-			"class CompletionInsideExtends12TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "implements CompletionInsideExtends";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"",
-			requestor.getResults());
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends2() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends2.js",
-			"package test;\n" +
-			"public class CompletionInsideExtends2 extends CompletionInsideExtends {\n" +
-			"  public class CompletionInsideExtends2Inner {}\n" +
-			"}\n" +
-			"class CompletionInsideExtends2TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "extends CompletionInsideExtends";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"CompletionInsideExtends2TopLevel[TYPE_REF]{CompletionInsideExtends2TopLevel, test, Ltest.CompletionInsideExtends2TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends3() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends3.js",
-			"package test;\n" +
-			"public class CompletionInsideExtends3 {\n" +
-			"  public class CompletionInsideExtends3Inner extends {\n" +
-			"    public class CompletionInsideExtends3InnerInner {\n" +
-			"    }\n" +
-			"  }\n" +
-			"}\n" +
-			"class CompletionInsideExtends3TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "extends ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-		assertResults(
-				"",
-				requestor.getResults());
-	} else {
-		assertResults(
-				"CompletionInsideExtends3[TYPE_REF]{CompletionInsideExtends3, test, Ltest.CompletionInsideExtends3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"CompletionInsideExtends3TopLevel[TYPE_REF]{CompletionInsideExtends3TopLevel, test, Ltest.CompletionInsideExtends3TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	}
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends4() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends4.js",
-			"package test;\n" +
-			"public class CompletionInsideExtends4 {\n" +
-			"  public class CompletionInsideExtends4Inner extends CompletionInsideExtends{\n" +
-			"    public class CompletionInsideExtends4InnerInner {\n" +
-			"    }\n" +
-			"  }\n" +
-			"\n}" +
-			"class CompletionInsideExtends4TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "extends CompletionInsideExtends";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"CompletionInsideExtends4[TYPE_REF]{CompletionInsideExtends4, test, Ltest.CompletionInsideExtends4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"CompletionInsideExtends4TopLevel[TYPE_REF]{CompletionInsideExtends4TopLevel, test, Ltest.CompletionInsideExtends4TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends5() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends5.js",
-			"package test;\n" +
-			"public class CompletionInsideExtends5 {\n" +
-			"  void foo() {\n" +
-			"    public class CompletionInsideExtends5Inner extends {\n" +
-			"      public class CompletionInsideExtends5InnerInner {\n" +
-			"      }\n" +
-			"    }\n" +
-			"  }\n" +
-			"}\n" +
-			"class CompletionInsideExtends5TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "extends ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-		assertResults(
-				"",
-				requestor.getResults());
-	} else {
-		assertResults(
-				"CompletionInsideExtends5[TYPE_REF]{CompletionInsideExtends5, test, Ltest.CompletionInsideExtends5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"CompletionInsideExtends5TopLevel[TYPE_REF]{CompletionInsideExtends5TopLevel, test, Ltest.CompletionInsideExtends5TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	}
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends6() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends6.js",
-			"package test;\n" +
-			"public class CompletionInsideExtends6 {\n" +
-			"  void foo() {\n" +
-			"    public class CompletionInsideExtends6Inner extends CompletionInsideExtends {\n" +
-			"      public class CompletionInsideExtends6InnerInner {\n" +
-			"      }\n" +
-			"    }\n" +
-			"  }\n" +
-			"}\n" +
-			"class CompletionInsideExtends6TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "extends CompletionInsideExtends";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"CompletionInsideExtends6[TYPE_REF]{CompletionInsideExtends6, test, Ltest.CompletionInsideExtends6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"CompletionInsideExtends6TopLevel[TYPE_REF]{CompletionInsideExtends6TopLevel, test, Ltest.CompletionInsideExtends6TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends7() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends7.js",
-			"package test;\n" +
-			"public interface CompletionInsideExtends7 extends  {\n" +
-			"  public interface CompletionInsideExtends7Inner {}\n" +
-			"}\n" +
-			"interface CompletionInsideExtends7TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "extends ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-		assertResults(
-				"",
-				requestor.getResults());
-	} else {
-		assertResults(
-				"CompletionInsideExtends7TopLevel[TYPE_REF]{CompletionInsideExtends7TopLevel, test, Ltest.CompletionInsideExtends7TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	}
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends8() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends8.js",
-			"package test;\n" +
-			"public interface CompletionInsideExtends8 extends CompletionInsideExtends {\n" +
-			"  public interface CompletionInsideExtends8Inner {}\n" +
-			"}\n" +
-			"interface CompletionInsideExtends8TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "extends CompletionInsideExtends";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"CompletionInsideExtends8TopLevel[TYPE_REF]{CompletionInsideExtends8TopLevel, test, Ltest.CompletionInsideExtends8TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
-public void testCompletionInsideExtends9() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideExtends9.js",
-			"package test;\n" +
-			"public interface CompletionInsideExtends9 {\n" +
-			"  public interface CompletionInsideExtends9Inner extends {\n" +
-			"    public interface CompletionInsideExtends9InnerInner {\n" +
-			"    }\n" +
-			"  }\n" +
-			"}\n" +
-			"interface CompletionInsideExtends9TopLevel {\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "extends ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
-		assertResults(
-				"",
-				requestor.getResults());
-	} else {
-		assertResults(
-				"CompletionInsideExtends9[TYPE_REF]{CompletionInsideExtends9, test, Ltest.CompletionInsideExtends9;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-				"CompletionInsideExtends9TopLevel[TYPE_REF]{CompletionInsideExtends9TopLevel, test, Ltest.CompletionInsideExtends9TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-				requestor.getResults());
-	}
-}
-
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=82740
-public void testCompletionInsideGenericClass() throws JavaScriptModelException {
-	this.wc = getWorkingCopy(
-			"/Completion/src/test/CompletionInsideGenericClass.js",
-			"package test;\n" +
-			"public class CompletionInsideGenericClass <CompletionInsideGenericClassParameter> {\n" +
-			"  CompletionInsideGenericClas\n" +
-			"}");
-	
-	
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.wc.getSource();
-	String completeBehind = "CompletionInsideGenericClas";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"CompletionInsideGenericClas[POTENTIAL_METHOD_DECLARATION]{CompletionInsideGenericClas, Ltest.CompletionInsideGenericClass;, ()V, CompletionInsideGenericClas, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
-			"CompletionInsideGenericClass[TYPE_REF]{CompletionInsideGenericClass, test, Ltest.CompletionInsideGenericClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-
-public void testCompletionInsideStaticMethod() throws JavaScriptModelException {
-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-	IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionInsideStaticMethod.js");
-
-	String str = cu.getSource();
-	String completeBehind = "doT";
-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
-	cu.codeComplete(cursorLocation, requestor);
-
-	assertEquals(
-			"element:doTheThing    completion:doTheThing()    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionInstanceofOperator1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src", "", "CompletionInstanceofOperator1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "x instanceof WWWCompletionInstanceof";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:WWWCompletionInstanceof1    completion:WWWCompletionInstanceof1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
-			"element:WWWCompletionInstanceof2    completion:WWWCompletionInstanceof2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
-			"element:WWWCompletionInstanceof3    completion:WWWCompletionInstanceof3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
-			"element:WWWCompletionInstanceof4    completion:WWWCompletionInstanceof4    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordAssert1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "as";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:assert    completion:assert    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordAssert2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "as";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordAssert3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "as";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordAssert4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "as";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:assert    completion:assert    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordAssert5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "as";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordAssert6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "as";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordBreak1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "bre";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:break    completion:break    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordBreak2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "bre";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordBreak3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "bre";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:break    completion:break    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordBreak4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "bre";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:break    completion:break    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordBreak5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "bre";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordBreak6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "bre";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:break    completion:break    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCase1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cas";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCase10() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase10.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cas";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordCase2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cas";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCase3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cas";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCase4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cas";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCase5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cas";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordCase6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cas";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCase7() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase7.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cas";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCase8() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase8.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cas";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCase9() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase9.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cas";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCatch1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cat";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCatch10() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch10.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cat";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
-			"element:catchz    completion:catchz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCatch2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cat";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordCatch3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cat";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordCatch4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cat";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordCatch5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cat";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
-			"element:catchz    completion:catchz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCatch6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cat";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordCatch7() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch7.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cat";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordCatch8() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch8.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cat";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordCatch9() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch9.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cat";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordClass1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass10() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass10.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass11() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass11.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass12() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass12.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass13() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass13.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass14() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass14.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass15() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass15.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass16() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass16.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass17() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass17.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass18() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass18.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass19() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass19.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass20() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass20.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass21() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass21.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass22() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass22.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass23() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass23.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass24() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass24.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass7() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass7.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass8() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass8.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordClass9() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass9.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cla";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordContinue1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cont";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:continue    completion:continue    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordContinue2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cont";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordContinue3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cont";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:continue    completion:continue    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordContinue4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "cont";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordDefault1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "def";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDefault10() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault10.js");
-
-		String str = cu.getSource();
-		String completeBehind = "def";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDefault2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "def";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDefault3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "def";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDefault4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "def";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDefault5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "def";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDefault6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "def";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDefault7() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault7.js");
-
-		String str = cu.getSource();
-		String completeBehind = "def";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDefault8() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault8.js");
-
-		String str = cu.getSource();
-		String completeBehind = "def";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDefault9() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault9.js");
-
-		String str = cu.getSource();
-		String completeBehind = "def";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDo1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "do";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:do    completion:do    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n"+
-			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDo2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "do";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDo3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "do";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDo4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "do";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:do    completion:do    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n"+
-			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDo5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "do";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordDo6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "do";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordElse1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "els";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:else    completion:else    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordElse2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "els";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordElse3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "els";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordElse4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "els";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordElse5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "els";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:else    completion:else    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordElse6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "els";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordElse7() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse7.js");
-
-		String str = cu.getSource();
-		String completeBehind = "els";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordElse8() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse8.js");
-
-		String str = cu.getSource();
-		String completeBehind = "els";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFalse1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fal";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFalse2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fal";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:false    completion:false    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFalse3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fal";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFalse4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fal";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:false    completion:false    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
-			requestor.getResults());
-}
-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=95008
-public void testCompletionKeywordFalse5() throws JavaScriptModelException {
-	this.workingCopies = new IJavaScriptUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-		"/Completion/src/test/Test.js",
-		"package test;"+
-		"public class Test {\n" + 
-		"  boolean test = ;\n" + 
-		"}\n");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "boolean test = ";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-
-	assertResults(
-			"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"clone[FUNCTION_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"finalize[FUNCTION_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"getClass[FUNCTION_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"hashCode[FUNCTION_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"notify[FUNCTION_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"notifyAll[FUNCTION_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"toString[FUNCTION_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"wait[FUNCTION_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"wait[FUNCTION_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"wait[FUNCTION_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
-			"test[FIELD_REF]{test, Ltest.Test;, Z, test, null, " + (R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
-			"equals[FUNCTION_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
-			"false[KEYWORD]{false, null, null, false, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}\n" +
-			"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal10() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal10.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal11() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal11.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal12() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal12.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal13() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal13.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal14() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal14.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
-			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal15() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal15.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal16() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal16.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
-			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal17() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal17.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal18() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal18.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
-			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
-			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal7() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal7.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
-			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal8() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal8.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinal9() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal9.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fin";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
-			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE +R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally10() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally10.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally11() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally11.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally12() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally12.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally13() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally13.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
-			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally14() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally14.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
-			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally7() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally7.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally8() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally8.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFinally9() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally9.js");
-
-		String str = cu.getSource();
-		String completeBehind = "finall";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFor1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fo";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:for    completion:for    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFor2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fo";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFor3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fo";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordFor4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fo";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
-			"element:for    completion:for    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFor5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fo";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordFor6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "fo";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordIf1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "if";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:if    completion:if    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordIf2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "if";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordIf3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "if";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordIf4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "if";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:if    completion:if    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordIf5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "if";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordIf6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "if";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordImport1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "imp";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordImport2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordImport2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "imp";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordImport3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "imp";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordImport4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "imp";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordImport5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "imp";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordImport6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "imp";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordImport7() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport7.js");
-
-		String str = cu.getSource();
-		String completeBehind = "imp";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordImport8() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordImport8.js");
-
-		String str = cu.getSource();
-		String completeBehind = "imp";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordInstanceof1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ins";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:instanceof    completion:instanceof    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordInstanceof2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ins";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordInstanceof3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ins";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordInstanceof4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ins";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:instanceof    completion:instanceof    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordInstanceof5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ins";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordInstanceof6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ins";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordNew1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew10() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew10.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew11() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew11.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew12() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew12.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew13() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew13.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew14() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew14.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew15() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew15.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew16() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew16.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew7() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew7.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew8() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew8.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNew9() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew9.js");
-
-		String str = cu.getSource();
-		String completeBehind = "ne";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNull1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "nul";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordNull2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "nul";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:null    completion:null    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordNull3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "nul";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordNull4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "nul";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:null    completion:null    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordPackage1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "pac";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:package    completion:package    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordPackage2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordPackage2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "pac";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-
-public void testCompletionKeywordPackage3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage3.js");
-
-		String str = cu.getSource();
-		String completeBehind = "pac";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordPackage4() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage4.js");
-
-		String str = cu.getSource();
-		String completeBehind = "pac";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordPackage5() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage5.js");
-
-		String str = cu.getSource();
-		String completeBehind = "pac";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordPackage6() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage6.js");
-
-		String str = cu.getSource();
-		String completeBehind = "pac";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordPackage7() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage7.js");
-
-		String str = cu.getSource();
-		String completeBehind = "pac";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordPackage8() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordPackage8.js");
-
-		String str = cu.getSource();
-		String completeBehind = "pac";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordPrivate1() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate1.js");
-
-		String str = cu.getSource();
-		String completeBehind = "pri";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:private    completion:private    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordPrivate10() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate10.js");
-
-		String str = cu.getSource();
-		String completeBehind = "pri";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"",
-			requestor.getResults());
-}
-public void testCompletionKeywordPrivate2() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate2.js");
-
-		String str = cu.getSource();
-		String completeBehind = "pri";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		cu.codeComplete(cursorLocation, requestor);
-
-		assertEquals(
-			"element:private    completion:private    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
-			requestor.getResults());
-}
-public void testCompletionKeywordPrivate3() throws JavaScriptModelException {
-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
-		IJavaScriptUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate3.js");