This commit was manufactured by cvs2svn to create tag 'v20040406'.

Sprout from master 2004-04-06 11:26:15 UTC Dirk Baeumer <dbaeumer> 'excluded org.eclipse.sdk.test-feature/plugins/'
Cherrypick from master 2004-03-30 17:26:25 UTC teicher <teicher> 'moved java template infrastructure to new persistence model':
    org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/infoviews/SourceView.java
    org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java
Delete:
    org.eclipse.jdt.astview.feature/.project
    org.eclipse.jdt.astview.feature/build.properties
    org.eclipse.jdt.astview.feature/cpl-v10.html
    org.eclipse.jdt.astview.feature/eclipse_update_120.jpg
    org.eclipse.jdt.astview.feature/feature.properties
    org.eclipse.jdt.astview.feature/feature.xml
    org.eclipse.jdt.astview.feature/license.html
    org.eclipse.jdt.astview/.classpath
    org.eclipse.jdt.astview/.project
    org.eclipse.jdt.astview/AST-View-Site/.sitebuild/sitebuild.xml
    org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.0.jar
    org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.0.jar
    org.eclipse.jdt.astview/AST-View-Site/site.xml
    org.eclipse.jdt.astview/Adarrow.gif
    org.eclipse.jdt.astview/build.properties
    org.eclipse.jdt.astview/icons/c/collapseall.gif
    org.eclipse.jdt.astview/icons/c/expandall.gif
    org.eclipse.jdt.astview/icons/c/refresh.gif
    org.eclipse.jdt.astview/icons/c/setfocus.gif
    org.eclipse.jdt.astview/icons/c/synced.gif
    org.eclipse.jdt.astview/icons/d/collapseall.gif
    org.eclipse.jdt.astview/icons/d/expandall.gif
    org.eclipse.jdt.astview/icons/d/refresh.gif
    org.eclipse.jdt.astview/icons/d/setfocus.gif
    org.eclipse.jdt.astview/icons/d/synced.gif
    org.eclipse.jdt.astview/icons/e/collapseall.gif
    org.eclipse.jdt.astview/icons/e/expandall.gif
    org.eclipse.jdt.astview/icons/e/refresh.gif
    org.eclipse.jdt.astview/icons/e/setfocus.gif
    org.eclipse.jdt.astview/icons/e/synced.gif
    org.eclipse.jdt.astview/icons/view.gif
    org.eclipse.jdt.astview/index.html
    org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.0.zip
    org.eclipse.jdt.astview/plugin.xml
    org.eclipse.jdt.astview/refresh.gif
    org.eclipse.jdt.astview/setfocus.gif
    org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewImages.java
    org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java
    org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java
    org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/GenericVisitor.java
    org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/NodeFinder.java
    org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
    org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java
    org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java
    org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/BindingProperty.java
    org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NodeProperty.java
    org.eclipse.jdt.astview/synced.gif
    org.eclipse.jdt.astview/view.gif
    org.eclipse.jdt.ui.vcm/.classpath
    org.eclipse.jdt.ui.vcm/.cvsignore
    org.eclipse.jdt.ui.vcm/.project
    org.eclipse.jdt.ui.vcm/.vcm_meta
    org.eclipse.jdt.ui.vcm/about.html
    org.eclipse.jdt.ui.vcm/build.properties
    org.eclipse.jdt.ui.vcm/plugin.properties
    org.eclipse.jdt.ui.vcm/plugin.xml.off
    org.eclipse.jdt.ui.vcm/scripts/exportplugin.xml
    org.junit/.classpath
    org.junit/.project
    org.junit/about.html
    org.junit/build.properties
    org.junit/junit.jar
    org.junit/junitsrc.zip
    org.junit/plugin.properties
    org.junit/plugin.xml
    org.junit/scripts/exportplugin.xml
diff --git a/org.eclipse.jdt.astview.feature/.project b/org.eclipse.jdt.astview.feature/.project
deleted file mode 100644
index eec119c..0000000
--- a/org.eclipse.jdt.astview.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.astview.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/org.eclipse.jdt.astview.feature/build.properties b/org.eclipse.jdt.astview.feature/build.properties
deleted file mode 100644
index c9dacd2..0000000
--- a/org.eclipse.jdt.astview.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.property,\
-               cpl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties
diff --git a/org.eclipse.jdt.astview.feature/cpl-v10.html b/org.eclipse.jdt.astview.feature/cpl-v10.html
deleted file mode 100644
index 36aa208..0000000
--- a/org.eclipse.jdt.astview.feature/cpl-v10.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-<HEAD>
-<TITLE>Common Public License - v 1.0</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF" VLINK="#800000">
-
-
-<P ALIGN="CENTER"><B>Common Public License - v 1.0</B>
-<P><B></B><FONT SIZE="3"></FONT>
-<P><FONT SIZE="3"></FONT><FONT SIZE="2">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT").  ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>1.  DEFINITIONS</B></FONT>
-<P><FONT SIZE="2">"Contribution" means:</FONT>
-
-<UL><FONT SIZE="2">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:</FONT></UL>
-
-
-<UL><FONT SIZE="2">i)	 	changes to the Program, and</FONT></UL>
-
-
-<UL><FONT SIZE="2">ii)		additions to the Program;</FONT></UL>
-
-
-<UL><FONT SIZE="2">where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.  </FONT><FONT SIZE="2">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.  </FONT><FONT SIZE="2">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.  </FONT></UL>
-
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Contributor" means any person or entity that distributes the Program.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.  </FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">"Program" means the Contributions distributed in accordance with this Agreement.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.</FONT>
-<P><FONT SIZE="2"><B></B></FONT>
-<P><FONT SIZE="2"><B>2.  GRANT OF RIGHTS</B></FONT>
-
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">a)	</FONT><FONT SIZE="2">Subject to the terms of this Agreement, each Contributor hereby grants</FONT><FONT SIZE="2"> Recipient a non-exclusive, worldwide, royalty-free copyright license to</FONT><FONT SIZE="2" COLOR="#FF0000"> </FONT><FONT SIZE="2">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.</FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">b) 	Subject to the terms of this Agreement, each Contributor hereby grants </FONT><FONT SIZE="2">Recipient a non-exclusive, worldwide,</FONT><FONT SIZE="2" COLOR="#008000"> </FONT><FONT SIZE="2">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.   </FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2">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.</FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2">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. </FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-<P><FONT SIZE="2"><B>3.  REQUIREMENTS</B></FONT>
-<P><FONT SIZE="2"><B></B>A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:</FONT>
-
-<UL><FONT SIZE="2">a)	it complies with the terms and conditions of this Agreement; and</FONT></UL>
-
-
-<UL><FONT SIZE="2">b)	its license agreement:</FONT></UL>
-
-
-<UL><FONT SIZE="2">i)	effectively disclaims</FONT><FONT SIZE="2"> 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; </FONT></UL>
-
-
-<UL><FONT SIZE="2">ii) 	effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; </FONT></UL>
-
-
-<UL><FONT SIZE="2">iii)</FONT><FONT SIZE="2">	states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and</FONT></UL>
-
-
-<UL><FONT SIZE="2">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.</FONT><FONT SIZE="2" COLOR="#0000FF"> </FONT><FONT SIZE="2" COLOR="#FF0000"></FONT></UL>
-
-
-<UL><FONT SIZE="2" COLOR="#FF0000"></FONT><FONT SIZE="2"></FONT></UL>
-
-<P><FONT SIZE="2">When the Program is made available in source code form:</FONT>
-
-<UL><FONT SIZE="2">a)	it must be made available under this Agreement; and </FONT></UL>
-
-
-<UL><FONT SIZE="2">b)	a copy of this Agreement must be included with each copy of the Program.  </FONT></UL>
-
-<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT>
-<P><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT><FONT SIZE="2">Contributors may not remove or alter any copyright notices contained within the Program.  </FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">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.  </FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>4.  COMMERCIAL DISTRIBUTION</B></FONT>
-<P><FONT SIZE="2">Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like.  While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors.   Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering.  The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement.  In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations.  The Indemnified Contributor may participate in any such claim at its own expense.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">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.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"></FONT>
-<P><FONT SIZE="2" COLOR="#0000FF"></FONT><FONT SIZE="2"><B>5.  NO WARRANTY</B></FONT>
-<P><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is</FONT><FONT SIZE="2"> solely responsible for determining the appropriateness of using and distributing </FONT><FONT SIZE="2">the Program</FONT><FONT SIZE="2"> and assumes all risks associated with its exercise of rights under this Agreement</FONT><FONT SIZE="2">, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, </FONT><FONT SIZE="2">programs or equipment, and unavailability or interruption of operations</FONT><FONT SIZE="2">.  </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"><B>6.  DISCLAIMER OF LIABILITY</B></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">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 </FONT><FONT SIZE="2">(INCLUDING WITHOUT LIMITATION LOST PROFITS),</FONT><FONT SIZE="2"> 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.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>7.  GENERAL</B></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">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.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed.  In addition, 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. </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">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.  </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">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 </FONT><FONT SIZE="2">publish new versions (including revisions) of this Agreement from time to </FONT><FONT SIZE="2">time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward.   IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity.  </FONT><FONT SIZE="2">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 </FONT><FONT SIZE="2">version.  </FONT><FONT SIZE="2">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, </FONT><FONT SIZE="2">by implication, estoppel or otherwise</FONT><FONT SIZE="2">.</FONT><FONT SIZE="2">  All rights in the Program not expressly granted under this Agreement are reserved.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">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.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-
-</BODY>
-
-</HTML>
\ No newline at end of file
diff --git a/org.eclipse.jdt.astview.feature/eclipse_update_120.jpg b/org.eclipse.jdt.astview.feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/org.eclipse.jdt.astview.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview.feature/feature.properties b/org.eclipse.jdt.astview.feature/feature.properties
deleted file mode 100644
index 3fc5c9a..0000000
--- a/org.eclipse.jdt.astview.feature/feature.properties
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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 Development Tools AST View
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-
-# "description" property - description of the feature
-description=Java Development Tools AST View
-
-# "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.ORG SOFTWARE USER AGREEMENT\n\
-17th June, 2002\n\
-\n\
-ECLIPSE.ORG 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\
-Unless otherwise indicated, all Content made available by Eclipse.org\n\
-is provided to you under the terms and conditions of the Common Public\n\
-License Version 1.0 ("CPL"). A copy of the CPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/cpl-v10.html.\n\
-For purposes of the CPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "features".\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Subdirectories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by Eclipse.org is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory. The Abouts, Feature\n\
-Licenses and Feature Update Licenses may refer to the CPL or other\n\
-license agreements, notices or terms and conditions . It is your\n\
-obligation to read and accept all such all terms and conditions prior\n\
-to use of the Content. If no About, Feature License or Feature Update\n\
-License is provided, please contact Eclipse.org to determine what terms\n\
-and conditions govern that particular Content.\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.jdt.astview.feature/feature.xml b/org.eclipse.jdt.astview.feature/feature.xml
deleted file mode 100644
index b6d0b0c..0000000
--- a/org.eclipse.jdt.astview.feature/feature.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jdt.astview.feature"
-      label="org.eclipse.jdt.astview.feature"
-      version="1.0.0"
-      provider-name="Eclipse.org">
-
-   <install-handler/>
-
-   <description>
-      %description
-   </description>
-
-   <license url="%licenseURL">%license</license>
-
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jdt.astview"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"/>
-
-</feature>
diff --git a/org.eclipse.jdt.astview.feature/license.html b/org.eclipse.jdt.astview.feature/license.html
deleted file mode 100644
index 00d784b..0000000
--- a/org.eclipse.jdt.astview.feature/license.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse.org Software User Agreement</h2>
-<p>17th June, 2002</p>
-
-<p>ECLIPSE.ORG 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>
-
-<p>Unless otherwise indicated, all Content made available by Eclipse.org is provided to you under the terms and conditions of the Common Public License Version 1.0
-   (&quot;CPL&quot;).  A copy of the CPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-   For purposes of the CPL, &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.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<p>Content may be apportioned into plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. 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 a Feature.   Plug-ins and Fragments are located in directories
-   named &quot;plugins&quot; and Features are located in directories named &quot;features&quot;.</p>
-  
-<p>Features may also include other Features (&quot;Included Features&quot;). Files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</p>
-  
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &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>Subdirectories 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 Eclipse.org is installed using the Eclipse Update Manager, 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;.
-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.  The Abouts, Feature Licenses and Feature Update Licenses may refer to the CPL or other license agreements, notices or terms and conditions . It is your obligation to read and accept all such all terms and conditions prior to use of the Content.
-If no About, Feature License or Feature Update License is provided, please contact Eclipse.org to determine what terms and conditions govern that particular Content.</p>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-</body>
-</html>
diff --git a/org.eclipse.jdt.astview/.classpath b/org.eclipse.jdt.astview/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.jdt.astview/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.astview/.project b/org.eclipse.jdt.astview/.project
deleted file mode 100644
index c3d8e13..0000000
--- a/org.eclipse.jdt.astview/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.astview</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.filebuffers</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jface.text</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.editors</project>
-		<project>org.eclipse.ui.ide</project>
-		<project>org.eclipse.ui.views</project>
-		<project>org.eclipse.ui.workbench.texteditor</project>
-	</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/org.eclipse.jdt.astview/AST-View-Site/.sitebuild/sitebuild.xml b/org.eclipse.jdt.astview/AST-View-Site/.sitebuild/sitebuild.xml
deleted file mode 100644
index 515a8e1..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/.sitebuild/sitebuild.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site-build
-      feature-location="features"
-      plugin-location="plugins"
-      autobuild="false"
-      scrub-output="false"
-      use-console="true">
-   <feature id="org.eclipse.jdt.astview.feature" version="1.0.0"/>
-</site-build>
diff --git a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.0.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.0.jar
deleted file mode 100644
index 8cc6233..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.0.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.0.jar
deleted file mode 100644
index 12cf517..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/site.xml b/org.eclipse.jdt.astview/AST-View-Site/site.xml
deleted file mode 100644
index 21485be..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/site.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-
-   <description>
-      Update site for AST View
-   </description>
-   <feature url="features/org.eclipse.jdt.astview.feature_1.0.0.jar" id="org.eclipse.jdt.astview.feature" version="1.0.0">
-      <category name="ast-view"/>
-   </feature>
-   <category-def name="ast-view" label="AST View">
-      <description>
-         Optional AST View
-      </description>
-   </category-def>
-</site>
diff --git a/org.eclipse.jdt.astview/Adarrow.gif b/org.eclipse.jdt.astview/Adarrow.gif
deleted file mode 100644
index 1848247..0000000
--- a/org.eclipse.jdt.astview/Adarrow.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/build.properties b/org.eclipse.jdt.astview/build.properties
deleted file mode 100644
index 6117bde..0000000
--- a/org.eclipse.jdt.astview/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.ASTView.jar = src/
-bin.includes = plugin.xml,\
-               *.jar,\
-               ASTView.jar,\
-               icons/,\
-               src/
-src.includes = src/
diff --git a/org.eclipse.jdt.astview/icons/c/collapseall.gif b/org.eclipse.jdt.astview/icons/c/collapseall.gif
deleted file mode 100644
index bb8ecbf..0000000
--- a/org.eclipse.jdt.astview/icons/c/collapseall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/c/expandall.gif b/org.eclipse.jdt.astview/icons/c/expandall.gif
deleted file mode 100644
index d56c0f5..0000000
--- a/org.eclipse.jdt.astview/icons/c/expandall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/c/refresh.gif b/org.eclipse.jdt.astview/icons/c/refresh.gif
deleted file mode 100644
index a063c23..0000000
--- a/org.eclipse.jdt.astview/icons/c/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/c/setfocus.gif b/org.eclipse.jdt.astview/icons/c/setfocus.gif
deleted file mode 100644
index 0533fc2..0000000
--- a/org.eclipse.jdt.astview/icons/c/setfocus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/c/synced.gif b/org.eclipse.jdt.astview/icons/c/synced.gif
deleted file mode 100644
index f865f3a..0000000
--- a/org.eclipse.jdt.astview/icons/c/synced.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/d/collapseall.gif b/org.eclipse.jdt.astview/icons/d/collapseall.gif
deleted file mode 100644
index 83e9c92..0000000
--- a/org.eclipse.jdt.astview/icons/d/collapseall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/d/expandall.gif b/org.eclipse.jdt.astview/icons/d/expandall.gif
deleted file mode 100644
index ab2b2e6..0000000
--- a/org.eclipse.jdt.astview/icons/d/expandall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/d/refresh.gif b/org.eclipse.jdt.astview/icons/d/refresh.gif
deleted file mode 100644
index b2281b4..0000000
--- a/org.eclipse.jdt.astview/icons/d/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/d/setfocus.gif b/org.eclipse.jdt.astview/icons/d/setfocus.gif
deleted file mode 100644
index b8e29ff..0000000
--- a/org.eclipse.jdt.astview/icons/d/setfocus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/d/synced.gif b/org.eclipse.jdt.astview/icons/d/synced.gif
deleted file mode 100644
index ae5d548..0000000
--- a/org.eclipse.jdt.astview/icons/d/synced.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/e/collapseall.gif b/org.eclipse.jdt.astview/icons/e/collapseall.gif
deleted file mode 100644
index 3409b11..0000000
--- a/org.eclipse.jdt.astview/icons/e/collapseall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/e/expandall.gif b/org.eclipse.jdt.astview/icons/e/expandall.gif
deleted file mode 100644
index ec923bb..0000000
--- a/org.eclipse.jdt.astview/icons/e/expandall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/e/refresh.gif b/org.eclipse.jdt.astview/icons/e/refresh.gif
deleted file mode 100644
index 919423d..0000000
--- a/org.eclipse.jdt.astview/icons/e/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/e/setfocus.gif b/org.eclipse.jdt.astview/icons/e/setfocus.gif
deleted file mode 100644
index b920e33..0000000
--- a/org.eclipse.jdt.astview/icons/e/setfocus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/e/synced.gif b/org.eclipse.jdt.astview/icons/e/synced.gif
deleted file mode 100644
index ae5d548..0000000
--- a/org.eclipse.jdt.astview/icons/e/synced.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/view.gif b/org.eclipse.jdt.astview/icons/view.gif
deleted file mode 100644
index b50b2c3..0000000
--- a/org.eclipse.jdt.astview/icons/view.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/index.html b/org.eclipse.jdt.astview/index.html
deleted file mode 100644
index 74a532b..0000000
--- a/org.eclipse.jdt.astview/index.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-  <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-  <title>JDT UI Component Development Resources</title>
-  <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
- type="text/css">
-</head>
-<body text="#000000" bgcolor="#ffffff">
-&nbsp;
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-  <tbody>
-    <tr>
-      <td align="left" valign="top" colspan="2" bgcolor="#0080c0"><b><font
- face="Arial,Helvetica"><font color="#ffffff">org.eclipse.jdt.astview
-- AST View<br>
-      </font></font></b></td>
-    </tr>
-    <tr>
-      <td align="right" valign="top" width="2%"><img src="Adarrow.gif"
- border="0" height="16" width="16"></td>
-      <td width="98%"><b>Purpose</b>
-      <p>A view to visualize the AST (abstract syntax tree) of a Java
-file open in the editor. Navigate from text selection to AST nodes and
-from nodes to selections.<br>
-      </p>
-      </td>
-    </tr>
-    <tr>
-      <td align="right" valign="top" width="2%"><img src="Adarrow.gif"
- border="0" height="16" width="16"></td>
-      <td width="98%"><b>Install</b>
-      <p><b><i>Eclipse 3.0</i></b></p>
-      <ul>
-        <li>requires a SDK build &gt; <span style="font-weight: bold;">I20040309</span></li>
-        <li>manually download the plugin <a
- href="AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.0.jar">org.eclipse.jdt.astview</a>
-and extract the plugins into the plugins directory of your Eclipse
-install.<br>
-&nbsp; or<br>
-        </li>
-        <li>use the update feature and go to the AST View Update Site:<br>
-          <span style="font-weight: bold;">&nbsp;&nbsp;&nbsp;
-http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/jdt-ui-home/plugins/org.eclipse.jdt.astview/AST-View-Site</span></li>
-      </ul>
-      <br>
-      </td>
-    </tr>
-    <tr>
-      <td align="right" valign="top" width="2%"><img src="Adarrow.gif"
- border="0" height="16" width="16"></td>
-      <td width="98%"><b>Usage</b>
-      <ol>
-        <li>Open the AST view from the view menu: Window &gt; Show View
-&gt; Other... Java &gt; AST View </li>
-        <li><font color="#000000">Open a Java file in the editor </font>
-        </li>
-        <li>Click on 'Show AST of active editor' (<img
- style="width: 16px; height: 16px;" src="setfocus.gif" alt=""> ) to
-populate the view: The view shows the AST of the file opened in the
-editor and will also reveal the element corresponding to the current
-text selection<br>
-        </li>
-        <li><font color="#000000">Enable 'Link with editor' (</font><img
- style="width: 16px; height: 16px;" src="synced.gif" alt="">) to
-automatically track the active editor and the selection in the active
-editor.<br>
-        </li>
-        <li>Double click on AST nodes to get the corresponding element
-revealed in the editor.</li>
-        <li>Double click again to see the 'extended range' of a node,
-that means the range including all comments associated with it (comment
-mapper heuristic).</li>
-        <li>When the AST's underlying document has been changed use
-'Refresh' (<img style="width: 16px; height: 16px;" src="refresh.gif"
- alt="">)&nbsp; to update the AST.<br>
-        </li>
-      </ol>
-      <b>AST View Elements</b><br>
-      <br>
-There are three kinds of elements shown in the AST view<br>
-      <img style="width: 449px; height: 315px;" alt="AST View"
- src="view.gif"><br>
-      <ul>
-        <li>AST nodes are shown in gray color and with source range
-information. Children of AST nodes are the node properties.<br>
-        </li>
-        <li>node properties have names that are all all capitalized.
-Node properties represent lists of child nodes, a child node or a
-primitive node attribute (String, int or boolean)<br>
-        </li>
-        <li>bindings are shown in brackets. Only selected bindings are
-shown,</li>
-      </ul>
-      <span style="font-weight: bold;">Advanced Features</span><br>
-      <ul>
-        <li>You can toggle between the AST Level 2 and AST level 3 in
-the view menu (triangle). AST level 3 is the extended and modified AST
-that includes the new 1.5 language constructs. In <span
- style="font-weight: bold;">I20040309</span>, the level 3 AST is not
-yet available.<br>
-        </li>
-      </ul>
-      <span style="font-weight: bold;">Comments and Requests</span><br>
-      <ul>
-        <li>Source is included in the plugin archive</li>
-        <li>Comments to&nbsp; <a
- href="mailto:Martin_Aeschlimann%5Bat%5Dch.ibm.com">Martin_Aeschlimann[at]ch.ibm.com</a></li>
-      </ul>
-      <br>
-Thanks and credits go to Christian Hauser: The current AST view plugin
-is based his AST view implementation from the Zuerich Code Camp. Thanks
-a lot!<br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.0.zip b/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.0.zip
deleted file mode 100644
index a84031f..0000000
--- a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.0.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/plugin.xml b/org.eclipse.jdt.astview/plugin.xml
deleted file mode 100644
index 918d5d0..0000000
--- a/org.eclipse.jdt.astview/plugin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jdt.astview"
-   name="AST View Plug-in"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   class="org.eclipse.jdt.astview.ASTViewPlugin">
-
-   <runtime>
-      <library name="ASTView.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide" optional="true"/>
-      <import plugin="org.eclipse.ui.views" optional="true"/>
-      <import plugin="org.eclipse.jface.text" optional="true"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" optional="true"/>
-      <import plugin="org.eclipse.ui.editors" optional="true"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.core.runtime.compatibility" optional="true"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-   </requires>
-
-
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="ASTView"
-            icon="icons/view.gif"
-            category="org.eclipse.jdt.ui.java"
-            class="org.eclipse.jdt.astview.views.ASTView"
-            id="org.eclipse.jdt.astview.views.ASTView">
-      </view>
-   </extension>
-
-</plugin>
diff --git a/org.eclipse.jdt.astview/refresh.gif b/org.eclipse.jdt.astview/refresh.gif
deleted file mode 100644
index a063c23..0000000
--- a/org.eclipse.jdt.astview/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/setfocus.gif b/org.eclipse.jdt.astview/setfocus.gif
deleted file mode 100644
index 0533fc2..0000000
--- a/org.eclipse.jdt.astview/setfocus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewImages.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewImages.java
deleted file mode 100644
index db956e4..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewImages.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-public class ASTViewImages {
-
-	private static URL fgIconBaseURL= null;
-	
-	static {
-		String pathSuffix= "icons/"; //$NON-NLS-1$
-		try {
-			fgIconBaseURL= new URL(ASTViewPlugin.getDefault().getDescriptor().getInstallURL(), pathSuffix);
-		} catch (MalformedURLException e) {
-			// do nothing
-		}
-	}
-	
-	public static final String COLLAPSE= "collapseall.gif"; //$NON-NLS-1$
-	public static final String EXPAND= "expandall.gif"; //$NON-NLS-1$
-	public static final String LINK_WITH_EDITOR= "synced.gif"; //$NON-NLS-1$
-
-	public static final String SETFOCUS= "setfocus.gif"; //$NON-NLS-1$
-	public static final String REFRESH= "refresh.gif"; //$NON-NLS-1$
-
-	
-	//---- Helper methods to access icons on the file system --------------------------------------
-
-	public static void setImageDescriptors(IAction action, String type) {
-		
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(makeIconFileURL("d", type)); //$NON-NLS-1$
-			if (id != null)
-				action.setDisabledImageDescriptor(id);
-		} catch (MalformedURLException e) {
-		}
-	
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(makeIconFileURL("c", type)); //$NON-NLS-1$
-			if (id != null)
-				action.setHoverImageDescriptor(id);
-		} catch (MalformedURLException e) {
-		}
-	
-		action.setImageDescriptor(create("e", type)); //$NON-NLS-1$
-	}
-	
-	
-	private static ImageDescriptor create(String path, String name) {
-		try {
-			return ImageDescriptor.createFromURL(makeIconFileURL(path, name));
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-	
-	private static URL makeIconFileURL(String path, String name) throws MalformedURLException {
-		if (fgIconBaseURL == null)
-			throw new MalformedURLException();
-			
-		StringBuffer buffer= new StringBuffer(path);
-		buffer.append('/');
-		buffer.append(name);
-		return new URL(fgIconBaseURL, buffer.toString());
-	}	
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java
deleted file mode 100644
index d9ce990..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPluginDescriptor;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class ASTViewPlugin extends AbstractUIPlugin {
-
-	private static ASTViewPlugin fDefault;
-
-	public ASTViewPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		fDefault = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ASTViewPlugin getDefault() {
-		return fDefault;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java
deleted file mode 100644
index 3ab45a3..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IOpenable;
-
-/**
- *
- */
-public class EditorUtility {
-	private EditorUtility() {
-		super();
-	}
-
-	public static IEditorPart getActiveEditor() {
-		IWorkbenchWindow window= ASTViewPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-		if (window != null) {
-			IWorkbenchPage page= window.getActivePage();
-			if (page != null) {
-				return page.getActiveEditor();
-			}
-		}
-		return null;
-	}
-	
-	
-	public static IOpenable getJavaInput(IEditorPart part) {
-		IEditorInput editorInput= part.getEditorInput();
-		if (editorInput != null) {
-			IJavaElement input= (IJavaElement)editorInput.getAdapter(IJavaElement.class);
-			if (input instanceof IOpenable) {
-				return (IOpenable) input;
-			}
-		}
-		return null;	
-	}
-	
-	public static void selectInEditor(ITextEditor editor, int offset, int length) {
-		IEditorPart active = getActiveEditor();
-		if (active != editor) {
-			editor.getSite().getPage().activate(editor);
-		}
-		
-		editor.selectAndReveal(offset, length);
-	}
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/GenericVisitor.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/GenericVisitor.java
deleted file mode 100644
index 771ba4d..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/GenericVisitor.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-import org.eclipse.jdt.core.dom.*;
-
-public class GenericVisitor extends ASTVisitor {
-	
-	public GenericVisitor() {
-		super();
-	}
-
-	public GenericVisitor(boolean visitJavadocTags) {
-		super(visitJavadocTags);
-	}
-
-	//---- Hooks for subclasses -------------------------------------------------
-
-	protected boolean visitNode(ASTNode node) {
-		return true;
-	}
-	
-	protected void endVisitNode(ASTNode node) {
-	}
-
-	public boolean visit(AnonymousClassDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(ArrayAccess node) {
-		return visitNode(node);
-	}
-	public boolean visit(ArrayCreation node) {
-		return visitNode(node);
-	}
-	public boolean visit(ArrayInitializer node) {
-		return visitNode(node);
-	}
-	public boolean visit(ArrayType node) {
-		return visitNode(node);
-	}
-	public boolean visit(AssertStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(Assignment node) {
-		return visitNode(node);
-	}
-	public boolean visit(Block node) {
-		return visitNode(node);
-	}
-	public boolean visit(BooleanLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(BreakStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(CastExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(CatchClause node) {
-		return visitNode(node);
-	}
-	public boolean visit(CharacterLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(ClassInstanceCreation node) {
-		return visitNode(node);
-	}
-	public boolean visit(CompilationUnit node) {
-		return visitNode(node);
-	}
-	public boolean visit(ConditionalExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(ConstructorInvocation node) {
-		return visitNode(node);
-	}
-	public boolean visit(ContinueStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(DoStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(EmptyStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(ExpressionStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(FieldAccess node) {
-		return visitNode(node);
-	}
-	public boolean visit(FieldDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(ForStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(IfStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(ImportDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(InfixExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(InstanceofExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(Initializer node) {
-		return visitNode(node);
-	}
-	public boolean visit(Javadoc node) {
-		//	do not visit Javadoc tags by default. Use constructor with boolean to enable.
-		if (super.visit(node)) { 
-			return visitNode(node);
-		}
-		return false;
-	}
-	public boolean visit(LabeledStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(MethodDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(MethodInvocation node) {
-		return visitNode(node);
-	}
-	public boolean visit(NullLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(NumberLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(PackageDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(ParenthesizedExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(PostfixExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(PrefixExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(PrimitiveType node) {
-		return visitNode(node);
-	}
-	public boolean visit(QualifiedName node) {
-		return visitNode(node);
-	}
-	public boolean visit(ReturnStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(SimpleName node) {
-		return visitNode(node);
-	}
-	public boolean visit(SimpleType node) {
-		return visitNode(node);
-	}
-	public boolean visit(StringLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(SuperConstructorInvocation node) {
-		return visitNode(node);
-	}
-	public boolean visit(SuperFieldAccess node) {
-		return visitNode(node);
-	}
-	public boolean visit(SuperMethodInvocation node) {
-		return visitNode(node);
-	}
-	public boolean visit(SwitchCase node) {
-		return visitNode(node);
-	}
-	public boolean visit(SwitchStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(SynchronizedStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(ThisExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(ThrowStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(TryStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(TypeDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(TypeDeclarationStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(TypeLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(SingleVariableDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(VariableDeclarationExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(VariableDeclarationStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(VariableDeclarationFragment node) {
-		return visitNode(node);
-	}
-	public boolean visit(WhileStatement node) {
-		return visitNode(node);
-	}
-
-	/* since 3.0 */
-	public boolean visit(BlockComment node) {
-		return visitNode(node);
-	}
-	public boolean visit(LineComment node) {
-		return visitNode(node);
-	}
-	public boolean visit(MemberRef node) {
-		return visitNode(node);
-	}
-	public boolean visit(MethodRef node) {
-		return visitNode(node);
-	}
-	public boolean visit(MethodRefParameter node) {
-		return visitNode(node);
-	}
-	public boolean visit(TagElement node) {
-		return visitNode(node);
-	}
-	public boolean visit(TextElement node) {
-		return visitNode(node);
-	}
-
-	public void endVisit(AnonymousClassDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ArrayAccess node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ArrayCreation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ArrayInitializer node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ArrayType node) {
-		endVisitNode(node);
-	}
-	public void endVisit(AssertStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(Assignment node) {
-		endVisitNode(node);
-	}
-	public void endVisit(Block node) {
-		endVisitNode(node);
-	}
-	public void endVisit(BooleanLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(BreakStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(CastExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(CatchClause node) {
-		endVisitNode(node);
-	}
-	public void endVisit(CharacterLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ClassInstanceCreation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(CompilationUnit node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ConditionalExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ConstructorInvocation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ContinueStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(DoStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(EmptyStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ExpressionStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(FieldAccess node) {
-		endVisitNode(node);
-	}
-	public void endVisit(FieldDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ForStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(IfStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ImportDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(InfixExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(InstanceofExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(Initializer node) {
-		endVisitNode(node);
-	}
-	public void endVisit(Javadoc node) {
-		endVisitNode(node);
-	}
-	public void endVisit(LabeledStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(MethodDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(MethodInvocation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(NullLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(NumberLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(PackageDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ParenthesizedExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(PostfixExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(PrefixExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(PrimitiveType node) {
-		endVisitNode(node);
-	}
-	public void endVisit(QualifiedName node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ReturnStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SimpleName node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SimpleType node) {
-		endVisitNode(node);
-	}
-	public void endVisit(StringLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SuperConstructorInvocation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SuperFieldAccess node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SuperMethodInvocation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SwitchCase node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SwitchStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SynchronizedStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ThisExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ThrowStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TryStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TypeDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TypeDeclarationStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TypeLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SingleVariableDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(VariableDeclarationExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(VariableDeclarationStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(VariableDeclarationFragment node) {
-		endVisitNode(node);
-	}
-	public void endVisit(WhileStatement node) {
-		endVisitNode(node);
-	}
-	
-	/* since 3.0 */
-	public void endVisit(BlockComment node) {
-		endVisitNode(node);
-	}
-	public void endVisit(LineComment node) {
-		endVisitNode(node);
-	}
-	public void endVisit(MemberRef node) {
-		endVisitNode(node);
-	}
-	public void endVisit(MethodRef node) {
-		endVisitNode(node);
-	}
-	public void endVisit(MethodRefParameter node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TagElement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TextElement node) {
-		endVisitNode(node);
-	}
-
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/NodeFinder.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/NodeFinder.java
deleted file mode 100644
index f2d8008..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/NodeFinder.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-
-/**
- * For a give range finds the node covered and the node covering.
- */
-public class NodeFinder extends GenericVisitor {
-
-	/**
-	 * A visitor that maps a selection to a given ASTNode. The result node is
-	 * determined as follows:
-	 * <ul>
-	 *   <li>first the visitor tries to find a node with the exact start and length</li>
-	 * 	 <li>if no such node exists than the node that encloses the range defined by
-	 *       start and end is returned.</li>
-	 *   <li>if the length is zero than also nodes are considered where the node's
-	 *       start or end position matches <code>start</code>.</li>
-	 *   <li>otherwise <code>null</code> is returned.</li>
-	 * </ul>
-	 */
-	public static ASTNode perform(ASTNode root, int start, int length) {
-		NodeFinder finder= new NodeFinder(start, length);
-		root.accept(finder);
-		ASTNode result= finder.getCoveredNode();
-		if (result == null || result.getStartPosition() != start || result.getLength() != length) {
-			return finder.getCoveringNode();
-		}
-		return result;
-	}
-		
-	private int fStart;
-	private int fEnd;
-	
-	private ASTNode fCoveringNode;
-	private ASTNode fCoveredNode;
-	
-	public NodeFinder(int offset, int length) {
-		super(true); // include Javadoc tags
-		fStart= offset;
-		fEnd= offset + length;
-	}
-
-	protected boolean visitNode(ASTNode node) {
-		int nodeStart= node.getStartPosition();
-		int nodeEnd= nodeStart + node.getLength();
-		if (nodeEnd < fStart || fEnd < nodeStart) {
-			return false;
-		}
-		if (nodeStart <= fStart && fEnd <= nodeEnd) {
-			fCoveringNode= node;
-		}
-		if (fStart <= nodeStart && nodeEnd <= fEnd) {
-			if (fCoveringNode == node) { // nodeStart == fStart && nodeEnd == fEnd
-				fCoveredNode= node;
-				return true; // look further for node with same length as parent
-			} else if (fCoveredNode == null) { // no better found
-				fCoveredNode= node;
-			}
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Returns the covered node. If more than one nodes are covered by the selection, the
-	 * returned node is first covered node found in a top-down traversal of the AST
-	 * @return ASTNode
-	 */
-	public ASTNode getCoveredNode() {
-		return fCoveredNode;
-	}
-
-	/**
-	 * Returns the covering node. If more than one nodes are covering the selection, the
-	 * returned node is last covering node found in a top-down traversal of the AST
-	 * @return ASTNode
-	 */
-	public ASTNode getCoveringNode() {
-		return fCoveringNode;
-	}
-	
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
deleted file mode 100644
index 96aaf3a..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
+++ /dev/null
@@ -1,655 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.jdt.astview.ASTViewImages;
-import org.eclipse.jdt.astview.ASTViewPlugin;
-import org.eclipse.jdt.astview.EditorUtility;
-import org.eclipse.jdt.astview.NodeFinder;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.IFileBuffer;
-import org.eclipse.core.filebuffers.IFileBufferListener;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.DrillDownAdapter;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IOpenable;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-
-public class ASTView extends ViewPart {
-	
-	private class ASTLevelToggle extends Action {
-		private int fLevel;
-
-		public ASTLevelToggle(String label, int level) {
-			super(label, AS_RADIO_BUTTON);
-			fLevel= level;
-			if (level == getCurrentASTLevel()) {
-				setChecked(true);
-			}
-		}
-	
-		public int getLevel() {
-			return fLevel;
-		}
-		
-		public void run() {
-			performLevelToggle(fLevel);
-		}
-	}
-	
-	private class SuperListener implements ISelectionListener, IFileBufferListener, IDocumentListener, ISelectionChangedListener, IDoubleClickListener {
-		public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-			handleEditorPostSelectionChanged(part, selection);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferCreated(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void bufferCreated(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferDisposed(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void bufferDisposed(IFileBuffer buffer) {
-			if (buffer instanceof ITextFileBuffer) {
-				handleDocumentDisposed(((ITextFileBuffer) buffer).getDocument());
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferContentAboutToBeReplaced(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void bufferContentAboutToBeReplaced(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferContentReplaced(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void bufferContentReplaced(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#stateChanging(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void stateChanging(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#dirtyStateChanged(org.eclipse.core.filebuffers.IFileBuffer, boolean)
-		 */
-		public void dirtyStateChanged(IFileBuffer buffer, boolean isDirty) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#stateValidationChanged(org.eclipse.core.filebuffers.IFileBuffer, boolean)
-		 */
-		public void stateValidationChanged(IFileBuffer buffer, boolean isStateValidated) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#underlyingFileMoved(org.eclipse.core.filebuffers.IFileBuffer, org.eclipse.core.runtime.IPath)
-		 */
-		public void underlyingFileMoved(IFileBuffer buffer, IPath path) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#underlyingFileDeleted(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void underlyingFileDeleted(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#stateChangeFailed(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void stateChangeFailed(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
-		public void documentAboutToBeChanged(DocumentEvent event) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
-		public void documentChanged(DocumentEvent event) {
-			handleDocumentChanged(event.getDocument());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-		 */
-		public void selectionChanged(SelectionChangedEvent event) {
-			handleSelectionChanged(event.getSelection());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
-		 */
-		public void doubleClick(DoubleClickEvent event) {
-			handleDoubleClick(event);
-		}
-	}
-	
-	
-	private TreeViewer fViewer;
-	private DrillDownAdapter fDrillDownAdapter;
-	private Action fFocusAction;
-	private Action fRefreshAction;
-	private Action fCollapseAction;
-	private Action fExpandAction;
-	private Action fDoubleClickAction;
-	private Action fLinkWithEditor;
-	
-	private ASTLevelToggle[] fASTVersionToggleActions;
-	private int fCurrentASTLevel;
-	
-	private ITextEditor fEditor;
-	private IOpenable fOpenable;
-	private CompilationUnit fRoot;
-	private IDocument fCurrentDocument;
-	
-	private boolean fDoLinkWithEditor;
-	private Object fPreviousDouble;
-	
-	private SuperListener fSuperListener;
-	
-	public ASTView() {
-		fSuperListener= null;
-		fDoLinkWithEditor= false;
-		fCurrentASTLevel= AST.LEVEL_2_0;
-	}
-	
-	/*(non-Javadoc)
-	 * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite)
-	 */
-	public void init(IViewSite site) throws PartInitException {
-		super.setSite(site);
-		if (fSuperListener == null) {
-			fSuperListener= new SuperListener();
-			
-			ISelectionService service= site.getWorkbenchWindow().getSelectionService();
-			service.addPostSelectionListener(fSuperListener);
-			FileBuffers.getTextFileBufferManager().addFileBufferListener(fSuperListener);
-		}
-	}
-	
-	public int getCurrentASTLevel() {
-		return fCurrentASTLevel;
-	}
-
-	public void setInput(ITextEditor editor) throws CoreException {
-		if (fEditor != null) {
-			uninstallModificationListener();
-		}
-		
-		fEditor= null;
-		fRoot= null;
-		
-		if (editor != null) {
-			IOpenable openable= EditorUtility.getJavaInput(editor);
-			if (openable == null) {
-				throw new CoreException(getErrorStatus("Editor not showing a CU or classfile", null)); //$NON-NLS-1$
-			}
-			fOpenable= openable;
-			
-			ISelection selection= editor.getSelectionProvider().getSelection();
-			if (selection instanceof ITextSelection) {
-				ITextSelection textSelection= (ITextSelection) selection;
-				fRoot= internalSetInput(openable, textSelection.getOffset(), textSelection.getLength());
-				fEditor= editor;
-			}
-			installModificationListener();
-		}
-
-	}
-	
-	private CompilationUnit internalSetInput(IOpenable input, int offset, int length) throws CoreException {
-		IBuffer buffer= input.getBuffer();
-		if (buffer == null) {
-			throw new CoreException(getErrorStatus("Input has no buffer", null)); //$NON-NLS-1$
-		}
-	
-		ASTParser parser= ASTParser.newParser(getCurrentASTLevel());
-		parser.setResolveBindings(true);
-		if (input instanceof ICompilationUnit) {
-			parser.setSource((ICompilationUnit) input);
-		} else {
-			parser.setSource((IClassFile) input);
-		}
-		try {
-			CompilationUnit root= (CompilationUnit) parser.createAST(null);
-			if (root == null) {
-				throw new CoreException(getErrorStatus("Could not create AST", null)); //$NON-NLS-1$
-			}
-			
-			fViewer.setInput(root);
-			setASTUptoDate(true);
-			
-			ASTNode node= NodeFinder.perform(root, offset, length);
-			if (node != null) {
-				fViewer.getTree().setRedraw(false);
-				fViewer.setSelection(new StructuredSelection(node), true);
-				fViewer.getTree().setRedraw(true);
-			}
-			return root;
-			
-		} catch (RuntimeException e) {
-			throw new CoreException(getErrorStatus("Could not create AST:\n" + e.getMessage(), e)); //$NON-NLS-1$
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		if (fSuperListener != null) {
-			if (fEditor != null) {
-				uninstallModificationListener();
-			}
-			ISelectionService service= getSite().getWorkbenchWindow().getSelectionService();
-			service.removePostSelectionListener(fSuperListener);
-			FileBuffers.getTextFileBufferManager().removeFileBufferListener(fSuperListener);
-			fSuperListener= null;
-		}
-		super.dispose();
-	}
-	
-	private IStatus getErrorStatus(String message, Throwable th) {
-		return new Status(IStatus.ERROR, ASTViewPlugin.getDefault().getDescriptor().getUniqueIdentifier(), IStatus.ERROR, message, th);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		fViewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		fDrillDownAdapter = new DrillDownAdapter(fViewer);
-		fViewer.setContentProvider(new ASTViewContentProvider());
-		fViewer.setLabelProvider(new ASTViewLabelProvider());
-		fViewer.addSelectionChangedListener(fSuperListener);
-		fViewer.addDoubleClickListener(fSuperListener);
-		
-		makeActions();
-		hookContextMenu();
-		contributeToActionBars();
-		
-		performRefresh();
-		setASTUptoDate(fOpenable != null);
-	}
-
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				ASTView.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(fViewer.getControl());
-		fViewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, fViewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(fLinkWithEditor);
-		manager.add(new Separator());
-		for (int i= 0; i < fASTVersionToggleActions.length; i++) {
-			manager.add(fASTVersionToggleActions[i]);	
-		}
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(fFocusAction);
-		manager.add(fRefreshAction);
-		manager.add(fCollapseAction);
-		manager.add(fExpandAction);
-		manager.add(new Separator());
-
-		fDrillDownAdapter.addNavigationActions(manager);
-		// Other plug-ins can contribute there actions here
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(fFocusAction);
-		manager.add(fRefreshAction);
-		manager.add(new Separator());
-		fDrillDownAdapter.addNavigationActions(manager);
-		manager.add(new Separator());
-		manager.add(fExpandAction);
-		manager.add(fCollapseAction);
-		manager.add(fLinkWithEditor);
-	}
-	
-	private void setASTUptoDate(boolean isuptoDate) {
-		fRefreshAction.setEnabled(!isuptoDate && fOpenable != null);
-	}
-	
-
-	private void makeActions() {
-		fRefreshAction = new Action() {
-			public void run() {
-				performRefresh();
-			}
-		};
-		fRefreshAction.setText("Refresh AST"); //$NON-NLS-1$
-		fRefreshAction.setToolTipText("Refresh AST"); //$NON-NLS-1$
-		fRefreshAction.setEnabled(false);
-		ASTViewImages.setImageDescriptors(fRefreshAction, ASTViewImages.REFRESH);
-
-		
-		fFocusAction = new Action() {
-			public void run() {
-				performSetFocus();
-			}
-		};
-		fFocusAction.setText("Show AST of active editor"); //$NON-NLS-1$
-		fFocusAction.setToolTipText("Show AST of active editor"); //$NON-NLS-1$
-		ASTViewImages.setImageDescriptors(fFocusAction, ASTViewImages.SETFOCUS);
-
-		fCollapseAction = new Action() {
-			public void run() {
-				performCollapse();
-			}
-		};
-		fCollapseAction.setText("Collapse"); //$NON-NLS-1$
-		fCollapseAction.setToolTipText("Collapse Selected Node"); //$NON-NLS-1$
-		fCollapseAction.setEnabled(false);
-		ASTViewImages.setImageDescriptors(fCollapseAction, ASTViewImages.COLLAPSE);
-		
-		fExpandAction = new Action() {
-			public void run() {
-				performExpand();
-			}
-		};
-		fExpandAction.setText("Expand"); //$NON-NLS-1$
-		fExpandAction.setToolTipText("Expand Selected Node"); //$NON-NLS-1$
-		fExpandAction.setEnabled(false);
-		ASTViewImages.setImageDescriptors(fExpandAction, ASTViewImages.EXPAND);
-		
-		fDoubleClickAction = new Action() {
-			public void run() {
-				performDoubleClick();
-			}
-		};
-		
-		fLinkWithEditor = new Action() {
-			public void run() {
-				performLinkWithEditor();
-			}
-		};
-		fLinkWithEditor.setChecked(false);
-		fLinkWithEditor.setText("Link with editor"); //$NON-NLS-1$
-		fLinkWithEditor.setToolTipText("Link With Editor"); //$NON-NLS-1$
-		ASTViewImages.setImageDescriptors(fLinkWithEditor, ASTViewImages.LINK_WITH_EDITOR);
-			
-		fASTVersionToggleActions= new ASTLevelToggle[] {
-				new ASTLevelToggle("AST Level 2.0", AST.LEVEL_2_0), //$NON-NLS-1$
-				new ASTLevelToggle("AST Level 3.0", AST.LEVEL_3_0) //$NON-NLS-1$
-		};
-	}
-	
-	private void refreshAST() throws CoreException {
-		ASTNode node= getASTNodeNearSelection((IStructuredSelection) fViewer.getSelection());
-		int offset= 0;
-		int length= 0;
-		if (node != null) {
-			offset= node.getStartPosition();
-			length= node.getLength();
-		}
-
-		internalSetInput(fOpenable, offset, length);
-	}
-	
-	
-	protected void performLevelToggle(int level) {
-		int oldLevel= fCurrentASTLevel;
-		fCurrentASTLevel= level;
-		if (fOpenable == null) {
-			return;
-		}
-		
-		try {
-			refreshAST();
-		} catch (CoreException e) {
-			ErrorDialog.openError(getSite().getShell(), "AST View", "Could not set AST to new level.", e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-			
-			// change to previous
-			for (int i= 0; i < fASTVersionToggleActions.length; i++) {
-				ASTLevelToggle curr= fASTVersionToggleActions[i];
-				curr.setChecked(curr.getLevel() == oldLevel);
-			}
-			fCurrentASTLevel= oldLevel;
-		}
-	}
-	
-	private ASTNode getASTNodeNearSelection(IStructuredSelection selection) {
-		Object elem= selection.getFirstElement();
-		if (elem instanceof NodeProperty) {
-			Object node= ((NodeProperty) elem).getNode();
-			if (node instanceof ASTNode) {
-				return (ASTNode) node;
-			}
-			return ((NodeProperty) elem).getParent();
-		} else if (elem instanceof ASTNode) {
-			return (ASTNode) elem;
-		} else if (elem instanceof BindingProperty) {
-			return ((BindingProperty) elem).getParent();
-		}
-		return null;
-	}
-	
-	private void installModificationListener() {
-		fCurrentDocument= fEditor.getDocumentProvider().getDocument(fEditor.getEditorInput());
-		fCurrentDocument.addDocumentListener(fSuperListener);
-	}
-	
-	private void uninstallModificationListener() {
-		if (fCurrentDocument != null) {
-			fCurrentDocument.removeDocumentListener(fSuperListener);
-			fCurrentDocument= null;
-		}
-	}
-		
-	protected void handleDocumentDisposed(IDocument document) {
-		uninstallModificationListener();
-	}
-	
-	protected void handleDocumentChanged(IDocument document) {
-		setASTUptoDate(false);
-	}
-	
-	protected void handleSelectionChanged(ISelection selection) {
-		fExpandAction.setEnabled(!selection.isEmpty());
-		fCollapseAction.setEnabled(!selection.isEmpty());
-	}
-
-	protected void handleEditorPostSelectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (!fDoLinkWithEditor || fRoot == null || !(selection instanceof ITextSelection)) {
-			return;
-		}
-		if (part != fEditor && part instanceof ITextEditor && (EditorUtility.getJavaInput((ITextEditor) part) != null)) {
-			try {
-				setInput((ITextEditor) part);
-			} catch (CoreException e) {
-				// ignore
-			}
-			return;
-		}
-		
-		
-		ITextSelection textSelection= (ITextSelection) selection;
-		int offset= textSelection.getOffset();
-		int length= textSelection.getLength();
-		
-		NodeFinder finder= new NodeFinder(offset, length);
-		fRoot.accept(finder);
-		ASTNode covering= finder.getCoveringNode();
-		fViewer.reveal(covering);
-		fViewer.setSelection(new StructuredSelection(covering));
-	}
-	
-	public void handleDoubleClick(DoubleClickEvent event) {
-		fDoubleClickAction.run();
-	}
-	
-
-	protected void performLinkWithEditor() {
-		fDoLinkWithEditor= fLinkWithEditor.isChecked();
-	}
-
-	protected void performCollapse() {
-		IStructuredSelection selection= (IStructuredSelection) fViewer.getSelection();
-		if (selection.isEmpty()) {
-			fViewer.collapseAll();
-		} else {
-			Object[] selected= selection.toArray();
-			fViewer.getTree().setRedraw(false);
-			for (int i= 0; i < selected.length; i++) {
-				fViewer.collapseToLevel(selected[i], AbstractTreeViewer.ALL_LEVELS);
-			}
-			fViewer.getTree().setRedraw(true);
-		}
-	}
-
-	protected void performExpand() {	
-		IStructuredSelection selection= (IStructuredSelection) fViewer.getSelection();
-		if (selection.isEmpty()) {
-			fViewer.expandAll();
-		} else {
-			Object[] selected= selection.toArray();
-			fViewer.getTree().setRedraw(false);
-			for (int i= 0; i < selected.length; i++) {
-				fViewer.expandToLevel(selected[i], AbstractTreeViewer.ALL_LEVELS);
-			}
-			fViewer.getTree().setRedraw(true);
-		}
-	}
-
-	protected void performSetFocus() {
-		IEditorPart part= EditorUtility.getActiveEditor();
-		if (part instanceof ITextEditor) {
-			try {
-				setInput((ITextEditor) part);
-			} catch (CoreException e) {
-				ErrorDialog.openError(getSite().getShell(), "AST View", "Could not set AST view input ", e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-	
-	protected void performRefresh() {
-		if (fOpenable != null) {
-			try {
-				refreshAST();
-			} catch (CoreException e) {
-				ErrorDialog.openError(getSite().getShell(), "AST View", "Could not set AST view input ", e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-
-	protected void performDoubleClick() {
-		ISelection selection = fViewer.getSelection();
-		Object obj = ((IStructuredSelection) selection).getFirstElement();
-
-		boolean isTrippleClick= (obj == fPreviousDouble);
-		fPreviousDouble= isTrippleClick ? null : obj;
-		
-		ASTNode node= null;
-		if (obj instanceof ASTNode) {
-			node= (ASTNode) obj;
-		} else if (obj instanceof NodeProperty) {
-			Object val= ((NodeProperty) obj).getNode();
-			if (val instanceof ASTNode) {
-				node= (ASTNode) val;
-			}
-		} else if (obj instanceof BindingProperty) {
-			IBinding binding= ((BindingProperty) obj).getBinding();
-			ASTNode declaring= fRoot.findDeclaringNode(binding);
-			if (declaring != null) {
-				fViewer.reveal(declaring);
-				fViewer.setSelection(new StructuredSelection(declaring));
-			}
-			return;
-		}
-		
-		if (node != null) {
-			int offset= isTrippleClick ? fRoot.getExtendedStartPosition(node) : node.getStartPosition();
-			int length= isTrippleClick ? fRoot.getExtendedLength(node) : node.getLength();
-
-			EditorUtility.selectInEditor(fEditor, offset, length);
-		}
-	}
-
-	public void setFocus() {
-		fViewer.getControl().setFocus();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java
deleted file mode 100644
index 87ebdaa..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.MemberRef;
-import org.eclipse.jdt.core.dom.MethodRef;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
-import org.eclipse.jdt.core.dom.Type;
-
-public class ASTViewContentProvider implements IStructuredContentProvider, ITreeContentProvider {
-
-	public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-	}
-	public void dispose() {
-	}
-	public Object[] getElements(Object parent) {
-		return getChildren(parent);
-	}
-	public Object getParent(Object child) {
-		if (child instanceof ASTNode) {
-			ASTNode node= (ASTNode) child;
-			ASTNode parent= node.getParent();
-			if (parent != null) {
-				StructuralPropertyDescriptor prop= node.getLocationInParent();
-				return new NodeProperty(parent, prop);
-			}
-		} else if (child instanceof NodeProperty) {
-			return ((NodeProperty) child).getParent();
-		} else if (child instanceof BindingProperty) {
-			return ((BindingProperty) child).getParent();
-		}
-		return null;
-	}
-
-	public Object[] getChildren(Object parent) {
-		if (parent instanceof NodeProperty) {
-			NodeProperty prop= (NodeProperty) parent;
-			Object child= prop.getNode();
-			if (child instanceof List) {
-				return ((List) child).toArray();
-			} else if (child instanceof ASTNode) {
-				return new Object[] { child };
-			}
-		} else if (parent instanceof ASTNode) {
-			return getNodeChildren((ASTNode) parent);
-		}
-		return new Object[0];
-	}
-	
-	private Object[] getNodeChildren(ASTNode node) {
-		ArrayList res= new ArrayList();
-
-		if (node instanceof Name) {
-			IBinding binding= ((Name) node).resolveBinding();
-			res.add(new BindingProperty(node, binding)); //$NON-NLS-1$
-		} else if (node instanceof MethodRef) {
-			IBinding binding= ((MethodRef) node).resolveBinding();
-			res.add(new BindingProperty(node, binding)); //$NON-NLS-1$
-		} else if (node instanceof MemberRef) {
-			IBinding binding= ((MemberRef) node).resolveBinding();
-			res.add(new BindingProperty(node, binding)); //$NON-NLS-1$
-		} else if (node instanceof Expression) {
-			IBinding binding= ((Expression) node).resolveTypeBinding();
-			res.add(new BindingProperty(node, binding)); //$NON-NLS-1$
-		} else if (node instanceof Type) {
-			IBinding binding= ((Type) node).resolveBinding();
-			res.add(new BindingProperty(node, binding)); //$NON-NLS-1$
-		}
-		
-		List list= node.structuralPropertiesForType();
-		for (int i= 0; i < list.size(); i++) {
-			StructuralPropertyDescriptor curr= (StructuralPropertyDescriptor) list.get(i);
-			res.add(new NodeProperty(node, curr));
-		}
-		
-		return res.toArray();
-	}
-	
-	public boolean hasChildren(Object parent) {
-		return getChildren(parent).length > 0;
-	}
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java
deleted file mode 100644
index b448a5e..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.jdt.core.Signature;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-
-public class ASTViewLabelProvider extends LabelProvider implements IColorProvider {
-	
-	private int fSelectionStart;
-	private int fSelectionLength;
-	
-	public ASTViewLabelProvider() {
-		fSelectionStart= -1;
-		fSelectionLength= -1;
-	}
-	
-	public void setSelectedRange(int start, int length) {
-		fSelectionStart= start;
-		fSelectionLength= length;
-	}
-	
-
-	public String getText(Object obj) {
-		StringBuffer buf= new StringBuffer();
-		if (obj instanceof ASTNode) {
-			getNodeType((ASTNode) obj, buf);
-		} else {
-			buf.append(obj.toString());
-		}
-		return buf.toString(); 
-	}
-	
-	private void getNodeType(ASTNode node, StringBuffer buf) {
-		buf.append(Signature.getSimpleName(node.getClass().getName()));
-		buf.append(" ["); //$NON-NLS-1$
-		buf.append(node.getStartPosition());
-		buf.append(", "); //$NON-NLS-1$
-		buf.append(node.getLength());
-		buf.append(']');
-	}
-	
-	
-	public Image getImage(Object obj) {
-		return null;
-//		String imageKey = ISharedImages.IMG_OBJ_ELEMENT;
-//		if (obj instanceof ASTNode) {
-//			imageKey = ISharedImages.IMG_OBJ_FOLDER;
-//		}
-//		return PlatformUI.getWorkbench().getSharedImages().getImage(imageKey);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-	 */
-	public Color getForeground(Object element) {
-		if (element instanceof ASTNode) {
-			ASTNode node= (ASTNode) element;
-			int start= node.getStartPosition();
-			int end= start + node.getLength();
-			
-			ASTNode parent= node.getParent();
-			int parentstart= parent.getStartPosition();
-			int parentend= start + parent.getLength();
-			
-			if (start < parentstart || end > parentend) {
-				return Display.getCurrent().getSystemColor(SWT.COLOR_RED);
-			}
-
-			return Display.getCurrent().getSystemColor(SWT.COLOR_DARK_GRAY);
-		} else if (element instanceof BindingProperty) {
-			if (((BindingProperty) element).getBinding() == null) {
-				return Display.getCurrent().getSystemColor(SWT.COLOR_RED);
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-	 */
-	public Color getBackground(Object element) {
-		if (fSelectionStart != -1 && isInside(element)) {
-			return Display.getCurrent().getSystemColor(SWT.COLOR_YELLOW);
-		}
-		return null;
-	}
-	
-	private boolean isInsideNode(ASTNode node) {
-		int start= node.getStartPosition();
-		int end= start + node.getLength();
-		if (start <= fSelectionStart && (fSelectionStart + fSelectionLength) < end) {
-			return true;
-		}
-		return false;
-	}
-	
-	private boolean isInside(Object element) {
-		if (element instanceof ASTNode) {
-			return isInsideNode((ASTNode) element);
-		} else if (element instanceof NodeProperty) {
-			NodeProperty property= (NodeProperty) element;
-			Object object= property.getNode();
-			if (object instanceof ASTNode) {
-				return isInsideNode((ASTNode) object);
-			}
-		}
-		return false;
-	}
-	
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/BindingProperty.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/BindingProperty.java
deleted file mode 100644
index 41f867b..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/BindingProperty.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.IPackageBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-
-/**
- *
- */
-public class BindingProperty {
-	
-	private IBinding fBinding;
-	private ASTNode fParent;
-	
-	public BindingProperty(ASTNode parent, IBinding binding) {
-		fParent= parent;
-		fBinding= binding;
-	}
-	
-	public ASTNode getParent() {
-		return fParent;
-	}
-	
-	public IBinding getBinding() {
-		return fBinding;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		StringBuffer buf= new StringBuffer();
-		if (fBinding != null) {
-			switch (fBinding.getKind()) {
-				case IBinding.VARIABLE:
-					IVariableBinding variableBinding= (IVariableBinding) fBinding;
-					
-					buf.append("(variable binding: "); //$NON-NLS-1$
-					if (! variableBinding.isField()) {
-						buf.append(variableBinding.toString());
-					} else if (variableBinding.getDeclaringClass() == null) {
-						buf.append("(array type):length"); //$NON-NLS-1$
-					} else {
-						buf.append(variableBinding.getDeclaringClass().getName());
-						buf.append(':');
-						buf.append(variableBinding.getName());				
-					}
-					break;
-				case IBinding.PACKAGE:
-					IPackageBinding packageBinding= (IPackageBinding) fBinding;
-					buf.append("(package binding: "); //$NON-NLS-1$
-					buf.append(packageBinding.getName());
-					break;
-				case IBinding.TYPE:
-					ITypeBinding typeBinding= (ITypeBinding) fBinding;
-					buf.append("(type binding: "); //$NON-NLS-1$
-					buf.append(typeBinding.getQualifiedName());
-					break;
-				case IBinding.METHOD:
-					IMethodBinding methodBinding= (IMethodBinding) fBinding;
-					buf.append("(method binding: "); //$NON-NLS-1$
-					buf.append(methodBinding.getDeclaringClass().getName());
-					buf.append(':');
-					buf.append(methodBinding.getName());
-					buf.append('(');
-					ITypeBinding[] parameters= methodBinding.getParameterTypes();
-					for (int i= 0; i < parameters.length; i++) {
-						if (i > 0) {
-							buf.append(", "); //$NON-NLS-1$
-						}
-						ITypeBinding parameter= parameters[i];
-						buf.append(parameter.getName());
-					}
-					buf.append(')');
-					break;
-			}
-			buf.append(')');
-		} else {
-			buf.append("(binding: null)"); //$NON-NLS-1$
-		}
-		return buf.toString();
-	}
-	
-
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NodeProperty.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NodeProperty.java
deleted file mode 100644
index 7bf39ce..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NodeProperty.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
-
-public class NodeProperty {
-	private ASTNode fParent;
-	private StructuralPropertyDescriptor fProperty;
-	
-	public NodeProperty(ASTNode parent, StructuralPropertyDescriptor property) {
-		fParent= parent;
-		fProperty= property;
-	}
-	
-	public ASTNode getParent() {
-		return fParent;
-	}
-	
-	public Object getNode() {
-		return fParent.getStructuralProperty(fProperty);
-	}
-	
-	public String getPropertyName() {
-		return toConstantName(fProperty.getId());
-	}
-	
-	private static String toConstantName(String string) {
-		StringBuffer buf= new StringBuffer();
-		for (int i= 0; i < string.length(); i++) {
-			char ch= string.charAt(i);
-			if (i != 0 && Character.isUpperCase(ch)) {
-				buf.append('_');
-			}
-			buf.append(Character.toUpperCase(ch));
-		}
-		return buf.toString();
-	}
-	
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || !o.getClass().equals(getClass())) {
-			return false;
-		}
-		NodeProperty castedObj= (NodeProperty) o;
-		return  fParent.equals(castedObj.fParent) && (fProperty == castedObj.fProperty);
-	}
-
-	public int hashCode() {
-		return fParent.hashCode() * 31 + fProperty.hashCode();
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		StringBuffer buf= new StringBuffer();
-		buf.append(getPropertyName());
-		
-		if (fProperty.isSimpleProperty()) {
-			buf.append(": "); //$NON-NLS-1$
-			Object node= getNode();
-			if (node != null) {
-				buf.append('\'');
-				buf.append(getNode().toString());
-				buf.append('\'');
-			} else {
-				buf.append("null"); //$NON-NLS-1$
-			}
-		}
-		return buf.toString();
-	}
-
-
-	
-}
diff --git a/org.eclipse.jdt.astview/synced.gif b/org.eclipse.jdt.astview/synced.gif
deleted file mode 100644
index f865f3a..0000000
--- a/org.eclipse.jdt.astview/synced.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/view.gif b/org.eclipse.jdt.astview/view.gif
deleted file mode 100644
index 44d1018..0000000
--- a/org.eclipse.jdt.astview/view.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.ui.vcm/.classpath b/org.eclipse.jdt.ui.vcm/.classpath
deleted file mode 100644
index b2cd8dd..0000000
--- a/org.eclipse.jdt.ui.vcm/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="vcm"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.vcm.core"/>
-    <classpathentry kind="src" path="/org.eclipse.vcm.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.ui.vcm/.cvsignore b/org.eclipse.jdt.ui.vcm/.cvsignore
deleted file mode 100644
index fe99505..0000000
--- a/org.eclipse.jdt.ui.vcm/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-
diff --git a/org.eclipse.jdt.ui.vcm/.project b/org.eclipse.jdt.ui.vcm/.project
deleted file mode 100644
index c59eeba..0000000
--- a/org.eclipse.jdt.ui.vcm/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.jdt.ui.vcm</name>

-	<comment></comment>

-	<projects>

-		<project>org.eclipse.jdt.ui</project>

-		<project>org.eclipse.ui</project>

-		<project>org.eclipse.jdt.core</project>

-		<project>org.eclipse.core.boot</project>

-		<project>org.eclipse.core.runtime</project>

-		<project>org.eclipse.core.resources</project>

-		<project>org.eclipse.swt</project>

-		<project>org.eclipse.vcm.core</project>

-		<project>org.eclipse.vcm.ui</project>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.team.cvs.core.cvsnature</nature>

-	</natures>

-</projectDescription>

diff --git a/org.eclipse.jdt.ui.vcm/.vcm_meta b/org.eclipse.jdt.ui.vcm/.vcm_meta
deleted file mode 100644
index 351bab6..0000000
--- a/org.eclipse.jdt.ui.vcm/.vcm_meta
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project-description>

-	<nature id="org.eclipse.jdt.core.javanature"/>

-	<reference project-name="org.eclipse.jdt.ui"/>

-	<reference project-name="org.eclipse.ui"/>

-	<reference project-name="org.eclipse.jdt.core"/>

-	<reference project-name="org.eclipse.core.boot"/>

-	<reference project-name="org.eclipse.core.runtime"/>

-	<reference project-name="org.eclipse.core.resources"/>

-	<reference project-name="org.eclipse.swt"/>

-	<reference project-name="org.eclipse.vcm.core"/>

-	<reference project-name="org.eclipse.vcm.ui"/>

-	<builder name="org.eclipse.jdt.core.javabuilder">

-	</builder>

-</project-description>

diff --git a/org.eclipse.jdt.ui.vcm/about.html b/org.eclipse.jdt.ui.vcm/about.html
deleted file mode 100644
index 768324e..0000000
--- a/org.eclipse.jdt.ui.vcm/about.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<html>

-<head>

-<title>About</title>

-<style type="text/css">

-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}

-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}

-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}

-code { font-family: "Courier New", Courier, mono; font-size: 10pt}

-sup { font-family: arial,helvetica,geneva; font-size: 10px}

-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}

-li { font-family: arial, helvetica, geneva; font-size: 10pt}

-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}

-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}

-</style>

-</head>

-<body lang="EN-US" link="blue" vlink="purple">

-<table border="0" cellspacing="5" cellpadding="2" width="100%" >

-  <tr> 

-    <td align="LEFT" valign="TOP" colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF">About This Content</font></b></td>

-  </tr>

-  <tr> 

-    <td> 

-<p>11th December, 2001</p>	

-<h3>License</h3>

-<p>Eclipse.org 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

-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> &quot;CPL&quot;.  For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>

-

-<h3>Contributions</h3>

-

-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise

-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such

-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>

-

-<p>If this Content is licensed to you under license terms and conditions other than the CPL &quot;Other License&quot;, any modifications, enhancements and/or

-other code and/or documentation &quot;Modifications&quot; uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the

-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of

-the CPL.</p>

-</td></tr></table>

-</body>

-</html>
\ No newline at end of file
diff --git a/org.eclipse.jdt.ui.vcm/build.properties b/org.eclipse.jdt.ui.vcm/build.properties
deleted file mode 100644
index 836c70a..0000000
--- a/org.eclipse.jdt.ui.vcm/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = plugin.xml,\

-               about.html,\

-               plugin.properties,\

-               *.jar

-source.jdtvcm.jar = vcm/

diff --git a/org.eclipse.jdt.ui.vcm/plugin.properties b/org.eclipse.jdt.ui.vcm/plugin.properties
deleted file mode 100644
index 6bab83a..0000000
--- a/org.eclipse.jdt.ui.vcm/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#########################################

-# (c) Copyright IBM Corp. 2000, 2001.

-# All Rights Reserved.

-#########################################

-

-pluginName=Java Development Tools VCM UI

-

-TogglePackagesViewVersionLabels.label = Show &Version Info

-TogglePackagesViewVersionLabels.tooltip = Show Version Info in the Packages View

-Managing = Team

-ManageGroupMenu.label = &Team
\ No newline at end of file
diff --git a/org.eclipse.jdt.ui.vcm/plugin.xml.off b/org.eclipse.jdt.ui.vcm/plugin.xml.off
deleted file mode 100644
index 09d244e..0000000
--- a/org.eclipse.jdt.ui.vcm/plugin.xml.off
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!-- ======================================================================= -->

-<!-- This plugin provides basic VCM functionality to the Eclipse Java UI     -->

-<!-- ======================================================================= -->

-<plugin

-	name="%pluginName"

-	id = "org.eclipse.jdt.ui.vcm"

-	version = "1.0"

-	provider-name = "Object Technology International, Inc.">

-

-	<requires>

-		<import plugin="org.eclipse.core.resources"/>

-		<import plugin="org.eclipse.ui"/>

-		<import plugin="org.eclipse.vcm.core"/>

-		<import plugin="org.eclipse.vcm.ui"/>

-		<import plugin="org.eclipse.vcm.ui.cvs"/>

-		<import plugin="org.eclipse.jdt.ui"/>

-		<import plugin="org.eclipse.jdt.core"/>

-	</requires> 

-

-<runtime>

-  <library name="jdtvcm.jar">  

-     <export name = "*"/>

-  </library> 

-</runtime>

-

-<extension point="org.eclipse.vcm.core.ignore">

-	<ignore pattern = "*.class" selected = "true"/>

-</extension>

-

-<!-- **************** View Actions ******************* -->

-<extension point="org.eclipse.ui.viewActions"> 

-	<viewContribution 

-		id="org.eclipse.vcm.packageViewContribution" 

-		targetID="org.eclipse.jdt.ui.PackageExplorer"> 

-		<action id="org.eclipse.vcm.vcminfoinpkg" 

-			label="%TogglePackagesViewVersionLabels.label" 

-			menubarPath="additions" 

-			state="false"

-			tooltip="%TogglePackagesViewVersionLabels.tooltip" 

-			class="org.eclipse.jdt.ui.vcm.TogglePackageViewVersionLabels">

-		</action> 

-	</viewContribution> 

-</extension> 

-   

-</plugin>
\ No newline at end of file
diff --git a/org.eclipse.jdt.ui.vcm/scripts/exportplugin.xml b/org.eclipse.jdt.ui.vcm/scripts/exportplugin.xml
deleted file mode 100644
index 35d3ba3..0000000
--- a/org.eclipse.jdt.ui.vcm/scripts/exportplugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- build script to create a plugin from org.eclipse.jdt.ui.vcm -->
-<project name="org.eclipse.jdt.ui.vcm" default="export" basedir="..">
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.eclipse.jdt.ui.vcm" />
-		<property name="dest"  value="${destdir}/${plugin}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		<jar 
-			jarfile="${dest}/jdtvcm.jar"
-			basedir="bin"
-		/>
-		<copy file="plugin.xml.off" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<zip zipfile="${dest}/jdtvcmsrc.zip">
-		    <fileset dir="vcm" />
-  		</zip>				
-	</target>
-</project>
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/infoviews/SourceView.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/infoviews/SourceView.java
index 9b5e468..33dfa32 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/infoviews/SourceView.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/infoviews/SourceView.java
@@ -11,6 +11,7 @@
 package org.eclipse.jdt.internal.ui.infoviews;
 
 import java.io.IOException;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.graphics.Color;
@@ -18,6 +19,7 @@
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
@@ -28,32 +30,39 @@
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextOperationTarget;
 import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.text.ITextViewerExtension;
 import org.eclipse.jface.text.TextViewer;
 import org.eclipse.jface.text.source.SourceViewer;
+
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.help.WorkbenchHelp;
 import org.eclipse.ui.texteditor.IAbstractTextEditorHelpContextIds;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
+
 import org.eclipse.jdt.core.ICodeAssist;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.ISourceRange;
 import org.eclipse.jdt.core.ISourceReference;
 import org.eclipse.jdt.core.JavaModelException;
+
 import org.eclipse.jdt.ui.IContextMenuConstants;
 import org.eclipse.jdt.ui.actions.JdtActionConstants;
 import org.eclipse.jdt.ui.actions.OpenAction;
 import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration;
 import org.eclipse.jdt.ui.text.JavaTextTools;
+
 import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility;
 import org.eclipse.jdt.internal.corext.util.CodeFormatterUtil;
 import org.eclipse.jdt.internal.corext.util.Strings;
+
 import org.eclipse.jdt.internal.ui.JavaPlugin;
 import org.eclipse.jdt.internal.ui.javaeditor.JavaSourceViewer;
 import org.eclipse.jdt.internal.ui.text.JavaCodeReader;
@@ -452,7 +461,11 @@
 			int topIndex= fViewer.getTopIndex();
 			
 			StyledText styledText= fViewer.getTextWidget();
-			Control parent= fViewer.getControl();
+			Control parent= styledText;
+			if (fViewer instanceof ITextViewerExtension) {
+				ITextViewerExtension extension= (ITextViewerExtension) fViewer;
+				parent= extension.getControl();
+			}
 			
 			parent.setRedraw(false);
 			
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java
index f1e443d..7359390 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java
@@ -15,10 +15,12 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.custom.VerifyKeyListener;
 import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionEvent;
@@ -36,6 +38,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.Widget;
+
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.IAction;
@@ -47,25 +50,31 @@
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
+
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextListener;
 import org.eclipse.jface.text.ITextOperationTarget;
 import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.ITextViewerExtension;
 import org.eclipse.jface.text.TextEvent;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.SourceViewer;
 import org.eclipse.jface.text.templates.ContextType;
 import org.eclipse.jface.text.templates.Template;
+
 import org.eclipse.ui.help.WorkbenchHelp;
 import org.eclipse.ui.texteditor.ChainedPreferenceStore;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 import org.eclipse.ui.texteditor.IUpdate;
 import org.eclipse.ui.texteditor.PreferencesAdapter;
+
 import org.eclipse.jdt.ui.IContextMenuConstants;
 import org.eclipse.jdt.ui.PreferenceConstants;
 import org.eclipse.jdt.ui.text.JavaTextTools;
+
 import org.eclipse.jdt.internal.corext.template.java.JavaTemplateMessages;
+
 import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
 import org.eclipse.jdt.internal.ui.JavaPlugin;
 import org.eclipse.jdt.internal.ui.dialogs.StatusDialog;
@@ -343,11 +352,21 @@
 			}
 		});
 
-		viewer.prependVerifyKeyListener(new VerifyKeyListener() {
-			public void verifyKey(VerifyEvent event) {
-				handleVerifyKeyPressed(event);
-			}
-		});
+		if (viewer instanceof ITextViewerExtension) {
+			 ((ITextViewerExtension) viewer).prependVerifyKeyListener(new VerifyKeyListener() {
+				public void verifyKey(VerifyEvent event) {
+					handleVerifyKeyPressed(event);
+				}
+			});
+		} else {			
+			viewer.getTextWidget().addKeyListener(new KeyListener() {
+				public void keyPressed(KeyEvent e) {
+					handleKeyPressed(e);
+				}
+	
+				public void keyReleased(KeyEvent e) {}
+			});
+		}
 		
 		return viewer;
 	}
diff --git a/org.junit/.classpath b/org.junit/.classpath
deleted file mode 100644
index e0b26de..0000000
--- a/org.junit/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry exported="true" kind="lib" path="junit.jar" sourcepath="/org.junit/junitsrc.zip"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="output" path=""/>
-</classpath>
diff --git a/org.junit/.project b/org.junit/.project
deleted file mode 100644
index 29a06e7..0000000
--- a/org.junit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.junit</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.junit/about.html b/org.junit/about.html
deleted file mode 100644
index 173b5b1..0000000
--- a/org.junit/about.html
+++ /dev/null
@@ -1,46 +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>29th March, 2004</p>	
-<h3>License</h3>
-<p>Eclipse.org 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
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Third Party Content</h3>
-
-<p>The Content includes items that have been sourced from third parties as follows:</p>
-
-<p><b>JUnit 3.8.1</b></p>
-
-<p>The plug-in is accompanied by software developed by JUnit.org.  The JUnit 3.8.1 code included with the plug-in includes no modifications.
-Your use of JUnit 3.8.1 in both source and binary code form contained in the plug-in is subject to the terms and conditions of the CPL.
-The binary code is located in junit.jar and the source code is located in src.jar.</p>
-
-<p>i) IBM effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;</p>
-
-<p>ii) IBM effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;</p>
-
-<p>iii) IBM states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.junit/build.properties b/org.junit/build.properties
deleted file mode 100644
index c308cec..0000000
--- a/org.junit/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               junit.jar
-               
-src.includes = *.zip,about.html
-
-
diff --git a/org.junit/junit.jar b/org.junit/junit.jar
deleted file mode 100644
index 674d71e..0000000
--- a/org.junit/junit.jar
+++ /dev/null
Binary files differ
diff --git a/org.junit/junitsrc.zip b/org.junit/junitsrc.zip
deleted file mode 100644
index 8804909..0000000
--- a/org.junit/junitsrc.zip
+++ /dev/null
Binary files differ
diff --git a/org.junit/plugin.properties b/org.junit/plugin.properties
deleted file mode 100644
index 7e995ae..0000000
--- a/org.junit/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName=JUnit Testing Framework
-providerName=Eclipse.org
diff --git a/org.junit/plugin.xml b/org.junit/plugin.xml
deleted file mode 100644
index 1e39fc5..0000000
--- a/org.junit/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-  name="%pluginName"
-  id="org.junit"
-  version="3.8.1"
-  provider-name="%providerName">
-
-  <runtime>
-    <library name="junit.jar">
-      <export name="*"/>
-	  <packages prefixes="junit"/>
-    </library>
-  </runtime>
-</plugin>
diff --git a/org.junit/scripts/exportplugin.xml b/org.junit/scripts/exportplugin.xml
deleted file mode 100644
index 5574c67..0000000
--- a/org.junit/scripts/exportplugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- build script to create JUnit Plugin -->
-<project name="org.junit" default="export" basedir="..">
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.junit" />
-		<property name="dest"  value="${destdir}/${plugin}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-
-		<copy file="junit.jar" todir="${dest}"/>
-		<copy file="junitsrc.zip" todir="${dest}"/>
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="about.html" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-				
-	</target>
-</project>