This commit was manufactured by cvs2svn to create tag 'v20051206-1200'.
Sprout from master 2005-12-06 11:22:35 UTC Dani Megert <dmegert> 'Documented changes made in JavadocContentAccess'
Cherrypick from master 2005-12-06 16:06:41 UTC Markus Keller <mkeller> '119414: [clean up][J2SE50] Failing test case in CleanUpTest#testJava5005':
org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.java
org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.properties
org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/Java50Fix.java
Cherrypick from master 2005-12-05 17:53:39 UTC Martin Aeschlimann <maeschli> 'temporarly disabled, new text search API':
org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/MixedLineDelimiterDetector.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/.settings/org.eclipse.jdt.core.prefs
org.eclipse.jdt.astview/.settings/org.eclipse.jdt.ui.prefs
org.eclipse.jdt.astview/.settings/org.eclipse.pde.prefs
org.eclipse.jdt.astview/AST-View-Site/.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/features/org.eclipse.jdt.astview.feature_1.0.1.jar
org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.2.jar
org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.3.jar
org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.4.jar
org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.5.jar
org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.6.jar
org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.7.jar
org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.8.jar
org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.jeview.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/plugins/org.eclipse.jdt.astview_1.0.1.jar
org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.2.jar
org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.3.jar
org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.4.jar
org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.5.jar
org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.6.jar
org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.7.jar
org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.8.jar
org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.jeview_1.0.0.jar
org.eclipse.jdt.astview/AST-View-Site/site.xml
org.eclipse.jdt.astview/Adarrow.gif
org.eclipse.jdt.astview/META-INF/MANIFEST.MF
org.eclipse.jdt.astview/build.properties
org.eclipse.jdt.astview/buildnotes_astview.html
org.eclipse.jdt.astview/icons/c/add.gif
org.eclipse.jdt.astview/icons/c/clear.gif
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/clear.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/view.gif
org.eclipse.jdt.astview/index.html
org.eclipse.jdt.astview/new.gif
org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.0.zip
org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.1.zip
org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.2.zip
org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.3.zip
org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.4.zip
org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.5.zip
org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.6.zip
org.eclipse.jdt.astview/plugin.properties
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/TreeInfoCollector.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.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/Binding.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/BindingProperty.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/CommentsProperty.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/DynamicBindingProperty.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/Error.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ExceptionAttribute.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/JavaElement.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/LeafAttribute.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NodeProperty.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NonRelevantFilter.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemsProperty.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TrayContentProvider.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TrayLabelProvider.java
org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TreeCopyAction.java
org.eclipse.jdt.astview/synced.gif
org.eclipse.jdt.astview/view.gif
org.eclipse.jdt.jeview.feature/.project
org.eclipse.jdt.jeview.feature/build.properties
org.eclipse.jdt.jeview.feature/eclipse_update_120.jpg
org.eclipse.jdt.jeview.feature/epl-v10.html
org.eclipse.jdt.jeview.feature/feature.properties
org.eclipse.jdt.jeview.feature/feature.xml
org.eclipse.jdt.jeview.feature/license.html
org.eclipse.jdt.jeview/.classpath
org.eclipse.jdt.jeview/.cvsignore
org.eclipse.jdt.jeview/.project
org.eclipse.jdt.jeview/.settings/org.eclipse.jdt.core.prefs
org.eclipse.jdt.jeview/.settings/org.eclipse.jdt.ui.prefs
org.eclipse.jdt.jeview/.settings/org.eclipse.pde.prefs
org.eclipse.jdt.jeview/META-INF/MANIFEST.MF
org.eclipse.jdt.jeview/about.html
org.eclipse.jdt.jeview/build.properties
org.eclipse.jdt.jeview/icons/c/children.png
org.eclipse.jdt.jeview/icons/c/codeSelect.gif
org.eclipse.jdt.jeview/icons/c/info.png
org.eclipse.jdt.jeview/icons/c/properties.gif
org.eclipse.jdt.jeview/icons/c/refresh.gif
org.eclipse.jdt.jeview/icons/c/setfocus.gif
org.eclipse.jdt.jeview/icons/view.gif
org.eclipse.jdt.jeview/plugin.properties
org.eclipse.jdt.jeview/plugin.xml
org.eclipse.jdt.jeview/scripts/exportplugin.xml
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/EditorUtility.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/JEPluginImages.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/JEViewPlugin.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/JavaElementProperties.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/ResourceProperties.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Error.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEAttribute.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEResource.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JERoot.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEViewContentProvider.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEViewLabelProvider.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElement.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementChildrenProperty.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementProperty.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Mapper.java
org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Null.java
org.eclipse.jdt.ui.examples.javafamily/.classpath
org.eclipse.jdt.ui.examples.javafamily/.cvsignore
org.eclipse.jdt.ui.examples.javafamily/.project
org.eclipse.jdt.ui.examples.javafamily/.settings/org.eclipse.jdt.core.prefs
org.eclipse.jdt.ui.examples.javafamily/ReleaseNotes.html
org.eclipse.jdt.ui.examples.javafamily/about.html
org.eclipse.jdt.ui.examples.javafamily/build.properties
org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/brkp_obj.gif
org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsp_obj.gif
org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/tomcat_obj.gif
org.eclipse.jdt.ui.examples.javafamily/plugin.properties
org.eclipse.jdt.ui.examples.javafamily/plugin.xml
org.eclipse.jdt.ui.examples.javafamily/sample/Date2.java
org.eclipse.jdt.ui.examples.javafamily/sample/easy.jsp
org.eclipse.jdt.ui.examples.javafamily/scripts/exportplugin.xml
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndex.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexQuery.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexer.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/ISearchResultCollector.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationAdapter.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DocumentAdapter.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JavaReconcileStep.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandlerFactory.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspEditor.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspSourceViewerConfiguration.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspTranslatorResultCollector.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandler.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandlerFactory.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslator.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslatorResultCollector.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/TagHandlerFactory.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/AbstractJspParser.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JavaFamilyExamplePreferencePage.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspIndexParser.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMatchLocatorParser.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.properties
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspPluginImages.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/Util.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.properties
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointRulerActionDelegate.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatLaunchDelegate.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java
org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTabGroup.java
org.eclipse.jdt.ui.examples.javafamily/stuff/Search.java
org.eclipse.jdt.ui.examples.javafamily/stuff/easy.jsp
org.eclipse.jdt.ui.examples.javafamily/stuff/easy_jsp.java
org.eclipse.jdt.ui.examples.javafamily/stuff/exampleJspProject.zip
org.eclipse.jdt.ui.examples.javafamily/stuff/index-format11
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.eclipse.ltk.ui/.classpath
org.eclipse.ltk.ui/.cvsignore
org.eclipse.ltk.ui/.project
org.eclipse.ltk.ui/plugin.xml
org.eclipse.ltk.ui/scripts/exportplugin.xml
org.junit/.classpath
org.junit/.project
org.junit/META-INF/MANIFEST.MF
org.junit/about.html
org.junit/build.properties
org.junit/cpl-v10.html
org.junit/junit.jar
org.junit/junitsrc.zip
org.junit/plugin.properties
org.junit/plugin.xml
org.junit/scripts/exportplugin.xmldiff --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 ce1ed03..0000000
--- a/org.eclipse.jdt.astview.feature/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- feature.property,\
- cpl-v10.html,\
- eclipse_update_120.jpg,\
- feature.properties
-src.includes = license.html,\
- feature.xml,\
- feature.properties,\
- eclipse_update_120.jpg,\
- cpl-v10.html
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 78a30e6..0000000
--- a/org.eclipse.jdt.astview.feature/feature.xml
+++ /dev/null
@@ -1,43 +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.8"
- provider-name="Eclipse.org">
- <install-handler/>
-
- <description>
- %description
- </description>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="AST View update site" url="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/jdt-ui-home/plugins/org.eclipse.jdt.astview/AST-View-Site"/>
- <discovery label="AST View Site" url="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/jdt-ui-home/plugins/org.eclipse.jdt.astview/AST-View-Site"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <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.filebuffers"/>
- <import plugin="org.eclipse.jdt.ui"/>
- </requires>
-
- <plugin
- id="org.eclipse.jdt.astview"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</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 "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<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
- ("CPL"). 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, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<p>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features"). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments are located in directories
- named "plugins" and Features are located in directories named "features".</p>
-
-<p>Features may also include other Features ("Included Features"). Files named "feature.xml" may contain a list of the names and version numbers of Included Features.</p>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Subdirectories of the directory named "src" 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 ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties".
-Such Abouts, Feature Licenses and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory. 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 966444f..0000000
--- a/org.eclipse.jdt.astview/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jdt.astview</name>
- <comment></comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.jdt.astview/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.astview/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index dd9f5d2..0000000
--- a/org.eclipse.jdt.astview/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,77 +0,0 @@
-#Thu Mar 31 15:25:03 CEST 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.jdt.astview/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.jdt.astview/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 45239af..0000000
--- a/org.eclipse.jdt.astview/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Dec 21 12:24:36 CET 2004
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org.eclipse.text;org.eclipse.core;org.eclipse.core.runtime;org.eclipse.core.expressions;org.eclipse.core.filebuffers;org.eclipse.core.resources;org.eclipse.swt;org.eclipse.jface;org.eclipse.jface.text;org.eclipse.ui;org.eclipse.ui.console;org.eclipse.ui.editors;org.eclipse.ui.forms;org.eclipse.ui.views;org.eclipse.ui.workbench;org.eclipse.ui.workbench.texteditor;org.eclipse.ui.ide;org.eclipse.compare;org.eclipse.search;org.eclipse.team.core;org.eclipse.debug.core;org.eclipse.debug.ui;org.eclipse.ltk.refactoring.core;org.eclipse.ltk.refactoring.internal.core;org.eclipse.ltk.refactoring.ui;org.eclipse.ltk.refactoring.internal.ui;org.eclipse.jdt.core;org.eclipse.jdt.internal.core;org.eclipse.jdt.internal.corext;org.eclipse.jdt.launching;org.eclipse.jdt.ui;org.eclipse.jdt.internal.ui;
diff --git a/org.eclipse.jdt.astview/.settings/org.eclipse.pde.prefs b/org.eclipse.jdt.astview/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f2a0617..0000000
--- a/org.eclipse.jdt.astview/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Apr 11 09:44:41 CEST 2005
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=1
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.jdt.astview/AST-View-Site/.project b/org.eclipse.jdt.astview/AST-View-Site/.project
deleted file mode 100644
index 007c9db..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>AST-View-Site</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.UpdateSiteBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.UpdateSiteNature</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 c725417..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/.sitebuild/sitebuild.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site-build
- autobuild="false"
- scrub-output="false"
- use-console="true">
- <feature id="org.eclipse.jdt.astview.feature" version="1.0.5"/>
-</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/features/org.eclipse.jdt.astview.feature_1.0.1.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.1.jar
deleted file mode 100644
index 6beb68f..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.2.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.2.jar
deleted file mode 100644
index 4f78760..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.3.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.3.jar
deleted file mode 100644
index 99d338e..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.3.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.4.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.4.jar
deleted file mode 100644
index ab95852..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.4.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.5.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.5.jar
deleted file mode 100644
index f0afa9a..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.5.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.6.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.6.jar
deleted file mode 100644
index 49a9b07..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.6.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.7.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.7.jar
deleted file mode 100644
index 0d85120..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.7.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.8.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.8.jar
deleted file mode 100644
index c16eee0..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.8.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.jeview.feature_1.0.0.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.jeview.feature_1.0.0.jar
deleted file mode 100644
index 32145a0..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.jeview.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/plugins/org.eclipse.jdt.astview_1.0.1.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.1.jar
deleted file mode 100644
index 3c1c8d3..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.2.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.2.jar
deleted file mode 100644
index 0016907..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.3.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.3.jar
deleted file mode 100644
index 42adfa4..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.3.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.4.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.4.jar
deleted file mode 100644
index daec480..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.4.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.5.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.5.jar
deleted file mode 100644
index 6dde890..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.5.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.6.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.6.jar
deleted file mode 100644
index 256a4c2..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.6.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.7.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.7.jar
deleted file mode 100644
index 7132185..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.7.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.8.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.8.jar
deleted file mode 100644
index b4ad876..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.8.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.jeview_1.0.0.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.jeview_1.0.0.jar
deleted file mode 100644
index 55b21ec..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.jeview_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 0417e953..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/site.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <description url="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/jdt-ui-home/plugins/org.eclipse.jdt.astview/AST-View-Site">
- Update site for AST View
- </description>
- <feature url="features/org.eclipse.jdt.astview.feature_1.0.1.jar" id="org.eclipse.jdt.astview.feature" version="1.0.1">
- <category name="ast-view-1.0.1"/>
- </feature>
- <feature url="features/org.eclipse.jdt.jeview.feature_1.0.0.jar" id="org.eclipse.jdt.jeview.feature" version="1.0.0">
- <category name="java-element-view-1.0.0"/>
- </feature>
- <feature url="features/org.eclipse.jdt.astview.feature_1.0.8.jar" id="org.eclipse.jdt.astview.feature" version="1.0.8">
- <category name="ast-view-1.0.8"/>
- </feature>
- <category-def name="ast-view-1.0.8" label="AST View for 3.1">
- <description>
- View to visualize the Java compilers abstract syntax tree generated for a Java file.
-
-Use this version Eclipse 3.1 and higher
- </description>
- </category-def>
- <category-def name="java-element-view-1.0.0" label="JavaElement View (requires Java 5.0)">
- <description>
- View to visualize IJavaElement and IResource handles in the Eclpse SDK. This feature requires Java 5.0.
- </description>
- </category-def>
- <category-def name="ast-view-1.0.1" label="AST View for Eclipse 3.0">
- <description>
- View to visualize the Java compilers abstract syntax tree generated for a Java file.
-
-Use this version of the AST view for Eclipse 3.0
- </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/META-INF/MANIFEST.MF b/org.eclipse.jdt.astview/META-INF/MANIFEST.MF
deleted file mode 100644
index 89c3413..0000000
--- a/org.eclipse.jdt.astview/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jdt.astview; singleton:=true
-Bundle-Version: 1.0.8
-Bundle-Activator: org.eclipse.jdt.astview.ASTViewPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jdt.astview;x-internal:=true,
- org.eclipse.jdt.astview.views;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.jdt.core,
- org.eclipse.core.filebuffers,
- org.eclipse.jdt.ui
-Eclipse-LazyStart: true
-Eclipse-AutoStart: true
diff --git a/org.eclipse.jdt.astview/build.properties b/org.eclipse.jdt.astview/build.properties
deleted file mode 100644
index a179585..0000000
--- a/org.eclipse.jdt.astview/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = plugin.xml,\
- icons/,\
- buildnotes_astview.html,\
- plugin.properties,\
- META-INF/,\
- .,\
- src/org/
-src.includes = plugin.xml,\
- plugin.properties,\
- buildnotes_astview.html,\
- src/
-source.. = src/
-output.. = bin/
diff --git a/org.eclipse.jdt.astview/buildnotes_astview.html b/org.eclipse.jdt.astview/buildnotes_astview.html
deleted file mode 100644
index 3c8466a..0000000
--- a/org.eclipse.jdt.astview/buildnotes_astview.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>ASTView Release Notes</title>
-</head>
-<body>
-
-<h1>
-ASTView Build Notes</h1>
-
-<!-- template:
-<h3>Date</h3>
-<ul>
- <li>
- Item
- </li>
-</ul>
-
--->
-
-
-
-<h3>2005-05-30</h3>
-<ul>
- <li>
- Added IMethodBinding#isSubsignature(IMethodBinding) (in comparison tray).
- </li>
- <li>
- Changed license from cpl-v10 to epl-v10
- </li>
-</ul>
-</ul>
-
-<h3>2005-04-21</h3>
-<ul>
- <li>
- Show Expression attributes: boxing, unboxing, constantExpressionValue.
- </li>
- <li>
- ITypeBinding#isCapture() and #getWildcard()
- </li>
- <li>
- Show arguments of problem nodes.
- </li>
- <li>
- Mark non-existent java elements, render resolved elements.
- </li>
-</ul>
-
-<h3>2005-03-22</h3>
-<ul>
- <li>
- Added IVariableBinding#getVariableDeclaration().
- </li>
-</ul>
-
-<h3>2005-03-03</h3>
-<ul>
- <li>
- Added "Resolve Binding Key..." action in view menu.<br>
- The key is converted into a binding by <code>ASTParser.createASTs(..)</code>.
- </li>
-</ul>
-
-<h3>2005-02-18</h3>
-<ul>
- <li>
- Added toggle "Create Bindings" in view menu.
- </li>
-</ul>
-
-<h3>2004-11-29</h3>
-<ul>
- <li>
- Added Delete action for items in comparison tray.
- </li>
- <li>
- Added toggle "Use Reconciler" in view menu.
- </li>
- <li>
- Doubleclicking a node whose calculation threw an exception now gives a dialog
- with the caught exception and writes it to the log.
- </li>
-</ul>
-
-<h3>2004-11-26</h3>
-<ul>
- <li>
- Improved comparison tray: Use ViewForm, show comparions as children, not in status line,
- added new comparisons.
- </li>
-</ul>
-
-<h3>2004-11-23</h3>
-<ul>
- <li>
- Added <b>Copy to clipboard</b> (Ctrl+C, Edit > Copy, Context Menu > Copy) for single- and multiselections.
- </li>
- <li>
- Added 'Context Menu > <b>Add To Comparison Tray</b>'. This action allows to temporarily copy
- a selected binding to a 'Comparison Tray' in the lower part of the ASTView.
- The workbench window status line shows interesting relationships between the selected
- bindings in the AST tree (upper part of the ASTView) and the comparison tray (lower part).
- </li>
-</ul>
-
-<h3>2004-11-22</h3>
-<ul>
- <li>
- Added all new properties for bindings.
- </li>
- <li>
- Showing <b>expression type bindings</b> in addition to node's binding where applicable (e.g for MethodInvocation).
- </li>
- <li>
- Combined related <b>boolean properties of ITypeBindings</b> to use only one line (KIND, ORIGIN, GENERICS).
- </li>
- <li>
- Added link to <b>java element</b>. Doubleclick or press Enter to reveal in editor.
- Navigate > Show In > Package Explorer is also supported.
- </li>
- <li>
- The ASTView can be opened with shortcut <b>Alt+Shift+Q, A</b>.
- </li>
-</ul>
-
-</body>
-</html>
-
diff --git a/org.eclipse.jdt.astview/icons/c/add.gif b/org.eclipse.jdt.astview/icons/c/add.gif
deleted file mode 100644
index 252d7eb..0000000
--- a/org.eclipse.jdt.astview/icons/c/add.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/c/clear.gif b/org.eclipse.jdt.astview/icons/c/clear.gif
deleted file mode 100644
index 2cd9c54..0000000
--- a/org.eclipse.jdt.astview/icons/c/clear.gif
+++ /dev/null
Binary files differ
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 a2d80a9..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 0205b29..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 3ca04d0..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 870934b..0000000
--- a/org.eclipse.jdt.astview/icons/c/synced.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/icons/d/clear.gif b/org.eclipse.jdt.astview/icons/d/clear.gif
deleted file mode 100644
index 559e462..0000000
--- a/org.eclipse.jdt.astview/icons/d/clear.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 7dc0de5..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 492c14f..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 1f55189..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 4f6e43a..0000000
--- a/org.eclipse.jdt.astview/icons/d/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 a2389cb..0000000
--- a/org.eclipse.jdt.astview/index.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
- <title>JDT UI Component Development Resources</title>
- <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
- type="text/css">
-</head>
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);">
-
-<table border="0" cellpadding="2" cellspacing="5" width="100%">
- <tbody>
- <tr>
- <td colspan="2" align="left" bgcolor="#0080c0" valign="top"><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><br>
- <p>for Eclipse 3.1 RC1 or greater:<br>
- </p>
- <div style="margin-left: 40px;"><span style="font-weight: bold;">ASTView
-version 1.0.8 </span><a
- href="AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.8.jar">org.eclipse.jdt.astview_1.0.8.jar</a><span
- style="font-weight: bold;"> </span>(copy to 'plugins' directory,
-JARed plugin - don't extract!)<span style="font-weight: bold;"><br>
- </span></div>
- <p>for Eclipse 3.0.x:<br>
- </p>
- <div style="margin-left: 40px;"><span style="font-weight: bold;">ASTView
-version 1.0.1 </span><a
- href="org.eclipse.jdt.astview_1.0.1.zip">org.eclipse.jdt.astview_1.0.1.zip</a>
-(extract to 'plugins' directory)<br>
- </div>
- <br>
- <p>or use the update site<br>
- </p>
- <div style="margin-left: 40px;"><span style="font-weight: bold;"></span><span
- style="font-weight: bold;">http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/jdt-ui-home/plugins/org.eclipse.jdt.astview/AST-View-Site</span><br>
- </div>
- </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 > Show View
-> Other... Java > 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="">) to update the AST.<br>
- </li>
- </ol>
- <b>AST View Elements</b><br>
- <br>
-The AST view shows the following nodes<br>
- <img 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 blue. Only selected bindings are
-shown</li>
- </ul>
-Version <a href="org.eclipse.jdt.astview_1.0.0.zip">1.0</a><br>
- <div style="margin-left: 40px;">initial version<br>
- </div>
-Version <a href="org.eclipse.jdt.astview_1.0.1.zip">1.0.1</a><br>
- <div style="margin-left: 40px;">shows all binding properties,
-comment nodes
-attached to the root compilation unit and compiler problems detected in
-the AST.<br>
- </div>
-Version <a href="org.eclipse.jdt.astview_1.0.2.zip">1.0.2</a><br>
- <div style="margin-left: 40px;">update to latest 5.0 AST API's<br>
-comparison tray to test binding API with arguments<br>
-test ASTs created by 'reconcile'<br>
- </div>
-Version <a href="org.eclipse.jdt.astview_1.0.3.zip">1.0.3</a>
-(requires Eclipse 3.1 I20050118 or higher)<br>
- <div style="margin-left: 40px;">bug fixes to run on I20050118<br>
- </div>
-Version <a href="org.eclipse.jdt.astview_1.0.4.zip">1.0.4</a>
-(requires
-Eclipse 3.1 M5 or higher)<br>
- <div style="margin-left: 40px;"> turn bindings on / off<br>
-bug fixes to run on 3.1 M5<br>
- </div>
-Version <a href="org.eclipse.jdt.astview_1.0.5.zip">1.0.5</a>
-(requires
-Eclipse 3.1 RC1 or higher)<br>
- <div style="margin-left: 40px;"> hide / show non-relevant type
-binding attributes (e.g. don't show dimensions if type is not array
-type)<br>
-bug fixes to run on 3.1 RC1<br>
- </div>
-Version <a
- href="AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.8.jar">1.0.6/1.0.7/1.0.8</a><img
- alt="New" src="new.gif" style="width: 31px; height: 14px;"> (Eclipse
-3.1 or higher)<br>
- <div style="margin-left: 40px;"> minor fixes. JARed plugin.<br>
- </div>
- <br>
- <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 5.0 language constructs. Note that the AST level
-3 is only available in 3.1 builds<br>
- </li>
- </ul>
- <span style="font-weight: bold;">Comments and Requests</span><br>
- <ul>
- <li>Source is included in the plugin archive<br>
- </li>
- <li>Comments to <a
- href="mailto:Martin_Aeschlimann%5Bat%5Dch.ibm.com">Martin_Aeschlimann[at]ch.ibm.com<br>
- </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>
-Version 1.0.2 credits go to Markus Keller!<br>
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><br>
- </td>
- <td style="vertical-align: top;"><br>
- </td>
- </tr>
- </tbody>
-</table>
-</body>
-</html>
diff --git a/org.eclipse.jdt.astview/new.gif b/org.eclipse.jdt.astview/new.gif
deleted file mode 100644
index c406057..0000000
--- a/org.eclipse.jdt.astview/new.gif
+++ /dev/null
Binary files differ
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/org.eclipse.jdt.astview_1.0.1.zip b/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.1.zip
deleted file mode 100644
index ff6af35..0000000
--- a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.1.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.2.zip b/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.2.zip
deleted file mode 100644
index 2239e6a..0000000
--- a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.2.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.3.zip b/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.3.zip
deleted file mode 100644
index 0291e2f..0000000
--- a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.3.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.4.zip b/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.4.zip
deleted file mode 100644
index e50bb21..0000000
--- a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.4.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.5.zip b/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.5.zip
deleted file mode 100644
index 0574696..0000000
--- a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.5.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.6.zip b/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.6.zip
deleted file mode 100644
index b7d81a7..0000000
--- a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.6.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.astview/plugin.properties b/org.eclipse.jdt.astview/plugin.properties
deleted file mode 100644
index 02f561e..0000000
--- a/org.eclipse.jdt.astview/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName= AST View Plug-in
-providerName= Eclipse.org
diff --git a/org.eclipse.jdt.astview/plugin.xml b/org.eclipse.jdt.astview/plugin.xml
deleted file mode 100644
index 1045af6..0000000
--- a/org.eclipse.jdt.astview/plugin.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <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>
-
- <extension
- point="org.eclipse.ui.commands">
- <command
- name="ASTView"
- description="AST View"
- categoryId="org.eclipse.ui.category.views"
- id="org.eclipse.jdt.astview.views.ASTView">
- </command>
- </extension>
-
-
- <extension
- point="org.eclipse.ui.bindings">
- <key
- sequence="M2+M3+Q A"
- commandId="org.eclipse.jdt.astview.views.ASTView"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </key>
- <key
- platform="carbon"
- sequence="M2+M3+Q A"
- commandId=""
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </key>
- <key
- platform="carbon"
- sequence="M1+M3+Q A"
- commandId="org.eclipse.jdt.astview.views.ASTView"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </key>
- </extension>
-
-
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
- <viewShortcut id="org.eclipse.jdt.astview.views.ASTView"/>
- </perspectiveExtension>
- <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
- <viewShortcut id="org.eclipse.jdt.astview.views.ASTView"/>
- </perspectiveExtension>
- <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaHierarchyPerspective">
- <viewShortcut id="org.eclipse.jdt.astview.views.ASTView"/>
- </perspectiveExtension>
- </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 3da4761..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewImages.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-import org.osgi.framework.Bundle;
-
-public class ASTViewImages {
-
- private static final IPath ICONS_PATH= new Path("$nl$/icons"); //$NON-NLS-1$
-
- 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$
- public static final String CLEAR= "clear.gif"; //$NON-NLS-1$
-
- public static final String ADD_TO_TRAY= "add.gif"; //$NON-NLS-1$
-
- //---- Helper methods to access icons on the file system --------------------------------------
-
- public static void setImageDescriptors(IAction action, String type) {
- ImageDescriptor id= create("d", type); //$NON-NLS-1$
- if (id != null)
- action.setDisabledImageDescriptor(id);
-
- id= create("c", type); //$NON-NLS-1$
- if (id != null) {
- action.setHoverImageDescriptor(id);
- action.setImageDescriptor(id);
- } else {
- action.setImageDescriptor(ImageDescriptor.getMissingImageDescriptor());
- }
- }
-
- private static ImageDescriptor create(String prefix, String name) {
- IPath path= ICONS_PATH.append(prefix).append(name);
- return createImageDescriptor(ASTViewPlugin.getDefault().getBundle(), path);
- }
-
- /*
- * Since 3.1.1. Load from icon paths with $NL$
- */
- public static ImageDescriptor createImageDescriptor(Bundle bundle, IPath path) {
- URL url= Platform.find(bundle, path);
- if (url != null) {
- return ImageDescriptor.createFromURL(url);
- }
- return null;
- }
-}
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 3e2cb0f..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class ASTViewPlugin extends AbstractUIPlugin {
-
- private static ASTViewPlugin fgDefault;
-
- public ASTViewPlugin() {
- fgDefault= this;
- }
-
- public static String getPluginId() {
- return "org.eclipse.jdt.astview"; //$NON-NLS-1$
- }
-
- /**
- * @return the shared instance
- */
- public static ASTViewPlugin getDefault() {
- return fgDefault;
- }
-
- public static void log(IStatus status) {
- getDefault().getLog().log(status);
- }
-
- public static void logErrorMessage(String message) {
- log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, null));
- }
-
- public static void logErrorStatus(String message, IStatus status) {
- if (status == null) {
- logErrorMessage(message);
- return;
- }
- MultiStatus multi= new MultiStatus(getPluginId(), IStatus.ERROR, message, null);
- multi.add(status);
- log(multi);
- }
-
- public static void log(String message, Throwable e) {
- log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, e));
- }
-
-}
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 e007c3d..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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 b5bfd1c..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/GenericVisitor.java
+++ /dev/null
@@ -1,674 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-import org.eclipse.jdt.core.dom.*;
-
-public class GenericVisitor extends ASTVisitor {
-
- public GenericVisitor() {
- super();
- }
-
- /**
- * @param visitJavadocTags <code>true</code> if doc comment tags are
- * to be visited by default, and <code>false</code> otherwise
- * @see Javadoc#tags()
- * @see #visit(Javadoc)
- * @since 3.0
- */
- public GenericVisitor(boolean visitJavadocTags) {
- super(visitJavadocTags);
- }
-
- //---- Hooks for subclasses -------------------------------------------------
-
- protected boolean visitNode(ASTNode node) {
- return true;
- }
-
- protected void endVisitNode(ASTNode node) {
- // do nothing
- }
-
- 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) {
- if (super.visit(node))
- return visitNode(node);
- else
- 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);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.AnnotationTypeDeclaration)
- */
- public boolean visit(AnnotationTypeDeclaration node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration)
- */
- public boolean visit(AnnotationTypeMemberDeclaration node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.BlockComment)
- */
- public boolean visit(BlockComment node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.EnhancedForStatement)
- */
- public boolean visit(EnhancedForStatement node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.EnumConstantDeclaration)
- */
- public boolean visit(EnumConstantDeclaration node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.EnumDeclaration)
- */
- public boolean visit(EnumDeclaration node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.LineComment)
- */
- public boolean visit(LineComment node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.MarkerAnnotation)
- */
- public boolean visit(MarkerAnnotation node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.MemberRef)
- */
- public boolean visit(MemberRef node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.MemberValuePair)
- */
- public boolean visit(MemberValuePair node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.MethodRef)
- */
- public boolean visit(MethodRef node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.MethodRefParameter)
- */
- public boolean visit(MethodRefParameter node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.Modifier)
- */
- public boolean visit(Modifier node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.NormalAnnotation)
- */
- public boolean visit(NormalAnnotation node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ParameterizedType)
- */
- public boolean visit(ParameterizedType node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.QualifiedType)
- */
- public boolean visit(QualifiedType node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.SingleMemberAnnotation)
- */
- public boolean visit(SingleMemberAnnotation node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.TagElement)
- */
- public boolean visit(TagElement node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.TextElement)
- */
- public boolean visit(TextElement node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.TypeParameter)
- */
- public boolean visit(TypeParameter node) {
- return visitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.WildcardType)
- */
- public boolean visit(WildcardType 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);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.AnnotationTypeDeclaration)
- */
- public void endVisit(AnnotationTypeDeclaration node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration)
- */
- public void endVisit(AnnotationTypeMemberDeclaration node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.BlockComment)
- */
- public void endVisit(BlockComment node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.EnhancedForStatement)
- */
- public void endVisit(EnhancedForStatement node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.EnumConstantDeclaration)
- */
- public void endVisit(EnumConstantDeclaration node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.EnumDeclaration)
- */
- public void endVisit(EnumDeclaration node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.LineComment)
- */
- public void endVisit(LineComment node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.MarkerAnnotation)
- */
- public void endVisit(MarkerAnnotation node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.MemberRef)
- */
- public void endVisit(MemberRef node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.MemberValuePair)
- */
- public void endVisit(MemberValuePair node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.MethodRef)
- */
- public void endVisit(MethodRef node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.MethodRefParameter)
- */
- public void endVisit(MethodRefParameter node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.Modifier)
- */
- public void endVisit(Modifier node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.NormalAnnotation)
- */
- public void endVisit(NormalAnnotation node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.ParameterizedType)
- */
- public void endVisit(ParameterizedType node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.QualifiedType)
- */
- public void endVisit(QualifiedType node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.SingleMemberAnnotation)
- */
- public void endVisit(SingleMemberAnnotation node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.TagElement)
- */
- public void endVisit(TagElement node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.TextElement)
- */
- public void endVisit(TextElement node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.TypeParameter)
- */
- public void endVisit(TypeParameter node) {
- endVisitNode(node);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.WildcardType)
- */
- public void endVisit(WildcardType 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 a659f07..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/NodeFinder.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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/TreeInfoCollector.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/TreeInfoCollector.java
deleted file mode 100644
index f15370d..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/TreeInfoCollector.java
+++ /dev/null
@@ -1,49 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-/**
- *
- */
-public class TreeInfoCollector {
-
- public static class NodeCounter extends GenericVisitor {
-
- public int numberOfNodes= 0;
-
- protected boolean visitNode(ASTNode node) {
- numberOfNodes++;
- return true;
- }
- }
-
-
- private final CompilationUnit fRoot;
-
- public TreeInfoCollector(CompilationUnit root) {
- fRoot= root;
- }
-
- public int getSize() {
- return fRoot.subtreeBytes();
- }
-
- public int getNumberOfNodes() {
- NodeCounter counter= new NodeCounter();
- fRoot.accept(counter);
- return counter.numberOfNodes;
- }
-
-
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.java
deleted file mode 100644
index 4e7e71b..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.java
+++ /dev/null
@@ -1,40 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-
-/**
- *
- */
-public abstract class ASTAttribute {
-
- protected static final Object[] EMPTY= new Object[0];
-
- public abstract Object getParent();
- public abstract Object[] getChildren();
- public abstract String getLabel();
- public abstract Image getImage();
-
- public ASTNode getParentASTNode() {
- Object parent= getParent();
- while (parent instanceof ASTAttribute) {
- parent= ((ASTAttribute) parent).getParent();
- }
- if (parent instanceof ASTNode) {
- return (ASTNode) parent;
- }
- return null;
- }
-
-}
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 b8670c3..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
+++ /dev/null
@@ -1,1375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-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.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.IFileBuffer;
-import org.eclipse.core.filebuffers.IFileBufferListener;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-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.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.util.ListenerList;
-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.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-
-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.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener2;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.part.DrillDownAdapter;
-import org.eclipse.ui.part.IShowInSource;
-import org.eclipse.ui.part.ShowInContext;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
-
-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.jdt.astview.TreeInfoCollector;
-
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IProblemRequestor;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.WorkingCopyOwner;
-import org.eclipse.jdt.core.compiler.IProblem;
-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.ASTRequestor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.actions.ShowInPackageViewAction;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.ASTProvider;
-
-public class ASTView extends ViewPart implements IShowInSource {
-
- private static final int JLS3= AST.JLS3;
- /** (Used to get rid of deprecation warnings in code)
- * @deprecated
- */
- private static final int JLS2= AST.JLS2;
-
- private class ASTViewSelectionProvider implements ISelectionProvider {
- ListenerList fListeners= new ListenerList();
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- fListeners.add(listener);
- }
-
- public ISelection getSelection() {
- IStructuredSelection selection= (IStructuredSelection) fViewer.getSelection();
- ArrayList externalSelection= new ArrayList();
- for (Iterator iter= selection.iterator(); iter.hasNext();) {
- Object element= iter.next();
- if (element instanceof JavaElement)
- externalSelection.add(((JavaElement) element).getJavaElement());
- else {
- //TODO: support for other node types?
- }
- }
- return new StructuredSelection(externalSelection);
- }
-
- public void removeSelectionChangedListener(ISelectionChangedListener listener) {
- fListeners.remove(listener);
- }
-
- public void setSelection(ISelection selection) {
- //not supported
- }
- }
-
- 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() {
- setASTLevel(fLevel, true);
- }
- }
-
- private class ASTInputKindAction extends Action {
- public static final int USE_PARSER= 1;
- public static final int USE_RECONCILE= 2;
- public static final int USE_CACHE= 3;
-
- private int fInputKind;
-
- public ASTInputKindAction(String label, int inputKind) {
- super(label, AS_RADIO_BUTTON);
- fInputKind= inputKind;
- if (inputKind == getCurrentInputKind()) {
- setChecked(true);
- }
- }
-
- public int getInputKind() {
- return fInputKind;
- }
-
- public void run() {
- setASTInputType(fInputKind);
- }
- }
-
-
- private static class ListenerMix implements ISelectionListener, IFileBufferListener, IDocumentListener, ISelectionChangedListener, IDoubleClickListener, IPartListener2 {
-
- private boolean fASTViewVisible= true;
- private ASTView fView;
-
- public ListenerMix(ASTView view) {
- fView= view;
- }
-
- public void dispose() {
- fView= null;
- }
-
- public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- if (fASTViewVisible) {
- fView.handleEditorPostSelectionChanged(part, selection);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferCreated(org.eclipse.core.filebuffers.IFileBuffer)
- */
- public void bufferCreated(IFileBuffer buffer) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferDisposed(org.eclipse.core.filebuffers.IFileBuffer)
- */
- public void bufferDisposed(IFileBuffer buffer) {
- if (buffer instanceof ITextFileBuffer) {
- fView.handleDocumentDisposed(((ITextFileBuffer) buffer).getDocument());
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferContentAboutToBeReplaced(org.eclipse.core.filebuffers.IFileBuffer)
- */
- public void bufferContentAboutToBeReplaced(IFileBuffer buffer) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferContentReplaced(org.eclipse.core.filebuffers.IFileBuffer)
- */
- public void bufferContentReplaced(IFileBuffer buffer) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.filebuffers.IFileBufferListener#stateChanging(org.eclipse.core.filebuffers.IFileBuffer)
- */
- public void stateChanging(IFileBuffer buffer) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.filebuffers.IFileBufferListener#dirtyStateChanged(org.eclipse.core.filebuffers.IFileBuffer, boolean)
- */
- public void dirtyStateChanged(IFileBuffer buffer, boolean isDirty) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.filebuffers.IFileBufferListener#stateValidationChanged(org.eclipse.core.filebuffers.IFileBuffer, boolean)
- */
- public void stateValidationChanged(IFileBuffer buffer, boolean isStateValidated) {
- // not interesting
- }
-
- /* (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) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.filebuffers.IFileBufferListener#underlyingFileDeleted(org.eclipse.core.filebuffers.IFileBuffer)
- */
- public void underlyingFileDeleted(IFileBuffer buffer) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.filebuffers.IFileBufferListener#stateChangeFailed(org.eclipse.core.filebuffers.IFileBuffer)
- */
- public void stateChangeFailed(IFileBuffer buffer) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
- */
- public void documentAboutToBeChanged(DocumentEvent event) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
- */
- public void documentChanged(DocumentEvent event) {
- fView.handleDocumentChanged(event.getDocument());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- fView.handleSelectionChanged(event.getSelection());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
- */
- public void doubleClick(DoubleClickEvent event) {
- fView.handleDoubleClick(event);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference)
- */
- public void partHidden(IWorkbenchPartReference partRef) {
- IWorkbenchPart part= partRef.getPart(false);
- if (part == fView) {
- fASTViewVisible= false;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference)
- */
- public void partVisible(IWorkbenchPartReference partRef) {
- IWorkbenchPart part= partRef.getPart(false);
- if (part == fView) {
- fASTViewVisible= true;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference)
- */
- public void partActivated(IWorkbenchPartReference partRef) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference)
- */
- public void partBroughtToTop(IWorkbenchPartReference partRef) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference)
- */
- public void partClosed(IWorkbenchPartReference partRef) {
- fView.notifyWorkbenchPartClosed(partRef);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference)
- */
- public void partDeactivated(IWorkbenchPartReference partRef) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference)
- */
- public void partOpened(IWorkbenchPartReference partRef) {
- // not interesting
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference)
- */
- public void partInputChanged(IWorkbenchPartReference partRef) {
- // not interesting
- }
- }
-
- private final static String SETTINGS_LINK_WITH_EDITOR= "link_with_editor"; //$NON-NLS-1$
- private final static String SETTINGS_INPUT_KIND= "input_kind"; //$NON-NLS-1$
- private final static String SETTINGS_NO_BINDINGS= "create_bindings"; //$NON-NLS-1$
- private final static String SETTINGS_SHOW_NON_RELEVANT="show_non_relevant";//$NON-NLS-1$
- private final static String SETTINGS_JLS= "jls"; //$NON-NLS-1$
-
-
- private TreeViewer fViewer;
- private DrillDownAdapter fDrillDownAdapter;
- private Action fFocusAction;
- private Action fRefreshAction;
- private Action fCreateBindingsAction;
- private Action fFilterNonRelevantAction;
- private Action fResolveBindingKeyAction;
- private Action fCollapseAction;
- private Action fExpandAction;
- private Action fClearAction;
- private TreeCopyAction fCopyAction;
- private Action fDoubleClickAction;
- private Action fLinkWithEditor;
-
- private ASTLevelToggle[] fASTVersionToggleActions;
- private int fCurrentASTLevel;
-
- private ASTInputKindAction[] fASTInputKindActions;
- private int fCurrentInputKind;
-
- private ITextEditor fEditor;
- private IOpenable fOpenable;
- private CompilationUnit fRoot;
- private IDocument fCurrentDocument;
-
- private boolean fDoLinkWithEditor;
- private boolean fCreateBindings;
- private NonRelevantFilter fNonRelevantFilter;
-
- private Object fPreviousDouble;
-
- private ListenerMix fSuperListener;
-
- private SashForm fSash;
- private TreeViewer fTray;
- private ArrayList fTrayRoots;
- private Action fAddToTrayAction;
- private ISelectionChangedListener fTrayUpdater;
- private Action fDeleteAction;
- private IDialogSettings fDialogSettings;
-
-
- public ASTView() {
- fSuperListener= null;
- fDialogSettings= ASTViewPlugin.getDefault().getDialogSettings();
- fDoLinkWithEditor= fDialogSettings.getBoolean(SETTINGS_LINK_WITH_EDITOR);
- try {
- fCurrentInputKind= fDialogSettings.getInt(SETTINGS_INPUT_KIND);
- } catch (NumberFormatException e) {
- fCurrentInputKind= ASTInputKindAction.USE_PARSER;
- }
- fCreateBindings= !fDialogSettings.getBoolean(SETTINGS_NO_BINDINGS); // inverse so that default is to create bindings
- fCurrentASTLevel= JLS3;
- try {
- int level= fDialogSettings.getInt(SETTINGS_JLS);
- if (level == JLS2 || level == JLS3) {
- fCurrentASTLevel= level;
- }
- } catch (NumberFormatException e) {
- // ignore
- }
- fNonRelevantFilter= new NonRelevantFilter();
- fNonRelevantFilter.setShowNonRelevant(fDialogSettings.getBoolean(SETTINGS_SHOW_NON_RELEVANT));
- }
-
- final void notifyWorkbenchPartClosed(IWorkbenchPartReference partRef) {
- if (fEditor != null && fEditor.equals(partRef.getPart(false))) {
- try {
- setInput(null);
- } catch (CoreException e) {
- // ignore
- }
- }
- }
-
- /*(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 ListenerMix(this);
-
- ISelectionService service= site.getWorkbenchWindow().getSelectionService();
- service.addPostSelectionListener(fSuperListener);
- site.getPage().addPartListener(fSuperListener);
- FileBuffers.getTextFileBufferManager().addFileBufferListener(fSuperListener);
- }
- }
-
- public int getCurrentASTLevel() {
- return fCurrentASTLevel;
- }
-
- public int getCurrentInputKind() {
- return fCurrentInputKind;
- }
-
- 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 class file", null)); //$NON-NLS-1$
- }
- fOpenable= openable;
- int astLevel= getInitialASTLevel((IJavaElement) openable);
-
- ISelection selection= editor.getSelectionProvider().getSelection();
- if (selection instanceof ITextSelection) {
- ITextSelection textSelection= (ITextSelection) selection;
- fRoot= internalSetInput(openable, textSelection.getOffset(), textSelection.getLength(), astLevel);
- fEditor= editor;
- setASTLevel(astLevel, false);
- }
- installModificationListener();
- }
-
- }
-
- private int getInitialASTLevel(IJavaElement openable) {
- IJavaProject project= (IJavaProject) openable.getAncestor(IJavaElement.JAVA_PROJECT);
- if (JavaCore.VERSION_1_5.equals(project.getOption(JavaCore.COMPILER_SOURCE, true))) {
- return JLS3;
- }
- return fCurrentASTLevel; // use previous level
- }
-
- private CompilationUnit internalSetInput(IOpenable input, int offset, int length, int astLevel) throws CoreException {
- if (input.getBuffer() == null) {
- throw new CoreException(getErrorStatus("Input has no buffer", null)); //$NON-NLS-1$
- }
-
- try {
- CompilationUnit root= createAST(input, astLevel);
- resetView(root);
- if (root == null) {
- setContentDescription("AST could not be created."); //$NON-NLS-1$
- return null;
- }
- 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$
- }
- }
-
- private void clearView() {
- resetView(null);
- setContentDescription("Open a Java editor and press the 'Show AST of active editor' toolbar button"); //$NON-NLS-1$
- }
-
-
- private void resetView(CompilationUnit root) {
- fViewer.setInput(root);
- fViewer.getTree().setEnabled(root != null);
- fSash.setMaximizedControl(fViewer.getTree());
- fTrayRoots= new ArrayList();
- if (fTray != null)
- fTray.setInput(fTrayRoots);
- setASTUptoDate(root != null);
- fClearAction.setEnabled(root != null);
- fResolveBindingKeyAction.setEnabled(root != null);
- }
-
- private CompilationUnit createAST(IOpenable input, int astLevel) throws JavaModelException, CoreException {
- long startTime;
- long endTime;
- CompilationUnit root;
-
- if (input instanceof ICompilationUnit && (getCurrentInputKind() == ASTInputKindAction.USE_RECONCILE)) {
- ICompilationUnit wc= ((ICompilationUnit) input).getWorkingCopy(
- new WorkingCopyOwner() {/*useless subclass*/},
- new IProblemRequestor() { //TODO: strange: don't get bindings when supplying null as problemRequestor
- public void acceptProblem(IProblem problem) {/*not interested*/}
- public void beginReporting() {/*not interested*/}
- public void endReporting() {/*not interested*/}
- public boolean isActive() {
- return true;
- }
- },
- null);
- try {
- //make inconsistent (otherwise, no AST is generated):
-// IBuffer buffer= wc.getBuffer();
-// buffer.append(new char[] {' '});
-// buffer.replace(buffer.getLength() - 1, 1, new char[0]);
-
- startTime= System.currentTimeMillis();
- root= wc.reconcile(getCurrentASTLevel(), true, null, null);
- endTime= System.currentTimeMillis();
- } finally {
- wc.discardWorkingCopy();
- }
- } else if (input instanceof ICompilationUnit && (getCurrentInputKind() == ASTInputKindAction.USE_CACHE)) {
- ICompilationUnit cu= (ICompilationUnit) input;
- startTime= System.currentTimeMillis();
- root= JavaPlugin.getDefault().getASTProvider().getAST(cu, ASTProvider.WAIT_NO, null);
- endTime= System.currentTimeMillis();
- } else {
- ASTParser parser= ASTParser.newParser(astLevel);
- parser.setResolveBindings(fCreateBindings);
- if (input instanceof ICompilationUnit) {
- parser.setSource((ICompilationUnit) input);
- } else {
- parser.setSource((IClassFile) input);
- }
- startTime= System.currentTimeMillis();
- root= (CompilationUnit) parser.createAST(null);
- endTime= System.currentTimeMillis();
- }
- if (root != null) {
- updateContentDescription((IJavaElement) input, root, endTime - startTime);
- }
- return root;
- }
-
- private void updateContentDescription(IJavaElement element, CompilationUnit root, long time) {
- String version= root.getAST().apiLevel() == JLS2 ? "AST Level 2" : "AST Level 3"; //$NON-NLS-1$//$NON-NLS-2$
- if (getCurrentInputKind() == ASTInputKindAction.USE_RECONCILE) {
- version+= ", from reconciler"; //$NON-NLS-1$
- } else if (getCurrentInputKind() == ASTInputKindAction.USE_CACHE) {
- version+= ", from ASTProvider"; //$NON-NLS-1$
- }
- TreeInfoCollector collector= new TreeInfoCollector(root);
-
- String msg= "{0} ({1}). Creation time: {2,number} ms. Size: {3,number} nodes, {4,number} bytes (AST nodes only)."; //$NON-NLS-1$
- Object[] args= { element.getElementName(), version, new Long(time), new Integer(collector.getNumberOfNodes()), new Integer(collector.getSize())};
- setContentDescription(MessageFormat.format(msg, args));
-
- }
-
- /* (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);
- getSite().getPage().removePartListener(fSuperListener);
- FileBuffers.getTextFileBufferManager().removeFileBufferListener(fSuperListener);
- fSuperListener.dispose(); // removes reference to view
- fSuperListener= null;
- }
- if (fTrayUpdater != null) {
- fViewer.removePostSelectionChangedListener(fTrayUpdater);
- fTray.removePostSelectionChangedListener(fTrayUpdater);
- fTrayUpdater= null;
- }
- super.dispose();
- }
-
- private IStatus getErrorStatus(String message, Throwable th) {
- return new Status(IStatus.ERROR, ASTViewPlugin.getPluginId(), IStatus.ERROR, message, th);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
- */
- public void createPartControl(Composite parent) {
- fSash= new SashForm(parent, SWT.VERTICAL | SWT.SMOOTH);
- fViewer = new TreeViewer(fSash, 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);
- fViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (!fCreateBindings && element instanceof Binding)
- return false;
- return true;
- }
- });
- fViewer.addFilter(fNonRelevantFilter);
-
-
- ViewForm trayForm= new ViewForm(fSash, SWT.NONE);
- Label label= new Label(trayForm, SWT.NONE);
- label.setText(" Comparison Tray (* = selection in the upper tree):"); //$NON-NLS-1$
- trayForm.setTopLeft(label);
-
- fTray= new TreeViewer(trayForm, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
- trayForm.setContent(fTray.getTree());
-
- fTrayRoots= new ArrayList();
- fTray.setContentProvider(new TrayContentProvider());
- final TrayLabelProvider trayLabelProvider= new TrayLabelProvider();
- fTray.setLabelProvider(trayLabelProvider);
- fTray.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
- fTrayUpdater= new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection viewerSelection= (IStructuredSelection) fViewer.getSelection();
- if (viewerSelection.size() == 1 && viewerSelection.getFirstElement() instanceof Binding) {
- trayLabelProvider.setViewerElement((Binding) viewerSelection.getFirstElement());
- } else {
- trayLabelProvider.setViewerElement(null);
- }
- }
- };
- fTray.addPostSelectionChangedListener(fTrayUpdater);
- fViewer.addPostSelectionChangedListener(fTrayUpdater);
- fTray.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- performTrayDoubleClick();
- }
- });
- fTray.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection= (IStructuredSelection) event.getSelection();
- boolean deleteEnabled= false;
- if (selection.size() == 1 && selection.getFirstElement() instanceof Binding)
- deleteEnabled= fTray.getTree().isFocusControl();
- fDeleteAction.setEnabled(deleteEnabled);
- }
- });
- fTray.getTree().addFocusListener(new FocusAdapter() {
- public void focusGained(FocusEvent e) {
- IStructuredSelection selection= (IStructuredSelection) fTray.getSelection();
- boolean deleteEnabled= false;
- if (selection.size() == 1 && selection.getFirstElement() instanceof Binding)
- deleteEnabled= true;
- fDeleteAction.setEnabled(deleteEnabled);
- }
- public void focusLost(FocusEvent e) {
- fDeleteAction.setEnabled(false);
- }
- });
-
- makeActions();
- hookContextMenu();
- hookTrayContextMenu();
- contributeToActionBars();
- getSite().setSelectionProvider(new ASTViewSelectionProvider());
-
- try {
- IEditorPart part= EditorUtility.getActiveEditor();
- if (part instanceof ITextEditor) {
- setInput((ITextEditor) part);
- }
- } catch (CoreException e) {
- // ignore
- }
- if (fOpenable == null) {
- clearView();
- } else {
- 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 hookTrayContextMenu() {
- MenuManager menuMgr = new MenuManager("#TrayPopupMenu"); //$NON-NLS-1$
- menuMgr.setRemoveAllWhenShown(true);
- menuMgr.addMenuListener(new IMenuListener() {
- public void menuAboutToShow(IMenuManager manager) {
- manager.add(fCopyAction);
- manager.add(fDeleteAction);
- manager.add(new Separator());
- manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
- }
- });
- Menu menu = menuMgr.createContextMenu(fTray.getControl());
- fTray.getControl().setMenu(menu);
- getSite().registerContextMenu("#TrayPopupMenu", menuMgr, fTray); //$NON-NLS-1$
- }
-
- private void contributeToActionBars() {
- IActionBars bars = getViewSite().getActionBars();
- fillLocalPullDown(bars.getMenuManager());
- fillLocalToolBar(bars.getToolBarManager());
- bars.setGlobalActionHandler(ActionFactory.COPY.getId(), fCopyAction);
- bars.setGlobalActionHandler(ActionFactory.REFRESH.getId(), fFocusAction);
- bars.setGlobalActionHandler(ActionFactory.DELETE.getId(), fDeleteAction);
- }
-
- private void fillLocalPullDown(IMenuManager manager) {
- for (int i= 0; i < fASTVersionToggleActions.length; i++) {
- manager.add(fASTVersionToggleActions[i]);
- }
- manager.add(new Separator());
- manager.add(fCreateBindingsAction);
- manager.add(fFilterNonRelevantAction);
- manager.add(new Separator());
- manager.add(fResolveBindingKeyAction);
- manager.add(new Separator());
- manager.add(fLinkWithEditor);
- MenuManager menu= new MenuManager("Advanced Options");
- manager.add(menu);
- for (int i= 0; i < fASTInputKindActions.length; i++) {
- menu.add(fASTInputKindActions[i]);
- }
- }
-
- protected void fillContextMenu(IMenuManager manager) {
- manager.add(fFocusAction);
- manager.add(fRefreshAction);
- manager.add(fClearAction);
- manager.add(fCollapseAction);
- manager.add(fExpandAction);
- manager.add(new Separator());
- manager.add(fCopyAction);
- if (fAddToTrayAction.isEnabled())
- manager.add(fAddToTrayAction);
- 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(fClearAction);
- 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);
-
- fClearAction = new Action() {
- public void run() {
- performClear();
- }
- };
- fClearAction.setText("&Clear AST"); //$NON-NLS-1$
- fClearAction.setToolTipText("Clear AST and release memory"); //$NON-NLS-1$
- fClearAction.setEnabled(false);
- ASTViewImages.setImageDescriptors(fClearAction, ASTViewImages.CLEAR);
-
- fASTInputKindActions= new ASTInputKindAction[] {
- new ASTInputKindAction("Use ASTParser.createAST", ASTInputKindAction.USE_PARSER), //$NON-NLS-1$
- new ASTInputKindAction("Use ICompilationUnit.reconcile", ASTInputKindAction.USE_RECONCILE), //$NON-NLS-1$
- new ASTInputKindAction("Use ASTProvider.getAST", ASTInputKindAction.USE_CACHE) //$NON-NLS-1$
- };
-
- fCreateBindingsAction = new Action("&Create Bindings", IAction.AS_CHECK_BOX) { //$NON-NLS-1$
- public void run() {
- performCreateBindings();
- }
- };
- fCreateBindingsAction.setChecked(fCreateBindings);
- fCreateBindingsAction.setToolTipText("Create Bindings"); //$NON-NLS-1$
- fCreateBindingsAction.setEnabled(true);
-
- fFilterNonRelevantAction = new Action("&Hide Non-Relevant Attributes", IAction.AS_CHECK_BOX) { //$NON-NLS-1$
- public void run() {
- performFilterNonRelevant();
- }
- };
- fFilterNonRelevantAction.setChecked(! fNonRelevantFilter.isShowNonRelevant());
- fFilterNonRelevantAction.setToolTipText("Hide non-relevant binding attributes"); //$NON-NLS-1$
- fFilterNonRelevantAction.setEnabled(true);
-
- fResolveBindingKeyAction= new Action("&Resolve Binding Key...", IAction.AS_PUSH_BUTTON) { //$NON-NLS-1$
- public void run() {
- performResolveBindingKey();
- }
- };
- fResolveBindingKeyAction.setToolTipText("Resolve Binding Key..."); //$NON-NLS-1$
- fResolveBindingKeyAction.setEnabled(false);
-
- 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$
- fFocusAction.setActionDefinitionId("org.eclipse.ui.file.refresh"); //$NON-NLS-1$
- ASTViewImages.setImageDescriptors(fFocusAction, ASTViewImages.SETFOCUS);
-
- fCollapseAction = new Action() {
- public void run() {
- performCollapse();
- }
- };
- fCollapseAction.setText("C&ollapse"); //$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("E&xpand"); //$NON-NLS-1$
- fExpandAction.setToolTipText("Expand Selected Node"); //$NON-NLS-1$
- fExpandAction.setEnabled(false);
- ASTViewImages.setImageDescriptors(fExpandAction, ASTViewImages.EXPAND);
-
- fCopyAction= new TreeCopyAction(new Tree[] {fViewer.getTree(), fTray.getTree()});
-
- fDoubleClickAction = new Action() {
- public void run() {
- performDoubleClick();
- }
- };
-
- fLinkWithEditor = new Action() {
- public void run() {
- performLinkWithEditor();
- }
- };
- fLinkWithEditor.setChecked(fDoLinkWithEditor);
- 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", JLS2), //$NON-NLS-1$
- new ASTLevelToggle("AST Level &3.0", JLS3) //$NON-NLS-1$
- };
-
- fAddToTrayAction= new Action() {
- public void run() {
- performAddToTray();
- }
- };
- fAddToTrayAction.setText("&Add to Comparison Tray"); //$NON-NLS-1$
- fAddToTrayAction.setToolTipText("Add Selected Node to Comparison Tray"); //$NON-NLS-1$
- fAddToTrayAction.setEnabled(false);
- ASTViewImages.setImageDescriptors(fAddToTrayAction, ASTViewImages.ADD_TO_TRAY);
-
- fDeleteAction= new Action() {
- public void run() {
- performDelete();
- }
- };
- fDeleteAction.setText("&Delete"); //$NON-NLS-1$
- fDeleteAction.setToolTipText("Delete Binding from Tray"); //$NON-NLS-1$
- fDeleteAction.setEnabled(false);
- fDeleteAction.setImageDescriptor(ASTViewPlugin.getDefault().getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
- fDeleteAction.setId(ActionFactory.DELETE.getId());
- fDeleteAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.DELETE);
- }
-
-
-
- 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, getCurrentASTLevel());
- }
-
- protected void setASTLevel(int level, boolean doRefresh) {
- int oldLevel= fCurrentASTLevel;
- fCurrentASTLevel= level;
-
- fDialogSettings.put(SETTINGS_JLS, fCurrentASTLevel);
-
- if (doRefresh && fOpenable != null && oldLevel != fCurrentASTLevel) {
- try {
- refreshAST();
- } catch (CoreException e) {
- showAndLogError("Could not set AST to new level.", e); //$NON-NLS-1$
- // set back to old level
- fCurrentASTLevel= oldLevel;
- }
- }
- // update action state
- for (int i= 0; i < fASTVersionToggleActions.length; i++) {
- ASTLevelToggle curr= fASTVersionToggleActions[i];
- curr.setChecked(curr.getLevel() == fCurrentASTLevel);
- }
- }
-
- protected void setASTInputType(int inputKind) {
- if (inputKind != fCurrentInputKind) {
- fCurrentInputKind= inputKind;
- fDialogSettings.put(SETTINGS_INPUT_KIND, inputKind);
- for (int i= 0; i < fASTInputKindActions.length; i++) {
- ASTInputKindAction curr= fASTInputKindActions[i];
- curr.setChecked(curr.getInputKind() == inputKind);
- }
- performRefresh();
- }
- }
-
- private ASTNode getASTNodeNearSelection(IStructuredSelection selection) {
- Object elem= selection.getFirstElement();
- if (elem instanceof ASTAttribute) {
- return ((ASTAttribute) elem).getParentASTNode();
- } else if (elem instanceof ASTNode) {
- return (ASTNode) elem;
- }
- 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());
- fCopyAction.setEnabled(!selection.isEmpty());
-
- boolean addEnabled= false;
- IStructuredSelection structuredSelection= (IStructuredSelection) selection;
- if (structuredSelection.size() == 1) {
- Object first= structuredSelection.getFirstElement();
- if (first instanceof Binding)
- addEnabled= ((Binding) first).getBinding() != null && fViewer.getTree().isFocusControl();
- }
- fAddToTrayAction.setEnabled(addEnabled);
- }
-
- protected void handleEditorPostSelectionChanged(IWorkbenchPart part, ISelection selection) {
- if (!fDoLinkWithEditor || !(selection instanceof ITextSelection)) {
- return;
- }
- if (fRoot == null || part != fEditor) {
- if (part instanceof ITextEditor && (EditorUtility.getJavaInput((ITextEditor) part) != null)) {
- try {
- setInput((ITextEditor) part);
- } catch (CoreException e) {
- setContentDescription(e.getStatus().getMessage());
- }
- }
-
- } else { // fRoot != null && part == fEditor
- doLinkWithEditor(selection);
- }
- }
-
- private void doLinkWithEditor(ISelection selection) {
- 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();
- if (covering != null) {
- fViewer.reveal(covering);
- fViewer.setSelection(new StructuredSelection(covering));
- }
- }
-
- protected void handleDoubleClick(DoubleClickEvent event) {
- fDoubleClickAction.run();
- }
-
- protected void performLinkWithEditor() {
- fDoLinkWithEditor= fLinkWithEditor.isChecked();
- fDialogSettings.put(SETTINGS_LINK_WITH_EDITOR, fDoLinkWithEditor);
-
-
- if (fDoLinkWithEditor && fEditor != null) {
- ISelectionProvider selectionProvider= fEditor.getSelectionProvider();
- if (selectionProvider != null) { // can be null when editor is closed
- doLinkWithEditor(selectionProvider.getSelection());
- }
- }
- }
-
- 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.expandToLevel(3);
- } else {
- Object[] selected= selection.toArray();
- fViewer.getTree().setRedraw(false);
- for (int i= 0; i < selected.length; i++) {
- fViewer.expandToLevel(selected[i], 3);
- }
- fViewer.getTree().setRedraw(true);
- }
- }
-
- protected void performSetFocus() {
- IEditorPart part= EditorUtility.getActiveEditor();
- if (part instanceof ITextEditor) {
- try {
- setInput((ITextEditor) part);
- } catch (CoreException e) {
- showAndLogError("Could not set AST view input ", e); //$NON-NLS-1$
- }
- }
- }
-
- protected void performRefresh() {
- if (fOpenable != null) {
- try {
- refreshAST();
- } catch (CoreException e) {
- showAndLogError("Could not set AST view input ", e); //$NON-NLS-1$
- }
- }
- }
-
- protected void performClear() {
- fOpenable= null;
- try {
- setInput(null);
- } catch (CoreException e) {
- showAndLogError("Could not reset AST view ", e); //$NON-NLS-1$
- }
- clearView();
- }
-
- private void showAndLogError(String message, CoreException e) {
- ASTViewPlugin.log(message, e);
- ErrorDialog.openError(getSite().getShell(), "AST View", message, e.getStatus()); //$NON-NLS-1$
- }
-
- private void showAndLogError(String message, Exception e) {
- IStatus status= new Status(IStatus.ERROR, ASTViewPlugin.getPluginId(), 0, message, e);
- ASTViewPlugin.log(status);
- ErrorDialog.openError(getSite().getShell(), "AST View", null, status); //$NON-NLS-1$
- }
-
- protected void performCreateBindings() {
- fCreateBindings= fCreateBindingsAction.isChecked();
- fDialogSettings.put(SETTINGS_NO_BINDINGS, !fCreateBindings);
- performRefresh();
- }
-
- protected void performFilterNonRelevant() {
- boolean showNonRelevant= !fFilterNonRelevantAction.isChecked();
- fNonRelevantFilter.setShowNonRelevant(showNonRelevant);
- fDialogSettings.put(SETTINGS_SHOW_NON_RELEVANT, showNonRelevant);
- fViewer.refresh();
- }
-
- protected void performResolveBindingKey() {
- InputDialog dialog= new InputDialog(getSite().getShell(), "Resolve Binding Key", "Key: (optionally surrounded by <KEY: '> and <'>)", "", null);
- if (dialog.open() != Window.OK)
- return;
-
- String key= dialog.getValue();
- if (key.startsWith("KEY: '") && key.endsWith("'"))
- key= key.substring(6, key.length() - 1);
- ASTParser parser= ASTParser.newParser(fCurrentASTLevel);
- parser.setResolveBindings(true);
- if (fOpenable instanceof IJavaElement) {
- parser.setProject(((IJavaElement) fOpenable).getJavaProject());
- class MyASTRequestor extends ASTRequestor {
- String fBindingKey;
- IBinding fBinding;
- public void acceptBinding(String bindingKey, IBinding binding) {
- fBindingKey= bindingKey;
- fBinding= binding;
- }
- }
- MyASTRequestor requestor= new MyASTRequestor();
- ASTAttribute item;
- Object viewerInput= fViewer.getInput();
- try {
- parser.createASTs(new ICompilationUnit[0], new String[] { key }, requestor, null);
- if (requestor.fBindingKey != null) {
- item= new Binding(viewerInput, requestor.fBindingKey, requestor.fBinding, true);
- } else {
- item= new Error(viewerInput, "Key not resolved: " + key, null);
- }
- } catch (RuntimeException e) {
- item= new Error(viewerInput, "Error resolving key: " + key, e);
- }
- fViewer.add(viewerInput, item);
- fViewer.setSelection(new StructuredSelection(item), true);
- }
- }
-
- protected void performDoubleClick() {
- if (fEditor == null) {
- return;
- }
-
- ISelection selection = fViewer.getSelection();
- Object obj = ((IStructuredSelection) selection).getFirstElement();
-
- boolean isTrippleClick= (obj == fPreviousDouble);
- fPreviousDouble= isTrippleClick ? null : obj;
-
- if (obj instanceof ExceptionAttribute) {
- RuntimeException exception= ((ExceptionAttribute) obj).getException();
- if (exception != null) {
- String label= ((ExceptionAttribute) obj).getLabel();
- showAndLogError("An error occurred while calculating an AST View Label:\n" + label, exception); //$NON-NLS-1$
- return;
- }
- }
-
- 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 Binding) {
- IBinding binding= ((Binding) obj).getBinding();
- ASTNode declaring= fRoot.findDeclaringNode(binding);
- if (declaring != null) {
- fViewer.reveal(declaring);
- fViewer.setSelection(new StructuredSelection(declaring));
- }
- return;
- } else if (obj instanceof ProblemNode) {
- ProblemNode problemNode= (ProblemNode) obj;
- EditorUtility.selectInEditor(fEditor, problemNode.getOffset(), problemNode.getLength());
- return;
- } else if (obj instanceof JavaElement) {
- IJavaElement javaElement= ((JavaElement) obj).getJavaElement();
- if (javaElement instanceof IPackageFragment) {
- ShowInPackageViewAction showInPackageViewAction= new ShowInPackageViewAction(getViewSite());
- showInPackageViewAction.run(javaElement);
- } else {
- try {
- IEditorPart editorPart= JavaUI.openInEditor(javaElement);
- if (editorPart != null)
- JavaUI.revealInEditor(editorPart, javaElement);
- } catch (PartInitException e) {
- showAndLogError("Could not open editor.", e); //$NON-NLS-1$
- } catch (JavaModelException e) {
- showAndLogError("Could not open editor.", e); //$NON-NLS-1$
- }
- }
- 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);
- }
- }
-
- protected void performAddToTray() {
- IStructuredSelection selection= (IStructuredSelection) fViewer.getSelection();
- Object firstElement= selection.getFirstElement();
- if (! fTrayRoots.contains(firstElement)) {
- fTrayRoots.add(firstElement);
- fTray.setInput(fTrayRoots);
- }
- if (fSash.getMaximizedControl() != null) {
- int trayHeight= fTray.getTree().getItemHeight() * (2 + TrayContentProvider.DEFAULT_CHILDREN_COUNT);
- int sashHeight= fSash.getClientArea().height;
- fSash.setWeights(new int[] { sashHeight - trayHeight, trayHeight });
- fSash.setMaximizedControl(null);
- }
- setTraySelection(selection);
- }
-
- private void setTraySelection(IStructuredSelection selection) {
- fTray.setSelection(selection, true);
- TreeItem[] itemSelection= fTray.getTree().getSelection();
- if (itemSelection.length > 0)
- fTray.getTree().setTopItem(itemSelection[0]);
- }
-
- protected void performTrayDoubleClick() {
- IStructuredSelection selection= (IStructuredSelection) fTray.getSelection();
- if (selection.size() != 1)
- return;
- Object obj = selection.getFirstElement();
- if (obj instanceof ExceptionAttribute) {
- RuntimeException exception= ((ExceptionAttribute) obj).getException();
- if (exception != null) {
- String label= ((ExceptionAttribute) obj).getLabel();
- showAndLogError("An error occurred while calculating an AST View Label:\n" + label, exception); //$NON-NLS-1$
- return;
- }
- }
- if (obj instanceof Binding) {
- Binding binding= (Binding) obj;
- fViewer.setSelection(new StructuredSelection(binding), true);
- }
- }
-
- protected void performDelete() {
- IStructuredSelection selection= (IStructuredSelection) fTray.getSelection();
- if (selection.size() != 1)
- return;
- Object obj = selection.getFirstElement();
- if (obj instanceof Binding) {
- int index= fTrayRoots.indexOf(obj);
- if (index != -1) {
- fTrayRoots.remove(index);
- fTray.setInput(fTrayRoots);
- int newSize= fTrayRoots.size();
- if (newSize == 0)
- return;
- else if (index == newSize)
- setTraySelection(new StructuredSelection(fTrayRoots.get(newSize - 1)));
- else
- setTraySelection(new StructuredSelection(fTrayRoots.get(index)));
- }
- }
- }
-
- public void setFocus() {
- fViewer.getControl().setFocus();
- }
-
- public ShowInContext getShowInContext() {
- return new ShowInContext(null, getSite().getSelectionProvider().getSelection());
- }
-}
\ 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 27c3f03..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
-import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
-import org.eclipse.jdt.core.dom.ClassInstanceCreation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ConstructorInvocation;
-import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.FieldAccess;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-import org.eclipse.jdt.core.dom.ImportDeclaration;
-import org.eclipse.jdt.core.dom.MemberRef;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.MethodInvocation;
-import org.eclipse.jdt.core.dom.MethodRef;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.PackageDeclaration;
-import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
-import org.eclipse.jdt.core.dom.SuperConstructorInvocation;
-import org.eclipse.jdt.core.dom.SuperFieldAccess;
-import org.eclipse.jdt.core.dom.SuperMethodInvocation;
-import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.TypeParameter;
-import org.eclipse.jdt.core.dom.VariableDeclaration;
-
-public class ASTViewContentProvider implements ITreeContentProvider {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer v, Object oldInput, Object newInput) {
- }
-
- /*(non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object parent) {
- return getChildren(parent);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
- */
- 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 ASTAttribute) {
- return ((ASTAttribute) child).getParent();
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
- */
- public Object[] getChildren(Object parent) {
- if (parent instanceof ASTAttribute) {
- return ((ASTAttribute) parent).getChildren();
- } 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 Expression) {
- Expression expression= (Expression) node;
- ITypeBinding expressionTypeBinding= expression.resolveTypeBinding();
- res.add(createExpressionTypeBinding(node, expressionTypeBinding));
-
- // expressions:
- if (expression instanceof Name) {
- IBinding binding= ((Name) expression).resolveBinding();
- if (binding != expressionTypeBinding)
- res.add(createBinding(expression, binding));
- } else if (expression instanceof MethodInvocation) {
- IMethodBinding binding= ((MethodInvocation) expression).resolveMethodBinding();
- res.add(createBinding(expression, binding));
- } else if (expression instanceof SuperMethodInvocation) {
- IMethodBinding binding= ((SuperMethodInvocation) expression).resolveMethodBinding();
- res.add(createBinding(expression, binding));
- } else if (expression instanceof ClassInstanceCreation) {
- IMethodBinding binding= ((ClassInstanceCreation) expression).resolveConstructorBinding();
- res.add(createBinding(expression, binding));
- } else if (expression instanceof FieldAccess) {
- IVariableBinding binding= ((FieldAccess) expression).resolveFieldBinding();
- res.add(createBinding(expression, binding));
- } else if (expression instanceof SuperFieldAccess) {
- IVariableBinding binding= ((SuperFieldAccess) expression).resolveFieldBinding();
- res.add(createBinding(expression, binding));
- }
- // Expression attributes:
- res.add(new LeafAttribute(expression, "Boxing: " + expression.resolveBoxing() + "; Unboxing: " + expression.resolveUnboxing())); //$NON-NLS-1$ //$NON-NLS-2$
- res.add(new LeafAttribute(expression, "ConstantExpressionValue", expression.resolveConstantExpressionValue())); //$NON-NLS-1$
-
- // references:
- } else if (node instanceof ConstructorInvocation) {
- IMethodBinding binding= ((ConstructorInvocation) node).resolveConstructorBinding();
- res.add(createBinding(node, binding));
- } else if (node instanceof SuperConstructorInvocation) {
- IMethodBinding binding= ((SuperConstructorInvocation) node).resolveConstructorBinding();
- res.add(createBinding(node, binding));
- } else if (node instanceof MethodRef) {
- IBinding binding= ((MethodRef) node).resolveBinding();
- res.add(createBinding(node, binding));
- } else if (node instanceof MemberRef) {
- IBinding binding= ((MemberRef) node).resolveBinding();
- res.add(createBinding(node, binding));
- } else if (node instanceof Type) {
- IBinding binding= ((Type) node).resolveBinding();
- res.add(createBinding(node, binding));
- } else if (node instanceof TypeParameter) {
- IBinding binding= ((TypeParameter) node).resolveBinding();
- res.add(createBinding(node, binding));
-
- // declarations:
- } else if (node instanceof AbstractTypeDeclaration) {
- IBinding binding= ((AbstractTypeDeclaration) node).resolveBinding();
- res.add(createBinding(node, binding));
- } else if (node instanceof AnnotationTypeMemberDeclaration) {
- IBinding binding= ((AnnotationTypeMemberDeclaration) node).resolveBinding();
- res.add(createBinding(node, binding));
- } else if (node instanceof EnumConstantDeclaration) {
- IBinding binding= ((EnumConstantDeclaration) node).resolveVariable();
- res.add(createBinding(node, binding));
- IBinding binding2= ((EnumConstantDeclaration) node).resolveConstructorBinding();
- res.add(createBinding(node, binding2));
- } else if (node instanceof MethodDeclaration) {
- IBinding binding= ((MethodDeclaration) node).resolveBinding();
- res.add(createBinding(node, binding));
- } else if (node instanceof VariableDeclaration) {
- IBinding binding= ((VariableDeclaration) node).resolveBinding();
- res.add(createBinding(node, binding));
- } else if (node instanceof AnonymousClassDeclaration) {
- IBinding binding= ((AnonymousClassDeclaration) node).resolveBinding();
- res.add(createBinding(node, binding));
- } else if (node instanceof ImportDeclaration) {
- IBinding binding= ((ImportDeclaration) node).resolveBinding();
- res.add(createBinding(node, binding));
- } else if (node instanceof PackageDeclaration) {
- IBinding binding= ((PackageDeclaration) node).resolveBinding();
- res.add(createBinding(node, binding));
- }
-
-
-
- List list= node.structuralPropertiesForType();
- for (int i= 0; i < list.size(); i++) {
- StructuralPropertyDescriptor curr= (StructuralPropertyDescriptor) list.get(i);
- res.add(new NodeProperty(node, curr));
- }
-
- if (node instanceof CompilationUnit) {
- CompilationUnit root= (CompilationUnit) node;
- res.add(new JavaElement(root, root.getJavaElement()));
- res.add(new CommentsProperty(root));
- res.add(new ProblemsProperty(root));
- }
-
- return res.toArray();
- }
-
- private Binding createBinding(ASTNode parent, IBinding binding) {
- String label;
- if (binding == null) {
- label= ">binding"; //$NON-NLS-1$
- } else {
- switch (binding.getKind()) {
- case IBinding.VARIABLE:
- label= "> variable binding"; //$NON-NLS-1$
- break;
- case IBinding.TYPE:
- label= "> type binding"; //$NON-NLS-1$
- break;
- case IBinding.METHOD:
- label= "> method binding"; //$NON-NLS-1$
- break;
- case IBinding.PACKAGE:
- label= "> package binding"; //$NON-NLS-1$
- break;
- default:
- label= "> unknown binding"; //$NON-NLS-1$
- }
- }
- return new Binding(parent, label, binding, true);
- }
-
-
- private Object createExpressionTypeBinding(ASTNode parent, ITypeBinding binding) {
- String label= "> (Expression) type binding"; //$NON-NLS-1$
- return new Binding(parent, label, binding, true);
- }
-
- 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 1ee3930..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.core.Signature;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-
-public class ASTViewLabelProvider extends LabelProvider implements IColorProvider, IFontProvider {
-
- private int fSelectionStart;
- private int fSelectionLength;
-
- private Color fBlue, fRed, fDarkGray, fYellow, fDarkGreen, fDarkRed, fLightRed;
- private Font fBold;
-
- public ASTViewLabelProvider() {
- fSelectionStart= -1;
- fSelectionLength= -1;
-
- Display display= Display.getCurrent();
-
- fRed= display.getSystemColor(SWT.COLOR_RED);
- fDarkGray= display.getSystemColor(SWT.COLOR_DARK_GRAY);
- fBlue= display.getSystemColor(SWT.COLOR_DARK_BLUE);
- fYellow= display.getSystemColor(SWT.COLOR_YELLOW);
- fDarkGreen= display.getSystemColor(SWT.COLOR_DARK_GREEN);
- fDarkRed= display.getSystemColor(SWT.COLOR_DARK_RED);
- fLightRed= new Color(display, 255, 190, 190);
-
- fBold= PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);
- }
-
- 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 if (obj instanceof ASTAttribute) {
- buf.append(((ASTAttribute) obj).getLabel());
- }
- 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(']');
- if ((node.getFlags() & ASTNode.MALFORMED) != 0) {
- buf.append(" (malformed)"); //$NON-NLS-1$
- }
- }
-
-
- public Image getImage(Object obj) {
- if (obj instanceof ASTNode) {
- return null;
- } else if (obj instanceof ASTAttribute) {
- return ((ASTAttribute) obj).getImage();
- }
-
- 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 Error))
- return fRed;
- if ((element instanceof ExceptionAttribute) && ((ExceptionAttribute) element).getException() != null)
- return fRed;
-
- if (element instanceof ASTNode) {
- ASTNode node= (ASTNode) element;
- if ((node.getFlags() & ASTNode.MALFORMED) != 0) {
- return fRed;
- }
- return fDarkGray;
- } else if (element instanceof Binding) {
- Binding binding= (Binding) element;
- if (!binding.isRelevant())
- return fDarkGray;
- return fBlue;
- } else if (element instanceof NodeProperty) {
- return null; // normal color
- } else if (element instanceof BindingProperty) {
- BindingProperty binding= (BindingProperty) element;
- if (!binding.isRelevant())
- return fDarkGray;
- return fBlue;
- } else if (element instanceof JavaElement) {
- JavaElement javaElement= (JavaElement) element;
- if (javaElement.getJavaElement() == null || ! javaElement.getJavaElement().exists()) {
- return fRed;
- }
- return fDarkGreen;
- }
- return fDarkRed; // all extra properties
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
- */
- public Color getBackground(Object element) {
- if (isNotProperlyNested(element)) {
- return fLightRed;
- }
- if (fSelectionStart != -1 && isInside(element)) {
- return fYellow;
- }
- return null;
- }
-
- private boolean isNotProperlyNested(Object element) {
- if (element instanceof ASTNode) {
- ASTNode node= (ASTNode) element;
- int start= node.getStartPosition();
- int end= start + node.getLength();
-
- ASTNode parent= node.getParent();
- if (parent != null) {
- int parentstart= parent.getStartPosition();
- int parentend= start + parent.getLength();
-
- if (start < parentstart || end > parentend) {
- return true;
- }
- }
- }
- return false;
- }
-
- 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;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
- */
- public Font getFont(Object element) {
- if (element instanceof ASTNode) {
- return fBold;
- }
- return null;
- }
-
- public void dispose() {
- super.dispose();
- fLightRed.dispose();
- }
-
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/Binding.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/Binding.java
deleted file mode 100644
index de3bb64..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/Binding.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import java.util.ArrayList;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IJavaElement;
-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 Binding extends ASTAttribute {
-
- private final IBinding fBinding;
- private final String fLabel;
- private final Object fParent;
- private final boolean fIsRelevant;
-
- public Binding(Object parent, String label, IBinding binding, boolean isRelevant) {
- fParent= parent;
- fBinding= binding;
- fLabel= label;
- fIsRelevant= isRelevant;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
- */
- public Object getParent() {
- return fParent;
- }
-
- public IBinding getBinding() {
- return fBinding;
- }
-
-
- public boolean hasBindingProperties() {
- return fBinding != null;
- }
-
- public boolean isRelevant() {
- return fIsRelevant;
- }
-
-
- private static boolean isType(int typeKinds, int kind) {
- return (typeKinds & kind) != 0;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
- */
- public Object[] getChildren() {
-
- if (fBinding != null) {
- ArrayList res= new ArrayList();
- res.add(new BindingProperty(this, "NAME", fBinding.getName(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "KEY", fBinding.getKey(), true)); //$NON-NLS-1$
- switch (fBinding.getKind()) {
- case IBinding.VARIABLE:
- IVariableBinding variableBinding= (IVariableBinding) fBinding;
- res.add(new BindingProperty(this, "IS FIELD", variableBinding.isField(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS ENUM CONSTANT", variableBinding.isEnumConstant(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "VARIABLE ID", variableBinding.getVariableId(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "MODIFIERS", Flags.toString(fBinding.getModifiers()), true)); //$NON-NLS-1$
- res.add(new Binding(this, "TYPE", variableBinding.getType(), true)); //$NON-NLS-1$
- res.add(new Binding(this, "DECLARING CLASS", variableBinding.getDeclaringClass(), true)); //$NON-NLS-1$
- res.add(new Binding(this, "DECLARING METHOD", variableBinding.getDeclaringMethod(), true)); //$NON-NLS-1$
- res.add(new Binding(this, "VARIABLE DECLARATION", variableBinding.getVariableDeclaration(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS SYNTHETIC", fBinding.isSynthetic(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS DEPRECATED", fBinding.isDeprecated(), true)); //$NON-NLS-1$
- Object constVal= variableBinding.getConstantValue();
- res.add(new BindingProperty(this, "CONSTANT VALUE", constVal == null ? "null" : constVal.toString(), true)); //$NON-NLS-1$ //$NON-NLS-2$
- break;
- case IBinding.PACKAGE:
- IPackageBinding packageBinding= (IPackageBinding) fBinding;
- res.add(new BindingProperty(this, "IS UNNAMED", packageBinding.isUnnamed(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS SYNTHETIC", fBinding.isSynthetic(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS DEPRECATED", fBinding.isDeprecated(), true)); //$NON-NLS-1$
- break;
- case IBinding.TYPE:
- ITypeBinding typeBinding= (ITypeBinding) fBinding;
- int typeKind= getTypeKind(typeBinding);
-
- boolean isRefType= isType(typeKind, REF_TYPE);
- final boolean isNonPrimitive= ! isType(typeKind, PRIMITIVE_TYPE);
-
- StringBuffer kinds= new StringBuffer("KIND:"); //$NON-NLS-1$
- if (typeBinding.isArray()) kinds.append(" isArray"); //$NON-NLS-1$
- if (typeBinding.isCapture()) kinds.append(" isCapture"); //$NON-NLS-1$
- if (typeBinding.isNullType()) kinds.append(" isNullType"); //$NON-NLS-1$
- if (typeBinding.isPrimitive()) kinds.append(" isPrimitive"); //$NON-NLS-1$
- if (typeBinding.isTypeVariable()) kinds.append(" isTypeVariable"); //$NON-NLS-1$
- if (typeBinding.isWildcardType()) kinds.append(" isWildcardType"); //$NON-NLS-1$
- // ref types
- if (typeBinding.isAnnotation()) kinds.append(" isAnnotation"); //$NON-NLS-1$
- if (typeBinding.isClass()) kinds.append(" isClass"); //$NON-NLS-1$
- if (typeBinding.isInterface()) kinds.append(" isInterface"); //$NON-NLS-1$
- if (typeBinding.isEnum()) kinds.append(" isEnum"); //$NON-NLS-1$
- res.add(new BindingProperty(this, kinds, true)); //$NON-NLS-1$
-
- kinds= new StringBuffer("GENERICS:"); //$NON-NLS-1$
- if (typeBinding.isRawType()) kinds.append(" isRawType"); //$NON-NLS-1$
- if (typeBinding.isGenericType()) kinds.append(" isGenericType"); //$NON-NLS-1$
- if (typeBinding.isParameterizedType()) kinds.append(" isParameterizedType"); //$NON-NLS-1$
- if (!isType(typeKind, GENERIC | PARAMETRIZED)) {
- kinds.append(" (non-generic, non-parametrized)");
- }
-
- res.add(new BindingProperty(this, kinds, isRefType)); //$NON-NLS-1$
-
- res.add(new Binding(this, "ELEMENT TYPE", typeBinding.getElementType(), isType(typeKind, ARRAY_TYPE))); //$NON-NLS-1$
- res.add(new BindingProperty(this, "DIMENSIONS", typeBinding.getDimensions(), isType(typeKind, ARRAY_TYPE))); //$NON-NLS-1$
-
- res.add(new BindingProperty(this, "TYPE BOUNDS", typeBinding.getTypeBounds(), isType(typeKind, VARIABLE_TYPE | CAPTURE_TYPE))); //$NON-NLS-1$
-
- StringBuffer origin= new StringBuffer("ORIGIN:"); //$NON-NLS-1$
- if (typeBinding.isTopLevel()) origin.append(" isTopLevel"); //$NON-NLS-1$
- if (typeBinding.isNested()) origin.append(" isNested"); //$NON-NLS-1$
- if (typeBinding.isLocal()) origin.append(" isLocal"); //$NON-NLS-1$
- if (typeBinding.isMember()) origin.append(" isMember"); //$NON-NLS-1$
- if (typeBinding.isAnonymous()) kinds.append(" isAnonymous"); //$NON-NLS-1$
- res.add(new BindingProperty(this, origin, isRefType));
-
- res.add(new BindingProperty(this, "IS FROM SOURCE", typeBinding.isFromSource(), isType(typeKind, REF_TYPE | VARIABLE_TYPE | CAPTURE_TYPE))); //$NON-NLS-1$
-
- res.add(new Binding(this, "PACKAGE", typeBinding.getPackage(), isRefType)); //$NON-NLS-1$
- res.add(new Binding(this, "DECLARING CLASS", typeBinding.getDeclaringClass(), isType(typeKind, REF_TYPE | VARIABLE_TYPE | CAPTURE_TYPE))); //$NON-NLS-1$
- res.add(new Binding(this, "DECLARING METHOD", typeBinding.getDeclaringMethod(), isType(typeKind, REF_TYPE | VARIABLE_TYPE | CAPTURE_TYPE))); //$NON-NLS-1$
- res.add(new BindingProperty(this, "MODIFIERS", Flags.toString(fBinding.getModifiers()), isRefType)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "BINARY NAME", typeBinding.getBinaryName(), true)); //$NON-NLS-1$
-
- res.add(new Binding(this, "TYPE DECLARATION", typeBinding.getTypeDeclaration(), isNonPrimitive)); //$NON-NLS-1$
- res.add(new Binding(this, "ERASURE", typeBinding.getErasure(), isNonPrimitive)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "TYPE PARAMETERS", typeBinding.getTypeParameters(), isType(typeKind, GENERIC))); //$NON-NLS-1$
- res.add(new BindingProperty(this, "TYPE ARGUMENTS", typeBinding.getTypeArguments(), isType(typeKind, PARAMETRIZED))); //$NON-NLS-1$
- res.add(new Binding(this, "BOUND", typeBinding.getBound(), isType(typeKind, WILDCARD_TYPE))); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS UPPERBOUND", typeBinding.isUpperbound(), isType(typeKind, WILDCARD_TYPE))); //$NON-NLS-1$
- res.add(new Binding(this, "WILDCARD", typeBinding.getWildcard(), isType(typeKind, CAPTURE_TYPE))); //$NON-NLS-1$
-
- res.add(new Binding(this, "SUPERCLASS", typeBinding.getSuperclass(), isRefType)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "INTERFACES", typeBinding.getInterfaces(), isRefType)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "DECLARED TYPES", typeBinding.getDeclaredTypes(), isRefType)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "DECLARED FIELDS", typeBinding.getDeclaredFields(), isRefType)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "DECLARED METHODS", typeBinding.getDeclaredMethods(), isRefType)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS SYNTHETIC", fBinding.isSynthetic(), isNonPrimitive)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS DEPRECATED", fBinding.isDeprecated(), isRefType)); //$NON-NLS-1$
- break;
- case IBinding.METHOD:
- IMethodBinding methodBinding= (IMethodBinding) fBinding;
- res.add(new BindingProperty(this, "IS CONSTRUCTOR", methodBinding.isConstructor(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS DEFAULT CONSTRUCTOR", methodBinding.isDefaultConstructor(), true)); //$NON-NLS-1$
- res.add(new Binding(this, "DECLARING CLASS", methodBinding.getDeclaringClass(), true)); //$NON-NLS-1$
- res.add(new Binding(this, "RETURN TYPE", methodBinding.getReturnType(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "MODIFIERS", Flags.toString(fBinding.getModifiers()), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "PARAMETER TYPES", methodBinding.getParameterTypes(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS VARARGS", methodBinding.isVarargs(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "EXCEPTION TYPES", methodBinding.getExceptionTypes(), true)); //$NON-NLS-1$
-
- StringBuffer genericsM= new StringBuffer("GENERICS:"); //$NON-NLS-1$
- if (methodBinding.isRawMethod()) genericsM.append(" isRawMethod"); //$NON-NLS-1$
- if (methodBinding.isGenericMethod()) genericsM.append(" isGenericMethod"); //$NON-NLS-1$
- if (methodBinding.isParameterizedMethod()) genericsM.append(" isParameterizedMethod"); //$NON-NLS-1$
- res.add(new BindingProperty(this, genericsM, true));
-
- res.add(new Binding(this, "METHOD DECLARATION", methodBinding.getMethodDeclaration(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "TYPE PARAMETERS", methodBinding.getTypeParameters(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "TYPE ARGUMENTS", methodBinding.getTypeArguments(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS SYNTHETIC", fBinding.isSynthetic(), true)); //$NON-NLS-1$
- res.add(new BindingProperty(this, "IS DEPRECATED", fBinding.isDeprecated(), true)); //$NON-NLS-1$
-
- break;
- }
- try {
- IJavaElement javaElement= fBinding.getJavaElement();
- res.add(new JavaElement(this, javaElement));
- } catch (RuntimeException e) {
- String label= ">java element: " + e.getClass().getName() + " for \"" + fBinding.getKey() + "\""; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
- res.add(new Error(this, label, e));
- }
- return res.toArray();
- }
- return EMPTY;
- }
-
- private final static int ARRAY_TYPE= 1 << 0;
- private final static int NULL_TYPE= 1 << 1;
- private final static int VARIABLE_TYPE= 1 << 2;
- private final static int WILDCARD_TYPE= 1 << 3;
- private final static int CAPTURE_TYPE= 1 << 4;
- private final static int PRIMITIVE_TYPE= 1 << 5;
-
- private final static int REF_TYPE= 1 << 6;
-
- private final static int GENERIC= 1 << 8;
- private final static int PARAMETRIZED= 1 << 9;
-
- private int getTypeKind(ITypeBinding typeBinding) {
- if (typeBinding.isArray()) return ARRAY_TYPE;
- if (typeBinding.isCapture()) return CAPTURE_TYPE;
- if (typeBinding.isNullType()) return NULL_TYPE;
- if (typeBinding.isPrimitive()) return PRIMITIVE_TYPE;
- if (typeBinding.isTypeVariable()) return VARIABLE_TYPE;
- if (typeBinding.isWildcardType()) return WILDCARD_TYPE;
-
- if (typeBinding.isGenericType()) return REF_TYPE | GENERIC;
- if (typeBinding.isParameterizedType() || typeBinding.isRawType()) return REF_TYPE | PARAMETRIZED;
-
- return REF_TYPE;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
- */
- public String getLabel() {
- StringBuffer buf= new StringBuffer(fLabel);
- buf.append(": "); //$NON-NLS-1$
- if (fBinding != null) {
- switch (fBinding.getKind()) {
- case IBinding.VARIABLE:
- IVariableBinding variableBinding= (IVariableBinding) fBinding;
- if (!variableBinding.isField()) {
- buf.append(variableBinding.getName());
- } else if (variableBinding.getDeclaringClass() == null) {
- buf.append("array type"); //$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(packageBinding.getName());
- break;
- case IBinding.TYPE:
- ITypeBinding typeBinding= (ITypeBinding) fBinding;
- buf.append(typeBinding.getQualifiedName());
- break;
- case IBinding.METHOD:
- IMethodBinding methodBinding= (IMethodBinding) fBinding;
- 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;
- }
-
- } else {
- buf.append("null"); //$NON-NLS-1$
- }
- return buf.toString();
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
- */
- public Image getImage() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return getLabel();
- }
-
- /*
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- Binding other= (Binding) obj;
- if (fParent == null) {
- if (other.fParent != null)
- return false;
- } else if (! fParent.equals(other.fParent)) {
- return false;
- }
-
- if (fBinding == null) {
- if (other.fBinding != null)
- return false;
- } else if (! fBinding.equals(other.fBinding)) {
- return false;
- }
-
- return true;
- }
-
- /*
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return (fParent != null ? fParent.hashCode() : 0) + (fBinding != null ? fBinding.getKey().hashCode() : 0);
- }
-}
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 e74430c..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/BindingProperty.java
+++ /dev/null
@@ -1,159 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-
-import org.eclipse.jdt.core.dom.IBinding;
-
-import org.eclipse.swt.graphics.Image;
-
-/**
- *
- */
-public class BindingProperty extends ASTAttribute {
-
- private final String fName;
- private final Binding fParent;
- private final Binding[] fValues;
- private final boolean fIsRelevant;
-
- public BindingProperty(Binding parent, String name, String value, boolean isRelevant) {
- fParent= parent;
- if (value == null) {
- fName= name + ": null"; //$NON-NLS-1$
- } else if (value.length() > 0) {
- fName= name + ": '" + value + "'"; //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- fName= name + ": (empty string)"; //$NON-NLS-1$
- }
- fValues= null;
- fIsRelevant= isRelevant;
- }
-
- public BindingProperty(Binding parent, String name, boolean value, boolean isRelevant) {
- fParent= parent;
- fName= name + ": " + String.valueOf(value); //$NON-NLS-1$
- fValues= null;
- fIsRelevant= isRelevant;
- }
-
- public BindingProperty(Binding parent, String name, int value, boolean isRelevant) {
- fParent= parent;
- fName= name + ": " + String.valueOf(value); //$NON-NLS-1$
- fValues= null;
- fIsRelevant= isRelevant;
- }
-
- public BindingProperty(Binding parent, String name, IBinding[] bindings, boolean isRelevant) {
- fParent= parent;
- if (bindings == null || bindings.length == 0) {
- fName= name + " (0)"; //$NON-NLS-1$
- fValues= null;
- } else {
- fValues= createBindings(bindings, isRelevant);
- fName= name + " (" + String.valueOf(fValues.length) + ')'; //$NON-NLS-1$
- }
- fIsRelevant= isRelevant;
- }
-
- public BindingProperty(Binding parent, StringBuffer label, boolean isRelevant) {
- fParent= parent;
- fName= label.toString();
- fValues= null;
- fIsRelevant= isRelevant;
- }
-
- private Binding[] createBindings(IBinding[] bindings, boolean isRelevant) {
- Binding[] res= new Binding[bindings.length];
- for (int i= 0; i < res.length; i++) {
- res[i]= new Binding(this, String.valueOf(i), bindings[i], isRelevant);
- }
- return res;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
- */
- public Object getParent() {
- return fParent;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
- */
- public Object[] getChildren() {
- if (fValues != null) {
- return fValues;
- }
- return EMPTY;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
- */
- public String getLabel() {
- return fName;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
- */
- public Image getImage() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return getLabel();
- }
-
- public boolean isRelevant() {
- return fIsRelevant;
- }
-
- /*
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- BindingProperty other= (BindingProperty) obj;
- if (fParent == null) {
- if (other.fParent != null)
- return false;
- } else if (! fParent.equals(other.fParent)) {
- return false;
- }
-
- if (fName == null) {
- if (other.fName != null)
- return false;
- } else if (! fName.equals(other.fName)) {
- return false;
- }
-
- return true;
- }
-
- /*
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return (fParent != null ? fParent.hashCode() : 0)
- + (fName != null ? fName.hashCode() : 0);
- }
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/CommentsProperty.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/CommentsProperty.java
deleted file mode 100644
index 4eb2b6c..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/CommentsProperty.java
+++ /dev/null
@@ -1,78 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import java.util.List;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-/**
- *
- */
-public class CommentsProperty extends ASTAttribute {
-
- private final CompilationUnit fRoot;
-
- public CommentsProperty(CompilationUnit root) {
- fRoot= root;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
- */
- public Object getParent() {
- return fRoot;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
- */
- public Object[] getChildren() {
- List commentList= fRoot.getCommentList();
- return (commentList == null ? EMPTY : commentList.toArray());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
- */
- public String getLabel() {
- List commentList= fRoot.getCommentList();
- return "> comments (" + (commentList == null ? 0 : commentList.size()) + ")"; //$NON-NLS-1$//$NON-NLS-2$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
- */
- public Image getImage() {
- return null;
- }
-
- /*
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
- return true;
- }
-
- /*
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return 17;
- }
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/DynamicBindingProperty.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/DynamicBindingProperty.java
deleted file mode 100644
index 35c04fa..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/DynamicBindingProperty.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.jdt.core.dom.IBinding;
-
-import org.eclipse.swt.graphics.Image;
-
-
-public abstract class DynamicBindingProperty extends ExceptionAttribute {
-
- protected static final String N_A= "N/A"; //$NON-NLS-1$
- private final Binding fParent;
-
- private Binding fViewerElement;
- private String fLabel;
-
- public DynamicBindingProperty(Binding parent) {
- fParent= parent;
- }
-
- public Object getParent() {
- return fParent;
- }
-
- public Object[] getChildren() {
- return EMPTY;
- }
-
- public void setViewerElement(Binding viewerElement) {
- if (fViewerElement == viewerElement)
- return;
-
- fViewerElement= viewerElement;
- fException= null;
- IBinding trayBinding= fParent.getBinding();
- StringBuffer buf= new StringBuffer(getName());
- if (viewerElement != null) {
- IBinding viewerBinding= viewerElement.getBinding();
- try {
- String queryResult= executeQuery(viewerBinding, trayBinding);
- buf.append(queryResult);
- } catch (RuntimeException e) {
- fException= e;
- buf.append(e.getClass().getName());
- buf.append(" for \""); //$NON-NLS-1$
- if (viewerBinding == null)
- buf.append("null"); //$NON-NLS-1$
- else
- buf.append('"').append(viewerBinding.getKey());
- buf.append("\" and "); //$NON-NLS-1$
- buf.append(trayBinding.getKey()).append('"');
- }
- } else {
- buf.append(N_A);
- }
- fLabel= buf.toString();
- }
-
- /**
- * Executes this dynamic binding property's query in a protected environment.
- * A {@link RuntimeException} thrown by this method is made available via
- * {@link #getException()}.
- *
- * @param viewerBinding the binding of the element selected in the AST viewer, or <code>null</code> iff none
- * @param trayBinding the binding of the element selected in the comparison tray, or <code>null</code> iff none
- * @return this property's result
- */
- protected abstract String executeQuery(IBinding viewerBinding, IBinding trayBinding);
-
- /**
- * @return a description of the dynamic property
- */
- protected abstract String getName();
-
- public String getLabel() {
- return fLabel;
- }
-
- public Image getImage() {
- return null;
- }
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/Error.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/Error.java
deleted file mode 100644
index 1f83e5d..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/Error.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.graphics.Image;
-
-
-public class Error extends ExceptionAttribute {
-
- private final Object fParent;
- private final String fLabel;
-
- public Error(Object parent, String label, RuntimeException thrownException) {
- fParent= parent;
- fLabel= label;
- fException= thrownException;
- }
-
- public Object[] getChildren() {
- return EMPTY;
- }
-
- public Image getImage() {
- return null;
- }
-
- public String getLabel() {
- return fLabel;
- }
-
- public Object getParent() {
- return fParent;
- }
-
- /*
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- Error other= (Error) obj;
- if (fParent == null) {
- if (other.fParent != null)
- return false;
- } else if (! fParent.equals(other.fParent)) {
- return false;
- }
-
- if (fLabel == null) {
- if (other.fLabel != null)
- return false;
- } else if (! fLabel.equals(other.fLabel)) {
- return false;
- }
-
- return true;
- }
-
- /*
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return (fParent != null ? fParent.hashCode() : 0)
- + (fLabel != null ? fLabel.hashCode() : 0);
- }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ExceptionAttribute.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ExceptionAttribute.java
deleted file mode 100644
index 832466c..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ExceptionAttribute.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-
-public abstract class ExceptionAttribute extends ASTAttribute {
-
- protected RuntimeException fException= null;
-
- public RuntimeException getException() {
- return fException;
- }
-
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/JavaElement.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/JavaElement.java
deleted file mode 100644
index 458f490..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/JavaElement.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.ui.JavaElementLabels;
-
-
-
-public class JavaElement extends ASTAttribute {
-
- private static final long LABEL_OPTIONS=
- JavaElementLabels.F_APP_TYPE_SIGNATURE | JavaElementLabels.M_PARAMETER_TYPES |
- JavaElementLabels.M_APP_RETURNTYPE | JavaElementLabels.ALL_FULLY_QUALIFIED |
- JavaElementLabels.T_TYPE_PARAMETERS |JavaElementLabels.USE_RESOLVED;
-
- private final IJavaElement fJavaElement;
- private final Object fParent;
-
- public JavaElement(Object parent, IJavaElement javaElement) {
- fParent= parent;
- fJavaElement= javaElement;
- }
-
- public IJavaElement getJavaElement() {
- return fJavaElement;
- }
-
- public Object getParent() {
- return fParent;
- }
-
- public Object[] getChildren() {
- return EMPTY;
- }
-
- public String getLabel() {
- if (fJavaElement == null) {
- return ">java element: null"; //$NON-NLS-1$
- } else {
- String classname= fJavaElement.getClass().getName();
- return "> " + classname.substring(classname.lastIndexOf('.') + 1) + ": " //$NON-NLS-1$ //$NON-NLS-2$
- + JavaElementLabels.getElementLabel(fJavaElement, LABEL_OPTIONS)
- + (fJavaElement.exists() ? "" : " (does not exist)"); //$NON-NLS-1$//$NON-NLS-2$
- }
- }
-
- public Image getImage() {
- return null;
- //TODO: looks ugly when not all nodes have an icon
-// return new JavaElementImageProvider().getImageLabel(fJavaElement, JavaElementImageProvider.SMALL_ICONS | JavaElementImageProvider.OVERLAY_ICONS);
- }
-
- /*
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- JavaElement other= (JavaElement) obj;
- if (fParent == null) {
- if (other.fParent != null)
- return false;
- } else if (! fParent.equals(other.fParent)) {
- return false;
- }
-
- if (fJavaElement == null) {
- if (other.fJavaElement != null)
- return false;
- } else if (! fJavaElement.equals(other.fJavaElement)) {
- return false;
- }
-
- return true;
- }
-
- /*
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return (fParent != null ? fParent.hashCode() : 0) + (fJavaElement != null ? fJavaElement.hashCode() : 0);
- }
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/LeafAttribute.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/LeafAttribute.java
deleted file mode 100644
index 1f9a335..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/LeafAttribute.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.graphics.Image;
-
-
-public class LeafAttribute extends ASTAttribute {
-
- private final Object fParent;
- private final String fLabel;
-
- public LeafAttribute(Object parent, String name, Object value) {
- fParent= parent;
- fLabel= name + ": " + String.valueOf(value); //$NON-NLS-1$
- }
-
- public LeafAttribute(Object parent, String label) {
- fParent= parent;
- fLabel= label;
- }
-
- public Object getParent() {
- return fParent;
- }
-
- public Object[] getChildren() {
- return EMPTY;
- }
-
- public String getLabel() {
- return fLabel;
- }
-
- public Image getImage() {
- return null;
- }
-
- /*
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- LeafAttribute other= (LeafAttribute) obj;
- if (fParent == null) {
- if (other.fParent != null)
- return false;
- } else if (! fParent.equals(other.fParent)) {
- return false;
- }
-
- if (fLabel == null) {
- if (other.fLabel != null)
- return false;
- } else if (! fLabel.equals(other.fLabel)) {
- return false;
- }
-
- return true;
- }
-
- /*
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return (fParent != null ? fParent.hashCode() : 0)
- + (fLabel != null ? fLabel.hashCode() : 0);
- }
-}
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 84b49c2..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NodeProperty.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import java.util.List;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
-
-public class NodeProperty extends ASTAttribute {
-
- private ASTNode fParent;
- private StructuralPropertyDescriptor fProperty;
-
- public NodeProperty(ASTNode parent, StructuralPropertyDescriptor property) {
- fParent= parent;
- fProperty= property;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
- */
- public Object getParent() {
- return fParent;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
- */
- public Object[] getChildren() {
- Object child= getNode();
- if (child instanceof List) {
- return ((List) child).toArray();
- } else if (child instanceof ASTNode) {
- return new Object[] { child };
- }
- return EMPTY;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
- */
- public String getLabel() {
- 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$
- }
- } else if (fProperty.isChildListProperty()) {
- List node= (List) getNode();
- buf.append(" (").append(node.size()).append(')'); //$NON-NLS-1$
- } else { // child property
- if (getNode() == null) {
- buf.append(": null"); //$NON-NLS-1$
- }
- }
- return buf.toString();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
- */
- public Image getImage() {
- return null;
- }
-
- 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() {
- return getLabel();
-
- }
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NonRelevantFilter.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NonRelevantFilter.java
deleted file mode 100644
index d8053c8..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NonRelevantFilter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-public class NonRelevantFilter extends ViewerFilter {
-
- private boolean fShowNonRelevant;
-
- public boolean isShowNonRelevant() {
- return fShowNonRelevant;
- }
-
- public void setShowNonRelevant(boolean showNonRelevant) {
- fShowNonRelevant= showNonRelevant;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (fShowNonRelevant)
- return true;
-
- if (element instanceof Binding) {
- return ((Binding) element).isRelevant();
- }
- if (element instanceof BindingProperty) {
- return ((BindingProperty) element).isRelevant();
- }
- return true;
- }
-
-
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java
deleted file mode 100644
index 907b544..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java
+++ /dev/null
@@ -1,155 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.compiler.IProblem;
-
-/**
- *
- */
-public class ProblemNode extends ASTAttribute {
-
- private final IProblem fProblem;
- private final Object fParent;
-
- public ProblemNode(Object parent, IProblem problem) {
- fParent= parent;
- fProblem= problem;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
- */
- public Object getParent() {
- return fParent;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
- */
- public Object[] getChildren() {
- String[] arguments= fProblem.getArguments();
- Object[] children= new Object[arguments.length];
- for (int i= 0; i < arguments.length; i++) {
- children[i]= new LeafAttribute(this, String.valueOf(i), arguments[i]);
- }
- return children;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
- */
- public String getLabel() {
- StringBuffer buf= new StringBuffer();
- int id= fProblem.getID();
- int offset= fProblem.getSourceStart();
- int length= fProblem.getSourceEnd() + 1 - offset;
-
- if (fProblem.isError())
- buf.append("E");
- if (fProblem.isWarning())
- buf.append("W");
- buf.append('[').append(offset).append(", ").append(length).append(']').append(' '); //$NON-NLS-1$
- buf.append(fProblem.getMessage()).append(' '); //$NON-NLS-1$
- buf.append("(").append(getErrorCode(id)).append(") "); //$NON-NLS-1$//$NON-NLS-2$
- return buf.toString();
- }
-
- private String getErrorCode(int code) {
- StringBuffer buf= new StringBuffer();
-
- if ((code & IProblem.TypeRelated) != 0) {
- buf.append("TypeRelated + "); //$NON-NLS-1$
- }
- if ((code & IProblem.FieldRelated) != 0) {
- buf.append("FieldRelated + "); //$NON-NLS-1$
- }
- if ((code & IProblem.ConstructorRelated) != 0) {
- buf.append("ConstructorRelated + "); //$NON-NLS-1$
- }
- if ((code & IProblem.MethodRelated) != 0) {
- buf.append("MethodRelated + "); //$NON-NLS-1$
- }
- if ((code & IProblem.ImportRelated) != 0) {
- buf.append("ImportRelated + "); //$NON-NLS-1$
- }
- if ((code & IProblem.Internal) != 0) {
- buf.append("Internal + "); //$NON-NLS-1$
- }
- if ((code & IProblem.Syntax) != 0) {
- buf.append("Syntax + "); //$NON-NLS-1$
- }
- if ((code & IProblem.Javadoc) != 0) {
- buf.append("Javadoc + "); //$NON-NLS-1$
- }
- buf.append(code & IProblem.IgnoreCategoriesMask);
-
- return buf.toString();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
- */
- public Image getImage() {
- return null;
- }
-
- /**
- * @return Returns the offset of the problem
- */
- public int getOffset() {
- return fProblem.getSourceStart();
- }
-
- /**
- * @return Returns the length of the problem
- */
- public int getLength() {
- return fProblem.getSourceEnd() + 1 - fProblem.getSourceStart();
- }
-
- /*
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- ProblemNode other= (ProblemNode) obj;
- if (fParent == null) {
- if (other.fParent != null)
- return false;
- } else if (! fParent.equals(other.fParent)) {
- return false;
- }
-
- if (fProblem== null) {
- if (other.fProblem != null)
- return false;
- } else if (! fProblem.equals(other.fProblem)) {
- return false;
- }
-
- return true;
- }
-
- /*
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return (fParent != null ? fParent.hashCode() : 0) + (fProblem != null ? fProblem.hashCode() : 0);
- }
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemsProperty.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemsProperty.java
deleted file mode 100644
index 4d2d07a..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemsProperty.java
+++ /dev/null
@@ -1,81 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.compiler.IProblem;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-/**
- *
- */
-public class ProblemsProperty extends ASTAttribute {
-
- private final CompilationUnit fRoot;
-
- public ProblemsProperty(CompilationUnit root) {
- fRoot= root;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
- */
- public Object getParent() {
- return fRoot;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
- */
- public Object[] getChildren() {
- IProblem[] problems= fRoot.getProblems();
- Object[] res= new Object[problems.length];
- for (int i= 0; i < res.length; i++) {
- res[i]= new ProblemNode(this, problems[i]);
- }
- return res;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
- */
- public String getLabel() {
- return "> compiler problems (" + fRoot.getProblems().length + ")"; //$NON-NLS-1$//$NON-NLS-2$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
- */
- public Image getImage() {
- return null;
- }
-
- /*
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
- return true;
- }
-
- /*
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return 18;
- }
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TrayContentProvider.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TrayContentProvider.java
deleted file mode 100644
index 02ac097..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TrayContentProvider.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import java.util.ArrayList;
-
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-
-public class TrayContentProvider implements ITreeContentProvider {
-
- public static final int DEFAULT_CHILDREN_COUNT= 7;
-
- protected static final String N_A= "N/A"; //$NON-NLS-1$
- protected static final Object[] EMPTY= new Object[0];
-
- /*
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
- */
- public Object[] getChildren(Object parentElement) {
- ArrayList result= new ArrayList();
- if (! (parentElement instanceof Binding))
- return EMPTY;
-
- Binding trayElement= (Binding) parentElement;
- IBinding trayBinding= trayElement.getBinding();
-
- addBindingComparisons(result, trayElement);
- if (trayBinding instanceof ITypeBinding)
- addTypeBindingComparions(result, trayElement);
- if (trayBinding instanceof IMethodBinding)
- addMethodBindingComparions(result, trayElement);
-
- return result.toArray();
- }
-
- private void addBindingComparisons(ArrayList result, Binding trayElement) {
- class IdentityProperty extends DynamicBindingProperty {
- public IdentityProperty(Binding parent) {
- super(parent);
- }
- protected String getName() {
- return "* == this: "; //$NON-NLS-1$
- }
- protected String executeQuery(IBinding viewerBinding, IBinding trayBinding) {
- return Boolean.toString(viewerBinding == trayBinding);
- }
- }
- result.add(new IdentityProperty(trayElement));
-
- class EqualsProperty extends DynamicBindingProperty {
- public EqualsProperty(Binding parent) {
- super(parent);
- }
- protected String getName() {
- return "*.equals(this): "; //$NON-NLS-1$
- }
- protected String executeQuery(IBinding viewerBinding, IBinding trayBinding) {
- if (viewerBinding != null)
- return Boolean.toString(viewerBinding.equals(trayBinding));
- else
- return "* is null"; //$NON-NLS-1$
- }
- }
- result.add(new EqualsProperty(trayElement));
-
- class IsEqualToProperty extends DynamicBindingProperty {
- public IsEqualToProperty(Binding parent) {
- super(parent);
- }
- protected String getName() {
- return "*.isEqualTo(this): "; //$NON-NLS-1$
- }
- protected String executeQuery(IBinding viewerBinding, IBinding trayBinding) {
- if (viewerBinding != null)
- return Boolean.toString(viewerBinding.isEqualTo(trayBinding));
- else
- return "* is null"; //$NON-NLS-1$
- }
- }
- result.add(new IsEqualToProperty(trayElement));
-
- class KeysEqualProperty extends DynamicBindingProperty {
- public KeysEqualProperty(Binding parent) {
- super(parent);
- }
- protected String getName() {
- return "*.getKey().equals(this.getKey()): "; //$NON-NLS-1$
- }
- protected String executeQuery(IBinding viewerBinding, IBinding trayBinding) {
- if (viewerBinding == null)
- return "* is null"; //$NON-NLS-1$
- else if (viewerBinding.getKey() == null)
- return "*.getKey() is null"; //$NON-NLS-1$
- else if (trayBinding.getKey() == null)
- return "this.getKey() is null"; //$NON-NLS-1$
- else
- return Boolean.toString(viewerBinding.getKey().equals(trayBinding.getKey()));
- }
- }
- result.add(new KeysEqualProperty(trayElement));
- }
-
- private void addTypeBindingComparions(ArrayList result, Binding trayElement) {
- class IsSubTypeCompatibleProperty extends DynamicBindingProperty {
- public IsSubTypeCompatibleProperty(Binding parent) {
- super(parent);
- }
- protected String getName() {
- return "*.isSubTypeCompatible(this): "; //$NON-NLS-1$
- }
- protected String executeQuery(IBinding viewerBinding, IBinding trayBinding) {
- if (viewerBinding instanceof ITypeBinding) {
- ITypeBinding viewerTB= (ITypeBinding) viewerBinding;
- ITypeBinding trayTB= (ITypeBinding) trayBinding;
- return Boolean.toString(viewerTB.isSubTypeCompatible(trayTB));
- } else {
- return "* not an ITypeBinding"; //$NON-NLS-1$
- }
- }
- }
- result.add(new IsSubTypeCompatibleProperty(trayElement));
-
- class IsCastCompatibleProperty extends DynamicBindingProperty {
- public IsCastCompatibleProperty(Binding parent) {
- super(parent);
- }
- protected String getName() {
- return "*.isCastCompatible(this): "; //$NON-NLS-1$
- }
- protected String executeQuery(IBinding viewerBinding, IBinding trayBinding) {
- if (viewerBinding instanceof ITypeBinding) {
- ITypeBinding viewerTB= (ITypeBinding) viewerBinding;
- ITypeBinding trayTB= (ITypeBinding) trayBinding;
- return Boolean.toString(viewerTB.isCastCompatible(trayTB));
- } else {
- return "* not an ITypeBinding"; //$NON-NLS-1$
- }
- }
- }
- result.add(new IsCastCompatibleProperty(trayElement));
-
- class IsAssignmentCompatibleProperty extends DynamicBindingProperty {
- public IsAssignmentCompatibleProperty(Binding parent) {
- super(parent);
- }
- protected String getName() {
- return "*.isAssignmentCompatible(this): "; //$NON-NLS-1$
- }
- protected String executeQuery(IBinding viewerBinding, IBinding trayBinding) {
- if (viewerBinding instanceof ITypeBinding) {
- ITypeBinding viewerTB= (ITypeBinding) viewerBinding;
- ITypeBinding trayTB= (ITypeBinding) trayBinding;
- return Boolean.toString(viewerTB.isAssignmentCompatible(trayTB));
- } else {
- return "* not an ITypeBinding"; //$NON-NLS-1$
- }
- }
- }
- result.add(new IsAssignmentCompatibleProperty(trayElement));
- }
-
- private void addMethodBindingComparions(ArrayList result, Binding trayElement) {
- class OverridesProperty extends DynamicBindingProperty {
- public OverridesProperty(Binding parent) {
- super(parent);
- }
- protected String getName() {
- return "*.overrides(this): "; //$NON-NLS-1$
- }
- protected String executeQuery(IBinding viewerBinding, IBinding trayBinding) {
- if (viewerBinding instanceof IMethodBinding) {
- IMethodBinding viewerMB= (IMethodBinding) viewerBinding;
- IMethodBinding trayMB= (IMethodBinding) trayBinding;
- return Boolean.toString(viewerMB.overrides(trayMB));
- } else {
- return "* not an IMethodBinding"; //$NON-NLS-1$
- }
- }
- }
- result.add(new OverridesProperty(trayElement));
-
- class IsSubsignatureProperty extends DynamicBindingProperty {
- public IsSubsignatureProperty(Binding parent) {
- super(parent);
- }
- protected String getName() {
- return "*.isSubsignature(this): "; //$NON-NLS-1$
- }
- protected String executeQuery(IBinding viewerBinding, IBinding trayBinding) {
- if (viewerBinding instanceof IMethodBinding) {
- IMethodBinding viewerMB= (IMethodBinding) viewerBinding;
- IMethodBinding trayMB= (IMethodBinding) trayBinding;
- return Boolean.toString(viewerMB.isSubsignature(trayMB));
- } else {
- return "* not an IMethodBinding"; //$NON-NLS-1$
- }
- }
- }
- result.add(new IsSubsignatureProperty(trayElement));
- }
-
- /*
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object element) {
- if (element instanceof ASTAttribute) {
- return ((ASTAttribute) element).getParent();
- } else {
- return null;
- }
- }
-
- /*
- * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object element) {
- return element instanceof Binding;
- }
-
- /*
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof ArrayList)
- return ((ArrayList) inputElement).toArray();
- return EMPTY;
- }
-
- /*
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose() {
- // do nothing
- }
-
- /*
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // do nothing
- }
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TrayLabelProvider.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TrayLabelProvider.java
deleted file mode 100644
index 8898561..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TrayLabelProvider.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.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.jface.viewers.LabelProviderChangedEvent;
-
-public class TrayLabelProvider extends LabelProvider implements IColorProvider {
-
- private Color fBlue, fRed;
- private Color fWidgetForeground;
-
- private Binding fViewerElement;
-
- public TrayLabelProvider() {
- Display display= Display.getCurrent();
-
- fRed= display.getSystemColor(SWT.COLOR_RED);
- fBlue= display.getSystemColor(SWT.COLOR_DARK_BLUE);
- fWidgetForeground= display.getSystemColor(SWT.COLOR_WIDGET_FOREGROUND);
- }
-
- public void setViewerElement(Binding viewerElement) {
- if (fViewerElement != viewerElement) {
- fViewerElement= viewerElement;
- fireLabelProviderChanged(new LabelProviderChangedEvent(this));
- }
- }
-
- public String getText(Object obj) {
- if (obj instanceof DynamicBindingProperty) {
- DynamicBindingProperty dynamicBindingProperty= (DynamicBindingProperty) obj;
- dynamicBindingProperty.setViewerElement(fViewerElement);
- return dynamicBindingProperty.getLabel();
- } else if (obj instanceof ASTAttribute) {
- return ((ASTAttribute) obj).getLabel();
- } else {
- return null;
- }
- }
-
- public Image getImage(Object obj) {
- if (obj instanceof DynamicBindingProperty) {
- DynamicBindingProperty dynamicBindingProperty= (DynamicBindingProperty) obj;
- dynamicBindingProperty.setViewerElement(fViewerElement);
- return dynamicBindingProperty.getImage();
- } else if (obj instanceof ASTAttribute) {
- return ((ASTAttribute) obj).getImage();
- } else {
- return null;
- }
- }
-
- /*
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
- super.dispose();
- fViewerElement= null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
- */
- public Color getForeground(Object element) {
- if (element instanceof Binding) {
- return fBlue;
-
- } else if (element instanceof ExceptionAttribute) {
- if (element instanceof DynamicBindingProperty)
- ((DynamicBindingProperty) element).setViewerElement(fViewerElement);
-
- if (((ExceptionAttribute) element).getException() == null)
-// return null; //Bug 75022: Does not work when label is updated (retains old color, doesn't get default)
- //TODO remove hackaround when bug 75022 is fixed
- return fWidgetForeground;
- else
- return fRed;
-
- } else {
- return null; // normal color
- }
- }
-
- /*
- * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
- */
- public Color getBackground(Object element) {
- return null;
- }
-
-}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TreeCopyAction.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TreeCopyAction.java
deleted file mode 100644
index 3f8921c..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TreeCopyAction.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jdt.astview.ASTViewPlugin;
-
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-import org.eclipse.jface.action.Action;
-
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
-
-
-public class TreeCopyAction extends Action {
-
- private static class TreeObject {
- private final TreeItem fTreeItem;
- private boolean fSelected;
- private final List fChildren;
- public TreeObject(TreeItem element, boolean selected) {
- fTreeItem= element;
- fSelected= selected;
- fChildren= new ArrayList();
- }
- public void setSelected() {
- fSelected= true;
- }
- public void addChild(TreeObject child) {
- fChildren.add(child);
- }
- public boolean isSelected() {
- return fSelected;
- }
- public TreeItem getTreeItem() {
- return fTreeItem;
- }
- public List getChildren() {
- return fChildren;
- }
- public String toString() {
- StringBuffer buf= new StringBuffer();
- if (fSelected)
- buf.append("* "); //$NON-NLS-1$
- buf.append(trim(fTreeItem.getText())).append(" ["); //$NON-NLS-1$
- for (int i= 0; i < fChildren.size(); i++) {
- TreeObject child= (TreeObject) fChildren.get(i);
- buf.append(trim(child.getTreeItem().getText()));
- if (i > 0)
- buf.append(", "); //$NON-NLS-1$
- }
- return buf.append("]").toString(); //$NON-NLS-1$
- }
- private String trim(String string) {
- if (string.length() > 60)
- return string.substring(0, 60) + "..."; //$NON-NLS-1$
- else
- return string;
- }
- }
-
- private final Tree[] fTrees;
-
- public TreeCopyAction(Tree[] trees) {
- fTrees= trees;
- setText("&Copy"); //$NON-NLS-1$
- setToolTipText("Copy to Clipboard"); //$NON-NLS-1$
- setEnabled(false);
- setImageDescriptor(ASTViewPlugin.getDefault().getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
- setId(ActionFactory.COPY.getId());
- setActionDefinitionId(IWorkbenchActionDefinitionIds.COPY);
- }
-
- public void run() {
- Tree tree= null;
- for (int i= 0; i < fTrees.length; i++) {
- if (fTrees[i].isFocusControl()) {
- tree= fTrees[i];
- break;
- }
- }
- if (tree == null)
- return;
-
- TreeItem[] selection= tree.getSelection();
- if (selection.length == 0)
- return;
-
- Clipboard clipboard= null;
- try {
- clipboard= new Clipboard(tree.getDisplay());
- if (selection.length == 1) {
- clipboard.setContents(new Object[]{selection[0].getText()}, new Transfer[]{TextTransfer.getInstance()});
- } else if (selection.length > 1) {
- copyTree(selection, clipboard);
- }
- } finally {
- if (clipboard != null)
- clipboard.dispose();
- }
- }
-
- private void copyTree(TreeItem[] selection, Clipboard clipboard) {
- HashMap elementToTreeObj= new HashMap();
- List roots= new ArrayList();
- int indent= Integer.MIN_VALUE;
-
- for (int i= 0; i < selection.length; i++) {
- TreeItem item= selection[i];
- TreeObject treeObj= (TreeObject) elementToTreeObj.get(item);
- if (treeObj == null) {
- treeObj= new TreeObject(item, true);
- elementToTreeObj.put(item, treeObj);
- } else {
- treeObj.setSelected();
- continue;
- }
- // walk up to roots:
- int level= 0;
- item= item.getParentItem();
- while (item != null) {
- TreeObject parentTreeObj= (TreeObject) elementToTreeObj.get(item);
- if (parentTreeObj == null) {
- parentTreeObj= new TreeObject(item, false);
- elementToTreeObj.put(item, parentTreeObj);
- parentTreeObj.addChild(treeObj);
- treeObj= parentTreeObj;
- item= item.getParentItem();
- level--;
- } else {
- parentTreeObj.addChild(treeObj);
- treeObj= parentTreeObj;
- break;
- }
- }
- if (item == null) {
- roots.add(treeObj);
- indent= Math.max(indent, level);
- }
- }
- elementToTreeObj= null;
- StringBuffer buf= new StringBuffer();
- appendSelectionObjects(buf, indent, roots);
- String result= buf.length() > 0 ? buf.substring(1) : buf.toString();
- clipboard.setContents(new Object[] { result }, new Transfer[] { TextTransfer.getInstance() });
- }
-
- private void appendSelectionObjects(StringBuffer buffer, int indent, List selObjs) {
- for (Iterator iter= selObjs.iterator(); iter.hasNext();) {
- TreeObject selObj= (TreeObject) iter.next();
- if (selObj.isSelected()) {
- buffer.append('\n');
- for (int d= 0; d < indent; d++)
- buffer.append('\t');
- buffer.append(selObj.getTreeItem().getText());
- }
- appendSelectionObjects(buffer, indent + 1, selObj.getChildren());
- }
- }
-}
\ No newline at end of file
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 d9c61ee..0000000
--- a/org.eclipse.jdt.astview/view.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.jeview.feature/.project b/org.eclipse.jdt.jeview.feature/.project
deleted file mode 100644
index 17b6b2b..0000000
--- a/org.eclipse.jdt.jeview.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jdt.jeview.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.jeview.feature/build.properties b/org.eclipse.jdt.jeview.feature/build.properties
deleted file mode 100644
index 3d4e1a2..0000000
--- a/org.eclipse.jdt.jeview.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- epl-v10.html,\
- feature.properties,\
- eclipse_update_120.jpg,\
- license.html
diff --git a/org.eclipse.jdt.jeview.feature/eclipse_update_120.jpg b/org.eclipse.jdt.jeview.feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/org.eclipse.jdt.jeview.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.jeview.feature/epl-v10.html b/org.eclipse.jdt.jeview.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.jdt.jeview.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.jdt.jeview.feature/feature.properties b/org.eclipse.jdt.jeview.feature/feature.properties
deleted file mode 100644
index 565657e..0000000
--- a/org.eclipse.jdt.jeview.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 JavaElement 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 JavaElement 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.jeview.feature/feature.xml b/org.eclipse.jdt.jeview.feature/feature.xml
deleted file mode 100644
index 3e33345..0000000
--- a/org.eclipse.jdt.jeview.feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jdt.jeview.feature"
- label="org.eclipse.jdt.jeview.feature"
- version="1.0.0"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="AST View update site" url="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/jdt-ui-home/plugins/org.eclipse.jdt.astview/AST-View-Site"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jdt.ui"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.views"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- </requires>
-
- <plugin
- id="org.eclipse.jdt.jeview"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.jdt.jeview.feature/license.html b/org.eclipse.jdt.jeview.feature/license.html
deleted file mode 100644
index 00d784b..0000000
--- a/org.eclipse.jdt.jeview.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 "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<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
- ("CPL"). 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, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<p>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features"). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments are located in directories
- named "plugins" and Features are located in directories named "features".</p>
-
-<p>Features may also include other Features ("Included Features"). Files named "feature.xml" may contain a list of the names and version numbers of Included Features.</p>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Subdirectories of the directory named "src" 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 ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties".
-Such Abouts, Feature Licenses and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory. 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.jeview/.classpath b/org.eclipse.jdt.jeview/.classpath
deleted file mode 100644
index e5f6cad..0000000
--- a/org.eclipse.jdt.jeview/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.jeview/.cvsignore b/org.eclipse.jdt.jeview/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.jdt.jeview/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.jdt.jeview/.project b/org.eclipse.jdt.jeview/.project
deleted file mode 100644
index 28b6021..0000000
--- a/org.eclipse.jdt.jeview/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jdt.jeview</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.jdt.jeview/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.jeview/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b8d65eb..0000000
--- a/org.eclipse.jdt.jeview/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,77 +0,0 @@
-#Tue Nov 15 20:39:35 CET 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.jdt.jeview/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.jdt.jeview/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 77f0e96..0000000
--- a/org.eclipse.jdt.jeview/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Jun 14 01:03:56 CEST 2005
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org.eclipse.text;org.eclipse.core;org.eclipse.core.runtime;org.eclipse.core.expressions;org.eclipse.core.filebuffers;org.eclipse.core.resources;org.eclipse.swt;org.eclipse.jface;org.eclipse.jface.text;org.eclipse.ui;org.eclipse.ui.console;org.eclipse.ui.editors;org.eclipse.ui.forms;org.eclipse.ui.views;org.eclipse.ui.workbench;org.eclipse.ui.workbench.texteditor;org.eclipse.ui.ide;org.eclipse.compare;org.eclipse.search;org.eclipse.team.core;org.eclipse.debug.core;org.eclipse.debug.ui;org.eclipse.ltk.refactoring.core;org.eclipse.ltk.refactoring.internal.core;org.eclipse.ltk.refactoring.ui;org.eclipse.ltk.refactoring.internal.ui;org.eclipse.jdt.core;org.eclipse.jdt.internal.core;org.eclipse.jdt.internal.corext;org.eclipse.jdt.launching;org.eclipse.jdt.ui;org.eclipse.jdt.internal.ui;
-org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/org.eclipse.jdt.jeview/.settings/org.eclipse.pde.prefs b/org.eclipse.jdt.jeview/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index ce5d96e..0000000
--- a/org.eclipse.jdt.jeview/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jun 13 23:27:41 CEST 2005
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=1
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.jdt.jeview/META-INF/MANIFEST.MF b/org.eclipse.jdt.jeview/META-INF/MANIFEST.MF
deleted file mode 100644
index bd8ad91..0000000
--- a/org.eclipse.jdt.jeview/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jdt.jeview; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.jdt.jeview.JEViewPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench.texteditor
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jdt.jeview;x-internal:=true,
- org.eclipse.jdt.jeview.properties;x-internal:=true,
- org.eclipse.jdt.jeview.views;x-internal:=true
diff --git a/org.eclipse.jdt.jeview/about.html b/org.eclipse.jdt.jeview/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/org.eclipse.jdt.jeview/about.html
+++ /dev/null
@@ -1,22 +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>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.jdt.jeview/build.properties b/org.eclipse.jdt.jeview/build.properties
deleted file mode 100644
index d77baa6..0000000
--- a/org.eclipse.jdt.jeview/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
- .,\
- icons/,\
- plugin.properties
-src.includes = src/
diff --git a/org.eclipse.jdt.jeview/icons/c/children.png b/org.eclipse.jdt.jeview/icons/c/children.png
deleted file mode 100644
index 2e19949..0000000
--- a/org.eclipse.jdt.jeview/icons/c/children.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.jeview/icons/c/codeSelect.gif b/org.eclipse.jdt.jeview/icons/c/codeSelect.gif
deleted file mode 100644
index effc3fc..0000000
--- a/org.eclipse.jdt.jeview/icons/c/codeSelect.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.jeview/icons/c/info.png b/org.eclipse.jdt.jeview/icons/c/info.png
deleted file mode 100644
index 4d4afd8..0000000
--- a/org.eclipse.jdt.jeview/icons/c/info.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.jeview/icons/c/properties.gif b/org.eclipse.jdt.jeview/icons/c/properties.gif
deleted file mode 100644
index 1dc19a3..0000000
--- a/org.eclipse.jdt.jeview/icons/c/properties.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.jeview/icons/c/refresh.gif b/org.eclipse.jdt.jeview/icons/c/refresh.gif
deleted file mode 100644
index e383147..0000000
--- a/org.eclipse.jdt.jeview/icons/c/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.jeview/icons/c/setfocus.gif b/org.eclipse.jdt.jeview/icons/c/setfocus.gif
deleted file mode 100644
index 0533fc2..0000000
--- a/org.eclipse.jdt.jeview/icons/c/setfocus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.jeview/icons/view.gif b/org.eclipse.jdt.jeview/icons/view.gif
deleted file mode 100644
index b50b2c3..0000000
--- a/org.eclipse.jdt.jeview/icons/view.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.jeview/plugin.properties b/org.eclipse.jdt.jeview/plugin.properties
deleted file mode 100644
index 14eba88..0000000
--- a/org.eclipse.jdt.jeview/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName= JavaElement View Plug-in
-providerName= Eclipse.org
diff --git a/org.eclipse.jdt.jeview/plugin.xml b/org.eclipse.jdt.jeview/plugin.xml
deleted file mode 100644
index e39da21..0000000
--- a/org.eclipse.jdt.jeview/plugin.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension
- point="org.eclipse.ui.views">
- <view
- name="JavaElement View"
- icon="icons/view.gif"
- category="org.eclipse.jdt.ui.java"
- class="org.eclipse.jdt.jeview.views.JavaElementView"
- id="org.eclipse.jdt.jeview.views.JavaElementView">
- </view>
- </extension>
-
- <extension
- point="org.eclipse.ui.commands">
- <command
- name="JavaElementView"
- description="JavaElement View"
- categoryId="org.eclipse.ui.category.views"
- id="org.eclipse.jdt.jeview.views.JavaElementView">
- </command>
- </extension>
-
-
- <extension
- point="org.eclipse.ui.bindings">
- <key
- sequence="M2+M3+Q Z"
- commandId="org.eclipse.jdt.jeview.views.JavaElementView"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </key>
- <key
- platform="carbon"
- sequence="M2+M3+Q Z"
- commandId=""
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </key>
- <key
- platform="carbon"
- sequence="M1+M3+Q Z"
- commandId="org.eclipse.jdt.jeview.views.JavaElementView"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </key>
- </extension>
-
-
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
- <viewShortcut id="org.eclipse.jdt.jeview.views.JavaElementView"/>
- </perspectiveExtension>
-
- <perspectiveExtension
- targetID="org.eclipse.jdt.ui.JavaPerspective">
- <showInPart
- id="org.eclipse.jdt.jeview.views.JavaElementView">
- </showInPart>
- </perspectiveExtension>
- <perspectiveExtension
- targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
- <showInPart
- id="org.eclipse.jdt.jeview.views.JavaElementView">
- </showInPart>
- </perspectiveExtension>
- <perspectiveExtension
- targetID="org.eclipse.jdt.ui.JavaHierarchyPerspective">
- <showInPart
- id="org.eclipse.jdt.jeview.views.JavaElementView">
- </showInPart>
- </perspectiveExtension>
- <perspectiveExtension
- targetID="org.eclipse.debug.ui.DebugPerspective">
- <showInPart
- id="org.eclipse.jdt.jeview.views.JavaElementView">
- </showInPart>
- </perspectiveExtension>
- </extension>
-
-
-</plugin>
diff --git a/org.eclipse.jdt.jeview/scripts/exportplugin.xml b/org.eclipse.jdt.jeview/scripts/exportplugin.xml
deleted file mode 100644
index e146183..0000000
--- a/org.eclipse.jdt.jeview/scripts/exportplugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<project name="org.eclipse.jdt.jeview" default="export" basedir="..">
-<!-- build script to create a plugin from org.eclipse.jdt.jeview -->
-
- <target name="init">
- <tstamp/>
- <property name="destdir" value="../../plugin-export" />
- <property name="plugin" value="org.eclipse.jdt.jeview" />
- <property name="plugin_version" value="_1.0.0" />
- <property name="destjar" value="${destdir}/${plugin}${plugin_version}.jar" />
- </target>
-
- <target name="build" depends="init">
- <eclipse.incrementalBuild project="${plugin}" kind="incr"/>
- </target>
-
- <target name="export" depends="build">
- <mkdir dir="${destdir}" />
- <delete file="${destjar}" />
- <zip zipfile="${destjar}">
- <fileset dir=".">
- <include name="plugin.xml" />
- <include name="plugin.properties" />
- <include name="META-INF/**" />
- <include name="icons/**" />
- <include name="src/**" />
- </fileset>
- <fileset dir="bin" />
- </zip>
- </target>
-</project>
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/EditorUtility.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/EditorUtility.java
deleted file mode 100644
index f89ef3e..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/EditorUtility.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.jeview;
-
-
-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= JEViewPlugin.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.jeview/src/org/eclipse/jdt/jeview/JEPluginImages.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/JEPluginImages.java
deleted file mode 100644
index 737f1dd..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/JEPluginImages.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.jeview;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-
-
-public class JEPluginImages {
-
- private static URL fgIconBaseURL= null;
- static {
- fgIconBaseURL= JEViewPlugin.getDefault().getBundle().getEntry("/icons/c/"); //$NON-NLS-1$
- }
-
- public static final String CHILDREN= "children.png";
- public static final String INFO= "info.png";
- public static final String PROPERTIES= "properties.gif";
- public static final String REFRESH= "refresh.gif";
- public static final String SET_FOCUS= "setfocus.gif";
- public static final String CODE_SELECT= "codeSelect.gif";
-
- public static final ImageDescriptor IMG_CHILDREN= create(CHILDREN);
- public static final ImageDescriptor IMG_INFO= create(INFO);
-
- public static final ImageDescriptor IMG_PROPERTIES= create(PROPERTIES);
- public static final ImageDescriptor IMG_REFRESH= create(REFRESH);
- public static final ImageDescriptor IMG_SET_FOCUS= create(SET_FOCUS);
- public static final ImageDescriptor IMG_SET_FOCUS_CODE_SELECT= create(CODE_SELECT);
-
- private static ImageDescriptor create(String name) {
- try {
- return ImageDescriptor.createFromURL(new URL(fgIconBaseURL, name));
- } catch (MalformedURLException e) {
- return ImageDescriptor.getMissingImageDescriptor();
- }
- }
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/JEViewPlugin.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/JEViewPlugin.java
deleted file mode 100644
index 52fd2d4..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/JEViewPlugin.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.jeview;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-import org.osgi.framework.BundleContext;
-
-public class JEViewPlugin extends AbstractUIPlugin {
-
- private static JEViewPlugin fDefault;
-
- public JEViewPlugin() {
- fDefault= this;
- }
-
- public static String getPluginId() {
- return "org.eclipse.jdt.jeview"; //$NON-NLS-1$
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- fDefault= null;
- }
-
- /**
- * @return the shared instance
- */
- public static JEViewPlugin getDefault() {
- return fDefault;
- }
-
- /**
- * @return the workspace instance
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- public static void log(IStatus status) {
- getDefault().getLog().log(status);
- }
-
- public static void logErrorMessage(String message) {
- log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, null));
- }
-
- public static void logErrorStatus(String message, IStatus status) {
- if (status == null) {
- logErrorMessage(message);
- return;
- }
- MultiStatus multi= new MultiStatus(getPluginId(), IStatus.ERROR, message, null);
- multi.add(status);
- log(multi);
- }
-
- public static void log(String message, Throwable e) {
- log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, e)); //$NON-NLS-1$
- }
-
- public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, e.getLocalizedMessage(), e)); //$NON-NLS-1$
- }
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/JavaElementProperties.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/JavaElementProperties.java
deleted file mode 100644
index 30ce23c..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/JavaElementProperties.java
+++ /dev/null
@@ -1,609 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.jeview.properties;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IParent;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.ISourceReference;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.jeview.JEViewPlugin;
-
-public class JavaElementProperties implements IPropertySource {
-
- private static HashMap<String, Property> fgIdToProperty= new HashMap<String, Property>();
- private static LinkedHashMap<Class<?>, List<Property>> fgTypeToProperty= new LinkedHashMap<Class<?>, List<Property>>();
-
-
- private static abstract class Property {
- private final Class<?> fType;
- private final String fName;
- private final String fId;
- private final PropertyDescriptor fDescriptor;
-
- public Property(Class<?> type, String name) {
- fType= type;
- fName= name;
- fId= "org.eclipse.jdt.jeview." + type.getSimpleName() + "." + name;
- fDescriptor= new PropertyDescriptor(fId, fName);
- fDescriptor.setAlwaysIncompatible(true);
- fDescriptor.setCategory(type.getSimpleName());
- }
-
- public abstract Object compute(IJavaElement javaElement) throws JavaModelException;
-
-
- public Class<?> getType() {
- return fType;
- }
-
-
- public String getName() {
- return fName;
- }
-
- public String getId() {
- return fId;
- }
-
- public PropertyDescriptor getDescriptor() {
- return fDescriptor;
- }
-
- }
-
- static {
- addProperty(new Property(IJavaElement.class, "elementName") {
- @Override public Object compute(IJavaElement element) {
- return element.getElementName();
- }
- });
- addProperty(new Property(IJavaElement.class, "elementType") {
- @Override public Object compute(IJavaElement element) {
- return getElementTypeString(element.getElementType());
- }
- });
- addProperty(new Property(IJavaElement.class, "exists") {
- @Override public Object compute(IJavaElement element) {
- return element.exists();
- }
- });
- addProperty(new Property(IJavaElement.class, "isReadOnly") {
- @Override public Object compute(IJavaElement element) {
- return element.isReadOnly();
- }
- });
- addProperty(new Property(IJavaElement.class, "isStructureKnown") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return element.isStructureKnown();
- }
- });
- addProperty(new Property(IJavaElement.class, "handleIdentifier") {
- @Override public Object compute(IJavaElement element) {
- return element.getHandleIdentifier();
- }
- });
- addProperty(new Property(IJavaElement.class, "path") {
- @Override public Object compute(IJavaElement element) {
- return element.getPath();
- }
- });
- addProperty(new Property(IJavaElement.class, "schedulingRule") {
- @Override public Object compute(IJavaElement element) {
- return getSchedulingRuleString(element.getSchedulingRule());
- }
- });
-
- addProperty(new Property(IClassFile.class, "isClass") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IClassFile) element).isClass();
- }
- });
- addProperty(new Property(IClassFile.class, "isInterface") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IClassFile) element).isInterface();
- }
- });
-
- addProperty(new Property(ICompilationUnit.class, "hasResourceChanged") {
- @Override public Object compute(IJavaElement element) {
- return ((ICompilationUnit) element).hasResourceChanged();
- }
- });
- addProperty(new Property(ICompilationUnit.class, "isWorkingCopy") {
- @Override public Object compute(IJavaElement element) {
- return ((ICompilationUnit) element).isWorkingCopy();
- }
- });
-
- addProperty(new Property(IImportDeclaration.class, "flags") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return getFlagsString(((IImportDeclaration) element).getFlags());
- }
- });
- addProperty(new Property(IImportDeclaration.class, "isOnDemand") {
- @Override public Object compute(IJavaElement element) {
- return ((IImportDeclaration) element).isOnDemand();
- }
- });
-
- addProperty(new Property(IJavaProject.class, "hasBuildState") {
- @Override public Object compute(IJavaElement element) {
- return ((IJavaProject) element).hasBuildState();
- }
- });
- addProperty(new Property(IJavaProject.class, "getOutputLocation") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IJavaProject) element).getOutputLocation();
- }
- });
- addProperty(new Property(IJavaProject.class, "readOutputLocation") {
- @Override public Object compute(IJavaElement element) {
- return ((IJavaProject) element).readOutputLocation();
- }
- });
-
- addProperty(new Property(ILocalVariable.class, "nameRange") {
- @Override public Object compute(IJavaElement element) {
- return getNameRangeString(((ILocalVariable) element).getNameRange());
- }
- });
- addProperty(new Property(ILocalVariable.class, "typeSignature") {
- @Override public Object compute(IJavaElement element) {
- return ((ILocalVariable) element).getTypeSignature();
- }
- });
-
- addProperty(new Property(IMember.class, "nameRange") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return getNameRangeString(((IMember) element).getNameRange());
- }
- });
- addProperty(new Property(IMember.class, "flags") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return getFlagsString(((IMember) element).getFlags());
- }
- });
- addProperty(new Property(IMember.class, "isBinary") {
- @Override public Object compute(IJavaElement element) {
- return ((IMember) element).isBinary();
- }
- });
-
- addProperty(new Property(IField.class, "isResolved") {
- @Override public Object compute(IJavaElement element) {
- return ((IField) element).isResolved();
- }
- });
- addProperty(new Property(IField.class, "key") {
- @Override public Object compute(IJavaElement element) {
- return ((IField) element).getKey();
- }
- });
- addProperty(new Property(IField.class, "typeSignature") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IField) element).getTypeSignature();
- }
- });
- addProperty(new Property(IField.class, "constant") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IField) element).getConstant();
- }
- });
- addProperty(new Property(IField.class, "isEnumConstant") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IField) element).isEnumConstant();
- }
- });
-
- addProperty(new Property(IMethod.class, "isResolved") {
- @Override public Object compute(IJavaElement element) {
- return ((IMethod) element).isResolved();
- }
- });
- addProperty(new Property(IMethod.class, "key") {
- @Override public Object compute(IJavaElement element) {
- return ((IMethod) element).getKey();
- }
- });
- addProperty(new Property(IMethod.class, "numberOfParameters") {
- @Override public Object compute(IJavaElement element) {
- return ((IMethod) element).getNumberOfParameters();
- }
- });
- addProperty(new Property(IMethod.class, "signature") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IMethod) element).getSignature();
- }
- });
- addProperty(new Property(IMethod.class, "returnType") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IMethod) element).getReturnType();
- }
- });
- addProperty(new Property(IMethod.class, "isConstructor") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IMethod) element).isConstructor();
- }
- });
- addProperty(new Property(IMethod.class, "isMainMethod") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IMethod) element).isMainMethod();
- }
- });
-
- addProperty(new Property(IType.class, "isResolved") {
- @Override public Object compute(IJavaElement element) {
- return ((IType) element).isResolved();
- }
- });
- addProperty(new Property(IType.class, "key") {
- @Override public Object compute(IJavaElement element) {
- return ((IType) element).getKey();
- }
- });
- addProperty(new Property(IType.class, "fullyQualifiedName") {
- @Override public Object compute(IJavaElement element) {
- return ((IType) element).getFullyQualifiedName();
- }
- });
- addProperty(new Property(IType.class, "fullyQualifiedName('*')") {
- @Override public Object compute(IJavaElement element) {
- return ((IType) element).getFullyQualifiedName('*');
- }
- });
- addProperty(new Property(IType.class, "fullyQualifiedParameterizedName") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IType) element).getFullyQualifiedParameterizedName();
- }
- });
- addProperty(new Property(IType.class, "typeQualifiedName") {
- @Override public Object compute(IJavaElement element) {
- return ((IType) element).getTypeQualifiedName();
- }
- });
- addProperty(new Property(IType.class, "typeQualifiedName('*')") {
- @Override public Object compute(IJavaElement element) {
- return ((IType) element).getTypeQualifiedName('*');
- }
- });
- addProperty(new Property(IType.class, "isAnnotation") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IType) element).isAnnotation();
- }
- });
- addProperty(new Property(IType.class, "isClass") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IType) element).isClass();
- }
- });
- addProperty(new Property(IType.class, "isEnum") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IType) element).isEnum();
- }
- });
- addProperty(new Property(IType.class, "isInterface") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IType) element).isInterface();
- }
- });
- addProperty(new Property(IType.class, "isAnonymous") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IType) element).isAnonymous();
- }
- });
- addProperty(new Property(IType.class, "isLocal") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IType) element).isLocal();
- }
- });
- addProperty(new Property(IType.class, "isMember") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IType) element).isMember();
- }
- });
-
- addProperty(new Property(IPackageFragment.class, "containsJavaResources") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IPackageFragment) element).containsJavaResources();
- }
- });
- addProperty(new Property(IPackageFragment.class, "kind") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return getPFRKindString(((IPackageFragment) element).getKind());
- }
- });
- addProperty(new Property(IPackageFragment.class, "hasSubpackages") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IPackageFragment) element).hasSubpackages();
- }
- });
- addProperty(new Property(IPackageFragment.class, "isDefaultPackage") {
- @Override public Object compute(IJavaElement element) {
- return ((IPackageFragment) element).isDefaultPackage();
- }
- });
-
- addProperty(new Property(IPackageFragmentRoot.class, "kind") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return getPFRKindString(((IPackageFragmentRoot) element).getKind());
- }
- });
- addProperty(new Property(IPackageFragmentRoot.class, "sourceAttachmentPath") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IPackageFragmentRoot) element).getSourceAttachmentPath();
- }
- });
- addProperty(new Property(IPackageFragmentRoot.class, "sourceAttachmentRootPath") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IPackageFragmentRoot) element).getSourceAttachmentRootPath();
- }
- });
- addProperty(new Property(IPackageFragmentRoot.class, "isArchive") {
- @Override public Object compute(IJavaElement element) {
- return ((IPackageFragmentRoot) element).isArchive();
- }
- });
- addProperty(new Property(IPackageFragmentRoot.class, "isExternal") {
- @Override public Object compute(IJavaElement element) {
- return ((IPackageFragmentRoot) element).isExternal();
- }
- });
-
- addProperty(new Property(ITypeParameter.class, "nameRange") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return getNameRangeString(((ITypeParameter) element).getNameRange());
- }
- });
-
-
- addProperty(new Property(IParent.class, "hasChildren") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IParent) element).hasChildren();
- }
- });
-
- addProperty(new Property(ISourceReference.class, "sourceRange") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((ISourceReference) element).getSourceRange();
- }
- });
-
- addProperty(new Property(IOpenable.class, "hasUnsavedChanges") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IOpenable) element).hasUnsavedChanges();
- }
- });
- addProperty(new Property(IOpenable.class, "isConsistent") {
- @Override public Object compute(IJavaElement element) throws JavaModelException {
- return ((IOpenable) element).isConsistent();
- }
- });
- addProperty(new Property(IOpenable.class, "isOpen") {
- @Override public Object compute(IJavaElement element) {
- return ((IOpenable) element).isOpen();
- }
- });
- }
-
- private static void addProperty(Property property) {
- fgIdToProperty.put(property.getId(), property);
- List<Property> properties= fgTypeToProperty.get(property.getType());
- if (properties == null) {
- properties= new ArrayList<Property>();
- fgTypeToProperty.put(property.getType(), properties);
- }
- properties.add(property);
- }
-
- protected IJavaElement fJavaElement;
-
- public JavaElementProperties(IJavaElement javaElement) {
- fJavaElement= javaElement;
- }
-
- public IPropertyDescriptor[] getPropertyDescriptors() {
- List<IPropertyDescriptor> result= new ArrayList<IPropertyDescriptor>();
- for (Entry<Class<?>, List<Property>> entry : fgTypeToProperty.entrySet()) {
- if (entry.getKey().isAssignableFrom(fJavaElement.getClass())) {
- for (Property property : entry.getValue()) {
- result.add(property.getDescriptor());
- }
- }
- }
- return result.toArray(new IPropertyDescriptor[result.size()]);
- }
-
- public Object getPropertyValue(Object id) {
- Property property= fgIdToProperty.get(id);
- if (property == null) {
- return null;
- } else {
- try {
- return property.compute(fJavaElement);
- } catch (JavaModelException e) {
- if (e.isDoesNotExist()) {
- return "JavaModelException: " + e.getLocalizedMessage();
- } else {
- JEViewPlugin.log("error calculating property '" + property.getType().getSimpleName() + '#' + property.getName() + '\'', e);
- return "Error: " + e.getLocalizedMessage();
- }
- }
- }
- }
-
- static String getElementTypeString(int elementType) {
- String name;
- switch (elementType) {
- case IJavaElement.JAVA_MODEL :
- name= "IJavaModel";
- break;
- case IJavaElement.JAVA_PROJECT :
- name= "IJavaProject";
- break;
- case IJavaElement.PACKAGE_FRAGMENT_ROOT :
- name= "IPackageFragmentRoot";
- break;
- case IJavaElement.PACKAGE_FRAGMENT :
- name= "IPackageFragment";
- break;
- case IJavaElement.COMPILATION_UNIT :
- name= "ICompilationUnit";
- break;
- case IJavaElement.CLASS_FILE :
- name= "IClassFile";
- break;
- case IJavaElement.TYPE :
- name= "IType";
- break;
- case IJavaElement.FIELD :
- name= "IField";
- break;
- case IJavaElement.METHOD :
- name= "IMethod";
- break;
- case IJavaElement.INITIALIZER :
- name= "IInitializer";
- break;
- case IJavaElement.PACKAGE_DECLARATION :
- name= "IPackageDeclaration";
- break;
- case IJavaElement.IMPORT_CONTAINER :
- name= "IImportContainer";
- break;
- case IJavaElement.IMPORT_DECLARATION :
- name= "IImportDeclaration";
- break;
- case IJavaElement.LOCAL_VARIABLE :
- name= "ILocalVariable";
- break;
- case IJavaElement.TYPE_PARAMETER :
- name= "ITypeParameter";
- break;
- default :
- name= "UNKNOWN";
- break;
- }
- return elementType + " (" + name + ")";
- }
-
- static String getNameRangeString(ISourceRange range) {
- return range.getOffset() + " + " + range.getLength();
- }
-
- static String getFlagsString(int flags) {
- StringBuffer sb = new StringBuffer().append("0x").append(Integer.toHexString(flags)).append(" (");
- int prologLen= sb.length();
- int rest= flags;
-
- rest&= ~ appendFlag(sb, flags, Flags.AccPublic, "public ");
- rest&= ~ appendFlag(sb, flags, Flags.AccPrivate, "private ");
- rest&= ~ appendFlag(sb, flags, Flags.AccProtected, "protected ");
- rest&= ~ appendFlag(sb, flags, Flags.AccStatic, "static ");
- rest&= ~ appendFlag(sb, flags, Flags.AccFinal, "final ");
- rest&= ~ appendFlag(sb, flags, Flags.AccSynchronized, "synchronized/super ");
- rest&= ~ appendFlag(sb, flags, Flags.AccVolatile, "volatile/bridge ");
- rest&= ~ appendFlag(sb, flags, Flags.AccTransient, "transient/varargs ");
- rest&= ~ appendFlag(sb, flags, Flags.AccNative, "native ");
- rest&= ~ appendFlag(sb, flags, Flags.AccInterface, "interface ");
- rest&= ~ appendFlag(sb, flags, Flags.AccAbstract, "abstract ");
- rest&= ~ appendFlag(sb, flags, Flags.AccStrictfp, "strictfp ");
- rest&= ~ appendFlag(sb, flags, Flags.AccSynthetic, "synthetic ");
- rest&= ~ appendFlag(sb, flags, Flags.AccAnnotation, "annotation ");
- rest&= ~ appendFlag(sb, flags, Flags.AccEnum, "enum ");
- rest&= ~ appendFlag(sb, flags, Flags.AccDeprecated, "deprecated ");
-
- if (rest != 0)
- sb.append("unknown:0x").append(Integer.toHexString(rest));
- int len = sb.length();
- if (len != prologLen)
- sb.setLength(len - 1);
- sb.append(")");
- return sb.toString();
- }
-
- private static int appendFlag(StringBuffer sb, int flags, int flag, String name) {
- if ((flags & flag) != 0) {
- sb.append(name);
- return flag;
- } else {
- return 0;
- }
- }
-
- static String getPFRKindString(int kind) {
- StringBuffer sb = new StringBuffer().append("0x").append(Integer.toHexString(kind)).append(" (");
- int prologLen= sb.length();
- int rest= kind;
-
- rest&= ~ appendFlag(sb, kind, IPackageFragmentRoot.K_BINARY, "binary ");
- rest&= ~ appendFlag(sb, kind, IPackageFragmentRoot.K_SOURCE, "source ");
-
- if (rest != 0)
- sb.append("unknown:0x").append(Integer.toHexString(rest));
- int len = sb.length();
- if (len != prologLen)
- sb.setLength(len - 1);
- sb.append(")");
- return sb.toString();
- }
-
- static String getSchedulingRuleString(ISchedulingRule schedulingRule) {
- if (schedulingRule == null)
- return null;
- else
- return schedulingRule.getClass().getSimpleName() + ": " + schedulingRule.toString();
- }
-
- public void setPropertyValue(Object name, Object value) {
- // do nothing
- }
-
- public Object getEditableValue() {
- return this;
- }
-
- public boolean isPropertySet(Object property) {
- return false;
- }
-
- public void resetPropertyValue(Object property) {
- // do nothing
- }
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/ResourceProperties.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/ResourceProperties.java
deleted file mode 100644
index f8d51ce..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/ResourceProperties.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.jeview.properties;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-public class ResourceProperties implements IPropertySource {
-
- private static final String C_RESOURCE= "IResource";
-
- private static final String P_NAME= "org.eclipse.jdt.jeview.IResource.name";
- private static final String P_FULL_PATH= "org.eclipse.jdt.jeview.IResource.fullPath";
- private static final String P_LOCATION= "org.eclipse.jdt.jeview.IResource.location";
- private static final String P_PROJECT_RELATIVE_PATH= "org.eclipse.jdt.jeview.IResource.projectRelativePath";
- private static final String P_RAW_LOCATION= "org.eclipse.jdt.jeview.IResource.rawLocation";
- private static final String P_LOCAL_TIME_STAMP= "org.eclipse.jdt.jeview.IResource.localTimeStamp";
- private static final String P_MODIFICATION_STAMP= "org.eclipse.jdt.jeview.IResource.modificationStamp";
-
- protected IResource fResource;
-
- private static final ArrayList<IPropertyDescriptor> RESOURCE_PROPERTY_DESCRIPTORS= new ArrayList<IPropertyDescriptor>();
- static {
- addResourceDescriptor(new PropertyDescriptor(P_NAME, "name"));
- addResourceDescriptor(new PropertyDescriptor(P_FULL_PATH, "fullPath"));
- addResourceDescriptor(new PropertyDescriptor(P_LOCATION, "location"));
- addResourceDescriptor(new PropertyDescriptor(P_PROJECT_RELATIVE_PATH, "projectRelativePath"));
- addResourceDescriptor(new PropertyDescriptor(P_RAW_LOCATION, "rawLocation"));
- addResourceDescriptor(new PropertyDescriptor(P_LOCAL_TIME_STAMP, "localTimeStamp"));
- addResourceDescriptor(new PropertyDescriptor(P_MODIFICATION_STAMP, "modificationStamp"));
- }
-
- private static void addResourceDescriptor(PropertyDescriptor descriptor) {
- descriptor.setAlwaysIncompatible(true);
- descriptor.setCategory(C_RESOURCE);
- RESOURCE_PROPERTY_DESCRIPTORS.add(descriptor);
- }
-
-
- public ResourceProperties(IResource resource) {
- fResource= resource;
- }
-
- public IPropertyDescriptor[] getPropertyDescriptors() {
- ArrayList<IPropertyDescriptor> result= new ArrayList<IPropertyDescriptor>(RESOURCE_PROPERTY_DESCRIPTORS);
-// if (fJavaElement instanceof IMember)
-// result.addAll(MEMBER_PROPERTY_DESCRIPTORS);
-// if (fJavaElement instanceof IParent)
-// result.addAll(PARENT_PROPERTY_DESCRIPTORS);
-
- return result.toArray(new IPropertyDescriptor[result.size()]);
- }
-
- public Object getPropertyValue(Object name) {
- if (name.equals(P_NAME)) {
- return fResource.getName();
- } else if (name.equals(P_FULL_PATH)) {
- return fResource.getFullPath();
- } else if (name.equals(P_LOCATION)) {
- return fResource.getLocation();
- } else if (name.equals(P_PROJECT_RELATIVE_PATH)) {
- return fResource.getProjectRelativePath();
- } else if (name.equals(P_RAW_LOCATION)) {
- return fResource.getRawLocation();
- } else if (name.equals(P_LOCAL_TIME_STAMP)) {
- return fResource.getLocalTimeStamp();
- } else if (name.equals(P_MODIFICATION_STAMP)) {
- return fResource.getModificationStamp();
- }
-
- return null;
- }
-
- public void setPropertyValue(Object name, Object value) {
- // do nothing
- }
-
- public Object getEditableValue() {
- return this;
- }
-
- public boolean isPropertySet(Object property) {
- return false;
- }
-
- public void resetPropertyValue(Object property) {
- // do nothing
- }
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Error.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Error.java
deleted file mode 100644
index 3fbaa7e..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Error.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.jeview.views;
-
-
-
-public class Error extends JEAttribute {
- public static final String ERROR= "ERROR";
-
- private final JEAttribute fParent;
- private final String fName;
- private final Exception fException;
-
- public Error(JEAttribute parent, String name, Exception exception) {
- fParent= parent;
- fName= name;
- fException= exception;
- }
-
- @Override
- public JEAttribute getParent() {
- return fParent;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- Error other= (Error) obj;
- if (fParent == null) {
- if (other.fParent != null)
- return false;
- } else if (! fParent.equals(other.fParent)) {
- return false;
- }
-
- if (fName == null) {
- if (other.fName != null)
- return false;
- } else if (! fName.equals(other.fName)) {
- return false;
- }
-
- if (fException == null) {
- if (other.fException != null)
- return false;
- } else if (! fException.equals(other.fException)) {
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return (fParent != null ? fParent.hashCode() : 0)
- + (fName != null ? fName.hashCode() : 0)
- + (fException != null ? fException.hashCode() : 0);
- }
-
- @Override
- public JEAttribute[] getChildren() {
- return EMPTY;
- }
-
- @Override
- public String getLabel() {
- return (fName == null ? "" : fName + ": ") + fException.toString();
- }
-
- public Exception getException() {
- return fException;
- }
-
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEAttribute.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEAttribute.java
deleted file mode 100644
index 6b41ac0..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEAttribute.java
+++ /dev/null
@@ -1,31 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.jeview.views;
-
-
-/**
- *
- */
-public abstract class JEAttribute {
-
- protected static final JEAttribute[] EMPTY= new JEAttribute[0];
-
- public abstract JEAttribute getParent();
- public abstract JEAttribute[] getChildren();
- public abstract String getLabel();
-
- @Override
- public abstract boolean equals(Object obj);
-
- @Override
- public abstract int hashCode();
-
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEResource.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEResource.java
deleted file mode 100644
index c5145700..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEResource.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.jeview.views;
-
-import java.util.ArrayList;
-import java.util.concurrent.Callable;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jface.util.Assert;
-
-
-public class JEResource extends JEAttribute {
-
- private final JEAttribute fParent;
- private final String fName;
- private IResource fResource;
-
- JEResource(JEAttribute parent, String name, IResource resource) {
- Assert.isNotNull(parent);
- Assert.isNotNull(name);
- Assert.isNotNull(resource);
- fParent= parent;
- fName= name;
- fResource= resource;
- }
-
- @Override
- public JEAttribute getParent() {
- return fParent;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- JEResource other= (JEResource) obj;
- if (! fParent.equals(other.fParent)) {
- return false;
- }
- if (! fName.equals(other.fName)) {
- return false;
- }
- if (! fResource.equals(other.fResource)) {
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return fParent.hashCode() + fName.hashCode() + fResource.hashCode();
- }
-
- public IResource getResource() {
- return fResource;
- }
-
- @Override
- public JEAttribute[] getChildren() {
- if (fResource instanceof IContainer) {
- ArrayList<JEAttribute> result= new ArrayList<JEAttribute>();
- final IContainer container= (IContainer) fResource;
-// result.add(new JavaElementProperty(this, "ModificationStamp") {
-// @Override protected Object computeValue() throws CoreException {
-// return container.getDefaultCharset();
-// }
-// });
- result.add(new JavaElementChildrenProperty(this, "members") {
- @Override protected JEAttribute[] computeChildren() throws CoreException {
- IResource[] resources= container.members();
- JEAttribute[] children= new JEAttribute[resources.length];
- for (int i= 0; i < resources.length; i++) {
- children[i]= new JEResource(this, "", resources[i]);
- }
- return children;
- }
- });
- return result.toArray(new JEAttribute[result.size()]);
- }
- return EMPTY;
- }
-
- @Override
- public String getLabel() {
- return fName + ": " + fResource.getName();
- }
-
- public static JEAttribute compute(JEAttribute parent, String name, Callable<IResource> computer) {
- try {
- IResource resource= computer.call();
- return create(parent, name, resource);
- } catch (Exception e) {
- return new Error(parent, name, e);
- }
- }
-
- public static JEAttribute create(JEAttribute parent, String name, IResource resource) {
- if (resource == null) {
- return new Null(parent, name);
- } else {
- return new JEResource(parent, name, resource);
- }
- }
-
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JERoot.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JERoot.java
deleted file mode 100644
index cabe749..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JERoot.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.jeview.views;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-
-public class JERoot extends JEAttribute {
-
- private final List<JavaElement> fJavaElements;
-
- public JERoot(Collection<? extends IJavaElement> javaElements) {
- fJavaElements= new Mapper<IJavaElement, JavaElement>() {
- @Override public JavaElement map(IJavaElement element) {
- return new JavaElement(null, element);
- }
- }.mapToList(javaElements);
-
-// fJavaElements= Mapper.build(javaElements, new Mapper<IJavaElement, JavaElement>() {
-// @Override public JavaElement map(IJavaElement element) {
-// return new JavaElement(null, element);
-// }
-// });
-
-// fJavaElements= new ArrayList<JavaElement>(javaElements.size());
-// for (IJavaElement javaElement : javaElements) {
-// fJavaElements.add(new JavaElement(null, javaElement));
-// }
- }
-
- @Override
- public JEAttribute getParent() {
- return null;
- }
-
- @Override
- public JEAttribute[] getChildren() {
- return fJavaElements.toArray(new JavaElement[fJavaElements.size()]);
- }
-
- @Override
- public String getLabel() {
- StringBuffer buf = new StringBuffer("root: ");
- boolean first= true;
- for (JavaElement je : fJavaElements) {
- if (! first)
- buf.append(", ");
- buf.append(je.getLabel());
- first= false;
- }
- return buf.toString();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- JERoot other= (JERoot) obj;
- return fJavaElements.equals(other.fJavaElements);
- }
-
- @Override
- public int hashCode() {
- return fJavaElements.hashCode();
- }
-
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEViewContentProvider.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEViewContentProvider.java
deleted file mode 100644
index 5d4b574..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEViewContentProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.jeview.views;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-
-public class JEViewContentProvider implements ITreeContentProvider {
-
- public Object[] getChildren(Object element) {
- if (element instanceof JEAttribute)
- return ((JEAttribute) element).getChildren();
- return JEAttribute.EMPTY;
- }
-
- public Object getParent(Object element) {
- if (element instanceof JEAttribute)
- return ((JEAttribute) element).getParent();
- return null;
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof JEAttribute)
- return ((JEAttribute) element).getChildren().length > 0;
- return false;
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof JEAttribute)
- return ((JEAttribute) inputElement).getChildren();
- return JEAttribute.EMPTY;
- }
-
- public void dispose() {
- // do nothing
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // do nothing
- }
-
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEViewLabelProvider.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEViewLabelProvider.java
deleted file mode 100644
index 1321a5c..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JEViewLabelProvider.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.jeview.views;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-
-import org.eclipse.jdt.jeview.JEPluginImages;
-
-
-
-public class JEViewLabelProvider extends LabelProvider /*implements IColorProvider, IFontProvider*/ {
-
- JavaElementLabelProvider fJavaElementLabelProvider;
- private Image fChildrenImg;
- private Image fInfoImg;
-
- public JEViewLabelProvider() {
- fChildrenImg= JEPluginImages.IMG_CHILDREN.createImage();
- fInfoImg= JEPluginImages.IMG_INFO.createImage();
- fJavaElementLabelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_SMALL_ICONS);
- }
-
-
- @Override
- public String getText(Object element) {
- if (element instanceof JEAttribute)
- return ((JEAttribute) element).getLabel();
- return super.getText(element);
- }
-
- @Override
- public Image getImage(Object element) {
- if (element instanceof JavaElement) {
- return fJavaElementLabelProvider.getImage(((JavaElement) element).getJavaElement());
-
- } else if (element instanceof JEResource) {
- return fJavaElementLabelProvider.getImage(((JEResource) element).getResource());
-
- } else if (element instanceof JavaElementProperty) {
- return fInfoImg;
-
- } else if (element instanceof JavaElementChildrenProperty) {
- return fChildrenImg;
-
- } else if (element instanceof Error) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
-
- } else {
- return super.getImage(element);
- }
- }
-
- @Override
- public void dispose() {
- super.dispose();
- fChildrenImg.dispose();
- fInfoImg.dispose();
- fJavaElementLabelProvider.dispose();
- }
-
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElement.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElement.java
deleted file mode 100644
index 535cae2..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElement.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.jeview.views;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.Callable;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IParent;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.ui.JavaElementLabels;
-
-
-public class JavaElement extends JEAttribute {
-
- private static final long LABEL_OPTIONS= JavaElementLabels.F_APP_TYPE_SIGNATURE | JavaElementLabels.M_PARAMETER_TYPES | JavaElementLabels.M_APP_RETURNTYPE | JavaElementLabels.ALL_FULLY_QUALIFIED | JavaElementLabels.T_TYPE_PARAMETERS | JavaElementLabels.USE_RESOLVED;
-
- private final JEAttribute fParent; //can be null
- private final String fName; //can be null
- private final IJavaElement fJavaElement; //can be null
-
- public JavaElement(JEAttribute parent, String name, IJavaElement element) {
- fParent= parent;
- fName= name;
- fJavaElement= element;
- }
-
- public JavaElement(JEAttribute parent, IJavaElement element) {
- this(parent, null, element);
- }
-
- @Override
- public JEAttribute getParent() {
- return fParent;
- }
-
- public IJavaElement getJavaElement() {
- return fJavaElement;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- JavaElement other= (JavaElement) obj;
- if (fParent == null) {
- if (other.fParent != null)
- return false;
- } else if (! fParent.equals(other.fParent)) {
- return false;
- }
-
- if (fName == null) {
- if (other.fName != null)
- return false;
- } else if (! fName.equals(other.fName)) {
- return false;
- }
-
- if (fJavaElement == null) {
- if (other.fJavaElement != null)
- return false;
- } else if (! fJavaElement.equals(other.fJavaElement)) {
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return (fParent != null ? fParent.hashCode() : 0)
- + (fName != null ? fName.hashCode() : 0)
- + (fJavaElement != null ? fJavaElement.hashCode() : 0);
- }
-
- @Override
- public String getLabel() {
- StringBuffer sb= new StringBuffer();
- if (fName != null)
- sb.append(fName).append(": ");
-
- if (fJavaElement == null) {
- sb.append("java element: null");
- } else {
- String classname= fJavaElement.getClass().getName();
- sb.append(classname.substring(classname.lastIndexOf('.') + 1)).append(": ");
- sb.append(JavaElementLabels.getElementLabel(fJavaElement, LABEL_OPTIONS));
- if (! fJavaElement.exists())
- sb.append(" (does not exist)");
- }
- return sb.toString();
- }
-
- @Override
- public JEAttribute[] getChildren() {
- if (fJavaElement == null)
- return EMPTY;
-
- ArrayList<JEAttribute> result= new ArrayList<JEAttribute>();
-
- if (fJavaElement instanceof IParent) {
- addParentChildren(result, (IParent) fJavaElement);
- }
-
- addJavaElementChildren(result, fJavaElement);
-
- if (fJavaElement instanceof IJavaModel)
- addJavaModelChildren(result, (IJavaModel) fJavaElement);
- if (fJavaElement instanceof IJavaProject)
- addJavaProjectChildren(result, (IJavaProject) fJavaElement);
- if (fJavaElement instanceof IPackageFragmentRoot)
- addPackageFragmentRootChildren(result, (IPackageFragmentRoot) fJavaElement);
- if (fJavaElement instanceof IPackageFragment)
- addPackageFragmentChildren(result, (IPackageFragment) fJavaElement);
-
- if (fJavaElement instanceof IClassFile)
- addClassFileChildren(result, (IClassFile) fJavaElement);
- if (fJavaElement instanceof ICompilationUnit)
- addCompilationUnitChildren(result, (ICompilationUnit) fJavaElement);
-
- if (fJavaElement instanceof IType)
- addTypeChildren(result, (IType) fJavaElement);
- if (fJavaElement instanceof IMethod)
- addMethodChildren(result, (IMethod) fJavaElement);
- if (fJavaElement instanceof IMember)
- addMemberChildren(result, (IMember) fJavaElement);
-
- return result.toArray(new JEAttribute[result.size()]);
-
- }
-
- private void addParentChildren(ArrayList<JEAttribute> result, final IParent parent) {
- result.add(new JavaElementChildrenProperty(this, "CHILDREN") {
- @Override
- public JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, parent.getChildren());
- }
- });
- }
-
- private void addJavaElementChildren(ArrayList<JEAttribute> result, final IJavaElement javaElement) {
- result.add(new JavaElement(this, "PARENT", javaElement.getParent()));
- result.add(new JavaElement(this, "PRIMARY ELEMENT", javaElement.getPrimaryElement()));
- result.add(new JavaElement(this, "JAVA MODEL", javaElement.getJavaModel()));
- result.add(new JavaElement(this, "JAVA PROJECT", javaElement.getJavaProject()));
- result.add(JEResource.create(this, "RESOURCE", javaElement.getResource()));
- result.add(JEResource.compute(this, "CORRESPONDING RESOURCE", new Callable<IResource>() {
- public IResource call() throws JavaModelException {
- return javaElement.getCorrespondingResource();
- }
- }));
- result.add(JEResource.compute(this, "UNDERLYING RESOURCE", new Callable<IResource>() {
- public IResource call() throws JavaModelException {
- return javaElement.getUnderlyingResource();
- }
- }));
- }
-
- private void addJavaModelChildren(ArrayList<JEAttribute> result, final IJavaModel javaModel) {
- result.add(new JavaElementChildrenProperty(this, "JAVA PROJECTS") {
- @Override
- public JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, javaModel.getJavaProjects());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "NON JAVA RESOURCES") {
- @Override
- public JEAttribute[] computeChildren() throws JavaModelException {
- return createResources(this, javaModel.getNonJavaResources());
- }
- });
- }
-
- private void addJavaProjectChildren(ArrayList<JEAttribute> result, final IJavaProject project) {
- //TODO: IClassPathEntry
- result.add(new JavaElementChildrenProperty(this, "ALL PACKAGE FRAGMENT ROOTS") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, project.getAllPackageFragmentRoots());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "PACKAGE FRAGMENT ROOTS") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, project.getPackageFragmentRoots());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "PACKAGE FRAGMENTS") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, project.getPackageFragments());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "NON JAVA RESOURCES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createResources(this, project.getNonJavaResources());
- }
- });
- result.add(JEResource.create(this, "PROJECT", project.getProject()));
- result.add(new JavaElementChildrenProperty(this, "REQUIRED PROJECT NAMES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createStrings(this, project.getRequiredProjectNames());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "OPTIONS(FALSE)") {
- @SuppressWarnings("unchecked")
- @Override
- protected JEAttribute[] computeChildren() {
- return createOptions(this, project.getOptions(false));
- }
- });
- result.add(new JavaElementChildrenProperty(this, "OPTIONS(TRUE)") {
- @SuppressWarnings("unchecked")
- @Override
- protected JEAttribute[] computeChildren() {
- return createOptions(this, project.getOptions(true));
- }
- });
- }
-
- private void addPackageFragmentRootChildren(ArrayList<JEAttribute> result, final IPackageFragmentRoot packageFragmentRoot) {
- result.add(new JavaElementChildrenProperty(this, "NON JAVA RESOURCES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createResources(this, packageFragmentRoot.getNonJavaResources());
- }
- });
- }
-
- private void addPackageFragmentChildren(ArrayList<JEAttribute> result, final IPackageFragment packageFragment) {
- result.add(new JavaElementChildrenProperty(this, "COMPILATION UNITS") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, packageFragment.getCompilationUnits());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "CLASS FILES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, packageFragment.getClassFiles());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "NON JAVA RESOURCES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createResources(this, packageFragment.getNonJavaResources());
- }
- });
- }
-
- private void addClassFileChildren(ArrayList<JEAttribute> result, final IClassFile classFile) {
- result.add(JavaElement.compute(this, "TYPE", new Callable<IJavaElement>() {
- public IJavaElement call() throws JavaModelException {
- return classFile.getType();
- }
- }));
- }
-
- private void addCompilationUnitChildren(ArrayList<JEAttribute> result, final ICompilationUnit compilationUnit) {
- //TODO: WorkingCopyOwner
- result.add(JavaElement.compute(this, "FIND PRIMARY TYPE", new Callable<IJavaElement>() {
- public IJavaElement call() {
- return compilationUnit.findPrimaryType();
- }
- }));
- result.add(new JavaElement(this, "PRIMARY", compilationUnit.getPrimary()));
- result.add(new JavaElementChildrenProperty(this, "TYPES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, compilationUnit.getTypes());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "ALL TYPES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, compilationUnit.getAllTypes());
- }
- });
- result.add(new JavaElement(this, "IMPORT CONTAINER", compilationUnit.getImportContainer()));
- result.add(new JavaElementChildrenProperty(this, "IMPORTS") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, compilationUnit.getImports());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "PACKAGE DECLARATIONS") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, compilationUnit.getPackageDeclarations());
- }
- });
- }
-
- private void addMemberChildren(ArrayList<JEAttribute> result, final IMember member) {
- result.add(new JavaElement(this, "CLASS FILE", member.getClassFile()));
- result.add(new JavaElement(this, "COMPILATION UNIT", member.getCompilationUnit()));
- result.add(new JavaElement(this, "DECLARING TYPE", member.getDeclaringType()));
- }
-
- private void addTypeChildren(ArrayList<JEAttribute> result, final IType type) {
- result.add(new JavaElementProperty(this, "IS RESOLVED", type.isResolved()));
- result.add(new JavaElementProperty(this, "KEY", type.getKey()));
- result.add(new JavaElement(this, "PACKAGE FRAGMENT", type.getPackageFragment()));
- result.add(new JavaElementChildrenProperty(this, "TYPE PARAMETERS") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, type.getTypeParameters());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "TYPE PARAMETER SIGNATURES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createStrings(this, type.getTypeParameterSignatures());
- }
- });
-
- result.add(new JavaElementProperty(this, "SUPERCLASS NAME") {
- @Override
- protected Object computeValue() throws Exception {
- return type.getSuperclassName();
- }
- });
-
- result.add(new JavaElementProperty(this, "SUPERCLASS TYPE SIGNATURE") {
- @Override
- protected Object computeValue() throws Exception {
- return type.getSuperclassTypeSignature();
- }
- });
- result.add(new JavaElementChildrenProperty(this, "SUPER INTERFACE NAMES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createStrings(this, type.getSuperInterfaceNames());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "SUPER INTERFACE TYPE SIGNATURES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createStrings(this, type.getSuperInterfaceTypeSignatures());
- }
- });
-
- result.add(new JavaElementChildrenProperty(this, "FIELDS") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, type.getFields());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "INITIALIZERS") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, type.getInitializers());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "METHODS") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, type.getMethods());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "TYPES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, type.getTypes());
- }
- });
- }
-
- private void addMethodChildren(ArrayList<JEAttribute> result, final IMethod method) {
- result.add(new JavaElementChildrenProperty(this, "EXCEPTION TYPES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createStrings(this, method.getExceptionTypes());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "PARAMETER NAMES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createStrings(this, method.getParameterNames());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "PARAMETER TYPES") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createStrings(this, method.getParameterTypes());
- }
- });
- result.add(new JavaElementChildrenProperty(this, "TYPE PARAMETERS") {
- @Override
- protected JEAttribute[] computeChildren() throws JavaModelException {
- return createJavaElements(this, method.getTypeParameters());
- }
- });
- }
-
- static JavaElement[] createJavaElements(JEAttribute parent, IJavaElement[] javaElements) {
- JavaElement[] jeChildren= new JavaElement[javaElements.length];
- for (int i= 0; i < javaElements.length; i++) {
- jeChildren[i]= new JavaElement(parent, javaElements[i]);
- }
- return jeChildren;
- }
-
- static JEAttribute[] createResources(JEAttribute parent, Object[] resources) {
- JEAttribute[] resourceChildren= new JEAttribute[resources.length];
- for (int i= 0; i < resources.length; i++) {
- Object resource= resources[i];
- if (resource instanceof IResource)
- resourceChildren[i]= new JEResource(parent, "", (IResource) resource);
- else
- resourceChildren[i]= new JavaElementProperty(parent, "", resource);
- }
- return resourceChildren;
- }
-
- static JEAttribute[] createOptions(JEAttribute parent, Map<String, String> options) {
- ArrayList<Entry<String, String>> entries= new ArrayList<Entry<String, String>>(options.entrySet());
- Collections.sort(entries, new Comparator<Entry<String, String>>() {
- public int compare(Entry<String, String> o1, Entry<String, String> o2) {
- return o1.getKey().compareTo(o2.getKey());
- }
- });
-
- JEAttribute[] children= new JEAttribute[entries.size()];
- for (int i= 0; i < entries.size(); i++) {
- Entry<String, String> entry= entries.get(i);
- children[i]= new JavaElementProperty(parent, entry.getKey(), entry.getValue());
- }
- return children;
- }
-
- static JEAttribute[] createStrings(JEAttribute parent, String[] strings) {
- JEAttribute[] children= new JEAttribute[strings.length];
- for (int i= 0; i < strings.length; i++) {
- children[i]= new JavaElementProperty(parent, null, strings[i]);
- }
- return children;
- }
-
- public static JEAttribute compute(JEAttribute parent, String name, Callable<IJavaElement> computer) {
- try {
- IJavaElement javaElement= computer.call();
- return create(parent, name, javaElement);
- } catch (Exception e) {
- return new Error(parent, name, e);
- }
- }
-
- public static JEAttribute create(JEAttribute parent, String name, IJavaElement javaElement) {
- if (javaElement == null) {
- return new Null(parent, name);
- } else {
- return new JavaElement(parent, name, javaElement);
- }
- }
-
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementChildrenProperty.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementChildrenProperty.java
deleted file mode 100644
index 073fb0e..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementChildrenProperty.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.jeview.views;
-
-
-public abstract class JavaElementChildrenProperty extends JEAttribute {
-
- private final JEAttribute fParent;
- private final String fName;
-
- public JavaElementChildrenProperty(JEAttribute parent, String name) {
- fParent= parent;
- fName= name;
- }
-
- @Override
- public JEAttribute getParent() {
- return fParent;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- JavaElementChildrenProperty other= (JavaElementChildrenProperty) obj;
- if (fParent == null) {
- if (other.fParent != null)
- return false;
- } else if (! fParent.equals(other.fParent)) {
- return false;
- }
-
- if (fName == null) {
- if (other.fName != null)
- return false;
- } else if (! fName.equals(other.fName)) {
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return (fParent != null ? fParent.hashCode() : 0)
- + (fName != null ? fName.hashCode() : 0);
- }
-
- @Override
- public JEAttribute[] getChildren() {
- try {
- return computeChildren();
- } catch (Exception e) {
- return new JEAttribute[] {new Error(this, "", e)};
- }
- }
-
- protected abstract JEAttribute[] computeChildren() throws Exception;
-
- @Override
- public String getLabel() {
- Object[] children= getChildren();
- String count;
- if (children.length == 1 && children[0] instanceof Error) {
- count= Error.ERROR;
- } else {
- count= String.valueOf(children.length);
- }
- return fName + " (" + count + ")";
- }
-
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementProperty.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementProperty.java
deleted file mode 100644
index a57463b..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementProperty.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.jeview.views;
-
-
-public class JavaElementProperty extends JEAttribute {
-
- private final JEAttribute fParent;
- private final String fName;
- private final String fValue;
-
- public JavaElementProperty(JEAttribute parent, String name) {
- fParent= parent;
- fName= name;
- fValue= null;
- }
-
- public JavaElementProperty(JEAttribute parent, String name, Object value) {
- fParent= parent;
- fName= name;
- if (value instanceof String)
- fValue= "\"" + value + "\"";
- else
- fValue= String.valueOf(value);
- }
-
- @Override
- public JEAttribute getParent() {
- return fParent;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- JavaElementProperty other= (JavaElementProperty) obj;
- if (fParent == null) {
- if (other.fParent != null)
- return false;
- } else if (! fParent.equals(other.fParent)) {
- return false;
- }
-
- if (fName == null) {
- if (other.fName != null)
- return false;
- } else if (! fName.equals(other.fName)) {
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return (fParent != null ? fParent.hashCode() : 0)
- + (fName != null ? fName.hashCode() : 0);
- }
-
- @Override
- public JEAttribute[] getChildren() {
- if (fValue != null)
- return EMPTY;
-
- try {
- computeValue();
- return EMPTY;
- } catch (Exception e) {
- return new Error[]{ new Error(this, "", e) };
- }
- }
-
- @Override
- public String getLabel() {
- String value= fValue;
- if (value == null) {
- try {
- value= String.valueOf(computeValue());
- } catch (Exception e) {
- return Error.ERROR;
- }
- }
-
- if (fName == null)
- return value;
- else
- return fName + ": " + value;
- }
-
- protected Object computeValue() throws Exception {
- return fValue;
- }
-
-}
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java
deleted file mode 100644
index 5029586..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.jeview.views;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.eclipse.core.commands.util.ListenerList;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Image;
-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.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-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.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.window.Window;
-
-import org.eclipse.jface.text.ITextSelection;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.part.DrillDownAdapter;
-import org.eclipse.ui.part.IShowInSource;
-import org.eclipse.ui.part.IShowInTarget;
-import org.eclipse.ui.part.ShowInContext;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
-
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICodeAssist;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.ISourceReference;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.actions.ShowInPackageViewAction;
-
-import org.eclipse.jdt.jeview.EditorUtility;
-import org.eclipse.jdt.jeview.JEPluginImages;
-import org.eclipse.jdt.jeview.JEViewPlugin;
-import org.eclipse.jdt.jeview.properties.JavaElementProperties;
-import org.eclipse.jdt.jeview.properties.ResourceProperties;
-
-
-public class JavaElementView extends ViewPart implements IShowInSource, IShowInTarget {
- TreeViewer fViewer;
- private DrillDownAdapter fDrillDownAdapter;
- JERoot fInput;
-
- private Action fFocusAction;
- private Action fResetAction;
- private Action fCodeSelectAction;
- private Action fElementAtAction;
- private Action fCreateFromHandleAction;
- private Action fRefreshAction;
- private Action fPropertiesAction;
- Action fDoubleClickAction;
-
- private PropertySheetPage fPropertySheetPage;
-
-
- private static class JEViewSelectionProvider implements ISelectionProvider {
- private final TreeViewer fViewer;
- ListenerList fSelectionChangedListeners= new ListenerList();
-
- public JEViewSelectionProvider(TreeViewer viewer) {
- fViewer= viewer;
- fViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- fireSelectionChanged();
- }
- });
- }
-
- void fireSelectionChanged() {
- if (fSelectionChangedListeners != null) {
- SelectionChangedEvent event= new SelectionChangedEvent(this, getSelection());
-
- Object[] listeners= fSelectionChangedListeners.getListeners();
- for (int i= 0; i < listeners.length; i++) {
- ISelectionChangedListener listener= (ISelectionChangedListener) listeners[i];
- listener.selectionChanged(event);
- }
- }
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- fSelectionChangedListeners.add(listener);
- }
-
- public ISelection getSelection() {
- IStructuredSelection selection= (IStructuredSelection) fViewer.getSelection();
- ArrayList<IAdaptable> externalSelection= new ArrayList<IAdaptable>();
- for (Iterator iter= selection.iterator(); iter.hasNext();) {
- Object element= iter.next();
- if (element instanceof JavaElement) {
- IJavaElement javaElement= ((JavaElement) element).getJavaElement();
- if (! (javaElement instanceof IJavaModel)) // various selection listeners assume getJavaProject() is non-null
- externalSelection.add(javaElement);
- } else if (element instanceof JEResource) {
- IResource resource= ((JEResource) element).getResource();
- if (! (resource instanceof IWorkspaceRoot)) // various selection listeners assume getProject() is non-null
- externalSelection.add(resource);
- } else {
- //TODO: support for other node types?
- }
- }
- return new StructuredSelection(externalSelection);
- }
-
- public void removeSelectionChangedListener(ISelectionChangedListener listener) {
- fSelectionChangedListeners.remove(listener);
- }
-
- public void setSelection(ISelection selection) {
- //not supported
- }
- }
-
- public JavaElementView() {
- //
- }
-
- @Override
- public void createPartControl(Composite parent) {
- fViewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
- fDrillDownAdapter = new DrillDownAdapter(fViewer) {
- @SuppressWarnings("synthetic-access")
- @Override
- protected void updateNavigationButtons() {
- super.updateNavigationButtons();
- if (fViewer.getInput() instanceof JEAttribute && ! fViewer.getInput().equals(fInput)) {
- setContentDescription(((JEAttribute) fViewer.getInput()).getLabel());
- } else {
- setContentDescription("");
- }
-
- }
- };
- fViewer.setContentProvider(new JEViewContentProvider());
- fViewer.setLabelProvider(new JEViewLabelProvider());
- reset();
- makeActions();
- hookContextMenu();
- hookDoubleClickAction();
- getSite().setSelectionProvider(new JEViewSelectionProvider(fViewer));
- contributeToActionBars();
- }
-
- void reset() {
- setInput(getJavaModel());
- }
-
- private IJavaModel getJavaModel() {
- return JavaCore.create(JEViewPlugin.getWorkspace().getRoot());
- }
-
- void setInput(IJavaElement javaElement) {
- setInput(Collections.singleton(javaElement));
- }
-
- void setInput(Collection<? extends IJavaElement> javaElements) {
- fInput= new JERoot(javaElements);
- fViewer.setInput(fInput);
- ITreeContentProvider tcp= (ITreeContentProvider) fViewer.getContentProvider();
- Object[] elements= tcp.getElements(fInput);
- if (elements.length > 0) {
- fViewer.setSelection(new StructuredSelection(elements[0]));
- fViewer.setExpandedState(elements[0], true);
- }
- fDrillDownAdapter.reset();
- }
-
- private void hookContextMenu() {
- MenuManager menuMgr = new MenuManager("#PopupMenu");
- menuMgr.setRemoveAllWhenShown(true);
- menuMgr.addMenuListener(new IMenuListener() {
- public void menuAboutToShow(IMenuManager manager) {
- JavaElementView.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());
- bars.setGlobalActionHandler(ActionFactory.REFRESH.getId(), fRefreshAction);
- bars.setGlobalActionHandler(ActionFactory.PROPERTIES.getId(), fPropertiesAction);
- }
-
- private void fillLocalPullDown(IMenuManager manager) {
- manager.add(fCodeSelectAction);
- manager.add(fElementAtAction);
- manager.add(fCreateFromHandleAction);
- manager.add(fResetAction);
- manager.add(new Separator());
- manager.add(fRefreshAction);
- }
-
- void fillContextMenu(IMenuManager manager) {
- addFocusActionOrNot(manager);
- manager.add(fResetAction);
- manager.add(fRefreshAction);
- manager.add(new Separator());
- fDrillDownAdapter.addNavigationActions(manager);
- manager.add(new Separator());
- // Other plug-ins can contribute there actions here
- manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
- manager.add(new Separator());
- manager.add(fPropertiesAction);
- }
-
- private void addFocusActionOrNot(IMenuManager manager) {
- if (fViewer.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection structuredSelection= (IStructuredSelection) fViewer.getSelection();
- if (structuredSelection.size() == 1) {
- Object first= structuredSelection.getFirstElement();
- if (first instanceof JavaElement) {
- String name= ((JavaElement) first).getJavaElement().getElementName();
- fFocusAction.setText("Fo&cus On '" + name + '\'');
- manager.add(fFocusAction);
- }
- }
- }
- }
-
- private void fillLocalToolBar(IToolBarManager manager) {
- manager.add(fCodeSelectAction);
- manager.add(fElementAtAction);
- manager.add(fResetAction);
- manager.add(fRefreshAction);
- manager.add(new Separator());
- fDrillDownAdapter.addNavigationActions(manager);
- }
-
- private void makeActions() {
- fCodeSelectAction= new Action("Set Input from Editor (codeSelect)", JEPluginImages.IMG_SET_FOCUS_CODE_SELECT) {
- @Override public void run() {
- IEditorPart editor= getSite().getPage().getActiveEditor();
- IEditorInput input= editor.getEditorInput();
- ISelectionProvider selectionProvider= editor.getSite().getSelectionProvider();
- if (input == null || selectionProvider == null)
- return;
- ISelection selection= selectionProvider.getSelection();
- if (! (selection instanceof ITextSelection))
- return;
- IJavaElement javaElement= (IJavaElement) input.getAdapter(IJavaElement.class);
- if (javaElement == null)
- return;
- IJavaElement[] resolved;
- try {
- resolved= codeResolve(javaElement, (ITextSelection) selection);
- } catch (JavaModelException e) {
- return;
- }
- if (resolved.length == 0)
- return;
-
- setInput(resolved[0]);
- }
- };
- fCodeSelectAction.setToolTipText("Set input from current editor's selection (codeSelect)");
-
- fElementAtAction= new Action("Set Input from Editor location (getElementAt)", JEPluginImages.IMG_SET_FOCUS) {
- @Override public void run() {
- IEditorPart editor= getSite().getPage().getActiveEditor();
- IEditorInput input= editor.getEditorInput();
- ISelectionProvider selectionProvider= editor.getSite().getSelectionProvider();
- if (input == null || selectionProvider == null)
- return;
- ISelection selection= selectionProvider.getSelection();
- if (! (selection instanceof ITextSelection))
- return;
- IJavaElement javaElement= (IJavaElement) input.getAdapter(IJavaElement.class);
- if (javaElement == null)
- return;
- IJavaElement resolved;
- try {
- resolved= getElementAtOffset(javaElement, (ITextSelection) selection);
- } catch (JavaModelException e) {
- return;
- }
- if (resolved == null)
- return;
-
- setInput(resolved);
- }
- };
- fElementAtAction.setToolTipText("Set input from current editor's selection location (getElementAt)");
-
- fCreateFromHandleAction= new Action("Create From Handle...") {
- @Override public void run() {
- InputDialog dialog= new InputDialog(getSite().getShell(), "Create Java Element From Handle Identifier", "Handle identifier:", "", null);
- if (dialog.open() != Window.OK)
- return;
- String handleIdentifier= dialog.getValue();
- IJavaElement javaElement= JavaCore.create(handleIdentifier);
- setInput(javaElement);
- }
- };
-
- fFocusAction= new Action() {
- @Override public void run() {
- Object selected= ((IStructuredSelection) fViewer.getSelection()).getFirstElement();
- setInput(((JavaElement) selected).getJavaElement());
- }
- };
- fFocusAction.setToolTipText("Focus on Selection");
-
- fResetAction= new Action("&Reset View", getJavaModelImageDescriptor()) {
- @Override public void run() {
- reset();
- }
- };
- fResetAction.setToolTipText("Reset View to JavaModel");
-
- fRefreshAction= new Action("Re&fresh", JEPluginImages.IMG_REFRESH) {
- @Override public void run() {
- BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
- public void run() {
- fViewer.refresh();
- }
- });
- }
- };
- fRefreshAction.setToolTipText("Refresh");
- fRefreshAction.setActionDefinitionId("org.eclipse.ui.file.refresh");
-
- fPropertiesAction= new Action("Properties", JEPluginImages.IMG_PROPERTIES) {
- @Override
- public void run() {
- String viewId = IPageLayout.ID_PROP_SHEET;
- IWorkbenchPage page= getViewSite().getPage();
- IViewPart view;
- try {
- view= page.showView(viewId);
- page.activate(JavaElementView.this);
- page.bringToTop(view);
- } catch (PartInitException e) {
- JEViewPlugin.log("could not find Properties view", e);
- }
- }
- };
- fPropertiesAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.PROPERTIES);
-
- fDoubleClickAction = new Action() {
- private Object fPreviousDouble;
-
- @Override public void run() {
- ISelection selection = fViewer.getSelection();
- Object obj = ((IStructuredSelection)selection).getFirstElement();
-
- boolean isSecondDoubleClick= (obj == fPreviousDouble);
- fPreviousDouble= isSecondDoubleClick ? null : obj;
-
- if (obj instanceof JavaElement) {
- IJavaElement javaElement= ((JavaElement) obj).getJavaElement();
- if (javaElement != null) {
- switch (javaElement.getElementType()) {
- case IJavaElement.JAVA_MODEL :
- break;
-
- case IJavaElement.JAVA_PROJECT :
- case IJavaElement.PACKAGE_FRAGMENT_ROOT :
- case IJavaElement.PACKAGE_FRAGMENT :
- ShowInPackageViewAction showInPackageViewAction= new ShowInPackageViewAction(getViewSite());
- showInPackageViewAction.run(javaElement);
- break;
-
- default :
- try {
- IEditorPart editorPart= JavaUI.openInEditor(javaElement);
- if (editorPart != null) {
- if (isSecondDoubleClick && javaElement instanceof ISourceReference && editorPart instanceof ITextEditor) {
- ISourceRange sourceRange= ((ISourceReference) javaElement).getSourceRange();
- EditorUtility.selectInEditor((ITextEditor) editorPart, sourceRange.getOffset(), sourceRange.getLength());
- } else {
- JavaUI.revealInEditor(editorPart, javaElement);
- }
- }
- } catch (PartInitException e) {
- showAndLogError("Could not open editor.", e); //$NON-NLS-1$
- } catch (JavaModelException e) {
- showAndLogError("Could not open editor.", e); //$NON-NLS-1$
- }
- }
- }
-
- } else if (obj instanceof Error) {
- Error error= (Error) obj;
- JEViewPlugin.log(error.getException());
- }
- }
- };
- }
-
-
- static IJavaElement[] codeResolve(IJavaElement input, ITextSelection selection) throws JavaModelException {
- if (input instanceof ICodeAssist) {
- if (input instanceof ICompilationUnit) {
- reconcile((ICompilationUnit) input);
- }
- IJavaElement[] elements= ((ICodeAssist)input).codeSelect(selection.getOffset(), selection.getLength());
- if (elements != null && elements.length > 0)
- return elements;
- }
- return new IJavaElement[0];
- }
-
- static IJavaElement getElementAtOffset(IJavaElement input, ITextSelection selection) throws JavaModelException {
- if (input instanceof ICompilationUnit) {
- ICompilationUnit cunit= (ICompilationUnit) input;
- reconcile(cunit);
- IJavaElement ref= cunit.getElementAt(selection.getOffset());
- if (ref == null)
- return input;
- else
- return ref;
- } else if (input instanceof IClassFile) {
- IJavaElement ref= ((IClassFile)input).getElementAt(selection.getOffset());
- if (ref == null)
- return input;
- else
- return ref;
- }
- return input;
- }
-
- /* see JavaModelUtil.reconcile((ICompilationUnit) input) */
- static void reconcile(ICompilationUnit unit) throws JavaModelException {
- synchronized(unit) {
- unit.reconcile(
- ICompilationUnit.NO_AST,
- false /* don't force problem detection */,
- null /* use primary owner */,
- null /* no progress monitor */);
- }
- }
-
- private ImageDescriptor getJavaModelImageDescriptor() {
- JavaElementLabelProvider lp= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_SMALL_ICONS);
- Image modelImage= lp.getImage(getJavaModel());
- ImageDescriptor modelImageDescriptor= ImageDescriptor.createFromImage(modelImage);
- lp.dispose();
- return modelImageDescriptor;
- }
-
- private void hookDoubleClickAction() {
- fViewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- fDoubleClickAction.run();
- }
- });
- }
-
- void showAndLogError(String message, CoreException e) {
- JEViewPlugin.log(message, e);
- ErrorDialog.openError(getSite().getShell(), "JavaElement View", message, e.getStatus()); //$NON-NLS-1$
- }
-
- void showAndLogError(String message, Exception e) {
- IStatus status= new Status(IStatus.ERROR, JEViewPlugin.getPluginId(), 0, message, e);
- JEViewPlugin.log(status);
- ErrorDialog.openError(getSite().getShell(), "JavaElement View", null, status); //$NON-NLS-1$
- }
-
- void showMessage(String message) {
- MessageDialog.openInformation(
- fViewer.getControl().getShell(),
- "JavaElement View",
- message);
- }
-
- /**
- * Passing the focus request to the viewer's control.
- */
- @Override
- public void setFocus() {
- fViewer.getControl().setFocus();
- }
-
- public ShowInContext getShowInContext() {
- return new ShowInContext(null, getSite().getSelectionProvider().getSelection());
- }
-
- public boolean show(ShowInContext context) {
- ISelection selection= context.getSelection();
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection structuredSelection= ((IStructuredSelection) selection);
- if (structuredSelection.size() >= 1) {
- Set<IJavaElement> input= new LinkedHashSet<IJavaElement>();
- for (Iterator iter = structuredSelection.iterator(); iter.hasNext();) {
- Object first= iter.next();
- if (first instanceof IJavaElement) {
- input.add((IJavaElement) first);
- } else if (first instanceof IResource) {
- IJavaElement je= JavaCore.create((IResource) first);
- if (je != null) {
- input.add(je);
- }
- }
- }
- if (input.size() > 0) {
- setInput(input);
- return true;
- }
- }
- }
-
- Object input= context.getInput();
- if (input instanceof IEditorInput) {
- IJavaElement elementOfInput= getElementOfInput((IEditorInput)context.getInput());
- if (elementOfInput != null) {
- setInput(elementOfInput);
- return true;
- }
- }
-
- return false;
- }
-
- IJavaElement getElementOfInput(IEditorInput input) {
- Object adapted= input.getAdapter(IClassFile.class);
- if (adapted != null)
- return (IClassFile) adapted;
-
- if (input instanceof IFileEditorInput) {
- IFile file= ((IFileEditorInput)input).getFile();
- IJavaElement javaElement= JavaCore.create(file);
- if (javaElement != null)
- return javaElement;
- }
-
-// if (input instanceof JarEntryEditorInput)
-// return ((JarEntryEditorInput)input).getStorage();
- return null;
- }
-
- @Override
- public Object getAdapter(Class adapter) {
- if (adapter == IPropertySheetPage.class) {
- return getPropertySheetPage();
- }
- return super.getAdapter(adapter);
- }
-
- private PropertySheetPage getPropertySheetPage() {
- if (fPropertySheetPage == null) {
- final PropertySheetPage propertySheetPage= new PropertySheetPage();
- propertySheetPage.setPropertySourceProvider(new IPropertySourceProvider() {
- public IPropertySource getPropertySource(Object object) {
- if (object instanceof IJavaElement)
- return new JavaElementProperties((IJavaElement) object);
- else if (object instanceof IResource)
- return new ResourceProperties((IResource) object);
- else
- return null;
- }
- });
- fPropertySheetPage= propertySheetPage;
- }
- return fPropertySheetPage;
- }
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Mapper.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Mapper.java
deleted file mode 100644
index c0ddd4c..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Mapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.jeview.views;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public abstract class Mapper<I, O> {
- public abstract O map(I element);
-
- public static <I, O> List<O> build(Collection<? extends I> elements, Mapper<I, O> mapper) {
- ArrayList<O> result = new ArrayList<O>(elements.size());
- for (I element : elements)
- result.add(mapper.map(element));
- return result;
- }
- public List<O> mapToList(Collection<? extends I> elements) {
- ArrayList<O> result = new ArrayList<O>(elements.size());
- for (I element : elements)
- result.add(map(element));
- return result;
- }
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Null.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Null.java
deleted file mode 100644
index b32ad71..0000000
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/Null.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.jeview.views;
-
-import org.eclipse.jface.util.Assert;
-
-
-public class Null extends JEAttribute {
-
- private final JEAttribute fParent;
- private final String fName;
-
- public Null(JEAttribute parent, String name) {
- Assert.isNotNull(parent);
- Assert.isNotNull(name);
- fParent= parent;
- fName= name;
- }
-
- @Override
- public JEAttribute getParent() {
- return fParent;
- }
-
- @Override
- public JEAttribute[] getChildren() {
- return EMPTY;
- }
-
- @Override
- public String getLabel() {
- return fName + ": null";
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null || !obj.getClass().equals(getClass())) {
- return false;
- }
-
- Null other= (Null) obj;
- if (! fParent.equals(other.fParent)) {
- return false;
- }
- if (! fName.equals(other.fName)) {
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return fParent.hashCode() + fName.hashCode();
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/.classpath b/org.eclipse.jdt.ui.examples.javafamily/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.ui.examples.javafamily/.cvsignore b/org.eclipse.jdt.ui.examples.javafamily/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.jdt.ui.examples.javafamily/.project b/org.eclipse.jdt.ui.examples.javafamily/.project
deleted file mode 100644
index 862fd47..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jdt.ui.examples.javafamily</name>
- <comment></comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.jdt.ui.examples.javafamily/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.ui.examples.javafamily/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b77333c..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,67 +0,0 @@
-#Thu Feb 03 11:46:43 CET 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.jdt.ui.examples.javafamily/ReleaseNotes.html b/org.eclipse.jdt.ui.examples.javafamily/ReleaseNotes.html
deleted file mode 100644
index 967948f..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/ReleaseNotes.html
+++ /dev/null
@@ -1,306 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Javafamily Release Notes</title></head><body>
-<h1 style="text-align: left;">Release Notes</h1>
-October 6, 2003<br>
-<br>
-The javafamily plug-in is a collection of prototypes that illustrate how
-the existing (mostly Java) infrastructure can be extended to support
-Java-like languages like JSP. Since this is a first cut, the project
-still contains a number of workarounds and duplications. However, it is
-our ultimate goal to eliminate all of these in order to make
-supporting Java-like languages smooth and simple.<br>
-<br>
-This initial release contains:<br>
-<ul>
- <li>a JSP editor with reconciling,<br>
- </li>
- <li>a JSP aware Java search,<br>
- </li>
- <li>a JSP aware Rename Type refactoring that uses the new Refactoring Participants.</li>
- <li>a Tomcat launcher and JSP source locator<br>
- </li>
-</ul>
-In addition this document contains a collection of findings we made
-while developing the various pieces.<br>
-<h2>Known issues and limitations:</h2>
-<ul>
- <li>Currently the JSP index isn't persisted and automatic indexing of JSP files is not enabled.
-So if you want to try the Rename Type refactoring or the JSP/Java search, you'll need to turn on
-JSP indexing via Window > Preferences > Java > JavaFamily Example > Start JSP indexing.
-Without this a JSP/Java search or a Rename Type refactoring
-will not find Java types in non-Java resources.</li>
-<li>
-JSP Search works only for types (because JSP indexing is only done for types).
-</li>
-</ul>
-<h2>Reconciling Steps</h2>
-Findings while developing the JSP Editor:<br>
-<ul>
- <li>JSR-045 specifies a line-oriented mapping between several input
-files
-(translated-source) and one output file (translated-source or
-final-source). The output file can either be the final-source or
-multiple output files (translated-source) can serve as input for a
-next mapping (e.g. MyCustomFormat -> JSP -> Java). Each step
-(language-translator) produces a SMAP file (.smap). The mapping cannot
-be used to exactly map positions inside a line.</li>
- <li>The compiler aborts compilation if it hits some severe errors.
-Because a JSP line sequence is not necessarily the same as in the
-intermediate Java file it might happen that the compiler stops very
-early on an error that corresponds to a JSP line which is at the very
-end of the file.<br>
- </li>
- <li>An annotation position reported on the Java file can correspond to<br>
- </li>
- <ul>
- <li>an annotation in the JSP file with adapted offset and length</li>
- <li>several annotation in the JSP file either distributed in the
-same Java partition or over several partitions</li>
- <li>no annotation at all, e.g. if the error is caused by the
-translator or by a wrong Java build path</li>
- </ul>
- <li>A JSP file can <span style="font-style: italic;">include</span>
-other JSP files. If an SMAP based approach is used and one of the
-included
-JSP files is opened in the editor then we need to find the correct SMAP
-file.</li>
- <li>For
-most of the tags in the JSP file it is not possible to
-provide a generic parsing and mapping. This has to be defined for each
-tag. The generated Java code and the mapping are tightly coupled and
-should be kept in a single class that we call tag handler. A tag
-handler might handle more than one tag. </li>
- <li>Special tags are needed to handle non-tagged sections like HTML
-in a JSP file.<br>
- </li>
- <li>The default implementation of the tag handler must be extensible
-in order to allow tag lib providers to extend the handler.</li>
- <li>Even if we decide to use an existing translator we will have to
-provide tag handlers that can map positions in a translated line back
-to the position in the corresponding source line.</li>
- <li>Unless we don't build a fully generic editor which can handle
-several file types (e.g. XML, Java and JSP) there's no need to have
-global tag handler factory which manages different languages.</li>
- <li>Currently only the source line is passed to the tag handler. If
-JSP
-allows that tag (lib) attributes span multiple lines then we must
-change the interface and pass sourceLineStart and sourceLineEnd.<br>
- </li>
-</ul>
-<h2>Towards Language Neutral Search<br>
-</h2>
-We tried to reuse the Java indexing/searching infrastructure from
-jdt.core for
-non-Java JSP files. This was easily possible for the indexing side,
-because that part makes almost no assumptions about was is being
-indexed. On the other hand, searching was more challenging because the
-search infrastructure makes hardwired assumptions about the type of
-files referenced from the index. So if a file doesn't have the .java
-extensions it is assumed to be a .class file without further checking
-of its extension. As a consequence it was not possible to get *.jsp
-files from a search because the search engine would treat them as class
-files and would run in a NPE.<br>
-<br>
-To solve this issue we created a new package
-"org.eclipse.core.indexsearch" as a starting point for an indexed
-search component. The package provides a minimal but sufficient API for
-indexing/searching non-Java files and uses the existing mechanisms from
-jdt.core as far as possible.<br>
-<br>
-As a first use case for this indexed search we combined the Type Rename
-refactoring participants
-with a JSP search engine based on "org.eclipse.core.indexsearch" and a
-simple JSP parser (org.eclipse.jsp.AbstractJspParser). With this you
-can rename Java types and
-automatically rename all occurrences of the Java type in JSP tags as
-well.<br>
-<br>
-In a second use case we created a new Java/JSP Search page that
-combines the existing Java search with the JSP search. As a result you
-can search for a Java type and can find occurrences not only in Java
-source but in JSP tags as well. The current implementation copies some
-of the classes from "org.eclipse.jdt.internal.ui.search" in order to be
-able to show non-Java files in the Java search result viewer. However,
-the ultimate goal would be to provide a new extension point for Java
-search that would allow for plugging in arbitrary "search
-participants".<br>
-Please note: it is not possible to automatically have
-every Java search return JSP search results as well, because some
-places in Eclipse assume that the search results only contain Java
-source, and they would fail miserably when confronted with non-Java
-files, e.g. JSP files.<br>
-<br>
-<span style="font-weight: bold;">Design considerations for an indexed
-search component:</span><br>
-<ul>
- <li>language independence</li>
- <li>a single index and a single indexer thread for all languages</li>
- <li>minimal API surface area</li>
- <li>flexible queries</li>
- <li>background indexing and searching</li>
- <li>not tied to IResources</li>
-</ul>
-<h3>The API</h3>
-<h4>Search Engine: class <code>SearchEngine</code></h4>
-<ul>
- <li>API entry point</li>
- <li>combines indexing API with searching API</li>
- <li>manages concurrency issues between indexing access and searching</li>
- <li>indexing based on the JobManager (current impl. delegates to
-jdt.core
-IndexManager)</li>
- <li>index requests are added as AddFileToIndex subclasses (like today)</li>
- <li>lifecycle issues: loading/saving index</li>
- <li>no notion of "Scope"; scope can be introduced as an
-implementation
-detail of the IIndexQuery</li>
-</ul>
- <code>/**<br>
- * Perform the given query against the index
-and return results via the resultCollector.<br>
- */<br>
- public void <span style="font-weight: bold;">search</span>(IIndexQuery
-search,
-ISearchResultCollector resultCollector,<br>
-
-
-IProgressMonitor progressMonitor, int waitingPolicy);<br>
-</code><br>
-<h4>Search query: interface <code>IIndexQuery</code></h4>
-An IIndexQuery is used to perform a query against the searching
-framework.<br>
-<pre>/**<br> * Compute the list of paths which are keying index files and add them to the given list.<br> */<br>void <span style="font-weight: bold;">computePathsKeyingIndexFiles</span>(ArrayList requiredIndexKeys);<br></pre>
-<pre>/**<br> * Perform the query on the given index and adds the paths of all found documents to the given collector.<br> */<br>void <span style="font-weight: bold;">findIndexMatches</span>(IIndex index, PathCollector collector, IProgressMonitor progressMonitor) throws IOException;<br><br>/**<br> * Locate all matches of this query in the given file candidate and return them via the resultcollector. <br> */<br>void <span style="font-weight: bold;">locateMatches</span>(IFile candidate, ISearchResultCollector resultCollector);</pre>
-<h4>Search results: interface <code>ISearchResultCollector</code></h4>
-<ul>
- <li>search results reported via ISearchResultCollector</li>
-</ul>
-<code>/**<br>
- * Accepts the given search result.<br>
- *<br>
- * @param resource the resource in which the
-match has been found<br>
- * @param start the start position of the
-match, -1 if it is unknown<br>
- * @param length the length of the match<br>
- * @exception CoreException if this collector
-had a problem accepting the search result<br>
- */<br>
-public void <span style="font-weight: bold;">accept</span>(IResource
-resource, int start,
-int length) throws CoreException;<br>
-</code>
-<h3>Open Issues</h3>
-<ul>
- <li>the PathCollector API has Java-specific methods which are not used</li>
- <li>Transparent search in WorkingCopies/Buffers: whenever a file
-resource in opened in an Editor, search should transparently search in
-the buffer and not in the underlying resource. Two options to make
-buffers available to SearchEngine:</li>
- <ul>
- <li> as argument to search(...) method</li>
- <li> whenever buffer is created or deleted it is registered
-with the SearchEngine</li>
- </ul>
- <li>No common abstraction for the "content" being indexed:<br>
-In the API from above "content" is represented as an IFile in
-locateMatches(...) and an IResource in
-ISearchResultCollector.accept(...). However, to transparently deal with
-"buffers" there seems to be a need for a more abstract interface for
-content access.</li>
-</ul>
-<h2><br>
- Debugging a JSP</h2>
-<p>This section describes how to launch a Tomcat server and debug a JSP and associated
- Java code being developed in a workspace.</p>
-<h3>Tomcat and Project Configuration</h3>
-<p>JSP debugging with the javafamily plug-in requires that you have a local installation
- of Tomcat, version 5.0.2 or higher. Tomcat can be configured to locate a web
- application in an arbitrary location. Thus, a web application (JSPs and Java
- code) can be developed in an Eclipse workspace, and Tomcat can be configured
- to locate the web application in the associated location in the file system.</p>
-<p>A project structure conforming to that of an expanded WAR (Web application
- ARchive) is required. Thus, you must create a Java project that contains the
- following directory structure.</p>
-<ul>
- <li><code>root-web-app-folder</code>
- <ul>
- <li><code>WEB-INF</code>
- <ul>
- <li><code>classes</code></li>
- <li><code>lib</code></li>
- </ul>
- </li>
- </ul>
- </li>
-</ul>
-<p>A root container is used to store a <code>WEB-INF</code> folder, which contains
- a <code>web.xml</code> file describing the web application. Note that the root
- container may be a Java project itself. The <code>classes</code> folder contains
- any required class files (i.e. client code that is not part of the standard
- class libraries, or common libraries shipped with Tomcat). Thus, your Java project
- must be configured to have an output location pointing to the <code>classes</code>
- folder. Similarly, the <code>lib</code> folder contains any required jars. JSPs
- should be developed in the web application's root folder.</p>
-<p>To configure Tomcat to find the web application, a context entry is added to
- Tomcat's <code>server.xml</code> configuration file (found in the <code>/conf</code>
- directory of your Tomcat installation), for each external web application being
- developed. Following is an example extract of context entries for the default
- context (identified by the empty <code>path</code> attribute), and a sample
- web application being developed in an Eclipse workspace (in this case, rooted
- at <code>d:\testspaces\test-space\JSPs\webapps\myWebApp</code>).</p>
-<pre><Context path="" docBase="ROOT" debug="0"/>
-<Context path="/myWebApp" docBase="d:\testspaces\test-space\JSPs\webapps\myWebApp" debug="0"/></pre>
-<p>The corresponding Java project is "<code>JSPs</code>", containing
- the folder "<code>webapps</code>", etc. The project may also contain
- Java source code (for example, in a "<code>src</code>" folder), and
- the output location is set to "<code>JSPs\webapps\myWebApp\WEB-INF\classes</code>".
- JSPs are created in the "<code>myWebApp</code>" folder.</p>
-<p><b>Update</b>: The tomcat 5.0 documentation specifies that "<i>it is NOT
- recommended to place <Context> elements directly in the server.xml file</i>".
- Instead, create a new file <code>myWebApp.xml</code> in the folder <code>$CATALINA_HOME/conf/Catalina/localhost</code>
- with the following content:</p>
-<pre><Context path="/myWebApp" docBase="d:\testspaces\test-space\JSPs\webapps\myWebApp" debug="0"/></pre>
-<h3>Example JSP Project</h3>
-<p>An example JSP project is included in the <code>exampleJspProject.zip</code>
- file, found in the <code>stuff</code> folder of the <code>javafamily</code>
- plug-in. It demonstrates the directory structure and includes a simple JSP and
- associated Java class.</p>
-<h3>Setting a Breakpoint in a JSP</h3>
-<p>To create a breakpoint in a JSP, double click in the JSP edtior ruler on the
- line where you want the breakpoint. The breakpoint will appear in the <b>Breakpoints</b>
- view as well as the editor's vertical ruler. Breakpoints can also be placed
- in Java source code.</p>
-<h3>Launching Tomcat</h3>
-<p>To debug a JSP, Tomcat must be launched in debug mode. This can be done with
- a "Tomcat Server" launch configuration.</p>
-<p>To create a Tomcat launch configuration for a web application in the workspace,
- open the launch configuration dialog, and create a new "Tomcat Server"
- launch configuration. You will notice an error message indicating that the Tomcat
- install directory or "${catalina_home}" does not exist. To solve this
- problem, set the value of the <code>${catalina_home}</code> string variable
- in the <b>Run/Debug </b>> <b>String Substitution</b> preference page to the location
- of your Tomcat installation. For example, "<code>d:\jakarta-tomcat-5.0.2</code>".</p>
-<p>On the Tomcat tab, also provide the location of your web application - for
- example "<code>JSPs\webapps\myWebApp</code>". This can also be done
- by pressing the <b>Browse</b> button and selecting the associated web application
- root folder in the workspace.</p>
-<p>Now you can launch Tomcat by pressing the <b>Debug</b> button.<br>
-</p>
-<h3>Summary to Debug a JSP</h3>
-<p>The following steps must be performed to debug a JSP</p>
-<ul>
- <li>Install Tomcat 5.0.2 or higher</li>
- <li>Set the value of <code>${catalina_home}</code> (<b>Run/Debug</b> > <b>String
- Substitution</b> preference page) to point to the Tomcat installation</li>
- <li>Create a project (web app) in your workspace in the expanded WAR format</li>
- <li>Ensure the output location of the project is the <code>WEB-INF/classes</code>
- folder</li>
- <li>Configure Tomcat to locate the web app by adding a context entry in the
- <code>server.xml</code> file</li>
- <li>Code JSPs in the web app's root folder</li>
- <li>Create a Tomcate Server launch configuration that includes the web app location
- (located on the "Tomcat" tab of the launch config)</li>
-</ul>
-<pre> </pre>
-</body></html>
\ No newline at end of file
diff --git a/org.eclipse.jdt.ui.examples.javafamily/about.html b/org.eclipse.jdt.ui.examples.javafamily/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/about.html
+++ /dev/null
@@ -1,30 +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>20th June, 2002</p>
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the 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.eclipse.jdt.ui.examples.javafamily/build.properties b/org.eclipse.jdt.ui.examples.javafamily/build.properties
deleted file mode 100644
index 7a4cba8..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.javafamily.jar = src/
-bin.includes = plugin.xml,\
- about.html,\
- icons/,\
- plugin.properties,\
- *.jar,\
- ReleaseNotes.html,\
- stuff/
-src.includes = about.html
-source.javafamily.jar = src/
diff --git a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/brkp_obj.gif b/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/brkp_obj.gif
deleted file mode 100644
index 06d0079..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/brkp_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsp_obj.gif b/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsp_obj.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsp_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/tomcat_obj.gif b/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/tomcat_obj.gif
deleted file mode 100644
index 3f18c55..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/tomcat_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.ui.examples.javafamily/plugin.properties b/org.eclipse.jdt.ui.examples.javafamily/plugin.properties
deleted file mode 100644
index 2f65b4d..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/plugin.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName= Java Development Tools JavaFamily Example
-providerName= Eclipse.org
-
-##########################################################################
-# JSP Editor
-##########################################################################
-jspEditorName= JSP Editor
-ToggleJspBreakpointAction.label= Toggle Breakpoint in JSP Editor
-
-##########################################################################
-# Tomcat Launching
-##########################################################################
-tomcatLaunchConfigurationTypeName= Tomcat Server
-catalinaHomeDescription= Root Tomcat installation directory
-TomcatSourceLocatorName= Tomcat Source Locator
-
-##########################################################################
-# Preference Page
-##########################################################################
-JavaFamilyExamplePreferencePage.name= JavaFamily Example
diff --git a/org.eclipse.jdt.ui.examples.javafamily/plugin.xml b/org.eclipse.jdt.ui.examples.javafamily/plugin.xml
deleted file mode 100644
index da286f4..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/plugin.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jdt.ui.examples.javafamily"
- name="%pluginName"
- version="3.1.100.qualifier"
- provider-name="%providerName"
- class="org.eclipse.jsp.JspUIPlugin">
-
- <runtime>
- <library name="javafamily.jar"/>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.variables"/>
- <import plugin="org.eclipse.jface"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.text"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- <import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jdt.ui"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.jdt.debug"/>
- <import plugin="org.eclipse.jdt.launching"/>
- <import plugin="org.eclipse.jdt.debug.ui"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.eclipse.ltk.core.refactoring"/>
- </requires>
-
- <!-- =========================================================================== -->
- <!-- Refactoring Participant -->
- <!-- =========================================================================== -->
- <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
- <renameParticipant
- id="org.eclipse.jsp.renameParticipant.IType"
- name="org.eclipse.jsp.renameParticipant.IType"
- class="org.eclipse.jsp.RenameTypeParticipant">
- <enablement>
- <with variable="affectedNatures">
- <iterate operator="or">
- <equals value="org.eclipse.jdt.core.javanature"/>
- </iterate>
- </with>
- <with variable="element">
- <instanceof value="org.eclipse.jdt.core.IType"/>
- </with>
- </enablement>
- </renameParticipant>
- </extension>
-
- <!-- =========================================================================== -->
- <!-- JSP Editor -->
- <!-- =========================================================================== -->
- <extension
- point="org.eclipse.ui.editors">
- <editor
- id="org.eclipse.jdt.ui.examples.JSPEditor"
- name="%jspEditorName"
- extensions="jsp"
- icon="icons/full/obj16/jsp_obj.gif"
- contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
- class="org.eclipse.jdt.internal.ui.examples.jspeditor.JspEditor"
- default="true">
- </editor>
- </extension>
-
- <!-- =========================================================================== -->
- <!-- Tomcat Launcnhing -->
- <!-- =========================================================================== -->
- <extension
- point="org.eclipse.debug.core.launchConfigurationTypes">
- <launchConfigurationType
- name="%tomcatLaunchConfigurationTypeName"
- delegate="org.eclipse.jsp.launching.TomcatLaunchDelegate"
- modes="run, debug"
- id="org.eclipse.jsp.TomcatConfigurationType"
- sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
- sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
- </launchConfigurationType>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- type="org.eclipse.jsp.TomcatConfigurationType"
- class="org.eclipse.jsp.launching.TomcatTabGroup"
- id="org.eclipse.jsp.TomcatTabGroup">
- </launchConfigurationTabGroup>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- icon="icons/full/obj16/tomcat_obj.gif"
- configTypeID="org.eclipse.jsp.TomcatConfigurationType"
- id="org.eclipse.jsp.image.Tomcat">
- </launchConfigurationTypeImage>
- </extension>
- <extension
- point="org.eclipse.core.variables.valueVariables">
- <variable
- name="catalina_home"
- description="%catalinaHomeDescription">
- </variable>
- </extension>
- <extension point="org.eclipse.jdt.launching.classpathProviders">
- <classpathProvider
- id="org.eclipse.jsp.tomcatClasspathProvider"
- class="org.eclipse.jsp.launching.TomcatClasspathProvider">
- </classpathProvider>
- </extension>
-
- <extension
- point="org.eclipse.ui.editorActions">
- <editorContribution
- targetID="org.eclipse.jdt.ui.examples.JSPEditor"
- id="org.eclipse.jsp.BreakpointRulerActions">
- <action
- label="%ToggleJspBreakpointAction.label"
- class="org.eclipse.jsp.launching.ToggleJspBreakpointRulerActionDelegate"
- actionID="RulerDoubleClick"
- id="org.eclipse.jsp.actions.ToggleJspBreakpointAction">
- </action>
- </editorContribution>
- </extension>
-
- <extension
- point="org.eclipse.ui.ide.markerImageProviders">
- <imageprovider
- id="org.eclipse.jsp.breakpointMarkerProvider"
- markertype="org.eclipse.jdt.debug.javaStratumLineBreakpointMarker"
- icon="icons/full/obj16/brkp_obj.gif">
- </imageprovider>
- </extension>
-
- <extension
- point="org.eclipse.ui.preferencePages">
- <page name="%JavaFamilyExamplePreferencePage.name"
- id="org.eclipse.jsp.JavaFamilyExamplePreferencePage"
- class="org.eclipse.jsp.JavaFamilyExamplePreferencePage"
- category= "org.eclipse.jdt.ui.preferences.JavaBasePreferencePage">
- </page>
- </extension>
-
-</plugin>
diff --git a/org.eclipse.jdt.ui.examples.javafamily/sample/Date2.java b/org.eclipse.jdt.ui.examples.javafamily/sample/Date2.java
deleted file mode 100644
index d04bcad..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/sample/Date2.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 26, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-
-/**
- * @author weinand
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class Date2 {
-
- public int getHours() {
- return 8;
- }
-
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/sample/easy.jsp b/org.eclipse.jdt.ui.examples.javafamily/sample/easy.jsp
deleted file mode 100644
index a8a0ac3..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/sample/easy.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ page contentType="text/html" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<html>
- <head>
- <title>JSP is Easy</title>
- </head>
- <body bgcolor="white">
- <jsp:useBean id="clock" class="Date2" />
-
- <%! int globalCounter= 0; %>
-
- <h1>JSP is as easy as ...</h1>
-
- <%-- Calculate the sum of 1 + 2 + 3 dynamically --%>
- 1 + 2 + 3 = <c:out value="${1 + 2 + 3}" />
-
- <% int i= 4;
- i= i+1; %>
-
- <% if (clock.getHours() < 12) { %>
- Good morning!
- <% } else if (clock.getHours() < 17) { %>
- Good day!
- <% } else { %>
- Good evening!
- <% } %>
-
- </body>
-</html>
diff --git a/org.eclipse.jdt.ui.examples.javafamily/scripts/exportplugin.xml b/org.eclipse.jdt.ui.examples.javafamily/scripts/exportplugin.xml
deleted file mode 100644
index f3bfe88..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/scripts/exportplugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<project name="org.eclipse.jdt.ui.examples.javafamily" default="export" basedir="..">
- <target name="init">
- <tstamp/>
- <property name="destdir" value="../../plugin-export" />
- <property name="plugin" value="org.eclipse.jdt.ui.examples.javafamily" />
- <property name="qualifier" value="zzz${DSTAMP}-${TSTAMP}" />
- <property name="plugin_version" value="_3.1.100.${qualifier}" />
- <property name="dest" value="${destdir}/${plugin}${plugin_version}" />
- </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}/javafamily.jar"
- basedir="bin"
- />
- <copy file="plugin.xml" todir="${dest}"/>
- <replaceregexp file="${dest}/plugin.xml" match="version="((\d)+\.(\d)+\.(\d)+\.)qualifier" replace="version=\"\1${qualifier}" byline="true" />
- <copy file="plugin.properties" todir="${dest}"/>
- <copy todir="${dest}/icons">
- <fileset dir="icons" />
- </copy>
- <zip zipfile="${dest}/javafamilysrc.zip">
- <fileset dir="src" />
- </zip>
- </target>
-</project>
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndex.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndex.java
deleted file mode 100644
index 434ba64..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndex.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.indexsearch;
-
-import java.util.HashSet;
-
-public interface IIndex {
-
- void addRef(String word, String path);
-
- void remove(String path);
-
- void queryPrefix(HashSet result, String prefix);
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexQuery.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexQuery.java
deleted file mode 100644
index 13197fd..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexQuery.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.indexsearch;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * An IndeyQuery is used to perform a query against the indexing framework.
- */
-public interface IIndexQuery {
-
- /**
- * Compute the list of paths which are keying index files and add them to the given list.
- */
- void computePathsKeyingIndexFiles(ArrayList requiredIndexKeys);
-
- /**
- * Perform the query on the given index and adds the paths of all found documents to the given collector.
- */
- void findIndexMatches(IIndex index, HashSet collector, IProgressMonitor progressMonitor) throws IOException;
-
- /**
- * Locate all matches of this query in the given file candidate and return them via the resultcollector.
- */
- void locateMatches(IFile candidate, ISearchResultCollector resultCollector);
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexer.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexer.java
deleted file mode 100644
index af2f342..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexer.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.indexsearch;
-
-import java.io.IOException;
-
-public interface IIndexer {
-
- void index(IIndex index) throws IOException;
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/ISearchResultCollector.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/ISearchResultCollector.java
deleted file mode 100644
index 1848035..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/ISearchResultCollector.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.indexsearch;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * A <code>ISearchResultCollector</code> collects search results from a <code>search</code>
- * query to a <code>SearchEngine</code>. Clients must implement this interface and pass
- * an instance to the <code>search(...)</code> methods.
- * <p>
- * The order of the results is unspecified. Clients must not rely on this order to display results,
- * but they should sort these results.
- * <p>
- * Clients may implement this interface.
- * </p>
- *
- * @see SearchEngine#search
- */
-public interface ISearchResultCollector {
-
- /**
- * Accepts the given search result.
- *
- * @param resource the resource in which the match has been found
- * @param start the start position of the match, -1 if it is unknown
- * @param length the length of the match
- * @exception CoreException if this collector had a problem accepting the search result
- */
- public void accept(IResource resource, int start, int length) throws CoreException;
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java
deleted file mode 100644
index 86b3302..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.indexsearch;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-/**
- * A <code>SearchEngine</code> searches for java elements following a search pattern.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- */
-public class SearchEngine {
-
- static class MyIndex implements IIndex {
-
- private HashMap fMap= new HashMap();
-
- public void addRef(String word, String path) {
- System.err.println("Index.add: " + path + " " + word); //$NON-NLS-1$ //$NON-NLS-2$
- HashMap words= (HashMap) fMap.get(path);
- if (words == null) {
- words= new HashMap();
- fMap.put(path, words);
- }
- words.put(word, word);
- }
-
- public void remove(String path) {
- System.err.println("Index.remove: " + path); //$NON-NLS-1$
- fMap.remove(path);
- }
-
- public void queryPrefix(HashSet results, String w) {
- Iterator iter= fMap.keySet().iterator();
- while (iter.hasNext()) {
- String path= (String) iter.next();
- HashMap words= (HashMap) fMap.get(path);
- if (words.containsKey(w))
- results.add(path);
- }
- }
- }
-
- /* Waiting policies */
- /**
- * The search operation throws an <code>org.eclipse.core.runtime.OperationCanceledException</code>
- * if the underlying indexer has not finished indexing the workspace.
- */
- public static int CANCEL_IF_NOT_READY_TO_SEARCH = 0;
- /**
- * The search operation waits for the underlying indexer to finish indexing
- * the workspace before starting the search.
- */
- public static int WAIT_UNTIL_READY_TO_SEARCH = 1;
-
-
- private static SearchEngine fgSearchEngine;
-
- private HashMap fIndexes= new HashMap();
-
- private SearchEngine() {
- }
-
- /**
- *
- * @return
- */
- public static SearchEngine getSearchEngine() {
- if (fgSearchEngine == null)
- fgSearchEngine= new SearchEngine();
- return fgSearchEngine;
- }
-
- /**
- * Trigger removal of a resource to an index
- * Note: the actual operation is performed in background
- */
- public void remove(String resourceName, IPath indexedContainer) {
- IIndex index= getIndex(indexedContainer, false);
- if (index != null)
- index.remove(resourceName);
- }
-
- public void add(IPath indexedContainer, IIndexer indexer) {
- IIndex index= getIndex(indexedContainer, true);
- try {
- indexer.index(index);
- } catch (IOException e) {
- }
- }
-
- /**
- * Returns the files that correspond to the paths that have been collected.
- * TODO_SEARCH
- */
- private IFile[] getFiles(HashSet pc, IWorkspace workspace) {
- IFile[] result= new IFile[pc.size()];
- int i = 0;
- for (Iterator iter= pc.iterator(); iter.hasNext();) {
- String resourcePath= (String)iter.next();
- IPath path= new Path(resourcePath);
- result[i++]= workspace.getRoot().getFile(path);
- }
- return result;
- }
-
- /**
- * Perform the given query against the index and return results via the resultCollector.
- */
- public void search(IIndexQuery search, ISearchResultCollector resultCollector,
- IProgressMonitor progressMonitor, int waitingPolicy) {
-
- HashSet pathCollector= new HashSet();
- IProgressMonitor pm= progressMonitor == null ? null : new SubProgressMonitor(progressMonitor, 5);
- execute(search, pathCollector, pm);
-
- /* TODO_SEARCH */
- IFile[] files= getFiles(pathCollector, ResourcesPlugin.getWorkspace());
- for (int i= 0; i < files.length; i++) {
- IFile file= files[i];
- search.locateMatches(file, resultCollector);
- }
- }
-
- public IIndex getIndex(IPath indexPath, boolean create) {
- IIndex ix= (IIndex) fIndexes.get(indexPath);
- if (create && ix == null) {
- ix= new MyIndex();
- fIndexes.put(indexPath, ix);
- }
- return ix;
- }
-
- private boolean execute(IIndexQuery search, HashSet pathCollector, IProgressMonitor progressMonitor) {
-
- if (progressMonitor != null && progressMonitor.isCanceled())
- throw new OperationCanceledException();
- boolean isComplete= true;
- IIndex[] searchIndexes= getIndexes(search);
- try {
- int max= searchIndexes.length;
- if (progressMonitor != null) {
- progressMonitor.beginTask("", max); //$NON-NLS-1$
- }
- for (int i = 0; i < max; i++) {
- isComplete &= search(search, searchIndexes[i], pathCollector, progressMonitor);
- if (progressMonitor != null) {
- if (progressMonitor.isCanceled()) {
- throw new OperationCanceledException();
- } else {
- progressMonitor.worked(1);
- }
- }
- }
- return isComplete;
- } finally {
- if (progressMonitor != null) {
- progressMonitor.done();
- }
- }
- }
-
- private IIndex[] getIndexes(IIndexQuery search) {
- IPath[] fIndexKeys= null; // cache of the keys for looking index up
- if (fIndexKeys == null) {
- ArrayList requiredIndexKeys= new ArrayList();
- search.computePathsKeyingIndexFiles(requiredIndexKeys);
- fIndexKeys= new IPath[requiredIndexKeys.size()];
- requiredIndexKeys.toArray(fIndexKeys);
- }
- // acquire the in-memory indexes on the fly
- int length = fIndexKeys.length;
- IIndex[] indexes = new IIndex[length];
- int count = 0;
- for (int i = 0; i < length; i++){
- // may trigger some index recreation work
- IIndex index = getIndex(fIndexKeys[i], false);
- if (index != null) indexes[count++] = index; // only consider indexes which are ready yet
- }
- if (count != length) {
- System.arraycopy(indexes, 0, indexes= new IIndex[count], 0, count);
- }
- return indexes;
- }
-
- private boolean search(IIndexQuery search, IIndex index, HashSet pathCollector, IProgressMonitor progressMonitor) {
-
- if (progressMonitor != null && progressMonitor.isCanceled())
- throw new OperationCanceledException();
-
- if (index == null)
- return true;
- try {
- search.findIndexMatches(index, pathCollector, progressMonitor);
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationAdapter.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationAdapter.java
deleted file mode 100644
index 6816dc7..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationAdapter.java
+++ /dev/null
@@ -1,40 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.reconciler.IReconcileResult;
-import org.eclipse.jface.text.source.Annotation;
-
-
-/**
- * Adapts a temporary or persitent annotation to a reconcile result.
- *
- * @since 3.0
- */
-public abstract class AnnotationAdapter implements IReconcileResult {
-
- /**
- * Creates and returns the annotation adapted by this adapter.
- *
- * @return an annotation (can be temporary or persistent)
- */
- public abstract Annotation createAnnotation();
-
- /**
- * The position of the annotation adapted by this adapter.
- *
- * @return the position
- */
- public abstract Position getPosition();
-
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DocumentAdapter.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DocumentAdapter.java
deleted file mode 100644
index 0a81f75..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DocumentAdapter.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.reconciler.IReconcilableModel;
-
-/**
- * Adapts an <code>IDocument</code> to a <code>IReconcilableModel</code>.
- *
- * @since 3.0
- */
-public class DocumentAdapter implements IReconcilableModel {
-
- private IDocument fDocument;
-
- /**
- * Creates a text model adapter for the given document.
- *
- * @param document
- */
- public DocumentAdapter(IDocument document) {
- fDocument= document;
- }
-
- /**
- * Returns this model's document.
- *
- * @return the model's input document
- */
- public IDocument getDocument() {
- return fDocument;
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JavaReconcileStep.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JavaReconcileStep.java
deleted file mode 100644
index 32a878f..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JavaReconcileStep.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-
-import org.eclipse.jface.text.Assert;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.reconciler.AbstractReconcileStep;
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.eclipse.jface.text.reconciler.IReconcilableModel;
-import org.eclipse.jface.text.reconciler.IReconcileResult;
-import org.eclipse.jface.text.reconciler.IReconcileStep;
-import org.eclipse.jface.text.source.Annotation;
-
-import org.eclipse.ui.editors.text.EditorsUI;
-
-import org.eclipse.ui.texteditor.AnnotationTypeLookup;
-
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IProblemRequestor;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.WorkingCopyOwner;
-import org.eclipse.jdt.core.compiler.IProblem;
-
-import org.eclipse.jdt.internal.core.BufferManager;
-
-
-/**
- * This reconcile step has a Java source document as
- * input model and maintains a Java working copy as its model.
- * <p>
- * FIXME: We do not destroy the temporary working copy at the end.
- * There are two ways to fix this:
- * 1. destroy it after each reconcile call ==> no internal model anylonger
- * 2. add life-cycle to reconcile steps (at least dispose/destroy)
- * </p>
- * @since 3.0
- */
-public class JavaReconcileStep extends AbstractReconcileStep {
-
- private AnnotationTypeLookup fAnnotationTypeLookup= EditorsUI.getAnnotationTypeLookup();
-
- private static class TemporaryWorkingCopyOwner extends WorkingCopyOwner {
-
-
- /*
- * @see org.eclipse.jdt.core.WorkingCopyOwner#createBuffer(org.eclipse.jdt.core.ICompilationUnit)
- */
- public IBuffer createBuffer(ICompilationUnit workingCopy) {
- // FIXME: Don't know how to get a buffer without using internal API.
- return new BufferManager().createBuffer(workingCopy);
- }
- }
-
- private class ProblemAdapter extends AnnotationAdapter {
-
- private IProblem fProblem;
- private Position fPosition;
-
- ProblemAdapter(IProblem problem) {
- fProblem= problem;
- }
-
- public Position getPosition() {
- if (fPosition == null)
- fPosition= createPositionFromProblem();
- return fPosition;
- }
-
- public Annotation createAnnotation() {
- int start= fProblem.getSourceStart();
- if (start < 0)
- return null;
-
- int length= fProblem.getSourceEnd() - fProblem.getSourceStart() + 1;
- if (length < 0)
- return null;
-
- int type= IMarker.SEVERITY_INFO;
- if (fProblem.isError())
- type= IMarker.SEVERITY_ERROR;
- else if (fProblem.isWarning())
- type= IMarker.SEVERITY_WARNING;
-
- return new Annotation(fAnnotationTypeLookup.getAnnotationType(IMarker.PROBLEM, type), false, fProblem.getMessage());
- }
-
- private Position createPositionFromProblem() {
- int start= fProblem.getSourceStart();
- if (start < 0)
- return null;
-
- int length= fProblem.getSourceEnd() - fProblem.getSourceStart() + 1;
- if (length < 0)
- return null;
-
- return new Position(start, length);
- }
- }
-
- private class ProblemRequestor implements IProblemRequestor {
-
- private List fCollectedProblems;
- private boolean fIsActive= false;
- private boolean fIsRunning= false;
-
- /*
- * @see IProblemRequestor#beginReporting()
- */
- public void beginReporting() {
- fIsRunning= true;
- fCollectedProblems= new ArrayList();
- }
-
- /*
- * @see IProblemRequestor#acceptProblem(IProblem)
- */
- public void acceptProblem(IProblem problem) {
- if (isActive())
- fCollectedProblems.add(problem);
- }
-
- /*
- * @see IProblemRequestor#endReporting()
- */
- public void endReporting() {
- fIsRunning= false;
-
-// WAS:
-// if (!isActive())
-// return;
-//
-// if (isCanceled())
-// return;
- }
-
- public IReconcileResult[] getReconcileResult() {
- Assert.isTrue(!fIsRunning);
-
- int size= fCollectedProblems.size();
- IReconcileResult[] result= new IReconcileResult[size];
-
- for (int i= 0; i < size; i++)
- result[i]= new ProblemAdapter((IProblem)fCollectedProblems.get(i));
-
- return result;
- }
-
- /*
- * @see IProblemRequestor#isActive()
- */
- public boolean isActive() {
- return fIsActive && fCollectedProblems != null && !isCanceled();
- }
-
- /**
- * Sets the active state of this problem requestor.
- *
- * @param isActive the state of this problem requestor
- */
- public void setIsActive(boolean isActive) {
- if (fIsActive != isActive) {
- fIsActive= isActive;
- if (fIsActive)
- startCollectingProblems();
- else
- stopCollectingProblems();
- }
- }
-
- /**
- * Tells this annotation model to collect temporary problems from now on.
- */
- private void startCollectingProblems() {
- fCollectedProblems= new ArrayList();
- }
-
- /**
- * Tells this annotation model to no longer collect temporary problems.
- */
- private void stopCollectingProblems() {
- // empty implementation
- }
- }
-
- /**
- * Adapts an <code>ICompilationUnit</code> to the <code>ITextModel</code> interface.
- */
- class CompilationUnitAdapter implements IReconcilableModel {
-
- private ICompilationUnit fCompilationUnit;
-
- CompilationUnitAdapter(ICompilationUnit cu) {
- fCompilationUnit= cu;
- }
-
- private ICompilationUnit getCompilationUnit() {
- return fCompilationUnit;
- }
- }
-
- private CompilationUnitAdapter fWorkingCopy;
- private ProblemRequestor fProblemRequestor;
- private WorkingCopyOwner fTemporaryWorkingCopyOwner;
-
- /**
- * Creates the last reconcile step of the pipe.
- */
- public JavaReconcileStep(IFile jspFile) {
- Assert.isNotNull(jspFile);
- fTemporaryWorkingCopyOwner= new TemporaryWorkingCopyOwner();
- try {
- fWorkingCopy= new CompilationUnitAdapter(createTemporaryWorkingCopy(jspFile));
- } catch (JavaModelException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Creates an intermediate reconcile step which adds
- * the given step to the pipe.
- */
- public JavaReconcileStep(IReconcileStep step, IFile jspFile) {
- super(step);
- Assert.isNotNull(jspFile);
- fTemporaryWorkingCopyOwner= new TemporaryWorkingCopyOwner();
- try {
- fWorkingCopy= new CompilationUnitAdapter(createTemporaryWorkingCopy(jspFile));
- } catch (JavaModelException e) {
- e.printStackTrace();
- }
- }
-
- /*
- * @see AbstractReconcileStep#reconcileModel(DirtyRegion, IRegion)
- */
- protected IReconcileResult[] reconcileModel(DirtyRegion dirtyRegion, IRegion subRegion) {
- Assert.isTrue(getInputModel() instanceof DocumentAdapter, "wrong model"); //$NON-NLS-1$
-
- ICompilationUnit cu= fWorkingCopy.getCompilationUnit();
- // Cannot reconcile if CU could not be built
- if (cu == null)
- return null;
-
- System.out.println("reconciling java model..."); //$NON-NLS-1$
-
- IBuffer buffer;
- try {
- buffer= cu.getBuffer();
- } catch (JavaModelException e) {
- e.printStackTrace();
- buffer= null;
- }
-
- if (buffer != null)
- buffer.setContents(((DocumentAdapter)getInputModel()).getDocument().get());
-
- try {
- synchronized (cu) {
- fProblemRequestor.setIsActive(true);
- cu.reconcile(true, getProgressMonitor());
- }
- } catch (JavaModelException ex) {
- ex.printStackTrace();
- } finally {
- fProblemRequestor.setIsActive(false);
- }
-
- return fProblemRequestor.getReconcileResult();
- }
-
- /*
- * @see AbstractReconcileStep#getModel()
- */
- public IReconcilableModel getModel() {
- return fWorkingCopy;
- }
-
- /*
- * @see org.eclipse.jdt.internal.corext.util.WorkingCopyUtil#getNewWorkingCopy
- */
- private ICompilationUnit createTemporaryWorkingCopy(IFile jspFile) throws JavaModelException {
-
- IContainer parent= jspFile.getParent();
- IPackageFragment packageFragment= null;
- IJavaElement je= JavaCore.create(parent);
-
- if (je == null || !je.exists())
- return null;
-
- switch (je.getElementType()) {
- case IJavaElement.PACKAGE_FRAGMENT:
- je= je.getParent();
- // fall through
-
- case IJavaElement.PACKAGE_FRAGMENT_ROOT:
- IPackageFragmentRoot packageFragmentRoot= (IPackageFragmentRoot)je;
- packageFragment= packageFragmentRoot.getPackageFragment(IPackageFragmentRoot.DEFAULT_PACKAGEROOT_PATH);
- break;
-
- case IJavaElement.JAVA_PROJECT:
- IJavaProject jProject= (IJavaProject)je;
-
- if (!jProject.exists()) {
- System.out.println("Abort reconciling: cannot create working copy: JSP is not in a Java project"); //$NON-NLS-1$
- return null;
- }
-
- packageFragmentRoot= null;
- IPackageFragmentRoot[] packageFragmentRoots= jProject.getPackageFragmentRoots();
- int i= 0;
- while (i < packageFragmentRoots.length) {
- if (!packageFragmentRoots[i].isArchive() && !packageFragmentRoots[i].isExternal()) {
- packageFragmentRoot= packageFragmentRoots[i];
- break;
- }
- i++;
- }
- if (packageFragmentRoot == null) {
- System.out.println("Abort reconciling: cannot create working copy: JSP is not in a Java project with source package fragment root"); //$NON-NLS-1$
- return null;
- }
- packageFragment= packageFragmentRoot.getPackageFragment(IPackageFragmentRoot.DEFAULT_PACKAGEROOT_PATH);
- break;
-
- default :
- return null;
- }
-
- fProblemRequestor= new ProblemRequestor();
-
- return packageFragment.getCompilationUnit("Demo.java").getWorkingCopy(fTemporaryWorkingCopyOwner, fProblemRequestor, getProgressMonitor()); //$NON-NLS-1$
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java
deleted file mode 100644
index d24477a..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-import org.eclipse.jface.text.Assert;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.reconciler.AbstractReconcileStep;
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.eclipse.jface.text.reconciler.IReconcileStep;
-import org.eclipse.jface.text.reconciler.IReconcileResult;
-import org.eclipse.jface.text.reconciler.IReconcilableModel;
-import org.eclipse.jface.text.source.translation.ITranslator;
-
-import org.eclipse.jsp.JspTranslator;
-
-/**
- * This reconcile step has a JSP source document as
- * input model and maintains a document that contains the Java
- * source.
- *
- * @since 3.0
- */
-public class Jsp2JavaReconcileStep extends AbstractReconcileStep {
-
- private DocumentAdapter fModel;
- private ITranslator fJspTranslator;
-
- /**
- * Creates the last reconcile step of the pipe.
- */
- public Jsp2JavaReconcileStep() {
- initialize();
- }
-
- /**
- * Creates an intermediate reconcile step which adds
- * the given step to the pipe.
- */
- public Jsp2JavaReconcileStep(IReconcileStep step) {
- super(step);
- initialize();
- }
-
- protected void initialize() {
- fJspTranslator= new JspTranslator();
- fJspTranslator.setTagHandlerFactory(new Jsp2JavaTagHandlerFactory());
- }
-
- /*
- * @see AbstractReconcileStep#reconcileModel(DirtyRegion, IRegion)
- */
- protected IReconcileResult[] reconcileModel(DirtyRegion dirtyRegion, IRegion subRegion) {
- Assert.isTrue(getInputModel() instanceof DocumentAdapter, "wrong model"); //$NON-NLS-1$
-
- System.out.println("reconciling jsp2java..."); //$NON-NLS-1$
-
- Reader reader= new StringReader(((DocumentAdapter)fInputModel).getDocument().get());
- try {
- String javaSource= fJspTranslator.translate(reader, "Demo"); //$NON-NLS-1$
- fModel= new DocumentAdapter(new Document(javaSource));
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- }
-
- // This reconcile step does not create own results
- return null;
- }
-
- /*
- * @see AbstractReconcileStep#getModel()
- */
- public IReconcilableModel getModel() {
- return fModel;
- }
-
- /*
- * @see AbstractReconcileStep#convertToInputModel(IReconcileResult[])
- */
- protected IReconcileResult[] convertToInputModel(IReconcileResult[] inputResults) {
-
- if (inputResults == null)
- return null;
-
- // the "only" thing we need to do is to adapt the positions
- int[] smap= fJspTranslator.getLineMapping();
-
- for (int i= 0; i < inputResults.length; i++) {
-
- if (isCanceled())
- return null;
-
- if (!(inputResults[i] instanceof AnnotationAdapter))
- continue;
-
- AnnotationAdapter result= (AnnotationAdapter)inputResults[i];
- Position pos= result.getPosition();
- int javaLine;
- try {
- javaLine= fModel.getDocument().getLineOfOffset(pos.offset);
-
- // Adjust offset to be relative to line beginning
- pos.offset -= fModel.getDocument().getLineOffset(javaLine);
- int relativeLineOffsetInJava= pos.offset;
-
- int jspLine= smap[javaLine + 1]; // document is 0-based, smap is 1-based
-
- // Add Jsp line offset
- pos.offset += ((DocumentAdapter)getInputModel()).getDocument().getLineOffset(jspLine-1); // document is 0-based, smap is 1-based
-
- String jspLineStr= ((DocumentAdapter)getInputModel()).getDocument().get(((DocumentAdapter)getInputModel()).getDocument().getLineOffset(jspLine-1), ((DocumentAdapter)getInputModel()).getDocument().getLineLength(jspLine-1));
-
- // XXX: Once partitioner is in place the partition can be used to ease section detection
- int offsetInLine= fJspTranslator.backTranslateOffsetInLine(jspLineStr, null, relativeLineOffsetInJava, null);
- if (offsetInLine > 0)
- pos.offset += offsetInLine;
-
- } catch (BadLocationException e) {
- e.printStackTrace();
- }
- }
- return inputResults;
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java
deleted file mode 100644
index 16639a2..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.io.IOException;
-
-import org.eclipse.jface.text.Assert;
-import org.eclipse.jface.text.source.translation.ITagHandler;
-import org.eclipse.jface.text.source.translation.ITranslatorResultCollector;
-
-/**
- *
- * @since 3.0
- */
-public class Jsp2JavaTagHandler implements ITagHandler {
-
- private boolean fInUseBean;
- private boolean fInTagLib;
- private String fTagLibValue;
- private String fClass;
- private String fId;
- private String fSource;
- private boolean fInDeclaration;
- private boolean fInJavaSection;
-
-
- /*
- * @see org.eclipse.jface.text.source.ITagHandler#canHandleTag(java.lang.String)
- */
- public boolean canHandleTag(String tag) {
- return true;
- }
-
- /*
- * @see org.eclipse.jface.text.source.ITagHandler#canHandleText(java.lang.String)
- */
- public boolean canHandleText(String text) {
- return true;
- }
-
- public void reset(String startTag) {
- fInUseBean= "jsp:useBean".equals(startTag); //$NON-NLS-1$
- fInTagLib= "c:out".equals(startTag); //$NON-NLS-1$
- fInJavaSection= "<%".equals(startTag); //$NON-NLS-1$
- fInDeclaration= "<%!".equals(startTag); //$NON-NLS-1$
- }
- /*
- * @see org.eclipse.jface.text.source.ITagHandler#addAttribute(java.lang.String, java.lang.String)
- */
- public void addAttribute(String name, String value, int sourceLineNumber) {
- if (fInUseBean) {
- if ("id".equals(name)) //$NON-NLS-1$
- fId= value;
- else if ("class".equals(name)) //$NON-NLS-1$
- fClass= value;
- }
- if (fInTagLib) {
- fTagLibValue= value;
- }
- if ("source".equals(name)) //$NON-NLS-1$
- fSource= value;
- }
-
- /*
- * @see org.eclipse.jface.text.source.ITagHandler#backTranslateOffsetInLine(java.lang.String, int)
- */
- public int backTranslateOffsetInLine(String originalLine, String translatedLine, int offsetInTranslatedLine) {
- int javaPartitionStart= 0;
- if (originalLine.indexOf("<%") != -1) //$NON-NLS-1$
- javaPartitionStart= handleJavaSection(originalLine, offsetInTranslatedLine);
- else if (originalLine.indexOf("<jsp:useBean id=\"") != -1) { //$NON-NLS-1$
- javaPartitionStart= handleUseBeanTag(originalLine, offsetInTranslatedLine);
- } else if (originalLine.indexOf("<c:out value=\"${") != -1) { //$NON-NLS-1$
- javaPartitionStart= handleTagLib(originalLine, offsetInTranslatedLine);
- }
- return javaPartitionStart;
- }
-
- private int handleJavaSection(String jspLineStr, int relativeLineOffsetInJava) {
- return jspLineStr.indexOf("<%") + 3; //$NON-NLS-1$
- }
-
- private int handleTagLib(String jspLineStr, int relativeLineOffsetInJava) {
- int javaFileOffset= "System.out.println(".length(); //$NON-NLS-1$
- return jspLineStr.indexOf("<c:out value=\"${") + 16 - javaFileOffset; //$NON-NLS-1$
- }
-
- /*
- * This is a good example where the relative line offset in the Java
- * document cannot be directly mapped back to Jsp document.
- */
- private int handleUseBeanTag(String jspLineStr, int relativeLineOffsetInJava) {
-
- int javaPartitionStart;
-
- int variableNameStart= jspLineStr.indexOf("<jsp:useBean id=\"") + 17; //$NON-NLS-1$
- int variableNameLength= Math.max(0, jspLineStr.indexOf('"', variableNameStart) - variableNameStart);
-
- int typeStart= jspLineStr.indexOf("class=\"") + 7; //$NON-NLS-1$
- int typeLength= Math.max(0, jspLineStr.indexOf('"', typeStart) - typeStart);
-
- if (relativeLineOffsetInJava < typeLength) {
- javaPartitionStart= typeStart;
- } else if (relativeLineOffsetInJava < typeLength + variableNameLength)
- javaPartitionStart= variableNameStart;
- else
- javaPartitionStart= typeStart;
-
- // start relative to Jsp line start
- return javaPartitionStart - relativeLineOffsetInJava;
- }
-
- /*
- * @see org.eclipse.jface.text.source.ITagHandler#processEndTag(ITranslatorResultCollector, int)
- */
- public void processEndTag(ITranslatorResultCollector resultCollector, int sourceLineNumber) throws IOException {
- Assert.isTrue(resultCollector instanceof JspTranslatorResultCollector);
-
- JspTranslatorResultCollector jspResultCollector= (JspTranslatorResultCollector)resultCollector;
-
- if (fInUseBean) {
- if (fId != null && fClass != null) {
- jspResultCollector.appendLocalDeclaration(fClass + " " + fId + "= new " + fClass + "();\n", sourceLineNumber); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- fId= fClass= null;
- }
- fInUseBean= false;
- }
- if (fInTagLib && fTagLibValue != null) {
- jspResultCollector.appendContent("System.out.println(" + fTagLibValue.substring(2, fTagLibValue.length() - 1) + ");\n", sourceLineNumber); //$NON-NLS-1$ //$NON-NLS-2$
- fTagLibValue= null;
- fInTagLib= false;
- }
- if (fInJavaSection) {
- int i= 0;
- StringBuffer out= new StringBuffer();
- while (i < fSource.length()) {
- char c= fSource.charAt(i++);
- if (c == '\n') {
- jspResultCollector.appendContent(out.toString() + "\n", sourceLineNumber++); //$NON-NLS-1$
- out.setLength(0);
- } else {
- out.append(c);
- }
- }
- if (out.length() > 0) {
- jspResultCollector.appendContent(out.toString() + "\n", sourceLineNumber); //$NON-NLS-1$
- }
- }
- if (fInDeclaration) {
- int i= 0;
- StringBuffer out= new StringBuffer();
- while (i < fSource.length()) {
- char c= fSource.charAt(i++);
- if (c == '\n') {
- jspResultCollector.appendDeclaration(out.toString() + "\n", sourceLineNumber++); //$NON-NLS-1$
- out.setLength(0);
- } else {
- out.append(c);
- }
- }
- if (out.length() > 0) {
- jspResultCollector.appendDeclaration(out.toString() + "\n", sourceLineNumber); //$NON-NLS-1$
- }
- }
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandlerFactory.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandlerFactory.java
deleted file mode 100644
index 64d1067..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandlerFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import org.eclipse.jface.text.source.translation.ITagHandler;
-import org.eclipse.jface.text.source.translation.ITagHandlerFactory;
-
-/**
- * First cut of JSP to Java tag handler factory.
- * Only one handler is used to do the job.
- *
- * @since 3.0
- */
-public class Jsp2JavaTagHandlerFactory implements ITagHandlerFactory {
-
- private ITagHandler fTagHandler= new Jsp2JavaTagHandler();
-
- /*
- * @see org.eclipse.jface.text.source.IHandlerFactory#getHandler(java.lang.String)
- */
- public ITagHandler getHandler(String tag) {
- fTagHandler.reset(tag);
- return fTagHandler;
- }
-
- /*
- * @see org.eclipse.jface.text.source.IHandlerFactory#findHandler(java.lang.String)
- */
- public ITagHandler findHandler(String text) {
- return fTagHandler;
- }
-
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspEditor.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspEditor.java
deleted file mode 100644
index 369f585..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspEditor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import org.eclipse.jface.text.source.IAnnotationAccess;
-
-import org.eclipse.ui.editors.text.FileDocumentProvider;
-import org.eclipse.ui.editors.text.TextEditor;
-
-import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;
-
-
-/**
- * A simple JSP Editor.
- *
- * @since 3.0
- */
-public class JspEditor extends TextEditor {
-
- /**
- * Creates a new JSP editor.
- */
- public JspEditor() {
- super();
- setSourceViewerConfiguration(new JspSourceViewerConfiguration(this));
- setDocumentProvider(new FileDocumentProvider());
-
-
- /*
- * FIXME:
- * This would be the right thing to do. Currently
- * we share the preferences with the text editor.
- */
-// setPreferenceStore(JspUIPlugin.getDefault().getPreferenceStore());
- }
-
- /*
- * @see TextEditor#createAnnotationAccess()
- */
- protected IAnnotationAccess createAnnotationAccess() {
- return new DefaultMarkerAnnotationAccess();
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java
deleted file mode 100644
index 75d307e..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.eclipse.jface.text.reconciler.IReconcileStep;
-import org.eclipse.jface.text.reconciler.IReconcileResult;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.ISourceViewer;
-
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Reconciling strategy for Java parts in JSP files.
- *
- * @since 3.0
- */
-public class JspReconcilingStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension {
-
- private IReconcileStep fFirstStep;
- private ITextEditor fTextEditor;
- private IProgressMonitor fProgressMonitor;
-
- public JspReconcilingStrategy(ISourceViewer sourceViewer, ITextEditor textEditor) {
- fTextEditor= textEditor;
- IReconcileStep javaReconcileStep= new JavaReconcileStep(getFile());
- fFirstStep= new Jsp2JavaReconcileStep(javaReconcileStep);
- }
-
- /*
- * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#setDocument(org.eclipse.jface.text.IDocument)
- */
- public void setDocument(IDocument document) {
- fFirstStep.setInputModel(new DocumentAdapter(document));
- }
-
- /*
- * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.reconciler.DirtyRegion, org.eclipse.jface.text.IRegion)
- */
- public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
- removeTemporaryAnnotations();
- process(fFirstStep.reconcile(dirtyRegion, subRegion));
- }
-
- /*
- * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.IRegion)
- */
- public void reconcile(IRegion partition) {
- removeTemporaryAnnotations();
- process(fFirstStep.reconcile(partition));
- }
-
- /*
- * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor)
- */
- public void setProgressMonitor(IProgressMonitor monitor) {
- fFirstStep.setProgressMonitor(monitor);
- fProgressMonitor= monitor;
-
- }
-
- /*
- * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#initialReconcile()
- */
- public void initialReconcile() {
- fFirstStep.reconcile(null);
-
- }
-
- private void process(final IReconcileResult[] results) {
-
- if (results == null)
- return;
-
- IRunnableWithProgress runnable= new WorkspaceModifyOperation(null) {
- /*
- * @see org.eclipse.ui.actions.WorkspaceModifyOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
- protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
- for (int i= 0; i < results.length; i++) {
-
- if (fProgressMonitor != null && fProgressMonitor.isCanceled())
- return;
-
- if (!(results[i] instanceof AnnotationAdapter))
- continue;
-
- AnnotationAdapter result= (AnnotationAdapter)results[i];
- Position pos= result.getPosition();
-
- Annotation annotation= result.createAnnotation();
- getAnnotationModel().addAnnotation(annotation, pos);
- }
- }
- };
- try {
- runnable.run(null);
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- private IAnnotationModel getAnnotationModel() {
- return fTextEditor.getDocumentProvider().getAnnotationModel(fTextEditor.getEditorInput());
- }
-
- /*
- * XXX: A "real" implementation must be smarter
- * i.e. don't remove and add the annotations
- * which are the same.
- */
- private void removeTemporaryAnnotations() {
- Iterator iter= getAnnotationModel().getAnnotationIterator();
- while (iter.hasNext()) {
- Object annotation= iter.next();
- if (annotation instanceof Annotation) {
- Annotation extension= (Annotation)annotation;
- if (!extension.isPersistent())
- getAnnotationModel().removeAnnotation((Annotation)annotation);
- }
- }
- }
-
- private IFile getFile() {
- IEditorInput input= fTextEditor.getEditorInput();
- if (!(input instanceof IFileEditorInput))
- return null;
-
- return ((IFileEditorInput)input).getFile();
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspSourceViewerConfiguration.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspSourceViewerConfiguration.java
deleted file mode 100644
index c2d3aa4..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspSourceViewerConfiguration.java
+++ /dev/null
@@ -1,70 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jface.text.DefaultTextHover;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
-import org.eclipse.jface.text.reconciler.MonoReconciler;
-import org.eclipse.jface.text.source.DefaultAnnotationHover;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-
-import org.eclipse.ui.texteditor.ITextEditor;
-
-
-/**
- * Configuration information for a simple JSP source viewer.
- *
- * @since 3.0
- */
-public class JspSourceViewerConfiguration extends SourceViewerConfiguration {
-
- private ITextEditor fTextEditor;
-
- /**
- * Creates a new JSP source viewer configuration that behaves
- * according to the specification of this class' methods.
- */
- public JspSourceViewerConfiguration(ITextEditor textEditor) {
- fTextEditor= textEditor;
- }
-
- /*
- * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getReconciler(org.eclipse.jface.text.source.ISourceViewer)
- */
- public IReconciler getReconciler(ISourceViewer sourceViewer) {
- IReconcilingStrategy reconcilingStrategy= new JspReconcilingStrategy(sourceViewer, fTextEditor);
- MonoReconciler reconciler= new MonoReconciler(reconcilingStrategy, false);
- reconciler.setProgressMonitor(new NullProgressMonitor());
- reconciler.setDelay(500);
- return reconciler;
- }
-
- /*
- * @see SourceViewerConfiguration#getAnnotationHover(ISourceViewer)
- */
- public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
- return new DefaultAnnotationHover();
- }
-
- /*
- * @see SourceViewerConfiguration#getTextHover(ISourceViewer, String)
- */
- public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
- return new DefaultTextHover(sourceViewer);
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspTranslatorResultCollector.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspTranslatorResultCollector.java
deleted file mode 100644
index e0bb4ee..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspTranslatorResultCollector.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.source.translation.ITranslatorResultCollector;
-
-/**
- * Collects the result for the JspTranslator.
- *
- * @since 3.0
- */
-public class JspTranslatorResultCollector implements ITranslatorResultCollector {
-
- private StringBuffer fDeclarations= new StringBuffer();
- private StringBuffer fContent= new StringBuffer();
- private StringBuffer fLocalDeclarations= new StringBuffer();
-
- private ArrayList fContentLines= new ArrayList();
- private ArrayList fDeclarationLines= new ArrayList();
- private ArrayList fLocalDeclarationLines= new ArrayList();
-
- /**
- * @param declarations
- * @param localDeclarations
- * @param content
- * @param declarationLines
- * @param localDeclarationLines
- * @param contentLines
- */
- public JspTranslatorResultCollector(StringBuffer declarations, StringBuffer localDeclarations, StringBuffer content, ArrayList declarationLines, ArrayList localDeclarationLines, ArrayList contentLines) {
- fDeclarations= declarations;
- fLocalDeclarations= localDeclarations;
- fContent= content;
- fDeclarationLines= declarationLines;
- fLocalDeclarationLines= localDeclarationLines;
- fContentLines= contentLines;
- }
-
- // XXX: In the real world we would need to pass a list of line numbers
- public void appendDeclaration(String string, int lineNumber) {
- fDeclarations.append(string);
- fDeclarationLines.add(new Integer(lineNumber));
- }
-
- // XXX: In the real world we would need to pass a list of line numbers
- public void appendLocalDeclaration(String string, int lineNumber) {
- fLocalDeclarations.append(string);
- fLocalDeclarationLines.add(new Integer(lineNumber));
- }
-
- // XXX: In the real world we would need to pass a list of line numbers
- public void appendContent(String string, int lineNumber) {
- fContent.append(string);
- fContentLines.add(new Integer(lineNumber));
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandler.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandler.java
deleted file mode 100644
index 67ab5ba..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandler.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.source.translation;
-
-import java.io.IOException;
-
-
-/**
- * A tag handler is responsible to
- * - handle the attributes for the tags it supports
- * - translate the tag sequence including attributes to another language
- * - back-translate relative line offsets.
- * <p>
- * Tag handlers are used by translators via tag handler factories. The factory
- * can either return a new tag or one that already has some attributes. </p>
- *
- * @see org.eclipse.jface.text.source.translation.ITranslator
- * @see org.eclipse.jface.text.source.translation.ITagHandlerFactory
- * @since 3.0
- */
-public interface ITagHandler {
-
- /**
- * Tells whether this handler can handle the given tag.
- *
- * @param tag the tag to check
- * @return <code>true</code> if this handler handles the given tag
- */
- boolean canHandleTag(String tag);
-
- /**
- * Tells whether this handler can handle the given text. Most
- * likely the handler will check if the text contains a tag
- * that he can handle.
- *
- * @param text the text to check
- * @return <code>true</code> if this handler handles the given text
- */
- boolean canHandleText(String text);
-
- /**
- * Adds an attribute to this tag handler.
- *
- * @param name the name of the attribute
- * @param value the attribute value
- * @param sourceLineNumber the line number of the attribute in the source or <code>-1</code> if unknown
- */
- void addAttribute(String name, String value, int sourceLineNumber);
-
- /**
- * Resets this handler and sets the current tag to the given tag.
- * A handler can handle more than one tag but only one tag at a time.
- * <p>
- * Resetting the handler clears the attributes.</p>
- *
- * @param tag the tag to check
- */
- void reset(String tag);
-
- /**
- * Writes the tag and line mapping information to the
- * given translator result collector.
- *
- * @param resultCollector the translator's result collector
- * @param sourceLineNumber the line number of the attribute in the source or <code>-1</code> if unknown
- * @throws IOException
- */
- void processEndTag(ITranslatorResultCollector resultCollector, int sourceLineNumber) throws IOException;
-
- /**
- * Computes the offset in the source line that corresponds
- * to the given offset in the translated line.
- *
- * @param sourceLine the source line
- * @param translatedLine the translated line
- * @param offsetInTranslatedLine the offset in the translated line
- * @return the offset in the source line or <code>-1</code> if
- * it was not possible to compute the offset
- */
- int backTranslateOffsetInLine(String sourceLine, String translatedLine, int offsetInTranslatedLine);
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandlerFactory.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandlerFactory.java
deleted file mode 100644
index 2c5fe2b..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandlerFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.source.translation;
-
-/**
- * A tag handler factory provides access to tag
- * handlers.
- *
- * @since 3.0
- */
-public interface ITagHandlerFactory {
-
- /**
- * Returns a handler that can handle the
- * given tag.
- * <p>
- * Depending on the used handler the factory might
- * return a new or a shared instance.</p>
- *
- * @param tag the tag for which to return the handler
- * @return a tag handler or <code>null</code> if no handler
- * is available
- */
- public ITagHandler getHandler(String tag);
-
- /**
- * Finds and returns a handler that can handle
- * the given text snippet.
- * <p>
- * Depending on the used handler the factory might
- * return a new or a shared instance.</p>
- *
- * @param text the text for which to find a handler
- * @return a tag handler or <code>null</code> if no handler
- * is available
- */
- public ITagHandler findHandler(String text);
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslator.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslator.java
deleted file mode 100644
index 37bba24..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.source.translation;
-
-import java.io.IOException;
-import java.io.Reader;
-
-/**
- * A translator translates a given file into another language.
- * The translator is also responsible to provide line mapping
- * information for the translation and to compute which offset
- * in an original line corresponds to a given offset in a
- * target line.
- *
- * @since 3.0
- */
-public interface ITranslator {
-
- /**
- * Reads the source from the given reader and creates
- * translates it into another language. The translated
- * source might be given the optional name.
- *
- * @param reader the reader to access the source
- * @param name the name of the translated source or <code>null</code> if none
- * @return
- * @throws IOException
- */
- String translate(Reader reader, String name) throws IOException;
-
- /**
- * Returns the line mapping information.
- *
- * @return an int array where the index corresponds to line
- * numbers in the translation and the value is a
- * source line number
- */
- int[] getLineMapping();
-
- /**
- * Assigns an optional tag handler factory to this translator.
- * <p>
- * A translator can delegate the handling of individual tags
- * to tag handlers. The factory is responsible to provide
- * the correct tag handlers.</p>
- *
- * @param tagHandlerFactory a tag handler factory or <code>null</code>
- * if this translator does all work itself
- */
- void setTagHandlerFactory(ITagHandlerFactory tagHandlerFactory);
-
- /**
- * Computes the offset in the source line that corresponds
- * to the given offset in the translated line.
- *
- * @param sourceLine the source line
- * @param translatedLine the translated line
- * @param offsetInTranslatedLine the offset in the translated line
- * @param tag the tag to which the source line belongs or
- * <code>null</code> if the tag is not known
- * @return the offset in the source line or <code>-1</code> if
- * it was not possible to compute the offset
- */
- int backTranslateOffsetInLine(String sourceLine, String translatedLine, int offsetInTranslatedLine, String tag);
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslatorResultCollector.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslatorResultCollector.java
deleted file mode 100644
index 8de52e4..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslatorResultCollector.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.source.translation;
-
-/**
- * Tagging interface for a translator result collector.
- *
- * @since 3.0
- */
-public interface ITranslatorResultCollector {
-
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/TagHandlerFactory.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/TagHandlerFactory.java
deleted file mode 100644
index 84a862a..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/TagHandlerFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.source.translation;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.text.Assert;
-
-/**
- * Default implementation of a tag handler factory
- *
- * @since 3.0
- */
-public class TagHandlerFactory implements ITagHandlerFactory {
-
- private Map fHandlers;
-
- public void addTagHandler(String tag, ITagHandler handler) {
- Assert.isNotNull(tag);
- Assert.isNotNull(handler);
-
- fHandlers.put(tag, handler);
- }
-
- public ITagHandler registerHandler(String tag) {
- Assert.isNotNull(tag);
- return (ITagHandler)fHandlers.remove(tag);
- }
-
-
- /*
- * @see org.eclipse.jface.text.source.ITagHandlerFactory#getHandler(java.lang.String)
- */
- public ITagHandler getHandler(String tag) {
- Assert.isNotNull(tag);
-
- return (ITagHandler)fHandlers.get(tag);
- }
-
- /*
- * @see org.eclipse.jface.text.source.ITagHandlerFactory#findHandler(java.lang.String)
- */
- public ITagHandler findHandler(String text) {
- Assert.isNotNull(text);
-
- Iterator iter= fHandlers.values().iterator();
- while (iter.hasNext()) {
- ITagHandler handler= (ITagHandler)iter.next();
- if (handler.canHandleText(text))
- return handler;
- }
- return null;
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/AbstractJspParser.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/AbstractJspParser.java
deleted file mode 100644
index d172afc..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/AbstractJspParser.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-
-public abstract class AbstractJspParser {
-
- private Reader fReader;
- private boolean fHasUnread;
- private int fUnread;
- private int fPos;
- protected int fLines= 1;
-
- AbstractJspParser() {
- super();
- }
-
- private int getc() throws IOException {
- fPos++;
- if (fHasUnread) {
- fHasUnread= false;
- return fUnread;
- }
-
- int ch= fReader.read();
-
- if (ch == '\n') // LF
- fLines++;
- else if (ch == '\r') { // CR
- int nextCh= getc();
- if (nextCh != '\n')
- fLines++;
- return nextCh;
- }
- return ch;
- }
-
- private void ungetc(int c) {
- fHasUnread= true;
- fUnread= c;
- fPos--;
- }
-
- private void parseDirective() throws IOException {
- StringBuffer sb= new StringBuffer();
- int pos= fPos;
- while (true) {
- int c = getc();
- if (c == '%') {
- c= getc();
- if (c == '>') {
- // get attributes
- parseAttributes(pos, sb.toString());
- return;
- }
- }
- sb.append((char)c);
- }
- }
-
- private void parseTag(boolean endTag) throws IOException {
- StringBuffer sb= new StringBuffer();
- int pos= fPos;
- while (true) {
- int c= getc();
- if (c == '/') {
- c= getc();
- if (c == '>') {
- // get attributes
- parseAttributes(pos, sb.toString());
- return;
- } else {
- ungetc(c);
- }
- } else if (c == '>') {
- // get attributes
- parseAttributes(pos, sb.toString());
- return;
- }
- sb.append((char)c);
- }
- }
-
- private void parseComment() throws IOException {
- while (true) {
- int c = getc();
- if (c == '-') {
- c= getc();
- if (c == '-') {
- c= getc();
- if (c == '%') {
- c= getc();
- if (c == '>') {
- return;
- }
- }
- }
- }
- }
- }
-
- private void parseJava(char type) throws IOException {
- StringBuffer sb= new StringBuffer();
- int line= fLines;
- while (true) {
- int c = getc();
- if (c == '%') {
- c= getc();
- if (c == '>') {
- java(type, sb.toString(), line);
- return;
- }
- }
- sb.append((char)c);
- }
- }
-
- protected void java(char tagType, String contents, int line) {
- // empty implementation
- }
-
- private void parseAttributes(int pos, String s) {
-
- boolean hasValue= false;
- StringBuffer name= new StringBuffer();
- StringBuffer value= new StringBuffer();
- String startTag= ""; //$NON-NLS-1$
- int i= 0;
- int ix= 0;
- int startName= 0;
- int startValue= 0;
- char c= s.charAt(i++);
-
- try {
- while (true) {
-
- // whitespace
- while (Character.isWhitespace(c))
- c= s.charAt(i++);
-
- startName= i;
- while (Character.isLetterOrDigit(c) || c == ':') {
- name.append(c);
- c= s.charAt(i++);
- }
-
- // whitespace
- while (Character.isWhitespace(c))
- c= s.charAt(i++);
-
- hasValue= false;
- if (c == '=') {
- c= s.charAt(i++);
-
- // value
- while (Character.isWhitespace(c))
- c= s.charAt(i++);
-
- startValue= i;
-
- // Special handling for this taglib tag
- if (startTag.equals("c:out")) { //$NON-NLS-1$
- value= value.append(s.substring(startValue, Math.max(startValue, s.length() - 2)));
- name.setLength(0);
- tagAttribute(name.toString(), value.toString(), startName+pos, startValue+pos);
- break;
- } else if (c == '"') {
- c= s.charAt(i++);
- while (c != '"') {
- value.append(c);
- c= s.charAt(i++);
- }
- c= s.charAt(i++);
-
- } else {
- while (Character.isLetterOrDigit(c)) {
- value.append(c);
- c= s.charAt(i++);
- }
- }
- hasValue= true;
- }
-
- if (ix == 0) {
- startTag= name.toString();
- startTag(false, startTag, startName+pos);
- } else
- tagAttribute(name.toString(), hasValue ? value.toString() : null, startName+pos, startValue+pos);
- ix++;
-
- name.setLength(0);
- value.setLength(0);
- }
- } catch (StringIndexOutOfBoundsException e) {
- // we don't log this exception because it is used
- // as one way to exit the scanning loop
- }
-
- if (name.length() > 0) {
- if (ix == 0)
- startTag(false, name.toString(), startName+pos);
- else
- tagAttribute(name.toString(), hasValue ? value.toString() : null, startName+pos, startValue+pos);
- }
-
- endTag(false);
- }
-
- protected void startTag(boolean endTag, String name, int startName) {
- // empty implementation
- }
-
- protected void tagAttribute(String attrName, String value, int startName, int startValue) {
- // empty implementation
- }
-
- protected void endTag(boolean end) {
- // empty implementation
- }
-
- protected void text(String t, int line) {
- // empty implementation
- }
-
- void parse(Reader reader) throws IOException {
- int c;
- StringBuffer buffer= new StringBuffer();
- fPos= 0;
- fLines= 1;
- int line= fLines;
- fReader= reader;
-
- while (true) {
- c= getc();
- switch (c) {
- case -1:
- if (buffer.length() > 0)
- text(buffer.toString(), line);
- return;
- case '<':
- c= getc();
- if (c == '%') {
- // flush buffer
- if (buffer.length() > 0) {
- text(buffer.toString(), line);
- buffer.setLength(0);
- line= fLines;
- }
- c= getc();
- switch (c) {
- case '-':
- c= getc();
- if (c == '-') {
- parseComment();
- } else {
- ungetc(c);
- continue;
- }
- break;
- case '@':
- parseDirective();
- break;
- case ' ':
- case '!':
- case '=':
- parseJava((char)c);
- break;
- default:
- parseComment();
- break;
- }
- } else if (c == '/') {
- parseTag(true);
- } else {
- ungetc(c);
- parseTag(false);
- }
- break;
- default:
- buffer.append((char)c);
- break;
- }
- }
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JavaFamilyExamplePreferencePage.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JavaFamilyExamplePreferencePage.java
deleted file mode 100644
index b2f7603..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JavaFamilyExamplePreferencePage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-public class JavaFamilyExamplePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite parent) {
- Composite c= new Composite(parent, SWT.NULL);
- //c.setLayout(new FillLayout());
-
- final Button b= new Button(c, SWT.NULL);
- b.setText(getButtonLabel());
- b.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- JspUIPlugin.getDefault().controlJSPIndexing(!JspUIPlugin.getDefault().isJSPIndexingOn());
- b.setText(getButtonLabel());
- }
- });
- b.pack();
-
- return c;
- }
-
- private String getButtonLabel() {
- if (JspUIPlugin.getDefault().isJSPIndexingOn())
- return "Stop JSP Indexing"; //$NON-NLS-1$
- return "Start JSP Indexing"; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
- public void init(IWorkbench workbench) {
- // empty implementation
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspIndexParser.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspIndexParser.java
deleted file mode 100644
index 1a02cf2..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspIndexParser.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.*;
-import java.io.Reader;
-
-import org.eclipse.core.indexsearch.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.*;
-
-/**
- * @author weinand
- */
-public class JspIndexParser extends AbstractJspParser implements IIndexer {
-
- public static final String JSP_TYPE_REF= "jsp_typeRef"; //$NON-NLS-1$
-
- IFile fFile;
- String fFilePath;
- boolean fInUseBean;
- String fId;
- String fClass;
- IIndex fOutput;
-
-
- JspIndexParser(IFile resource) {
- fFile= resource;
- }
-
- protected void startTag(boolean endTag, String name, int startName) {
- fInUseBean= "jsp:useBean".equals(name); //$NON-NLS-1$
- }
-
- protected void tagAttribute(String attrName, String value, int startName, int startValue) {
- if (fInUseBean) {
- if ("id".equals(attrName)) //$NON-NLS-1$
- fId= value;
- else if ("class".equals(attrName)) //$NON-NLS-1$
- fClass= value;
- }
- }
-
- protected void endTag(boolean end) {
- if (fInUseBean) {
- if (fId != null && fClass != null) {
-
- String s= JSP_TYPE_REF + "/" + fClass; //$NON-NLS-1$
- System.out.println(" " + s); //$NON-NLS-1$
- fOutput.addRef(s, fFilePath);
-
- fId= fClass= null;
- }
- fInUseBean= false;
- }
- }
-
- public void index(IIndex indexerOutput) throws IOException {
-
- String type= fFile.getFileExtension();
- if (type != null && JspUIPlugin.JSP_TYPE.equalsIgnoreCase(type)) {
-
- // Add the name of the file to the index
- String path= fFile.getFullPath().toString();
-
- String encoding= null;
- try {
- encoding= fFile.getCharset();
- } catch (CoreException e1) {
- }
- if (encoding == null)
- encoding= ResourcesPlugin.getEncoding();
-
- String s= null;
- IPath location= fFile.getLocation();
- if (location == null)
- s= ""; //$NON-NLS-1$
- else
- s= new String(Util.getFileCharContent(location.toFile(), encoding));
-
- try {
- Reader reader= new StringReader(s);
- fOutput= indexerOutput;
- fFilePath= path;
- parse(reader);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMatchLocatorParser.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMatchLocatorParser.java
deleted file mode 100644
index 93a1688..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMatchLocatorParser.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.indexsearch.*;
-
-
-public class JspMatchLocatorParser extends AbstractJspParser {
-
- IFile fResource;
- String fMatchString;
- ISearchResultCollector fCollector;
-
- boolean fInUseBean;
- String fId;
- String fClass;
-
- public JspMatchLocatorParser() {
- super();
- }
-
- protected void startTag(boolean endTag, String name, int startName) {
- fInUseBean= "jsp:useBean".equals(name); //$NON-NLS-1$
- }
-
- protected void tagAttribute(String attrName, String value, int startName, int startValue) {
- if (fInUseBean && "class".equals(attrName) && fMatchString.equals(value)) { //$NON-NLS-1$
- try {
- fCollector.accept(fResource, startValue, value.length());
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- }
-
- public void match(IFile resource, String matchString, ISearchResultCollector collector) {
-
- fResource= resource;
- fMatchString= matchString;
- fCollector= collector;
- Reader reader= null;
-
- try {
- reader= new InputStreamReader(fResource.getContents());
- } catch (CoreException e1) {
- e1.printStackTrace();
- }
-
- try {
- parse(reader);
- } catch (IOException e2) {
- e2.printStackTrace();
- }
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.java
deleted file mode 100644
index 0823733..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class JspMessages extends NLS {
-
- private static final String BUNDLE_NAME= "org.eclipse.jsp.JspMessages";//$NON-NLS-1$
-
- private JspMessages() {
- // Do not instantiate
- }
-
- public static String RenameTypeParticipant_name;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, JspMessages.class);
- }
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.properties b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.properties
deleted file mode 100644
index c64de9f..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-RenameTypeParticipant_name= JSP participant
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspPluginImages.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspPluginImages.java
deleted file mode 100644
index 32792ce..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspPluginImages.java
+++ /dev/null
@@ -1,163 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The images provided by the debug plugin.
- */
-public class JspPluginImages {
-
- /**
- * The image registry containing <code>Image</code>s.
- */
- private static ImageRegistry imageRegistry;
-
- /**
- * A table of all the <code>ImageDescriptor</code>s.
- */
- private static HashMap imageDescriptors;
-
- /* Declare Common paths */
- private static URL ICON_BASE_URL= null;
-
- static {
- String pathSuffix = "icons/full/"; //$NON-NLS-1$
-
- try {
- ICON_BASE_URL= new URL(JspUIPlugin.getDefault().getDescriptor().getInstallURL(), pathSuffix);
- } catch (MalformedURLException e) {
- // do nothing
- }
- }
-
- // Use IPath and toOSString to build the names to ensure they have the slashes correct
- //private final static String CTOOL= "ctool16/"; //basic colors - size 16x16 //$NON-NLS-1$
- //private final static String LOCALTOOL= "clcl16/"; //basic colors - size 16x16 //$NON-NLS-1$
- //private final static String DLCL= "dlcl16/"; //disabled - size 16x16 //$NON-NLS-1$
- //private final static String ELCL= "elcl16/"; //enabled - size 16x16 //$NON-NLS-1$
- private final static String OBJECT= "obj16/"; //basic colors - size 16x16 //$NON-NLS-1$
- //private final static String WIZBAN= "wizban/"; //basic colors - size 16x16 //$NON-NLS-1$
- //private final static String OVR= "ovr16/"; //basic colors - size 7x8 //$NON-NLS-1$
- //private final static String VIEW= "cview16/"; // views //$NON-NLS-1$
-
- public final static String IMG_OBJ_TOMCAT = "IMG_TOMCAT"; //$NON-NLS-1$
- public final static String IMG_OBJ_JSP = "IMG_OBJ_JSP"; //$NON-NLS-1$
-
- /**
- * Declare all images
- */
- private static void declareImages() {
-
- declareRegistryImage(IMG_OBJ_TOMCAT, OBJECT + "tomcat_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJ_JSP, OBJECT + "jsp_obj.gif"); //$NON-NLS-1$
- }
-
- /**
- * Declare an Image in the registry table.
- * @param key The key to use when registering the image
- * @param path The path where the image can be found. This path is relative to where
- * this plugin class is found (i.e. typically the packages directory)
- */
- private final static void declareRegistryImage(String key, String path) {
- ImageDescriptor desc= ImageDescriptor.getMissingImageDescriptor();
- try {
- desc= ImageDescriptor.createFromURL(makeIconFileURL(path));
- } catch (MalformedURLException me) {
- DebugPlugin.log(me);
- }
- imageRegistry.put(key, desc);
- imageDescriptors.put(key, desc);
- }
-
- /**
- * Returns the ImageRegistry.
- */
- public static ImageRegistry getImageRegistry() {
- if (imageRegistry == null) {
- initializeImageRegistry();
- }
- return imageRegistry;
- }
-
- /**
- * Initialize the image registry by declaring all of the required
- * graphics. This involves creating JFace image descriptors describing
- * how to create/find the image should it be needed.
- * The image is not actually allocated until requested.
- *
- * Prefix conventions
- * Wizard Banners WIZBAN_
- * Preference Banners PREF_BAN_
- * Property Page Banners PROPBAN_
- * Color toolbar CTOOL_
- * Enable toolbar ETOOL_
- * Disable toolbar DTOOL_
- * Local enabled toolbar ELCL_
- * Local Disable toolbar DLCL_
- * Object large OBJL_
- * Object small OBJS_
- * View VIEW_
- * Product images PROD_
- * Misc images MISC_
- *
- * Where are the images?
- * The images (typically gifs) are found in the same location as this plugin class.
- * This may mean the same package directory as the package holding this class.
- * The images are declared using this.getClass() to ensure they are looked up via
- * this plugin class.
- * @see JFace's ImageRegistry
- */
- public static ImageRegistry initializeImageRegistry() {
- imageRegistry= new ImageRegistry(JspUIPlugin.getStandardDisplay());
- imageDescriptors = new HashMap(30);
- declareImages();
- return imageRegistry;
- }
-
- /**
- * Returns the <code>Image<code> identified by the given key,
- * or <code>null</code> if it does not exist.
- */
- public static Image getImage(String key) {
- return getImageRegistry().get(key);
- }
-
- /**
- * Returns the <code>ImageDescriptor<code> identified by the given key,
- * or <code>null</code> if it does not exist.
- */
- public static ImageDescriptor getImageDescriptor(String key) {
- if (imageDescriptors == null) {
- initializeImageRegistry();
- }
- return (ImageDescriptor)imageDescriptors.get(key);
- }
-
- private static URL makeIconFileURL(String iconPath) throws MalformedURLException {
- if (ICON_BASE_URL == null) {
- throw new MalformedURLException();
- }
-
- return new URL(ICON_BASE_URL, iconPath);
- }
-}
-
-
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java
deleted file mode 100644
index 9730d05..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import org.eclipse.core.indexsearch.IIndexQuery;
-import org.eclipse.core.indexsearch.ISearchResultCollector;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.search.IJavaSearchResultCollector;
-
-
-public class JspSearchEngine {
-
- public static void search(final IJavaSearchResultCollector collector, final IIndexQuery query, IProgressMonitor pm) {
-
- System.out.println("JspSearchEngine.search: " + query); //$NON-NLS-1$
-
- JspUIPlugin.getDefault().search(
- query,
- new ISearchResultCollector() {
- public void accept(IResource resource, int start, int length) throws CoreException {
- System.out.println(" accept: " + resource); //$NON-NLS-1$
- collector.accept(resource, start, start+length, null, 999);
- }
- },
- pm
- );
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java
deleted file mode 100644
index 28ef43a..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.source.translation.ITagHandler;
-import org.eclipse.jface.text.source.translation.ITagHandlerFactory;
-import org.eclipse.jface.text.source.translation.ITranslator;
-
-import org.eclipse.jdt.internal.ui.examples.jspeditor.JspTranslatorResultCollector;
-
-
-public class JspTranslator extends AbstractJspParser implements ITranslator {
-
- private StringBuffer fDeclarations= new StringBuffer();
- private StringBuffer fContent= new StringBuffer();
- private StringBuffer fLocalDeclarations= new StringBuffer();
-
- private ArrayList fContentLines= new ArrayList();
- private ArrayList fDeclarationLines= new ArrayList();
- private ArrayList fLocalDeclarationLines= new ArrayList();
- private int[] fSmap;
-
- private ITagHandlerFactory fTagHandlerFactor;
- private ITagHandler fCurrentTagHandler;
-
- private JspTranslatorResultCollector fResultCollector;
-
-
- public JspTranslator() {
-
- // Links for passing parameters to the tag handlers
- fResultCollector= new JspTranslatorResultCollector(fDeclarations, fLocalDeclarations, fContent, fDeclarationLines, fLocalDeclarationLines, fContentLines);
- }
-
- protected void startTag(boolean endTag, String name, int startName) {
-
- fCurrentTagHandler= fTagHandlerFactor.getHandler(name);
- }
-
- protected void tagAttribute(String attrName, String value, int startName, int startValue) {
-
- if (fCurrentTagHandler != null)
- fCurrentTagHandler.addAttribute(attrName, value, fLines);
- }
-
- protected void endTag(boolean end) {
-
- if (fCurrentTagHandler != null)
- try {
- fCurrentTagHandler.processEndTag(fResultCollector, fLines);
- } catch (IOException ex) {
- ex.printStackTrace();
- }
- }
-
- protected void java(char ch, String java, int line) {
-
- if (ch == '!')
- fCurrentTagHandler= fTagHandlerFactor.getHandler("<%!"); //$NON-NLS-1$
- else
- fCurrentTagHandler= fTagHandlerFactor.getHandler("<%"); //$NON-NLS-1$
-
- /*
- * XXX: This is needed because the used parser does not treat
- * "<%" like every other tag.
- */
- fCurrentTagHandler.addAttribute("source", java, line); //$NON-NLS-1$
-
- try {
- fCurrentTagHandler.processEndTag(fResultCollector, line);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- protected void text(String t, int line) {
- int i= 0;
- StringBuffer out= new StringBuffer();
- while (i < t.length()) {
- char c= t.charAt(i++);
- if (c == '\n') {
- fContent.append(" System.out.println(\"" + out.toString() + "\"); //$NON-NLS-1$\n"); //$NON-NLS-1$//$NON-NLS-2$
- fContentLines.add(new Integer(line++));
- out.setLength(0);
- } else {
- out.append(c);
- }
- }
- if (out.length() > 0) {
- fContent.append(" System.out.print(\"" + out.toString() + "\"); //$NON-NLS-1$\n"); //$NON-NLS-1$ //$NON-NLS-2$
- fContentLines.add(new Integer(line));
- }
- }
-
- private void resetTranslator() {
- fDeclarations.setLength(0);
- fContent.setLength(0);
- fLocalDeclarations.setLength(0);
-
- fLocalDeclarationLines.clear();
- fContentLines.clear();
- fDeclarationLines.clear();
-
- }
-
- public String translate(Reader reader, String name) throws IOException {
-
- StringBuffer buffer= new StringBuffer();
-
- resetTranslator();
- parse(reader);
-
- int lineCount= 2 + fDeclarationLines.size() + 1 + 1 + fLocalDeclarationLines.size() + fContentLines.size() + 3;
- fSmap= new int[lineCount];
- int line= 0;
- fSmap[line++]= 1;
-
- buffer.append("public class " + name + " {\n\n"); //$NON-NLS-1$ //$NON-NLS-2$
- fSmap[line++]= 1;
- fSmap[line++]= 1;
-
- buffer.append(fDeclarations.toString() + "\n"); //$NON-NLS-1$
- System.out.println(fDeclarations.toString());
- for (int i= 0; i < fDeclarationLines.size(); i++) {
- fSmap[line++]= ((Integer)fDeclarationLines.get(i)).intValue();
- System.out.println("" + ((Integer)fDeclarationLines.get(i)).intValue()); //$NON-NLS-1$
- }
- fSmap[line]= fSmap[line - 1] + 1;
- line++;
-
- buffer.append(" public void out() {\n"); //$NON-NLS-1$
- fSmap[line]= fSmap[line - 1] + 1;
- line++;
-
- if (fLocalDeclarations.length() > 0) {
- buffer.append(fLocalDeclarations.toString());
- System.out.println(fLocalDeclarations);
- for (int i= 0; i < fLocalDeclarationLines.size(); i++) {
- System.out.println("" + ((Integer)fLocalDeclarationLines.get(i)).intValue()); //$NON-NLS-1$
- fSmap[line++]= ((Integer)fLocalDeclarationLines.get(i)).intValue();
- }
- }
-
- buffer.append(fContent.toString());
- System.out.println(fContent);
- for (int i= 0; i < fContentLines.size(); i++) {
- fSmap[line++]= ((Integer)fContentLines.get(i)).intValue();
- System.out.println("" + ((Integer)fContentLines.get(i)).intValue()); //$NON-NLS-1$
- }
-
- buffer.append(" }\n"); //$NON-NLS-1$
- fSmap[line]= fSmap[line - 1];
-
- line++;
-
- buffer.append("}\n"); //$NON-NLS-1$
- fSmap[line]= fSmap[line - 2];
-
- for (int i= 0; i < fSmap.length; i++)
- System.out.println("" + i + " -> " + fSmap[i]); //$NON-NLS-1$ //$NON-NLS-2$
-
- System.out.println(buffer.toString());
-
- return buffer.toString();
- }
-
- public int[] getLineMapping() {
- return fSmap;
- }
-
- /*
- * @see org.eclipse.jface.text.source.ITranslator#setTagHandlerFactory(org.eclipse.jface.text.source.ITagHandlerFactory)
- */
- public void setTagHandlerFactory(ITagHandlerFactory tagHandlerFactory) {
- fTagHandlerFactor= tagHandlerFactory;
- }
-
- /*
- * @see ITranslator#backTranslateOffsetInLine(String, String, int)
- */
- public int backTranslateOffsetInLine(String originalLine, String translatedLine, int offsetInTranslatedLine, String tag) {
-
- ITagHandler handler;
- if (tag != null)
- handler= fTagHandlerFactor.getHandler(tag);
- else
- handler= fTagHandlerFactor.findHandler(originalLine);
-
- if (handler != null)
- return handler.backTranslateOffsetInLine(originalLine, translatedLine, offsetInTranslatedLine);
-
- return -1;
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java
deleted file mode 100644
index cb95cb53..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.indexsearch.*;
-import org.eclipse.core.indexsearch.IIndexQuery;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * Implementation for a JSP type query.
- */
-public class JspTypeQuery implements IIndexQuery {
-
- private IType fType;
- private JspMatchLocatorParser fParser;
-
- public JspTypeQuery(IType type) {
- fType= type;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.search.ISearch#computePathsKeyingIndexFiles(java.util.ArrayList)
- */
- public void computePathsKeyingIndexFiles(ArrayList requiredIndexKeys) {
- IWorkspace workspace= ResourcesPlugin.getWorkspace();
- IProject[] projects= workspace.getRoot().getProjects();
- try {
- for (int i= 0; i < projects.length; i++) {
- IProject project= projects[i];
- if (!project.isAccessible() || !project.hasNature(JavaCore.NATURE_ID))
- continue;
- IPath path= project.getFullPath();
- if (requiredIndexKeys.indexOf(path) == -1) {
- requiredIndexKeys.add(path);
- }
- }
- } catch (CoreException ex) {
- JspUIPlugin.log("jsp query internal error", ex); //$NON-NLS-1$
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.search.ISearch#findIndexMatches(org.eclipse.jdt.internal.core.index.IIndex, org.eclipse.jdt.internal.core.search.PathCollector, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void findIndexMatches(IIndex index, HashSet pathCollector, IProgressMonitor progressMonitor) throws IOException {
-
- String typeName= fType.getFullyQualifiedName();
- String s= JspIndexParser.JSP_TYPE_REF + "/" + typeName; //$NON-NLS-1$
- index.queryPrefix(pathCollector, s);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.search.ISearch#locateMatches(org.eclipse.core.resources.IFile, org.eclipse.jsp.IJspSearchResultCollector)
- */
- public void locateMatches(IFile candidate, ISearchResultCollector resultCollector) {
- if (fParser== null)
- fParser= new JspMatchLocatorParser();
- String typeName= fType.getFullyQualifiedName();
- fParser.match(candidate, typeName, resultCollector);
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java
deleted file mode 100644
index eb3397a..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import org.eclipse.core.indexsearch.IIndexQuery;
-import org.eclipse.core.indexsearch.ISearchResultCollector;
-import org.eclipse.core.indexsearch.SearchEngine;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageRegistry;
-
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.editors.text.TextEditorPreferenceConstants;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-/**
- */
-public class JspUIPlugin extends AbstractUIPlugin implements IResourceChangeListener {
-
- /**
- * The id of the JavaFamilyExample plugin (value <code>"org.eclipse.jdt.ui.examples.javafamily"</code>).
- */
- public static final String ID_PLUGIN= "org.eclipse.jdt.ui.examples.javafamily"; //$NON-NLS-1$
-
- public static final String JSP_TYPE= "jsp"; //$NON-NLS-1$
-
- private static final boolean DEBUG= false;
- private static JspUIPlugin fgDefault;
- private static boolean fgJSPIndexingIsEnabled= false;
-
- private SearchEngine fSearchEngine;
-
- /**
- * @param descriptor
- */
- public JspUIPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- fgDefault= this;
- fSearchEngine= SearchEngine.getSearchEngine();
- }
-
- public static JspUIPlugin getDefault() {
- return fgDefault;
- }
-
- void controlJSPIndexing(boolean enable) {
- if (fgJSPIndexingIsEnabled != enable) {
- fgJSPIndexingIsEnabled= enable;
- IWorkspace workspace= ResourcesPlugin.getWorkspace();
- if (enable) {
-
- IResourceProxyVisitor visitor=
- new IResourceProxyVisitor() {
- public boolean visit(IResourceProxy proxy) throws CoreException {
- String name= proxy.getName();
- int pos= name.lastIndexOf('.');
- if (pos >= 0) {
- String extension= name.substring(pos+1);
- if (JSP_TYPE.equalsIgnoreCase(extension)) {
- IResource r= proxy.requestResource();
- if (r instanceof IFile)
- jspAdded((IFile)r);
- }
- }
- return true;
- }
- };
- try {
- workspace.getRoot().accept(visitor, 0);
- } catch (CoreException e) {
- log("visiting jsp files", e); //$NON-NLS-1$
- }
-
- workspace.addResourceChangeListener(this,
- // IResourceChangeEvent.PRE_AUTO_BUILD |
- // IResourceChangeEvent.POST_AUTO_BUILD |
- IResourceChangeEvent.POST_CHANGE |
- IResourceChangeEvent.PRE_DELETE |
- IResourceChangeEvent.PRE_CLOSE
- );
- } else {
- workspace.removeResourceChangeListener(this);
- }
- }
- }
-
- boolean isJSPIndexingOn() {
- return fgJSPIndexingIsEnabled;
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- if ( !fgJSPIndexingIsEnabled || event == null)
- return;
- IResourceDelta d= event.getDelta();
- if (d == null)
- return;
- try {
- d.accept(
- new IResourceDeltaVisitor() {
- public boolean visit(IResourceDelta delta) {
- if (delta != null) {
- IResource r= delta.getResource();
- if (r instanceof IFile) {
- IFile file= (IFile) r;
- String type= file.getFileExtension();
- if (JSP_TYPE.equalsIgnoreCase(type)) {
- switch (delta.getKind()) {
- case IResourceDelta.ADDED:
- jspAdded(file);
- break;
- case IResourceDelta.REMOVED:
- jspRemoved(file);
- break;
- case IResourceDelta.CHANGED:
- // no need to index if the content has not changed
- if ((delta.getFlags() & IResourceDelta.CONTENT) != 0)
- jspAdded(file);
- break;
- }
- }
- }
- }
- return true;
- }
- }
- );
- } catch (CoreException e) {
- log("processing resource delta", e); //$NON-NLS-1$
- }
- }
-
- public static void log(String message, Throwable e) {
- getDefault().getLog().log(new Status(IStatus.ERROR, ID_PLUGIN, IStatus.ERROR, message, e));
- }
-
- void jspAdded(IFile jspFile) {
- if (DEBUG) System.out.println("Added: " + jspFile); //$NON-NLS-1$
- JspIndexParser indexer= new JspIndexParser(jspFile);
- fSearchEngine.add(jspFile.getProject().getFullPath(), indexer);
- }
-
- void jspRemoved(IFile jspFile) {
- if (DEBUG) System.out.println("Removed: " + jspFile); //$NON-NLS-1$
- fSearchEngine.remove(jspFile.getFullPath().toString(), jspFile.getProject().getFullPath());
- }
-
- public void search(IIndexQuery query, ISearchResultCollector resultCollector, IProgressMonitor pm) {
- fSearchEngine.search(query, resultCollector, pm, SearchEngine.WAIT_UNTIL_READY_TO_SEARCH);
- }
-
- /**
- * Shutdown the JspCore plug-in.
- * <p>
- * De-registers the resource changed listener.
- * <p>
- * @see org.eclipse.core.runtime.Plugin#shutdown()
- */
- public void shutdown() {
- controlJSPIndexing(false);
- }
-
- protected void initializeDefaultPreferences(IPreferenceStore prefs) {
- TextEditorPreferenceConstants.initializeDefaultValues(prefs);
- }
-
- /**
- * Returns the standard display to be used. The method first checks, if
- * the thread calling this method has an associated display. If so, this
- * display is returned. Otherwise the method returns the default display.
- */
- public static Display getStandardDisplay() {
- Display display= Display.getCurrent();
- if (display == null) {
- display= Display.getDefault();
- }
- return display;
- }
-
- protected ImageRegistry createImageRegistry() {
- return JspPluginImages.initializeImageRegistry();
- }
-
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java
deleted file mode 100644
index 5ef8e75..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.text.edits.ReplaceEdit;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.core.indexsearch.ISearchResultCollector;
-
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jdt.internal.corext.refactoring.changes.TextChangeCompatibility;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-
-
-public class RenameTypeParticipant extends RenameParticipant {
-
- private IType fType;
-
- protected boolean initialize(Object element) {
- fType= (IType)element;
- return true;
- }
-
- public String getName() {
- return JspMessages.RenameTypeParticipant_name;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.internal.corext.refactoring.participants.IRenameParticipant#checkInput(org.eclipse.core.runtime.IProgressMonitor)
- */
- public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
- return new RefactoringStatus();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.internal.corext.refactoring.participants.IRenameParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
- */
- public Change createChange(IProgressMonitor pm) throws CoreException {
- final Map changes= new HashMap();
- final String newName= computeNewName();
- ISearchResultCollector collector= new ISearchResultCollector() {
- public void accept(IResource resource, int start, int length) throws CoreException {
- TextFileChange change= (TextFileChange)changes.get(resource);
- if (change == null) {
- change= new TextFileChange(resource.getName(), (IFile)resource);
- changes.put(resource, change);
- }
- TextChangeCompatibility.addTextEdit(change, "Update type reference", new ReplaceEdit(start, length, newName)); //$NON-NLS-1$
- }
- };
- JspUIPlugin.getDefault().search(new JspTypeQuery(fType), collector, pm);
-
- if (changes.size() == 0)
- return null;
- CompositeChange result= new CompositeChange("JSP updates"); //$NON-NLS-1$
- for (Iterator iter= changes.values().iterator(); iter.hasNext();) {
- result.add((Change)iter.next());
- }
- return result;
- }
-
- private String computeNewName() {
- String newName= getArguments().getNewName();
- String currentName= fType.getFullyQualifiedName();
- int pos= currentName.lastIndexOf('.');
- if (pos == -1)
- return newName;
- return currentName.substring(0, pos + 1) + newName;
- }
-
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/Util.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/Util.java
deleted file mode 100644
index 9f8321d..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/Util.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.*;
-import java.io.File;
-
-public class Util {
-
- static char[] getChars(String s) {
- int l= s.length();
- char[] cc= new char[l];
- if (l > 0)
- s.getChars(0, l, cc, 0);
- return cc;
- }
-
- static char[] getFileCharContent(File file, String encoding) throws IOException {
- System.out.println("****jdt.internal.compiler.util.Util.getFileCharContent: " + file + " " + encoding); //$NON-NLS-1$ //$NON-NLS-2$
- InputStream stream = null;
- try {
- stream = new BufferedInputStream(new FileInputStream(file));
- return Util.getInputStreamAsCharArray(stream, (int) file.length(), encoding);
- } finally {
- if (stream != null) {
- try {
- stream.close();
- } catch (IOException e) {
- // ignore
- }
- }
- }
- }
-
- public static char[] getInputStreamAsCharArray(InputStream stream, int length, String encoding) throws IOException {
- InputStreamReader reader = (encoding == null)
- ? new InputStreamReader(stream)
- : new InputStreamReader(stream, encoding);
- char[] contents;
- if (length == -1) {
- contents = new char[0];
- int contentsLength = 0;
- int amountRead = -1;
- do {
- int amountRequested = Math.max(stream.available(), 8192); // read at least 8K
-
- // resize contents if needed
- if (contentsLength + amountRequested > contents.length) {
- System.arraycopy(
- contents,
- 0,
- contents = new char[contentsLength + amountRequested],
- 0,
- contentsLength);
- }
-
- // read as many chars as possible
- amountRead = reader.read(contents, contentsLength, amountRequested);
-
- if (amountRead > 0) {
- // remember length of contents
- contentsLength += amountRead;
- }
- } while (amountRead != -1);
-
- // resize contents if necessary
- if (contentsLength < contents.length) {
- System.arraycopy(
- contents,
- 0,
- contents = new char[contentsLength],
- 0,
- contentsLength);
- }
- } else {
- contents = new char[length];
- int len = 0;
- int readSize = 0;
- while ((readSize != -1) && (len != length)) {
- // See PR 1FMS89U
- // We record first the read size. In this case len is the actual read size.
- len += readSize;
- readSize = reader.read(contents, len, length - len);
- }
- // See PR 1FMS89U
- // Now we need to resize in case the default encoding used more than one byte for each
- // character
- if (len != length)
- System.arraycopy(contents, 0, (contents = new char[len]), 0, len);
- }
-
- return contents;
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.java
deleted file mode 100644
index cc9361d..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class LaunchingMessages extends NLS {
-
- private static final String BUNDLE_NAME= "org.eclipse.jsp.launching.LaunchingMessages";//$NON-NLS-1$
-
- private LaunchingMessages() {
- // Do not instantiate
- }
-
- public static String ToggleJspBreakpointAction_2;
- public static String TomcatLaunchDelegate_6;
- public static String TomcatLaunchDelegate_7;
- public static String TomcatLaunchDelegate_8;
- public static String TomcatLaunchDelegate_9;
- public static String TomcatTab_3;
- public static String TomcatTab_4;
- public static String TomcatTab_5;
- public static String TomcatTab_6;
- public static String TomcatTab_7;
- public static String TomcatTab_21;
- public static String TomcatTab_22;
- public static String TomcatTab_23;
- public static String TomcatTab_24;
- public static String TomcatTab_28;
- public static String TomcatTab_29;
- public static String TomcatTab_30;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, LaunchingMessages.class);
- }
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.properties b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.properties
deleted file mode 100644
index 7d4a5de..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-ToggleJspBreakpointAction_2=Toggle Breakpoint
-
-TomcatLaunchDelegate_6=Unable to resolve ${catalina_home}
-TomcatLaunchDelegate_7=Specified $catalina_home does not exist: {0}
-TomcatLaunchDelegate_8=Unable to resolve ${catalina_home}
-TomcatLaunchDelegate_9=${catalina_home} variable does not exist.
-
-TomcatTab_3=&Tomcat install location:
-TomcatTab_4=Select a Tomcat installation directory
-TomcatTab_5=Tomcat installation directory does not exist.
-TomcatTab_6=Tomcat installation directory is not a directory.
-TomcatTab_7=Tomcat
-TomcatTab_21=&Browse...
-TomcatTab_22=&Project:
-TomcatTab_23=B&rowse...
-TomcatTab_24=Select a single project
-TomcatTab_28=Project Selection
-TomcatTab_29=Choose a project containing a web application
-TomcatTab_30=Specified project does not exist
-
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java
deleted file mode 100644
index 4bbc463..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IBreakpointManager;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStratumLineBreakpoint;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * ToggleJspBreakpointAction
- */
-public class ToggleJspBreakpointAction extends Action implements IAction {
-
- private ITextEditor fEditor;
- private IVerticalRulerInfo fRulerInfo;
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager();
- IBreakpoint[] breakpoints = manager.getBreakpoints();
- IResource resource = getResource();
- int lineNumber = fRulerInfo.getLineOfLastMouseButtonActivity() + 1;
- for (int i = 0; i < breakpoints.length; i++) {
- IBreakpoint bp = breakpoints[i];
- if (bp instanceof IJavaStratumLineBreakpoint) {
- IJavaStratumLineBreakpoint breakpoint = (IJavaStratumLineBreakpoint)bp;
- if (breakpoint.getMarker().getResource().equals(resource)) {
- try {
- if (breakpoint.getLineNumber() == lineNumber) {
- // remove
- breakpoint.delete();
- return;
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- }
- }
- createBreakpoint();
- }
-
- protected void createBreakpoint() {
- IResource resource = getResource();
- int lineNumber = fRulerInfo.getLineOfLastMouseButtonActivity() + 1;
- try {
- JDIDebugModel.createStratumBreakpoint(resource, null, resource.getName(), null, null, lineNumber, -1, -1, 0, true, null); //
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * @param editor
- * @param rulerInfo
- */
- public ToggleJspBreakpointAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
- super(LaunchingMessages.ToggleJspBreakpointAction_2);
- fEditor = editor;
- fRulerInfo = rulerInfo;
- }
-
- protected IResource getResource() {
- IEditorInput input= fEditor.getEditorInput();
- IResource resource= (IResource) input.getAdapter(IFile.class);
- if (resource == null) {
- resource= (IResource) input.getAdapter(IResource.class);
- }
- return resource;
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointRulerActionDelegate.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointRulerActionDelegate.java
deleted file mode 100644
index 27d52ed..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointRulerActionDelegate.java
+++ /dev/null
@@ -1,31 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * ToggleJspBreakpointActionDelegate
- */
-public class ToggleJspBreakpointRulerActionDelegate extends AbstractRulerActionDelegate {
-
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
- */
- protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
- return new ToggleJspBreakpointAction(editor, rulerInfo);
- }
-
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java
deleted file mode 100644
index 3a074a0..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-import org.eclipse.jdt.launching.StandardClasspathProvider;
-
-/**
- * TomcatClasspathProvider
- */
-public class TomcatClasspathProvider extends StandardClasspathProvider {
-
- /**
- * Tomcat requires <code>tools.jar</code> and <code>bootstrap.jar</code> on its
- * classpath.
- *
- * @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#computeUnresolvedClasspath(org.eclipse.debug.core.ILaunchConfiguration)
- */
- public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
- boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
- if (useDefault) {
- IRuntimeClasspathEntry[] defaults = super.computeUnresolvedClasspath(configuration);
- IVMInstall vm = JavaRuntime.computeVMInstall(configuration);
- LibraryLocation[] libs = JavaRuntime.getLibraryLocations(vm);
- List rtes = new ArrayList();
- for (int i = 0; i < defaults.length; i++) {
- rtes.add(defaults[i]);
- }
- // add bootstrap.jar
- String catalinaHome = TomcatLaunchDelegate.getCatalinaHome();
- IPath path = new Path(catalinaHome).append("bin").append("bootstrap.jar"); //$NON-NLS-1$ //$NON-NLS-2$
- IRuntimeClasspathEntry r = JavaRuntime.newArchiveRuntimeClasspathEntry(path);
- r.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
- rtes.add(r);
- // add class libraries to bootpath
- boolean tools = false; // keeps track of whether a tools.jar was found
- for (int i = 0; i < libs.length; i++) {
- LibraryLocation lib = libs[i];
- if (lib.getSystemLibraryPath().toString().endsWith("tools.jar")) { //$NON-NLS-1$
- tools = true;
- }
- }
- if (!tools) {
- // add a tools.jar
- IPath toolsPath = new Path(vm.getInstallLocation().getAbsolutePath()).append("lib").append("tools.jar"); //$NON-NLS-1$ //$NON-NLS-2$
- if (toolsPath.toFile().exists()) {
- r = JavaRuntime.newArchiveRuntimeClasspathEntry(toolsPath);
- r.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
- rtes.add(r);
- }
- }
- return (IRuntimeClasspathEntry[])rtes.toArray(new IRuntimeClasspathEntry[rtes.size()]);
- } else {
- // recover persisted classpath
- return recoverRuntimePath(configuration, IJavaLaunchConfigurationConstants.ATTR_CLASSPATH);
- }
- }
-
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatLaunchDelegate.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatLaunchDelegate.java
deleted file mode 100644
index b78d885..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatLaunchDelegate.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.IValueVariable;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.jdt.launching.JavaLaunchDelegate;
-import org.eclipse.jsp.JspUIPlugin;
-
-/**
- * Launch delegate for a local Tomcat server
- */
-public class TomcatLaunchDelegate extends JavaLaunchDelegate {
-
- /**
- * Identifier for Tomcat launch configurations.
- */
- public static final String ID_TOMCAT_LAUNCH_CONFIGURATION_TYPE = "org.eclipse.jsp.TomcatConfigurationType"; //$NON-NLS-1$
-
- /**
- * Identifier for Tomcat classpath provider.
- */
- public static final String ID_TOMCAT_CLASSPATH_PROVIDER = "org.eclipse.jsp.tomcatClasspathProvider"; //$NON-NLS-1$
-
- /**
- * Launch configuration attribute - value is path to local installation of Tomcat.
- * The path may be encoded in a launch variable.
- */
- public static final String ATTR_CATALINA_HOME = "org.eclipse.jsp.CATALINA_HOME"; //$NON-NLS-1$
-
- /**
- * Constructs a new launch delegate
- */
- public TomcatLaunchDelegate() {
- super();
- }
-
- /**
- * Returns the value of the <code>${catalina_home}</code> launch variable.
- *
- * @return the value of the <code>${catalina_home}</code> launch variable
- * @exception CoreException if the variable or value is undefined
- */
- public static String getCatalinaHome() throws CoreException {
- IValueVariable variable = VariablesPlugin.getDefault().getStringVariableManager().getValueVariable("catalina_home"); //$NON-NLS-1$
- IStatus err = null;
- if (variable == null) {
- err = new Status(IStatus.ERROR, JspUIPlugin.getDefault().getDescriptor().getUniqueIdentifier(), 0, LaunchingMessages.TomcatLaunchDelegate_9, null);
- } else {
- String home = variable.getValue();
- if (home != null && home.length() > 0) {
- File file = new File(home);
- if (file.exists() && file.isDirectory()) {
- return home;
- } else {
- err = new Status(IStatus.ERROR, JspUIPlugin.getDefault().getDescriptor().getUniqueIdentifier(), 0, MessageFormat.format(LaunchingMessages.TomcatLaunchDelegate_7, new String[]{home}), null);
- }
- } else {
- err = new Status(IStatus.ERROR, JspUIPlugin.getDefault().getDescriptor().getUniqueIdentifier(), 0, LaunchingMessages.TomcatLaunchDelegate_8, null);
- }
- }
- throw new CoreException(err);
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java
deleted file mode 100644
index 2c1668f..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jsp.JspPluginImages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * Specifies the install location of Tomcat.
- */
-public class TomcatTab extends AbstractLaunchConfigurationTab {
-
-
- // Tomcat location
- private Button fBrowseButton;
- private Text fTomcatDir;
-
- // WebApp location
- private Button fProjectButton;
- private Text fProjectText;
-
- /**
- * Constructs a new Tomcat tab
- */
- public TomcatTab() {
- super();
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(Composite)
- */
- public void createControl(Composite parent) {
-
- Font font = parent.getFont();
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout workingDirLayout = new GridLayout();
- workingDirLayout.numColumns = 3;
- workingDirLayout.marginHeight = 0;
- workingDirLayout.marginWidth = 0;
- composite.setLayout(workingDirLayout);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- composite.setLayoutData(gd);
- composite.setFont(font);
- setControl(composite);
-
- createVerticalSpacer(composite, 3);
-
- Label label = new Label(composite, SWT.NONE);
- label.setText(LaunchingMessages.TomcatTab_3);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- gd.horizontalSpan = 3;
- label.setLayoutData(gd);
- label.setFont(font);
-
- fTomcatDir = new Text(composite, SWT.SINGLE | SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- fTomcatDir.setLayoutData(gd);
- fTomcatDir.setFont(font);
- fTomcatDir.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent evt) {
- updateLaunchConfigurationDialog();
- }
- });
-
- fBrowseButton = createPushButton(composite, LaunchingMessages.TomcatTab_21, null);
- fBrowseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent evt) {
- handleTomcatBrowseButtonSelected();
- }
- });
-
- createVerticalSpacer(composite, 3);
-
- label = new Label(composite, SWT.NONE);
- label.setText(LaunchingMessages.TomcatTab_22);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- gd.horizontalSpan = 3;
- label.setLayoutData(gd);
- label.setFont(font);
-
- fProjectText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- fProjectText.setLayoutData(gd);
- fProjectText.setFont(font);
- fProjectText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent evt) {
- updateLaunchConfigurationDialog();
- }
- });
-
- fProjectButton = createPushButton(composite, LaunchingMessages.TomcatTab_23, null);
- fProjectButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent evt) {
- handleProjectBrowseButtonSelected();
- }
- });
- }
-
- /**
- * Show a dialog that lets the user select a project
- * from the workspace
- */
- protected void handleProjectBrowseButtonSelected() {
- ILabelProvider lp= new WorkbenchLabelProvider();
- ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), lp);
- dialog.setElements(ResourcesPlugin.getWorkspace().getRoot().getProjects());
- dialog.setMultipleSelection(false);
- dialog.setTitle(LaunchingMessages.TomcatTab_28);
- dialog.setMessage(LaunchingMessages.TomcatTab_29);
- if (dialog.open() == Window.OK) {
- Object[] elements= dialog.getResult();
- if (elements != null && elements.length == 1) {
- fProjectText.setText(((IResource)elements[0]).getName());
- }
- }
-
- }
-
- /**
- * Show a dialog that lets the user select a tomcat install directory
- */
- protected void handleTomcatBrowseButtonSelected() {
- DirectoryDialog dialog = new DirectoryDialog(getShell());
- dialog.setMessage(LaunchingMessages.TomcatTab_4);
- String currentWorkingDir = fTomcatDir.getText();
- if (!currentWorkingDir.trim().equals("")) { //$NON-NLS-1$
- File path = new File(currentWorkingDir);
- if (path.exists()) {
- dialog.setFilterPath(currentWorkingDir);
- }
- }
-
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null) {
- fTomcatDir.setText(selectedDirectory);
- }
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose()
- */
- public void dispose() {
- // empty implementation
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(ILaunchConfiguration)
- */
- public boolean isValid(ILaunchConfiguration config) {
- setErrorMessage(null);
- setMessage(null);
-
- String workingDirPath = fTomcatDir.getText().trim();
- // resolve variables (if any)
- String expansion;
- try {
- expansion = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(workingDirPath);
- } catch (CoreException e) {
- setErrorMessage(e.getMessage());
- return false;
- }
- if (workingDirPath.length() > 0) {
- File dir = new File(expansion);
- if (!dir.exists()) {
- setErrorMessage(LaunchingMessages.TomcatTab_5);
- return false;
- }
- if (!dir.isDirectory()) {
- setErrorMessage(LaunchingMessages.TomcatTab_6);
- return false;
- }
- }
-
- String projectName = fProjectText.getText().trim();
- if (projectName.length() > 0) {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if (!project.exists()) {
- setErrorMessage(LaunchingMessages.TomcatTab_30);
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
- */
- public void setDefaults(ILaunchConfigurationWorkingCopy config) {
- config.setAttribute(TomcatLaunchDelegate.ATTR_CATALINA_HOME, "${catalina_home}"); //$NON-NLS-1$
- config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, TomcatLaunchDelegate.ID_TOMCAT_CLASSPATH_PROVIDER);
- config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.apache.catalina.startup.Bootstrap"); //$NON-NLS-1$
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
- */
- public void initializeFrom(ILaunchConfiguration configuration) {
- try {
- fTomcatDir.setText(configuration.getAttribute(TomcatLaunchDelegate.ATTR_CATALINA_HOME, "")); //$NON-NLS-1$
- fProjectText.setText(configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "")); //$NON-NLS-1$
- if (configuration.isWorkingCopy()) {
- // set VM args
- ILaunchConfigurationWorkingCopy workingCopy = (ILaunchConfigurationWorkingCopy)configuration;
- String home = TomcatLaunchDelegate.getCatalinaHome();
- IPath endorsed = new Path(home).append("common").append("endorsed"); //$NON-NLS-1$//$NON-NLS-2$
- IPath temp = new Path(home).append("temp"); //$NON-NLS-1$
- StringBuffer args = new StringBuffer();
- args.append("-Djava.endorsed.dirs=\""); //$NON-NLS-1$
- args.append(endorsed.toOSString());
- args.append("\" "); //$NON-NLS-1$
- args.append("-Dcatalina.base=\""); //$NON-NLS-1$
- args.append(home);
- args.append("\" "); //$NON-NLS-1$
- args.append("-Dcatalina.home=\""); //$NON-NLS-1$
- args.append(home);
- args.append("\" "); //$NON-NLS-1$
- args.append("-Djava.io.tmpdir=\""); //$NON-NLS-1$
- args.append(temp.toOSString());
- args.append("\""); //$NON-NLS-1$
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, args.toString());
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "start"); //$NON-NLS-1$
- }
- } catch (CoreException e) {
- setErrorMessage(e.getMessage());
- DebugPlugin.log(e);
- }
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
- */
- public void performApply(ILaunchConfigurationWorkingCopy configuration) {
- configuration.setAttribute(TomcatLaunchDelegate.ATTR_CATALINA_HOME, getAttributeValueFrom(fTomcatDir));
- String projectName = getAttributeValueFrom(fProjectText);
- configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, projectName);
- }
-
- /**
- * Retuns the string in the text widget, or <code>null</code> if empty.
- *
- * @return text or <code>null</code>
- */
- protected String getAttributeValueFrom(Text text) {
- String content = text.getText().trim();
- if (content.length() > 0) {
- return content;
- }
- return null;
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
- */
- public String getName() {
- return LaunchingMessages.TomcatTab_7;
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
- */
- public Image getImage() {
- return JspPluginImages.getImage(JspPluginImages.IMG_OBJ_TOMCAT);
- }
-
-}
-
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTabGroup.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTabGroup.java
deleted file mode 100644
index 215b743..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTabGroup.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-
-/**
- * Tab group for launching a local Tomcat server.
- */
-public class TomcatTabGroup extends AbstractLaunchConfigurationTabGroup {
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.lang.String)
- */
- public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
- ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
- new TomcatTab(),
- new JavaJRETab(),
- new JavaClasspathTab(),
- new SourceLookupTab(),
- new CommonTab(),
- };
- setTabs(tabs);
- }
-
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/stuff/Search.java b/org.eclipse.jdt.ui.examples.javafamily/stuff/Search.java
deleted file mode 100644
index 93bf989..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/stuff/Search.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 24, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code Template
- */
-package org.eclipse.jsp.core.search;
-
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
-
-import javax.servlet.jsp.tagext.TagInfo;
-import javax.servlet.jsp.tagext.TagLibraryInfo;
-
-import org.apache.jasper.CommandLineContext;
-import org.apache.jasper.JasperException;
-import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.Options;
-import org.apache.jasper.compiler.*;
-import org.apache.jasper.compiler.Compiler;
-import org.xml.sax.Attributes;
-
-/**
- * @author weinand
- */
-public class Search {
-
- static JspCompilationContext context= new JspCompilationContext() {
- public String getClassPath() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public JspReader getReader() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ServletWriter getWriter() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ClassLoader getClassLoader() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean isErrorPage() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public String getOutputDir() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getJavacOutputDir() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getJspFile() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getServletClassName() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getServletPackageName() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getServletJavaFileName() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean keepGenerated() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public String getContentType() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Options getOptions() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void setContentType(String arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public void setReader(JspReader arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public void setWriter(ServletWriter arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public void setServletClassName(String arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public void setServletPackageName(String arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public void setServletJavaFileName(String arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public void setErrorPage(boolean arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public Compiler createCompiler() throws JasperException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String resolveRelativeUri(String arg0) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public InputStream getResourceAsStream(String arg0) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public URL getResource(String arg0) throws MalformedURLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getRealPath(String arg0) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String[] getTldLocation(String arg0) throws JasperException {
- // TODO Auto-generated method stub
- return null;
- }
- };
-
- static ParseEventListener pel= new ParseEventListener() {
- public void setReader(JspReader arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public void setDefault(boolean arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public void setTemplateInfo(Mark arg0, Mark arg1) {
- // TODO Auto-generated method stub
-
- }
-
- public void beginPageProcessing() throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleComment(Mark arg0, Mark arg1, char[] arg2)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleDirective(
- String arg0,
- Mark arg1,
- Mark arg2,
- Attributes arg3)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleDeclaration(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- char[] arg3)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleScriptlet(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- char[] arg3)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleExpression(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- char[] arg3)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleBean(Mark arg0, Mark arg1, Attributes arg2)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleBean(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- boolean arg3)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleBeanEnd(Mark arg0, Mark arg1, Attributes arg2)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleGetProperty(Mark arg0, Mark arg1, Attributes arg2)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleSetProperty(Mark arg0, Mark arg1, Attributes arg2)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleSetProperty(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- boolean arg3)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handlePlugin(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- Hashtable arg3,
- String arg4)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handlePlugin(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- Hashtable arg3,
- String arg4,
- boolean arg5)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleCharData(Mark arg0, Mark arg1, char[] arg2)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public TagLibraries getTagLibraries() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void handleTagBegin(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- String arg3,
- String arg4,
- TagLibraryInfo arg5,
- TagInfo arg6,
- boolean arg7)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleTagBegin(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- String arg3,
- String arg4,
- TagLibraryInfo arg5,
- TagInfo arg6,
- boolean arg7,
- boolean arg8)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleTagEnd(
- Mark arg0,
- Mark arg1,
- String arg2,
- String arg3,
- Attributes arg4,
- TagLibraryInfo arg5,
- TagInfo arg6,
- boolean arg7)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleForward(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- Hashtable arg3)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleForward(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- Hashtable arg3,
- boolean arg4)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleInclude(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- Hashtable arg3)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleInclude(
- Mark arg0,
- Mark arg1,
- Attributes arg2,
- Hashtable arg3,
- boolean arg4)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void endPageProcessing() throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleRootBegin(Attributes arg0) throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleRootEnd() {
- // TODO Auto-generated method stub
-
- }
-
- public void handleUninterpretedTagBegin(
- Mark arg0,
- Mark arg1,
- String arg2,
- Attributes arg3)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleUninterpretedTagEnd(
- Mark arg0,
- Mark arg1,
- String arg2,
- char[] arg3)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
-
- public void handleJspCdata(Mark arg0, Mark arg1, char[] arg2)
- throws JasperException {
- // TODO Auto-generated method stub
-
- }
- };
-
- public static void main(String[] args) {
-
- String file= null;
- String encoding= null;
- InputStreamReader reader= null;
-
- try {
- Parser p= new Parser(context, file, encoding, reader, pel);
- p.parse();
- } catch (ParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (JasperException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/stuff/easy.jsp b/org.eclipse.jdt.ui.examples.javafamily/stuff/easy.jsp
deleted file mode 100644
index ace438a..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/stuff/easy.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ page contentType="text/html" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<html>
- <head>
- <title>JSP is Easy</title>
- </head>
- <body bgcolor="white">
-
- <h1>JSP is as easy as ...</h1>
-
- <%-- Calculate the sum of 1 + 2 + 3 dynamically --%>
- 1 + 2 + 3 = <c:out value="${1 + 2 + 3}" />
-
- </body>
-</html>
diff --git a/org.eclipse.jdt.ui.examples.javafamily/stuff/easy_jsp.java b/org.eclipse.jdt.ui.examples.javafamily/stuff/easy_jsp.java
deleted file mode 100644
index 85ec518..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/stuff/easy_jsp.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.apache.jsp;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import org.apache.jasper.runtime.*;
-
-public class easy_jsp extends HttpJspBase {
-
-
- private static java.util.Vector _jspx_includes;
-
- private org.apache.jasper.runtime.TagHandlerPool _jspx_tagPool_c_out_value;
-
- public easy_jsp() {
- _jspx_tagPool_c_out_value = new org.apache.jasper.runtime.TagHandlerPool();
- }
-
- public java.util.List getIncludes() {
- return _jspx_includes;
- }
-
- public void _jspDestroy() {
- _jspx_tagPool_c_out_value.release();
- }
-
- public void _jspService(HttpServletRequest request, HttpServletResponse response)
- throws java.io.IOException, ServletException {
-
- JspFactory _jspxFactory = null;
- javax.servlet.jsp.PageContext pageContext = null;
- HttpSession session = null;
- ServletContext application = null;
- ServletConfig config = null;
- JspWriter out = null;
- Object page = this;
- JspWriter _jspx_out = null;
-
-
- try {
- _jspxFactory = JspFactory.getDefaultFactory();
- response.setContentType("text/html;charset=ISO-8859-1");
- pageContext = _jspxFactory.getPageContext(this, request, response,
- null, true, 8192, true);
- application = pageContext.getServletContext();
- config = pageContext.getServletConfig();
- session = pageContext.getSession();
- out = pageContext.getOut();
- _jspx_out = out;
-
- out.write("\r\n");
- out.write("\r\n");
- out.write("<html>\r\n ");
- out.write("<head>\r\n ");
- out.write("<title>JSP is Easy");
- out.write("</title>\r\n ");
- out.write("</head>\r\n ");
- out.write("<body bgcolor=\"white\">\r\n\r\n ");
- out.write("<h1>JSP is as easy as ...");
- out.write("</h1>\r\n\r\n ");
- out.write("\r\n 1 + 2 + 3 = ");
- if (_jspx_meth_c_out_0(pageContext))
- return;
- out.write("\r\n\r\n ");
- out.write("</body>\r\n");
- out.write("</html>\r\n");
- } catch (Throwable t) {
- out = _jspx_out;
- if (out != null && out.getBufferSize() != 0)
- out.clearBuffer();
- if (pageContext != null) pageContext.handlePageException(t);
- } finally {
- if (_jspxFactory != null) _jspxFactory.releasePageContext(pageContext);
- }
- }
-
- private boolean _jspx_meth_c_out_0(javax.servlet.jsp.PageContext pageContext)
- throws Throwable {
- JspWriter out = pageContext.getOut();
- /* ---- c:out ---- */
- org.apache.taglibs.standard.tag.el.core.OutTag _jspx_th_c_out_0 = (org.apache.taglibs.standard.tag.el.core.OutTag) _jspx_tagPool_c_out_value.get(org.apache.taglibs.standard.tag.el.core.OutTag.class);
- _jspx_th_c_out_0.setPageContext(pageContext);
- _jspx_th_c_out_0.setParent(null);
- _jspx_th_c_out_0.setValue("${1 + 2 + 3}");
- int _jspx_eval_c_out_0 = _jspx_th_c_out_0.doStartTag();
- if (_jspx_th_c_out_0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE)
- return true;
- _jspx_tagPool_c_out_value.reuse(_jspx_th_c_out_0);
- return false;
- }
-}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/stuff/exampleJspProject.zip b/org.eclipse.jdt.ui.examples.javafamily/stuff/exampleJspProject.zip
deleted file mode 100644
index fc299767..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/stuff/exampleJspProject.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.ui.examples.javafamily/stuff/index-format11 b/org.eclipse.jdt.ui.examples.javafamily/stuff/index-format11
deleted file mode 100644
index 1303041..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/stuff/index-format11
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/MixedLineDelimiterDetector.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/MixedLineDelimiterDetector.java
index ae81e07..4a9491c 100644
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/MixedLineDelimiterDetector.java
+++ b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/MixedLineDelimiterDetector.java
@@ -176,9 +176,6 @@
// SearchScope scope= SearchScope.newSearchScope("", new IResource[] { resource }); //$NON-NLS-1$
// engine.search(scope, false, collector, new LineDelimiterLocator(MIXED_LD));
// return (IResource[])result.toArray(new IResource[result.size()]);
-
- Assert.fail("support currently disabled");
-
return new IResource[0];
}
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 "Content". 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> "CPL". For purposes of the CPL, "Program" 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 "Other License", any modifications, enhancements and/or
-other code and/or documentation "Modifications" uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the 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/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.java
index 00cfa76..9052624 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.java
@@ -28,7 +28,6 @@
public static String UnusedCodeFix_RemoveImport_description;
public static String Java50Fix_AddMissingAnnotation_description;
- public static String Java50Fix_AddMissingAnnotations_description;
public static String Java50Fix_AddDeprecated_description;
public static String Java50Fix_AddOverride_description;
public static String Java50Fix_ConvertToEnhancedForLoop_description;
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.properties b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.properties
index 4cb860d..c76b36e 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.properties
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.properties
@@ -8,7 +8,6 @@
UnusedCodeFix_RemoveImport_description=Remove unused import
Java50Fix_AddMissingAnnotation_description=Add missing @{0} annotation
-Java50Fix_AddMissingAnnotations_description=Add missing annotations
Java50Fix_ConvertToEnhancedForLoop_description=Convert to enhanced for loop
Java50Fix_AddDeprecated_description=Add missing @Deprecated annotation
Java50Fix_AddOverride_description=Add missing @Override annotation
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/Java50Fix.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/Java50Fix.java
index aa1da3f..a3a5cbe 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/Java50Fix.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/Java50Fix.java
@@ -57,6 +57,8 @@
*/
public class Java50Fix extends LinkedFix {
+ private static final String OVERRIDE= "Override"; //$NON-NLS-1$
+ private static final String DEPRECATED= "Deprecated"; //$NON-NLS-1$
private static final String FOR_LOOP_ELEMENT_IDENTIFIER= "element"; //$NON-NLS-1$
private static class ForLoopConverterGenerator extends GenericVisitor {
@@ -128,49 +130,53 @@
private static class AnnotationRewriteOperation implements IFixRewriteOperation {
private final BodyDeclaration fBodyDeclaration;
- private final String[] fAnnotations;
+ private final String fAnnotation;
- public AnnotationRewriteOperation(BodyDeclaration bodyDeclaration, String[] annotations) {
+ public AnnotationRewriteOperation(BodyDeclaration bodyDeclaration, String annotation) {
fBodyDeclaration= bodyDeclaration;
- fAnnotations= annotations;
+ fAnnotation= annotation;
}
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.corext.fix.AbstractFix.IFixRewriteOperation#rewriteAST(org.eclipse.jdt.core.dom.rewrite.ASTRewrite, org.eclipse.jdt.internal.corext.codemanipulation.ImportRewrite, org.eclipse.jdt.core.dom.CompilationUnit, java.util.List)
*/
public void rewriteAST(ASTRewrite rewrite, NewImportRewrite importRewrite, CompilationUnit compilationUnit, List textEditGroups) throws CoreException {
- addAnnotation(fBodyDeclaration, fAnnotations, compilationUnit.getAST(), rewrite, textEditGroups);
+ addAnnotation(fBodyDeclaration, fAnnotation, compilationUnit.getAST(), rewrite, textEditGroups);
}
- private void addAnnotation(BodyDeclaration declaration, String[] annotationNames, AST ast, ASTRewrite rewrite, List textEditGroups) {
+ private void addAnnotation(BodyDeclaration declaration, String annotation, AST ast, ASTRewrite rewrite, List textEditGroups) {
ListRewrite listRewrite= rewrite.getListRewrite(declaration, declaration.getModifiersProperty());
-
- for (int i= 0; i < annotationNames.length; i++) {
- Annotation newAnnotation= ast.newMarkerAnnotation();
- newAnnotation.setTypeName(ast.newSimpleName(annotationNames[i]));
- TextEditGroup group= new TextEditGroup(MessageFormat.format(FixMessages.Java50Fix_AddMissingAnnotation_description, new Object[] {annotationNames[i]}));
- textEditGroups.add(group);
- listRewrite.insertFirst(newAnnotation, group);
- }
+ Annotation newAnnotation= ast.newMarkerAnnotation();
+ newAnnotation.setTypeName(ast.newSimpleName(annotation));
+ TextEditGroup group= new TextEditGroup(MessageFormat.format(FixMessages.Java50Fix_AddMissingAnnotation_description, new Object[] {annotation}));
+ textEditGroups.add(group);
+ listRewrite.insertFirst(newAnnotation, group);
}
}
public static Java50Fix createAddOverrideAnnotationFix(CompilationUnit compilationUnit, IProblemLocation problem) {
- return createFix(compilationUnit, problem, true, false);
+ if (problem.getProblemId() != IProblem.MissingOverrideAnnotation)
+ return null;
+
+ return createFix(compilationUnit, problem, OVERRIDE, FixMessages.Java50Fix_AddOverride_description);
}
public static Java50Fix createAddDeprectatedAnnotation(CompilationUnit compilationUnit, IProblemLocation problem) {
- return createFix(compilationUnit, problem, false, true);
+ int id= problem.getProblemId();
+ if (id != IProblem.FieldMissingDeprecatedAnnotation &&
+ id != IProblem.MethodMissingDeprecatedAnnotation &&
+ id != IProblem.TypeMissingDeprecatedAnnotation)
+
+ return null;
+
+ return createFix(compilationUnit, problem, DEPRECATED, FixMessages.Java50Fix_AddDeprecated_description);
}
- private static Java50Fix createFix(CompilationUnit compilationUnit, IProblemLocation problem, boolean addOverrideAnnotation, boolean addDepricatedAnnotation) {
+ private static Java50Fix createFix(CompilationUnit compilationUnit, IProblemLocation problem, String annotation, String label) {
ICompilationUnit cu= (ICompilationUnit)compilationUnit.getJavaElement();
if (!JavaModelUtil.is50OrHigher(cu.getJavaProject()))
return null;
- if (!addOverrideAnnotation && !addDepricatedAnnotation)
- return null;
-
ASTNode selectedNode= problem.getCoveringNode(compilationUnit);
if (selectedNode == null)
return null;
@@ -179,18 +185,11 @@
if (!(declaringNode instanceof BodyDeclaration))
return null;
- List/*<String>*/ annotations= new ArrayList();
-
- String name= addAnnotations(problem, addOverrideAnnotation, addDepricatedAnnotation, annotations);
-
- if (annotations.isEmpty())
- return null;
-
BodyDeclaration declaration= (BodyDeclaration) declaringNode;
- AnnotationRewriteOperation operation= new AnnotationRewriteOperation(declaration, (String[])annotations.toArray(new String[annotations.size()]));
+ AnnotationRewriteOperation operation= new AnnotationRewriteOperation(declaration, annotation);
- return new Java50Fix(name, compilationUnit, new IFixRewriteOperation[] {operation});
+ return new Java50Fix(label, compilationUnit, new IFixRewriteOperation[] {operation});
}
public static Java50Fix createConvertForLoopToEnhancedFix(CompilationUnit compilationUnit, ForStatement loop) {
@@ -223,31 +222,50 @@
List/*<IFixRewriteOperation>*/ operations= new ArrayList();
- if (addOverrideAnnotation || addDeprecatedAnnotation) {
+ if (addOverrideAnnotation) {
IProblem[] problems= compilationUnit.getProblems();
for (int i= 0; i < problems.length; i++) {
- IProblemLocation problem= getProblemLocation(problems[i]);
- if (isMissingDeprecated(problem) || isMissingOverride(problem)) {
-
+ if (problems[i].getID() == IProblem.MissingOverrideAnnotation) {
+
+ IProblemLocation problem= getProblemLocation(problems[i]);
+
ASTNode selectedNode= problem.getCoveringNode(compilationUnit);
if (selectedNode != null) {
-
+
ASTNode declaringNode= getDeclaringNode(selectedNode);
if (declaringNode instanceof BodyDeclaration) {
-
- List/*<String>*/ annotations= new ArrayList();
-
- addAnnotations(problem, addOverrideAnnotation, addDeprecatedAnnotation, annotations);
-
- if (!annotations.isEmpty()) {
- BodyDeclaration declaration= (BodyDeclaration) declaringNode;
- AnnotationRewriteOperation annotationAdapter= new AnnotationRewriteOperation(declaration, (String[])annotations.toArray(new String[annotations.size()]));
- operations.add(annotationAdapter);
- }
+ BodyDeclaration declaration= (BodyDeclaration) declaringNode;
+ AnnotationRewriteOperation operation= new AnnotationRewriteOperation(declaration, OVERRIDE);
+ operations.add(operation);
}
}
- }
+ }
+ }
+ }
+
+ if (addDeprecatedAnnotation) {
+ IProblem[] problems= compilationUnit.getProblems();
+ for (int i= 0; i < problems.length; i++) {
+ int id= problems[i].getID();
+
+ if (id == IProblem.FieldMissingDeprecatedAnnotation ||
+ id == IProblem.MethodMissingDeprecatedAnnotation ||
+ id == IProblem.TypeMissingDeprecatedAnnotation) {
+
+ IProblemLocation problem= getProblemLocation(problems[i]);
+
+ ASTNode selectedNode= problem.getCoveringNode(compilationUnit);
+ if (selectedNode != null) {
+
+ ASTNode declaringNode= getDeclaringNode(selectedNode);
+ if (declaringNode instanceof BodyDeclaration) {
+ BodyDeclaration declaration= (BodyDeclaration) declaringNode;
+ AnnotationRewriteOperation operation= new AnnotationRewriteOperation(declaration, DEPRECATED);
+ operations.add(operation);
+ }
+ }
+ }
}
}
@@ -262,34 +280,6 @@
IFixRewriteOperation[] operationsArray= (IFixRewriteOperation[])operations.toArray(new IFixRewriteOperation[operations.size()]);
return new Java50Fix("", compilationUnit, operationsArray); //$NON-NLS-1$
}
-
- private static String addAnnotations(IProblemLocation problem, boolean addOverrideAnnotation, boolean addDepricatedAnnotation, List annotations) {
- String name= ""; //$NON-NLS-1$
- if (addOverrideAnnotation && isMissingOverride(problem)) {
- annotations.add("Override"); //$NON-NLS-1$
- name= FixMessages.Java50Fix_AddOverride_description;
- }
-
- if (addDepricatedAnnotation && isMissingDeprecated(problem)) {
- annotations.add("Deprecated"); //$NON-NLS-1$
- name= FixMessages.Java50Fix_AddDeprecated_description;
- }
-
- if (annotations.size() == 2) {
- name= FixMessages.Java50Fix_AddMissingAnnotations_description;
- }
- return name;
- }
-
- private static boolean isMissingOverride(IProblemLocation problem) {
- return problem.getProblemId() == IProblem.MissingOverrideAnnotation;
- }
-
- private static boolean isMissingDeprecated(IProblemLocation problem) {
- return problem.getProblemId() == IProblem.FieldMissingDeprecatedAnnotation ||
- problem.getProblemId() == IProblem.MethodMissingDeprecatedAnnotation ||
- problem.getProblemId() == IProblem.TypeMissingDeprecatedAnnotation;
- }
private static ASTNode getDeclaringNode(ASTNode selectedNode) {
ASTNode declaringNode= null;
diff --git a/org.eclipse.ltk.ui/.classpath b/org.eclipse.ltk.ui/.classpath
deleted file mode 100644
index 12dd669..0000000
--- a/org.eclipse.ltk.ui/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="**/internal/**" 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.ltk.ui/.cvsignore b/org.eclipse.ltk.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.ltk.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.ltk.ui/.project b/org.eclipse.ltk.ui/.project
deleted file mode 100644
index 939a5ed..0000000
--- a/org.eclipse.ltk.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ltk.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.ltk.ui/plugin.xml b/org.eclipse.ltk.ui/plugin.xml
deleted file mode 100644
index 61a59dd..0000000
--- a/org.eclipse.ltk.ui/plugin.xml
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.ltk.ui"
- name="%plugin.name"
- version="1.0.0"
- provider-name="%provider.name">
-
- <runtime>
- <library name="ltkui.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.ui"/>
- </requires>
-
- <extension
- point="org.eclipse.ui.contexts">
- <context
- name="%context.editingSource.name"
- description="%context.editingSource.description"
- parentId="org.eclipse.ui.textEditorScope"
- id="org.eclipse.ltk.ui.sourceEditingScope">
- </context>
- </extension>
-
-
- <extension
- point="org.eclipse.ui.commands">
-
- <category
- name="%category.source.name"
- description="%category.source.description"
- id="org.eclipse.ltk.ui.category.source">
- </category>
-
-<!-- edit -->
-
- <command
- name="%command.selectEnclosingElement.name"
- description="%command.selectEnclosingElement.description"
- categoryId="org.eclipse.ui.category.edit"
- id="org.eclipse.ltk.ui.sourceEditing.selectEnclosingElement">
- </command>
- <keyBinding
- keySequence="M3+M2+ARROW_UP"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.selectEnclosingElement"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.selectNextElement.name"
- description="%command.selectNextElement.description"
- categoryId="org.eclipse.ui.category.edit"
- id="org.eclipse.ltk.ui.sourceEditing.selectNextElement">
- </command>
- <keyBinding
- keySequence="M3+M2+ARROW_RIGHT"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.selectNextElement"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.selectPreviousElement.name"
- description="%command.selectPreviousElement.description"
- categoryId="org.eclipse.ui.category.edit"
- id="org.eclipse.ltk.ui.sourceEditing.selectPreviousElement">
- </command>
- <keyBinding
- keySequence="M3+M2+ARROW_LEFT"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.selectPreviousElement"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.restoreLastElementSelection.name"
- description="%command.restoreLastElementSelection.description"
- categoryId="org.eclipse.ui.category.edit"
- id="org.eclipse.ltk.ui.sourceEditing.restoreLastElementSelection">
- </command>
- <keyBinding
- keySequence="M3+M2+ARROW_DOWN"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.restoreLastElementSelection"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.showTooltip.name"
- description="%command.showTooltip.description"
- categoryId="org.eclipse.ui.category.edit"
- id="org.eclipse.ltk.ui.sourceEditing.showTooltip">
- </command>
- <keyBinding
- keySequence="F2"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.showTooltip"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
-<!-- source -->
-
- <command
- name="%command.sourceMenu.name"
- description="%command.sourceMenu.description"
- categoryId="org.eclipse.ui.category.edit"
- id="org.eclipse.ltk.ui.sourceEditing.sourceMenu">
- </command>
- <keyBinding
- keySequence="M3+M2+S"
- contextId="org.eclipse.ui.globalScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.sourceMenu"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="carbon"
- keySequence="M3+M2+S"
- contextId="org.eclipse.ui.globalScope"
- commandId=""
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="carbon"
- keySequence="M1+M3+S"
- contextId="org.eclipse.ui.globalScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.sourceMenu"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.comment.name"
- description="%command.comment.description"
- categoryId="org.eclipse.ltk.ui.category.source"
- id="org.eclipse.ltk.ui.sourceEditing.comment">
- </command>
-
- <command
- name="%command.uncomment.name"
- description="%command.uncomment.description"
- categoryId="org.eclipse.ltk.ui.category.source"
- id="org.eclipse.ltk.ui.sourceEditing.uncomment">
- </command>
-
- <command
- name="%command.toggleComment.name"
- description="%command.toggleComment.description"
- categoryId="org.eclipse.ltk.ui.category.source"
- id="org.eclipse.ltk.ui.sourceEditing.toggleComment">
- </command>
- <keyBinding
- keySequence="M1+M2+C"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.toggleComment"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- keySequence="M1+/"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.toggleComment"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- keySequence="M1+7"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.toggleComment"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="gtk"
- keySequence="M1+M2+C"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId=""
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="gtk"
- keySequence="Esc M1+C"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.toggleComment"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%comment.addBlockComment.name"
- description="%comment.addBlockComment.description"
- categoryId="org.eclipse.ltk.ui.category.source"
- id="org.eclipse.ltk.ui.sourceEditing.addBlockComment">
- </command>
- <keyBinding
- keySequence="M1+M2+/"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.addBlockComment"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.removeBlockComment.name"
- description="%command.removeBlockComment.description"
- categoryId="org.eclipse.ltk.ui.category.source"
- id="org.eclipse.ltk.ui.sourceEditing.removeBlockComment">
- </command>
- <keyBinding
- keySequence="M1+M2+\"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.removeBlockComment"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.format.name"
- description="%command.format.description"
- categoryId="org.eclipse.ltk.ui.category.source"
- id="org.eclipse.ltk.ui.sourceEditing.format">
- </command>
- <keyBinding
- keySequence="M1+M2+F"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.format"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="gtk"
- keySequence="M1+M2+F"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId=""
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="gtk"
- keySequence="Esc M1+F"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.format"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.formatElement.name"
- description="%command.formatElement.description"
- categoryId="org.eclipse.ltk.ui.category.source"
- id="org.eclipse.ltk.ui.sourceEditing.formatElement">
- </command>
-
- <command
- name="%command.correctIndentation.name"
- description="%command.correctIndentation.description"
- categoryId="org.eclipse.ltk.ui.category.source"
- id="org.eclipse.ltk.ui.sourceEditing.correctIndentation">
- </command>
- <keyBinding
- keySequence="M1+I"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.correctIndentation"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.toggleMarkOccurrences.label"
- description="%command.toggleMarkOccurrences.description"
- categoryId="org.eclipse.ltk.ui.category.source"
- id="org.eclipse.ltk.ui.sourceEditing.toggleMarkOccurrences">
- </command>
- <keyBinding
- keySequence="M3+M2+O"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.toggleMarkOccurrences"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="carbon"
- keySequence="M3+M2+O"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId=""
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="carbon"
- keySequence="M1+M3+O"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.toggleMarkOccurrences"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
-<!-- navigate -->
-
- <command
- name="%command.gotoNextMember.name"
- description="%command.gotoNextMember.description"
- categoryId="org.eclipse.ui.category.navigate"
- id="org.eclipse.ltk.ui.sourceEditing.gotoNextMember">
- </command>
- <keyBinding
- keySequence="M1+M2+ARROW_DOWN"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.gotoNextMember"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.gotoPreviousMember.name"
- description="%command.gotoPreviousMember.description"
- categoryId="org.eclipse.ui.category.navigate"
- id="org.eclipse.ltk.ui.sourceEditing.gotoPreviousMember">
- </command>
- <keyBinding
- keySequence="M1+M2+ARROW_UP"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.gotoPreviousMember"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.gotoMatchingBracket.name"
- description="%command.gotoMatchingBracket.description"
- categoryId="org.eclipse.ui.category.navigate"
- id="org.eclipse.ltk.ui.sourceEditing.gotoMatchingBracket">
- </command>
- <keyBinding
- keySequence="M1+M2+P"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.gotoMatchingBracket"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.showOutline.name"
- description="%command.showOutline.description"
- categoryId="org.eclipse.ui.category.navigate"
- id="org.eclipse.ltk.ui.sourceEditing.showOutline">
- </command>
- <keyBinding
- keySequence="M1+O"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.showOutline"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.openStructure.name"
- description="%command.openStructure.description"
- categoryId="org.eclipse.ui.category.navigate"
- id="org.eclipse.ltk.ui.sourceEditing.openStructure">
- </command>
- <keyBinding
- keySequence="M1+F3"
- contextId="org.eclipse.ltk.ui.sourceEditingScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.openStructure"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- name="%command.openEditor.name"
- description="%command.openEditor.description"
- categoryId="org.eclipse.ui.category.navigate"
- id="org.eclipse.ltk.ui.sourceEditing.openEditor">
- </command>
- <keyBinding
- keySequence="F3"
- contextId="org.eclipse.ui.globalScope"
- commandId="org.eclipse.ltk.ui.sourceEditing.openEditor"
- keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- </extension>
-
-</plugin>
diff --git a/org.eclipse.ltk.ui/scripts/exportplugin.xml b/org.eclipse.ltk.ui/scripts/exportplugin.xml
deleted file mode 100644
index 4402954..0000000
--- a/org.eclipse.ltk.ui/scripts/exportplugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<project name="Export LTK UI" default="export" basedir="..">
- <target name="init">
- <tstamp/>
- <property name="destdir" value="../../plugin-export" />
- <property name="plugin" value="org.eclipse.ltk.ui" />
- <property name="version" value="_3.1.0" />
- <property name="dest" value="${destdir}/${plugin}${version}" />
- </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}/ltkui.jar"
- basedir="bin"
- />
- <copy file="plugin.xml" todir="${dest}"/>
- <copy file="plugin.properties" todir="${dest}"/>
- <zip zipfile="${dest}/ltkuisrc.zip">
- <fileset dir="src" />
- </zip>
- </target>
-</project>
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/META-INF/MANIFEST.MF b/org.junit/META-INF/MANIFEST.MF
deleted file mode 100644
index fd7be3a..0000000
--- a/org.junit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.junit
-Bundle-Version: 3.8.1
-Bundle-ClassPath: junit.jar
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package:
- junit.awtui,
- junit.extensions,
- junit.framework,
- junit.runner,
- junit.swingui,
- junit.swingui.icons,
- junit.textui
-Eclipse-AutoStart: true
diff --git a/org.junit/about.html b/org.junit/about.html
deleted file mode 100644
index a1a9244..0000000
--- a/org.junit/about.html
+++ /dev/null
@@ -1,39 +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>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>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
-Common Public License Version 1.0 ("CPL"). 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>.
-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 the CPL are offered by that IBM alone and not by any other party.</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 19301a7..0000000
--- a/org.junit/build.properties
+++ /dev/null
@@ -1,19 +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,\
- META-INF/
-
-src.includes = *.zip,about.html
-
-
diff --git a/org.junit/cpl-v10.html b/org.junit/cpl-v10.html
deleted file mode 100644
index 455e7b0..0000000
--- a/org.junit/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.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 f588160..0000000
--- a/org.junit/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName=JUnit Testing Framework
-providerName=Eclipse.org
diff --git a/org.junit/plugin.xml b/org.junit/plugin.xml
deleted file mode 100644
index 4d8a631..0000000
--- a/org.junit/plugin.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-</plugin>
diff --git a/org.junit/scripts/exportplugin.xml b/org.junit/scripts/exportplugin.xml
deleted file mode 100644
index 8839876..0000000
--- a/org.junit/scripts/exportplugin.xml
+++ /dev/null
@@ -1,29 +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}"/>
- <copy todir= "${dest}/META-INF">
- <fileset dir="META-INF"/>
- </copy>
-
- </target>
-</project>
