This commit was manufactured by cvs2svn to create tag 'R_3_0_0_e_3_3'.
Sprout from master 2008-06-19 18:45:54 UTC mkersten 'NEW - bug 237367: modified resources go missing from synchronize view in change set mode'
Cherrypick from master 2008-04-18 04:24:44 UTC mkersten 'NEW - bug 202547: improve packaging of Mylyn features to allow redistributions of Team and CVS integration':
org.eclipse.mylyn.context-feature/about.html
org.eclipse.mylyn.ide-feature/about.html
org.eclipse.mylyn.java-feature/about.html
org.eclipse.mylyn.pde-feature/about.html
org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitTabGroup.java
org.eclipse.mylyn.team-feature/about.html
Cherrypick from e_3_3_m_3_x 2008-06-20 18:03:48 UTC spingel 'Version update':
org.eclipse.mylyn.context-feature/feature.xml
org.eclipse.mylyn.ide-feature/feature.xml
org.eclipse.mylyn.ide.ui/.classpath
org.eclipse.mylyn.ide.ui/.project
org.eclipse.mylyn.ide.ui/.settings/org.eclipse.jdt.core.prefs
org.eclipse.mylyn.ide.ui/.settings/org.eclipse.jdt.ui.prefs
org.eclipse.mylyn.ide.ui/.settings/org.eclipse.pde.prefs
org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
org.eclipse.mylyn.ide.ui/about.html
org.eclipse.mylyn.ide.ui/build.properties
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractMarkerInterestFilter.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/IdeUiBridgePlugin.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/IdeUiUtil.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerInterestFilter.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewLabelProvider.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewerInterestSorter.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/XmlNodeHelper.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusBookmarkMarkersViewAction.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProblemsListAction.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProjectExplorerAction.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusResourceNavigatorAction.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusTaskMarkersViewAction.java
org.eclipse.mylyn.java-feature/feature.xml
org.eclipse.mylyn.pde-feature/feature.xml
org.eclipse.mylyn.pde.ui/.classpath
org.eclipse.mylyn.pde.ui/.project
org.eclipse.mylyn.pde.ui/about.html
org.eclipse.mylyn.pde.ui/build.properties
org.eclipse.mylyn.pde.ui/plugin.xml
org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/XmlJavaRelationProvider.java
org.eclipse.mylyn.team-feature/feature.xml
Cherrypick from e_3_3_m_2_x 2008-05-30 20:33:57 UTC mkersten 'Version update':
org.eclipse.mylyn.ide.ui/plugin.xml
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/AbstractFocusMarkerViewAction.java
org.eclipse.mylyn.pde.ui/.settings/org.eclipse.jdt.core.prefs
org.eclipse.mylyn.pde.ui/.settings/org.eclipse.jdt.ui.prefs
org.eclipse.mylyn.pde.ui/.settings/org.eclipse.pde.prefs
org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
org.eclipse.mylyn.pde.ui/icons/elcl16/focus-disabled.gif
org.eclipse.mylyn.pde.ui/icons/elcl16/focus.gif
org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeContextLabelProvider.java
org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java
org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeStructureBridge.java
org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeUiBridge.java
org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeUiBridgePlugin.java
org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitLaunchConfiguration.java
Delete:
org.eclipse.mylyn.cdt-feature/.project
org.eclipse.mylyn.cdt-feature/build.properties
org.eclipse.mylyn.cdt-feature/eclipse_update_120.jpg
org.eclipse.mylyn.cdt-feature/epl-v10.html
org.eclipse.mylyn.cdt-feature/feature.properties
org.eclipse.mylyn.cdt-feature/feature.xml
org.eclipse.mylyn.cdt-feature/license.html
org.eclipse.mylyn.cdt.ui/.classpath
org.eclipse.mylyn.cdt.ui/.project
org.eclipse.mylyn.cdt.ui/.settings/org.eclipse.jdt.core.prefs
org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF
org.eclipse.mylyn.cdt.ui/about.html
org.eclipse.mylyn.cdt.ui/build.properties
org.eclipse.mylyn.cdt.ui/icons/elcl16/focus-disabled.gif
org.eclipse.mylyn.cdt.ui/icons/elcl16/focus.gif
org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-decrease.gif
org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-folding.gif
org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-increase.gif
org.eclipse.mylyn.cdt.ui/icons/etool16/browse-filtered.gif
org.eclipse.mylyn.cdt.ui/icons/wizban/banner-prefs.gif
org.eclipse.mylyn.cdt.ui/plugin.properties
org.eclipse.mylyn.cdt.ui/plugin.xml
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/ActiveFoldingEditorTracker.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTContextLabelProvider.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTDeclarationsFilter.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTEditorMonitor.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTStructureBridge.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUIBridgePlugin.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUiBridge.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUiUtil.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/InterestInducingProblemListener.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/InterestUpdateDeltaListener.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/LandmarkMarkerManager.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/PluginResources.properties
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/TypeHistoryManager.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/actions/FocusCViewAction.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/actions/ShowFilteredChildrenAction.java
org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/editor/ActiveFoldingListener.java
org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusAllMarkersViewAction.javadiff --git a/org.eclipse.mylyn.cdt-feature/.project b/org.eclipse.mylyn.cdt-feature/.project
deleted file mode 100644
index 69673b0..0000000
--- a/org.eclipse.mylyn.cdt-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.mylyn-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.mylyn.cdt-feature/build.properties b/org.eclipse.mylyn.cdt-feature/build.properties
deleted file mode 100644
index c6af93f..0000000
--- a/org.eclipse.mylyn.cdt-feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/org.eclipse.mylyn.cdt-feature/eclipse_update_120.jpg b/org.eclipse.mylyn.cdt-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/org.eclipse.mylyn.cdt-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.cdt-feature/epl-v10.html b/org.eclipse.mylyn.cdt-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.mylyn.cdt-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.mylyn.cdt-feature/feature.properties b/org.eclipse.mylyn.cdt-feature/feature.properties
deleted file mode 100644
index 6bbdf8b..0000000
--- a/org.eclipse.mylyn.cdt-feature/feature.properties
+++ /dev/null
@@ -1,116 +0,0 @@
-featureName=Mylyn Bridge: C/C++ Development
-updateSiteName=CDT Update Site
-description=Eclipse Mylyn Bridge for CDT. Allows use of Mylyn with CDT supported projects.
-
-# copyright
-copyright=\
-Copyright (c) 2008 Red Hat, Inc. and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.mylyn.cdt-feature/feature.xml b/org.eclipse.mylyn.cdt-feature/feature.xml
deleted file mode 100644
index a719645..0000000
--- a/org.eclipse.mylyn.cdt-feature/feature.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.cdt.mylyn"
- label="%featureName"
- version="5.0.0.qualifier"
- provider-name="Eclipse.org"
- plugin="org.eclipse.cdt.mylyn">
-
- <description>
- %description
- </description>
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/ganymede"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.cdt.core"/>
- <import plugin="org.eclipse.mylyn.context.core"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.mylyn.resources.ui"/>
- <import plugin="org.eclipse.mylyn.monitor.core"/>
- <import plugin="org.eclipse.cdt.ui"/>
- <import plugin="org.eclipse.ui.views"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.mylyn.context.ui"/>
- <import plugin="org.eclipse.mylyn.monitor.ui"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.mylyn.tasks.ui" version="2.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.forms" version="3.3.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.mylyn.tasks.core" version="2.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.navigator" version="3.3.100" match="greaterOrEqual"/>
- <import plugin="com.ibm.icu"/>
- </requires>
-
- <plugin
- id="org.eclipse.cdt.mylyn.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.cdt.mylyn"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/org.eclipse.mylyn.cdt-feature/license.html b/org.eclipse.mylyn.cdt-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/org.eclipse.mylyn.cdt-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/org.eclipse.mylyn.cdt.ui/.classpath b/org.eclipse.mylyn.cdt.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/org.eclipse.mylyn.cdt.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.cdt.ui/.project b/org.eclipse.mylyn.cdt.ui/.project
deleted file mode 100644
index d6c138e..0000000
--- a/org.eclipse.mylyn.cdt.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.mylyn.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.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.cdt.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.cdt.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cc62c85..0000000
--- a/org.eclipse.mylyn.cdt.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Mar 07 14:55:44 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 7e32cf6..0000000
--- a/org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.cdt.mylyn.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %bundleVendor
-Require-Bundle: org.eclipse.cdt.core;bundle-version="5.0.0",
- org.eclipse.mylyn.context.core;bundle-version="3.0.0",
- org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.mylyn.resources.ui;bundle-version="3.0.0",
- org.eclipse.mylyn.monitor.core;bundle-version="3.0.0",
- org.eclipse.cdt.ui;bundle-version="5.0.0",
- org.eclipse.ui.views,
- org.eclipse.ui.ide,
- org.eclipse.mylyn.context.ui;bundle-version="3.0.0",
- org.eclipse.mylyn.monitor.ui;bundle-version="3.0.0",
- org.eclipse.jface.text,
- org.eclipse.ui.editors;bundle-version="3.4.0",
- org.eclipse.mylyn.tasks.ui;bundle-version="3.0.0",
- org.eclipse.ui.forms;bundle-version="3.3.100",
- org.eclipse.mylyn.tasks.core;bundle-version="3.0.0",
- org.eclipse.ui.navigator;bundle-version="3.3.100",
- org.eclipse.mylyn.commons.core;bundle-version="3.0.0"
-Export-Package: org.eclipse.cdt.mylyn.internal.ui;x-internal:=true,
- org.eclipse.cdt.mylyn.internal.ui.actions;x-internal:=true,
- org.eclipse.cdt.mylyn.internal.ui.editor;x-internal:=true
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.cdt.mylyn.internal.ui.CDTUIBridgePlugin
-Import-Package: com.ibm.icu.text
diff --git a/org.eclipse.mylyn.cdt.ui/about.html b/org.eclipse.mylyn.cdt.ui/about.html
deleted file mode 100644
index d7c5118..0000000
--- a/org.eclipse.mylyn.cdt.ui/about.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 22, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.cdt.ui/build.properties b/org.eclipse.mylyn.cdt.ui/build.properties
deleted file mode 100644
index 158afa1..0000000
--- a/org.eclipse.mylyn.cdt.ui/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Red Hat Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Red Hat Inc. - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
- .,\
- plugin.properties,\
- icons/,\
- about.html
-src.includes = about.html
diff --git a/org.eclipse.mylyn.cdt.ui/icons/elcl16/focus-disabled.gif b/org.eclipse.mylyn.cdt.ui/icons/elcl16/focus-disabled.gif
deleted file mode 100644
index 24bbeae..0000000
--- a/org.eclipse.mylyn.cdt.ui/icons/elcl16/focus-disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.cdt.ui/icons/elcl16/focus.gif b/org.eclipse.mylyn.cdt.ui/icons/elcl16/focus.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.cdt.ui/icons/elcl16/focus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-decrease.gif b/org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-decrease.gif
deleted file mode 100644
index 645a58f..0000000
--- a/org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-decrease.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-folding.gif b/org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-folding.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-folding.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-increase.gif b/org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-increase.gif
deleted file mode 100644
index 98a2586..0000000
--- a/org.eclipse.mylyn.cdt.ui/icons/elcl16/interest-increase.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.cdt.ui/icons/etool16/browse-filtered.gif b/org.eclipse.mylyn.cdt.ui/icons/etool16/browse-filtered.gif
deleted file mode 100644
index 273bda0..0000000
--- a/org.eclipse.mylyn.cdt.ui/icons/etool16/browse-filtered.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.cdt.ui/icons/wizban/banner-prefs.gif b/org.eclipse.mylyn.cdt.ui/icons/wizban/banner-prefs.gif
deleted file mode 100644
index ce0f6e3..0000000
--- a/org.eclipse.mylyn.cdt.ui/icons/wizban/banner-prefs.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.cdt.ui/plugin.properties b/org.eclipse.mylyn.cdt.ui/plugin.properties
deleted file mode 100644
index 245a4bc..0000000
--- a/org.eclipse.mylyn.cdt.ui/plugin.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Red Hat Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Red Hat Inc. - initial API and implementation
-###############################################################################
-bundleVendor = Red Hat, Inc.
-bundleName = Mylyn CDT Integrator
-structureBridge.name = CDT Structure Bridge
-
-MarkLandmark.label=Mark as Landmark
-MarkLandmark.tooltip=Mark the selected element as a landmark
-RemoveFromContext.label=Remove from Context
-RemoveFromContext.tooltip=Mark selected element as uninteresting
-ShowFilteredChildren.label=Show Filtered Children
-ShowFilteredChildren.tooltip=Show filtered children of selected element, if any exist
-FocusActiveTask.label=Focus on Active Task
-FocusActiveTask.tooltip=Focus only on elements in active Mylyn task
diff --git a/org.eclipse.mylyn.cdt.ui/plugin.xml b/org.eclipse.mylyn.cdt.ui/plugin.xml
deleted file mode 100644
index 47c606f..0000000
--- a/org.eclipse.mylyn.cdt.ui/plugin.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.mylyn.context.core.bridges">
- <structureBridge
- class="org.eclipse.cdt.mylyn.internal.ui.CDTStructureBridge"
- name="%structureBridge.name"
- parentContentType="resource">
- </structureBridge>
- </extension>
- <extension
- point="org.eclipse.mylyn.context.ui.bridges">
- <uiBridge
- class="org.eclipse.cdt.mylyn.internal.ui.CDTUiBridge"
- contentType="c/c++">
- </uiBridge>
- <labelProvider
- class="org.eclipse.cdt.mylyn.internal.ui.CDTContextLabelProvider"
- contentType="c/c++">
- </labelProvider>
- <preservedFilters
- viewId="org.eclipse.cdt.ui.CView">
- <filter
- class="org.eclipse.cdt.mylyn.internal.ui.CDTDeclarationsFilter">
- </filter>
- </preservedFilters>
- </extension>
- <extension
- point="org.eclipse.mylyn.context.ui.startup">
- <startup
- class="org.eclipse.cdt.mylyn.internal.ui.CDTUIBridgePlugin$CDTUIBridgeStartup">
- </startup>
- </extension>
- <extension
- point="org.eclipse.ui.viewActions">
- <viewContribution
- id="org.eclipse.cdt.mylyn.ui.cview.contribution"
- targetID="org.eclipse.cdt.ui.CView">
- <action
- class="org.eclipse.cdt.mylyn.internal.ui.actions.FocusCViewAction"
- disabledIcon="icons/elcl16/focus-disabled.gif"
- enablesFor="*"
- icon="icons/elcl16/focus.gif"
- id="org.eclipse.cdt.mylyn.ui.cview.focusActiveTask.action"
- label="%FocusActiveTask.label"
- menubarPath="mylyn"
- style="toggle"
- toolbarPath="mylyn"
- tooltip="%FocusActiveTask.tooltip">
- </action>
- </viewContribution>
- </extension>
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="false"
- id="org.eclipse.cdt.mylyn.ui.interest.increase.contribution"
- objectClass="org.eclipse.cdt.core.model.ICElement">
- <action
- class="org.eclipse.mylyn.internal.context.ui.actions.InterestIncrementAction"
- definitionId="org.eclipse.mylyn.context.ui.commands.interest.increment"
- enablesFor="*"
- icon="icons/elcl16/interest-increase.gif"
- id="org.eclipse.cdt.mylyn.ui.markAsLandmark.action"
- label="%MarkLandmark.label"
- menubarPath="group.reorganize"
- tooltip="%MarkLandmark.tooltip">
- </action>
- <visibility>
- <and>
- <systemProperty
- name="org.eclipse.mylyn.context.core.context.active"
- value="true">
- </systemProperty>
- <or>
- <objectClass
- name="org.eclipse.cdt.core.model.IFunction">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IMethod">
- </objectClass>
- </or>
- </and>
- </visibility>
- </objectContribution>
- <objectContribution
- adaptable="false"
- id="org.eclipse.cdt.mylyn.ui.interest.remove.contribution.elements"
- objectClass="org.eclipse.cdt.core.model.ICElement">
- <action
- class="org.eclipse.mylyn.internal.context.ui.actions.InterestDecrementAction"
- definitionId="org.eclipse.mylyn.context.ui.commands.interest.decrement"
- enablesFor="*"
- icon="icons/elcl16/interest-decrease.gif"
- id="org.eclipse.mylyn.cdt.ui.interest.decrease.element"
- label="%RemoveFromContext.label"
- menubarPath="group.reorganize"
- tooltip="%RemoveFromContext.tooltip">
- </action>
- <visibility>
- <and>
- <systemProperty
- name="org.eclipse.mylyn.context.core.context.active"
- value="true">
- </systemProperty>
- <or>
- <objectClass
- name="org.eclipse.cdt.core.model.IMethod">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IFunction">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IStructureDeclaration">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IDeclaration">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IUsing">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.ITypeDef">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IMacro">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.INamespace">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IInclude">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IIncludeReference">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IEnumerator">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IContributedCElement">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IBinaryElement">
- </objectClass>
- <objectClass
- name="org.eclipse.cdt.core.model.IBinary">
- </objectClass>
- </or>
- </and>
- </visibility>
- </objectContribution>
- <viewerContribution
- id="org.eclipse.cdt.mylyn.ui.browse.filtered.contribution"
- targetID="org.eclipse.cdt.ui.CView">
- <action
- class="org.eclipse.cdt.mylyn.internal.ui.actions.ShowFilteredChildrenAction"
- enablesFor="1"
- icon="icons/etool16/browse-filtered.gif"
- id="org.eclipse.mylyn.cdt.ui.action3"
- label="%ShowFilteredChildren.label"
- menubarPath="group.reorganize"
- tooltip="%ShowFilteredChildren.tooltip">
- </action>
- <visibility>
- <systemProperty
- name="org.eclipse.mylyn.context.core.context.active"
- value="true">
- </systemProperty>
- </visibility>
- </viewerContribution>
- </extension>
- <extension
- point="org.eclipse.ui.navigator.viewer">
- <viewerContentBinding
- viewerId="org.eclipse.mylyn.context.ui.navigator.context">
- <includes>
- <contentExtension
- pattern="org.eclipse.cdt.ui.navigator.content">
- </contentExtension>
- </includes>
- </viewerContentBinding>
- <viewerContentBinding
- viewerId="org.eclipse.mylyn.context.ui.navigator.context.quick">
- <includes>
- <contentExtension
- pattern="org.eclipse.cdt.ui.navigator.content">
- </contentExtension>
- </includes>
- </viewerContentBinding>
- </extension>
-</plugin>
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/ActiveFoldingEditorTracker.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/ActiveFoldingEditorTracker.java
deleted file mode 100644
index cdda555..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/ActiveFoldingEditorTracker.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.cdt.mylyn.internal.ui.editor.ActiveFoldingListener;
-import org.eclipse.mylyn.monitor.ui.AbstractEditorTracker;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class ActiveFoldingEditorTracker extends AbstractEditorTracker {
-
- protected Map<CEditor, ActiveFoldingListener> editorListenerMap = new HashMap<CEditor, ActiveFoldingListener>();
-
- @Override
- public void editorOpened(IEditorPart part) {
- if (part instanceof CEditor)
- registerEditor((CEditor) part);
- }
-
- @Override
- public void editorClosed(IEditorPart part) {
- if (part instanceof CEditor)
- unregisterEditor((CEditor) part);
- }
-
- public void registerEditor(final CEditor editor) {
- if (editorListenerMap.containsKey(editor)) {
- return;
- } else {
- ActiveFoldingListener listener = new ActiveFoldingListener(editor);
- editorListenerMap.put(editor, listener);
- }
- }
-
- public void unregisterEditor(CEditor editor) {
- ActiveFoldingListener listener = editorListenerMap.get(editor);
- if (listener != null) {
- listener.dispose();
- }
- editorListenerMap.remove(editor);
- }
-
- /**
- * For testing.
- */
- public Map<CEditor, ActiveFoldingListener> getEditorListenerMap() {
- return editorListenerMap;
- }
-
- @Override
- protected void editorBroughtToTop(IEditorPart part) {
- // ignore
- }
-
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTContextLabelProvider.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTContextLabelProvider.java
deleted file mode 100644
index e19fb59..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTContextLabelProvider.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-/*
- * Created on Aug 6, 2004
- * Modified for CDT usage Feb 28, 2008
- */
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
-import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider;
-import org.eclipse.cdt.internal.ui.viewsupport.ProblemsLabelDecorator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.internal.context.ui.ContextUiImages;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class CDTContextLabelProvider extends AppearanceAwareLabelProvider {
-
- private static final String LABEL_ELEMENT_MISSING_KEY = "MylynCDT.missingElementLabel"; // $NON-NLS-1$
- private static final String CONTAINMENT_RELATION_NAME_KEY = "MylynCDT.containmentRelation"; // $NON-NLS-1$
-
- public CDTContextLabelProvider() {
- super(AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS,
- AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS | CElementImageProvider.SMALL_ICONS);
- }
-
- @Override
- public String getText(Object object) {
- if (object instanceof IInteractionElement) {
- IInteractionElement node = (IInteractionElement) object;
- if (CDTStructureBridge.CONTENT_TYPE.equals(node.getContentType())) {
- ICElement element = CDTStructureBridge.getElementForHandle(node.getHandleIdentifier());
- if (element == null) {
- return CDTUIBridgePlugin.getResourceString(LABEL_ELEMENT_MISSING_KEY);
- } else {
- return getTextForElement(element);
- }
- }
- } else if (object instanceof IInteractionRelation) {
- return getNameForRelationship(((IInteractionRelation) object).getRelationshipHandle());
- } else if (object instanceof ICElement) {
- return getTextForElement((ICElement) object);
- }
- return super.getText(object);
- }
-
- private String getTextForElement(ICElement element) {
- // FIXME: Removed due to missing interface in 3.0. Should this test be done somehow?
-// if (DelegatingContextLabelProvider.isQualifyNamesMode()) {
-// if (element instanceof IMethod || element instanceof IFunction) {
-// String parentName = ((ICElement) element).getParent().getElementName();
-// if (parentName != null && parentName != "") {
-// return parentName + '.' + super.getText(element);
-// }
-// }
-// }
- if (element.exists()) {
- return super.getText(element);
- } else {
- return CDTUIBridgePlugin.getResourceString(LABEL_ELEMENT_MISSING_KEY);
- }
- }
-
- @Override
- public Image getImage(Object object) {
- if (object instanceof IInteractionElement) {
- IInteractionElement node = (IInteractionElement) object;
- if (node.getContentType().equals(CDTStructureBridge.CONTENT_TYPE)) {
- ICElement element = CDTStructureBridge.getElementForHandle(node.getHandleIdentifier());
- if (element != null)
- return super.getImage(element);
- return null;
- }
- } else if (object instanceof IInteractionRelation) {
- ImageDescriptor descriptor = getIconForRelationship(((IInteractionRelation) object).getRelationshipHandle());
- if (descriptor != null) {
- return ContextUiImages.getImage(descriptor);
- } else {
- return null;
- }
- }
- return super.getImage(object);
- }
-
- private ImageDescriptor getIconForRelationship(String relationshipHandle) {
- // We have no relation providers for the CDT
- return null;
- }
-
- private String getNameForRelationship(String relationshipHandle) {
- if (relationshipHandle.equals(InteractionContextManager.CONTAINMENT_PROPAGATION_ID)) {
- return CDTUIBridgePlugin.getResourceString(CONTAINMENT_RELATION_NAME_KEY);
- } else {
- return null;
- }
- }
-
- public static AppearanceAwareLabelProvider createCDTUiLabelProvider() {
- AppearanceAwareLabelProvider cdtUiLabelProvider = new AppearanceAwareLabelProvider(
- AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS,
- AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS | CElementImageProvider.SMALL_ICONS);
- cdtUiLabelProvider.addLabelDecorator(new ProblemsLabelDecorator(null));
- return cdtUiLabelProvider;
- }
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTDeclarationsFilter.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTDeclarationsFilter.java
deleted file mode 100644
index 54c45b5..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTDeclarationsFilter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import org.eclipse.cdt.core.model.IFunction;
-import org.eclipse.cdt.core.model.IMethod;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class CDTDeclarationsFilter extends ViewerFilter {
-
- @Override
- public boolean select(Viewer viewer, Object parent, Object element) {
- return !((element instanceof IMethod || element instanceof IFunction));
- }
-
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTEditorMonitor.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTEditorMonitor.java
deleted file mode 100644
index 0c1cc9c..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTEditorMonitor.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import java.util.Iterator;
-
-import org.eclipse.cdt.core.model.CModelException;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.IFunction;
-import org.eclipse.cdt.core.model.IMethod;
-import org.eclipse.cdt.internal.ui.actions.SelectionConverter;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.monitor.ui.AbstractUserInteractionMonitor;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class CDTEditorMonitor extends AbstractUserInteractionMonitor {
-
- protected ICElement lastSelectedElement = null;
-
- protected ICElement lastResolvedElement = null;
-
- protected CEditor currentEditor;
-
- protected StructuredSelection currentSelection = null;
-
- public CDTEditorMonitor() {
- super();
- }
-
- /**
- * Only public for testing
- */
- @Override
- public void handleWorkbenchPartSelection(IWorkbenchPart part,
- ISelection selection, boolean contributeToContext) {
- try {
- ICElement selectedElement = null;
- if (selection instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) selection;
-
- if (structuredSelection.equals(currentSelection)) {
- return;
- }
- currentSelection = structuredSelection;
-
- // Object selectedObject =
- // structuredSelection.getFirstElement();
- for (Iterator<?> iterator = structuredSelection.iterator(); iterator
- .hasNext();) {
- Object selectedObject = iterator.next();
- if (selectedObject instanceof ICElement) {
- ICElement checkedElement = checkIfAcceptedAndPromoteIfNecessary((ICElement) selectedObject);
- if (checkedElement == null) {
- return;
- } else {
- selectedElement = checkedElement;
- }
- }
- if (selectedElement != null) {
- super.handleElementSelection(part, selectedElement,
- contributeToContext);
- }
- }
- } else {
- if (part instanceof CEditor) {
- currentEditor = (CEditor) part;
- selectedElement = SelectionConverter
- .getElementAtOffset(currentEditor);
- if (selectedElement == null)
- return; // nothing selected
-
- if (selectedElement != null) {
- if (selectedElement.equals(lastSelectedElement)) {
- super.handleElementEdit(part, selectedElement,
- contributeToContext);
- } else if (!selectedElement.equals(lastSelectedElement)) {
- super.handleElementSelection(part, selectedElement,
- contributeToContext);
- }
- }
-
- ICElement checkedElement = checkIfAcceptedAndPromoteIfNecessary(selectedElement);
- if (checkedElement == null) {
- return;
- } else {
- selectedElement = checkedElement;
- }
- }
- }
- if (selectedElement != null) {
- lastSelectedElement = selectedElement;
- }
- } catch (CModelException e) {
- // ignore, fine to fail to resolve an element if the model is not
- // up-to-date
- }
- }
-
- /**
- * @return null for elements that aren't modeled
- */
- protected ICElement checkIfAcceptedAndPromoteIfNecessary(ICElement element) {
- if (element instanceof IMethod || element instanceof IFunction)
- return element;
- return null;
- }
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTStructureBridge.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTStructureBridge.java
deleted file mode 100644
index 440ab08..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTStructureBridge.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.CModelException;
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.model.IBinary;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.IFunction;
-import org.eclipse.cdt.core.model.IInclude;
-import org.eclipse.cdt.core.model.IMethod;
-import org.eclipse.cdt.core.model.IParent;
-import org.eclipse.cdt.core.model.ISourceReference;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.resources.ui.ResourceStructureBridge;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.views.markers.internal.ConcreteMarker;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class CDTStructureBridge extends AbstractContextStructureBridge {
-
- public final static String CONTENT_TYPE = "c/c++"; // $NON-NLS-1$
- public final static int C_SOURCEROOT = 1000;
-
- public CDTStructureBridge() {
- }
-
- @Override
- public String getContentType() {
- return CONTENT_TYPE;
- }
-
- @Override
- public Object getAdaptedParent(Object object) {
- if (object instanceof IFile) {
- IFile file = (IFile) object;
- return CoreModel.getDefault().create(file.getParent());
- } else {
- return super.getAdaptedParent(object);
- }
- }
-
- @Override
- public String getParentHandle(String handle) {
- ICElement cElement = (ICElement) getObjectForHandle(handle);
- if (cElement != null && cElement.getParent() != null) {
- return getHandleForElement(cElement.getParent());
- } else {
- return null;
- }
- }
-
- @Override
- public List<String> getChildHandles(String handle) {
- Object object = getObjectForHandle(handle);
- if (object instanceof ICElement) {
- ICElement element = (ICElement) object;
- if (element instanceof IParent) {
- IParent parent = (IParent) element;
- ICElement[] children;
- try {
- children = parent.getChildren();
- List<String> childHandles = new ArrayList<String>();
- for (int i = 0; i < children.length; i++) {
- String childHandle = getHandleIdentifier(children[i]);
- if (childHandle != null)
- childHandles.add(childHandle);
- }
- AbstractContextStructureBridge parentBridge = ContextCorePlugin.getDefault().getStructureBridge(
- parentContentType);
- if (parentBridge != null && parentBridge instanceof ResourceStructureBridge) {
- // TODO: Make sure line below is correct
- if (element.getElementType() < ICElement.C_NAMESPACE) {
- List<String> resourceChildren = parentBridge.getChildHandles(handle);
- if (!resourceChildren.isEmpty())
- childHandles.addAll(resourceChildren);
- }
- }
-
- return childHandles;
- } catch (CModelException e) {
- // ignore these, usually indicate no-existent element
- }
- }
- }
- return Collections.emptyList();
- }
-
- public static ICElement getElementForHandle(String handle) {
- return CoreModel.create(handle);
- }
-
-
- @Override
- public Object getObjectForHandle(String handle) {
- return getElementForHandle(handle);
- }
-
- // In the CDT, an ICElement does not have a handle interface like a
- // JavaElement. So, to find an element again, we save its CProject name,
- // plus its path, plus its element name. The CProject name allows us
- // to find the CProject. The path allows us to find the ITranslationUnit.
- // The element name (optional) allows us to find an element within the
- // TranslationUnit.
- public static String getHandleForElement(ICElement element) {
- return element.getHandleIdentifier();
- }
-
- /**
- * Uses resource-compatible path for projects
- */
- @Override
- public String getHandleIdentifier(Object object) {
- if (object instanceof ICElement) {
- return getHandleForElement((ICElement) object);
- } else {
- if (object instanceof IAdaptable) {
- Object adapter = ((IAdaptable) object).getAdapter(ICElement.class);
- if (adapter instanceof ICElement) {
- return getHandleForElement((ICElement) adapter);
- }
- }
- }
- return null;
- }
-
-
- @Override
- public String getLabel(Object object) {
- if (object instanceof ICElement) {
- return ((ICElement) object).getElementName();
- } else {
- return "";
- }
- }
-
- @Override
- public boolean canBeLandmark(String handle) {
- ICElement element = (ICElement) getObjectForHandle(handle);
- if ((element instanceof IMethod || element instanceof IFunction) && element.exists()) {
- return true;
- } else {
- return false;
- }
- }
-
- /**
- * TODO: figure out if the non ICElement stuff is needed
- */
- @Override
- public boolean acceptsObject(Object object) {
- if (object instanceof IResource) {
- object = ((IResource) object).getAdapter(ICElement.class);
- }
-
- boolean accepts = (object instanceof ICElement && !(object instanceof IBinary))
- || object instanceof IWorkingSet;
-
- return accepts;
- }
-
- @Override
- public boolean canFilter(Object object) {
- // FIXME: Removed some logic from JavaStructureBridge...is it necessary?
- if (object instanceof IWorkingSet) {
- try {
- IWorkingSet workingSet = (IWorkingSet) object;
- IAdaptable[] elements = workingSet.getElements();
- for (int i = 0; i < elements.length; i++) {
- IAdaptable adaptable = elements[i];
- IInteractionElement element = ContextCorePlugin.getContextManager().getElement(
- getHandleIdentifier(adaptable));
- if (element.getInterest().isInteresting())
- return false;
- }
- } catch (Exception e) {
- return false;
- }
- }
- return true;
- }
-
- @Override
- public boolean isDocument(String handle) {
- ICElement element = (ICElement) getObjectForHandle(handle);
- return element instanceof ITranslationUnit;
- }
-
- @Override
- public String getHandleForOffsetInObject(Object object, int offset) {
- IMarker marker;
- int charStart = 0;
- if (object instanceof ConcreteMarker)
- marker = ((ConcreteMarker)object).getMarker();
- if (object instanceof IMarker) {
- marker = (IMarker)object;
- } else {
- return null;
- }
-
- Object attribute = marker.getAttribute(IMarker.CHAR_START, 0);
- if (attribute instanceof Integer) {
- charStart = ((Integer)attribute).intValue();
- }
-
- try {
- ITranslationUnit translationUnit = null;
- IResource resource = marker.getResource();
- if (resource instanceof IFile) {
- IFile file = (IFile)resource;
- if (CoreModel.isValidTranslationUnitName(null, file.getName())) {
- ICElement element = CoreModel.getDefault().create(file);
- translationUnit = CoreModel.getDefault().createTranslationUnitFrom(element.getCProject(), element.getPath());
- } else {
- return null;
- }
- }
- if (translationUnit != null) {
- ICElement cElement = translationUnit.getElementAtOffset(charStart);
- if (cElement != null) {
- if (cElement instanceof IInclude)
- cElement = cElement.getParent().getParent();
- return cElement.getElementName();
- } else {
- return null;
- }
- } else {
- return null;
- }
- } catch (CModelException ex) {
- if (ex.doesNotExist())
- StatusHandler.fail(ex.getStatus());
- return null;
- }
- }
-
- @Override
- public String getContentType(String elementHandle) {
- return getContentType();
- }
-
- /**
- * Some copying from:
- *
- * @see org.eclipse.jdt.ui.ProblemsLabelDecorator
- */
- public boolean containsProblem(IInteractionElement node) {
- try {
- ICElement element = (ICElement) getObjectForHandle(node.getHandleIdentifier());
- switch (element.getElementType()) {
- case ICElement.C_PROJECT:
- case ICElement.C_CCONTAINER:
- case ICElement.C_VCONTAINER:
- return getErrorTicksFromMarkers(element.getResource(), IResource.DEPTH_INFINITE, null);
- case ICElement.C_UNIT:
- return getErrorTicksFromMarkers(element.getResource(), IResource.DEPTH_ONE, null);
- case ICElement.C_USING:
- case ICElement.C_NAMESPACE:
- case ICElement.C_INCLUDE:
- case ICElement.C_TYPEDEF:
- case ICElement.C_MACRO:
- case ICElement.C_FUNCTION:
- case ICElement.C_METHOD:
- case ICElement.C_FIELD:
- case ICElement.C_VARIABLE_LOCAL:
- case ICElement.C_CLASS:
- ITranslationUnit cu = (ITranslationUnit) element.getAncestor(ICElement.C_UNIT);
- if (cu != null)
- return getErrorTicksFromMarkers(element.getResource(), IResource.DEPTH_ONE, null);
- }
- } catch (CoreException e) {
- // ignore
- }
- return false;
- }
-
- private boolean getErrorTicksFromMarkers(IResource res, int depth, ISourceReference sourceElement)
- throws CoreException {
- if (res == null || !res.isAccessible())
- return false;
- IMarker[] markers = res.findMarkers(IMarker.PROBLEM, true, depth);
- if (markers != null) {
- for (int i = 0; i < markers.length; i++) {
- IMarker curr = markers[i];
- if (sourceElement == null) {
- int priority = curr.getAttribute(IMarker.SEVERITY, -1);
- if (priority == IMarker.SEVERITY_ERROR) {
- return true;
- }
- }
- }
- }
- return false;
- }
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUIBridgePlugin.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUIBridgePlugin.java
deleted file mode 100644
index 36e32a8..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUIBridgePlugin.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat Inc. - modification from Java to CDT
- *******************************************************************************/
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.cdt.mylyn.internal.ui.editor.ActiveFoldingListener;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.context.ui.IContextUiStartup;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class CDTUIBridgePlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.cdt.mylyn.ui"; //$NON-NLS-1$
-
- public static final String AUTO_FOLDING_ENABLED = "org.eclipse.mylyn.context.ui.editor.folding.enabled"; //$NON-NLS-1$
-
- private static final String MYLYN_FIRST_RUN = "org.eclipse.mylyn.ui.first.run.0_4_9"; //$NON-NLS-1$
-
- public static final int START_ACTIVATION_POLICY = 0x00000002;
-
- private static CDTUIBridgePlugin INSTANCE;
-
- private ResourceBundle resourceBundle;
-
- private ActiveFoldingEditorTracker editorTracker;
-
-// private PackageExplorerManager packageExplorerManager = new PackageExplorerManager();
-
-// private TypeHistoryManager typeHistoryManager = null;
-
- private LandmarkMarkerManager landmarkMarkerManager = new LandmarkMarkerManager();
-
- private InterestInducingProblemListener problemListener = new InterestInducingProblemListener();
-
- private CDTEditorMonitor cEditingMonitor;
-
- private InterestUpdateDeltaListener cElementChangeListener = new InterestUpdateDeltaListener();
-
- public CDTUIBridgePlugin() {
- super();
- INSTANCE = this;
- }
-
- /**
- * Startup order is critical.
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- initDefaultPrefs();
-
- // NOTE: moved out of wizard and first task activation to avoid bug 194766
- if (getPreferenceStore().getBoolean(MYLYN_FIRST_RUN)) {
- getPreferenceStore().setValue(MYLYN_FIRST_RUN, false);
- CDTUiUtil.installContentAssist(CUIPlugin.getDefault().getPreferenceStore(), true);
- }
- }
-
- private void lazyStart() {
- ContextCorePlugin.getContextManager().addListener(landmarkMarkerManager);
- cEditingMonitor = new CDTEditorMonitor();
- MonitorUiPlugin.getDefault().getSelectionMonitors().add(cEditingMonitor);
- installEditorTracker(PlatformUI.getWorkbench());
- CoreModel.getDefault().addElementChangedListener(cElementChangeListener);
-
- getPreferenceStore().addPropertyChangeListener(problemListener);
- if (getPreferenceStore().getBoolean(InterestInducingProblemListener.PREDICTED_INTEREST_ERRORS)) {
- problemListener.enable();
- }
-
-// try {
-// typeHistoryManager = new TypeHistoryManager();
-// ContextCorePlugin.getContextManager().addListener(typeHistoryManager);
-// } catch (Throwable t) {
-// StatusHandler.log(t, "Could not install type history manager, incompatible Eclipse version.");
-// }
- }
-
- private void initDefaultPrefs() {
- getPreferenceStore().setDefault(InterestInducingProblemListener.PREDICTED_INTEREST_ERRORS, false);
- getPreferenceStore().setDefault(MYLYN_FIRST_RUN, true);
- }
-
-
- private void lazyStop() {
-// ContextCorePlugin.getContextManager().removeListener(typeHistoryManager);
- ContextCorePlugin.getContextManager().removeListener(landmarkMarkerManager);
- MonitorUiPlugin.getDefault().getSelectionMonitors().remove(cEditingMonitor);
- CoreModel.getDefault().removeElementChangedListener(cElementChangeListener);
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- lazyStop();
-
- super.stop(context);
- INSTANCE = null;
- resourceBundle = null;
- }
-
- private void installEditorTracker(IWorkbench workbench) {
- editorTracker = new ActiveFoldingEditorTracker();
- editorTracker.install(workbench);
- // workbench.addWindowListener(editorTracker);
- // IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- // for (int i = 0; i < windows.length; i++) {
- // windows[i].addPageListener(editorTracker);
- // IWorkbenchPage[] pages = windows[i].getPages();
- // for (int j = 0; j < pages.length; j++) {
- // pages[j].addPartListener(editorTracker);
- // }
- // }
-
- // update editors that are already opened
- for (IWorkbenchWindow w : PlatformUI.getWorkbench().getWorkbenchWindows()) {
- IWorkbenchPage page = w.getActivePage();
- if (page != null) {
- IEditorReference[] references = page.getEditorReferences();
- for (int i = 0; i < references.length; i++) {
- IEditorPart part = references[i].getEditor(false);
- if (part != null && part instanceof CEditor) {
- CEditor editor = (CEditor) part;
- editorTracker.registerEditor(editor);
- ActiveFoldingListener.resetProjection(editor);
- }
- }
- }
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static CDTUIBridgePlugin getDefault() {
- return INSTANCE;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = CDTUIBridgePlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- try {
- if (resourceBundle == null)
- resourceBundle = ResourceBundle.getBundle("org.eclipse.cdt.mylyn.internal.ui.PluginResources"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- *
- * @param key the message key
- * @param args an array of substituition strings
- * @return the resource bundle message
- */
- public static String getFormattedString(String key, String[] args) {
- return MessageFormat.format(getResourceString(key), (Object[])args);
- }
-
- /**
- * Returns an image descriptor for the image file at the given plug-in relative path.
- *
- * @param path
- * the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-
- /**
- * For testing.
- */
- public ActiveFoldingEditorTracker getEditorTracker() {
- return editorTracker;
- }
-
-
- /**
- * Lazy startup. See extension point "org.eclipse.mylyn.context.ui.startup".
- */
- public static class CDTUIBridgeStartup implements IContextUiStartup {
-
- public void lazyStartup() {
- CDTUIBridgePlugin.getDefault().lazyStart();
- }
-
- }
-
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUiBridge.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUiBridge.java
deleted file mode 100644
index 3f91885..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUiBridge.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat Inc. - Initial implementation based on JavaUiBridge
- *******************************************************************************/
-
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.CModelException;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.internal.ui.actions.SelectionConverter;
-import org.eclipse.cdt.internal.ui.editor.AbstractCModelOutlinePage;
-import org.eclipse.cdt.internal.ui.editor.CContentOutlinePage;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.cdt.internal.ui.util.EditorUtility;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class CDTUiBridge extends AbstractContextUiBridge {
-
- private Field cOutlineField = null;
-
- public CDTUiBridge() {
- try {
- cOutlineField = AbstractCModelOutlinePage.class.getDeclaredField("fTreeViewer");
- cOutlineField.setAccessible(true);
- } catch (Exception e) {
- StatusHandler.fail(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.outlineViewerFailure"), e)); // $NON-NLS-1$
- }
- }
-
- @Override
- public void open(IInteractionElement node) {
- try {
- ICElement cElement = CDTStructureBridge.getElementForHandle(node.getHandleIdentifier());
- if (cElement == null || !cElement.exists())
- return;
- IEditorPart part = EditorUtility.openInEditor(cElement);
- } catch (Throwable t) {
- StatusHandler.fail(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getFormattedString("MylynCDT.openEditorFailure", // $NON-NLS-1$
- new String[]{node.getHandleIdentifier()}), t));
- }
- }
-
- @Override
- public void close(IInteractionElement node) {
- try {
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- if (page != null) {
- List<IEditorReference> toClose = new ArrayList<IEditorReference>(4);
- for (IEditorReference reference : page.getEditorReferences()) {
- try {
- ICElement input = (ICElement) reference.getEditorInput().getAdapter(ICElement.class);
- if (input != null
- && node.getHandleIdentifier().equals(CDTStructureBridge.getHandleForElement(input))) {
- toClose.add(reference);
- }
- } catch (PartInitException e) {
- // ignore
- }
- }
- if (toClose.size() > 0) {
- page.closeEditors(toClose.toArray(new IEditorReference[toClose.size()]), true);
- }
- }
- } catch (Throwable t) {
- StatusHandler.fail(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.autoCloseEditorFailure"), t)); // $NON-NLS-1$
- }
- }
-
- @Override
- public boolean acceptsEditor(IEditorPart editorPart) {
- return editorPart instanceof CEditor;
- }
-
- @Override
- public IInteractionElement getElement(IEditorInput input) {
- Object adapter = input.getAdapter(ICElement.class);
- if (adapter instanceof ICElement) {
- ICElement cElement = (ICElement) adapter;
- String handle = ContextCorePlugin.getDefault().getStructureBridge(cElement).getHandleIdentifier(
- cElement);
- return ContextCorePlugin.getContextManager().getElement(handle);
- } else {
- return null;
- }
- }
-
- @Override
- public List<TreeViewer> getContentOutlineViewers(IEditorPart editorPart) {
- if (editorPart == null || cOutlineField == null)
- return null;
- List<TreeViewer> viewers = new ArrayList<TreeViewer>();
- Object out = editorPart.getAdapter(IContentOutlinePage.class);
- if (out instanceof CContentOutlinePage) {
- CContentOutlinePage page = (CContentOutlinePage) out;
- if (page.getControl() != null) {
- try {
- viewers.add((TreeViewer) cOutlineField.get(page));
- } catch (Exception e) {
- StatusHandler.log(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.log.getOutlineViewerFailure"), e)); // $NON-NLS-1$
- }
- }
- }
- return viewers;
- }
-
- @Override
- public Object getObjectForTextSelection(TextSelection selection, IEditorPart editor) {
- if (editor instanceof CEditor) {
- TextSelection textSelection = selection;
- try {
- if (selection != null) {
- return SelectionConverter.getElementAtOffset(((CEditor) editor).getInputCElement(), textSelection);
- } else {
- Object element = ((CEditor) editor).getInputCElement();
- if (element instanceof ICElement)
- return element;
- }
- } catch (CModelException e) {
- // ignore
- }
- }
- return null;
- }
-
- @Override
- public String getContentType() {
- return CDTStructureBridge.CONTENT_TYPE;
- }
-
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUiUtil.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUiUtil.java
deleted file mode 100644
index 96d0756..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/CDTUiUtil.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.cdt.core.model.CModelException;
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.model.CoreModelUtil;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.cdt.internal.ui.util.ExceptionHandler;
-import org.eclipse.cdt.ui.CElementImageDescriptor;
-import org.eclipse.cdt.ui.PreferenceConstants;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.views.markers.internal.ConcreteMarker;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class CDTUiUtil {
-
- private static final Point SMALL_SIZE = new Point(16, 16);
-
- private static final String SEPARATOR_CODEASSIST = "\0";
-
- public static final String ASSIST_MYLYN_TYPE = "org.eclipse.cdt.mylyn.cdtTypeProposalCategory"; // $NON-NLS-1$
-
- public static final String ASSIST_MYLYN_NOTYPE = "org.eclipse.cdt.mylyn.cdtNoTypeProposalCategory"; // $NON-NLS-1$
-
- public static final String ASSIST_CDT_TYPE = "org.eclipse.cdt.ui.cdtTypeProposalCategory"; // $NON-NLS-1$
-
- public static final String ASSIST_CDT_NOTYPE = "org.eclipse.cdt.ui.cdtNoTypeProposalCategory"; // $NON-NLS-1$
-
- public static final String ASSIST_CDT_TEMPLATE = "org.eclipse.cdt.ui.templateProposalCategory"; // $NON-NLS-1$
-
- public static final String ASSIST_MYLYN_TEMPLATE = "org.eclipse.cdt.mylyn.templateProposalCategory"; // $NON-NLS-1$
-
- public static void installContentAssist(IPreferenceStore cdtPrefs, boolean mylynContentAssist) {
- String oldValue = cdtPrefs.getString(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES);
- StringTokenizer tokenizer = new StringTokenizer(oldValue, SEPARATOR_CODEASSIST);
- Set<String> disabledIds = new HashSet<String>();
- while (tokenizer.hasMoreTokens()) {
- disabledIds.add((String) tokenizer.nextElement());
- }
- if (!mylynContentAssist) {
- disabledIds.remove(ASSIST_CDT_TYPE);
- disabledIds.remove(ASSIST_CDT_NOTYPE);
- disabledIds.remove(ASSIST_CDT_TEMPLATE);
- disabledIds.add(ASSIST_MYLYN_NOTYPE);
- disabledIds.add(ASSIST_MYLYN_TYPE);
- disabledIds.add(ASSIST_MYLYN_TEMPLATE);
- } else {
- disabledIds.add(ASSIST_CDT_TYPE);
- disabledIds.add(ASSIST_CDT_NOTYPE);
- disabledIds.add(ASSIST_CDT_TEMPLATE);
- disabledIds.remove(ASSIST_MYLYN_NOTYPE);
- disabledIds.remove(ASSIST_MYLYN_TYPE);
- disabledIds.remove(ASSIST_MYLYN_TEMPLATE);
- }
- String newValue = ""; // $NON-NLS-1$
- for (String id : disabledIds) {
- newValue += id + SEPARATOR_CODEASSIST;
- }
- cdtPrefs.setValue(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES, newValue);
- }
-
- public static ImageDescriptor decorate(ImageDescriptor base, int decorations) {
- ImageDescriptor imageDescriptor = new CElementImageDescriptor(base, decorations, SMALL_SIZE);
- return imageDescriptor;
- }
-
- public static ICElement getCDTElement(ConcreteMarker marker) {
- if (marker == null)
- return null;
- try {
- IResource res = marker.getResource();
- ITranslationUnit cu = null;
- if (res instanceof IFile) {
- IFile file = (IFile) res;
- if (CoreModel.isValidTranslationUnitName(null, file.getName())) {
- cu = CoreModelUtil.findTranslationUnit(file);
- } else {
- return null;
- }
- }
- if (cu != null) {
- ICElement ce = cu.getElementAtOffset(marker.getMarker().getAttribute(IMarker.CHAR_START, 0));
- return ce;
- } else {
- return null;
- }
- } catch (CModelException ex) {
- if (!ex.doesNotExist())
- ExceptionHandler.handle(ex, CDTUIBridgePlugin.getResourceString("MylynCDT.error"), // $NON-NLS-1$
- CDTUIBridgePlugin.getResourceString("MylynCDT.findCElementFailure")); //$NON-NLS-1$
- return null;
- } catch (Throwable t) {
- StatusHandler.fail(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getFormattedString("MylynCDT.findElementFailure", new String[]{marker.toString()}), t)); // $NON-NLS-1$
- return null;
- }
- }
-
- /**
- * Get the fully qualified name of an IMember or IFunction
- *
- * @param m
- * The IMember or IFunction to get the fully qualified name for
- * @return String representing the fully qualified name
- */
- public static String getFullyQualifiedName(ICElement ce) {
- if (ce.getParent() == null || ce.getParent() instanceof ICProject)
- return ce.getElementName();
- else
- return getFullyQualifiedName(ce.getParent()) + "." + ce.getElementName(); // $NON-NLS-1$
- }
-
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/InterestInducingProblemListener.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/InterestInducingProblemListener.java
deleted file mode 100644
index f39928e..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/InterestInducingProblemListener.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.internal.ui.util.IProblemChangedListener;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class InterestInducingProblemListener implements IProblemChangedListener, IPropertyChangeListener {
-
- public static final String PREDICTED_INTEREST_ERRORS = "org.eclipse.cdt.mylyn.ui.interest.prediction.errors"; // $NON-NLS-1$
-
- // TODO: consider getting rid of this
- private CDTStructureBridge cdtStructureBridge = new CDTStructureBridge();
-
- public void problemsChanged(IResource[] changedResources, boolean isMarkerChange) {
- try {
- if (!ContextCorePlugin.getContextManager().isContextActive()) {
- return;
- } else {
- for (int i = 0; i < changedResources.length; i++) {
- IResource resource = changedResources[i];
- if (resource instanceof IFile) {
- ICElement cdtElement = (ICElement) resource.getAdapter(ICElement.class);
- if (cdtElement != null) {
- IInteractionElement element = ContextCorePlugin.getContextManager().getElement(
- CDTStructureBridge.getHandleForElement(cdtElement));
- if (!cdtStructureBridge.containsProblem(element)) {
- ContextCorePlugin.getContextManager().removeErrorPredictedInterest(
- element.getHandleIdentifier(), CDTStructureBridge.CONTENT_TYPE, true);
- } else {
- ContextCorePlugin.getContextManager().addErrorPredictedInterest(
- element.getHandleIdentifier(), CDTStructureBridge.CONTENT_TYPE, true);
- }
- }
- }
- }
- }
- } catch (Exception e) {
- StatusHandler.log(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.updateMarkerFailure"), e)); // $NON-NLS-1$
- }
- }
-
- public void propertyChange(PropertyChangeEvent event) {
- if (PREDICTED_INTEREST_ERRORS.equals(event.getProperty())) {
- if (CDTUIBridgePlugin.getDefault().getPreferenceStore().getBoolean(PREDICTED_INTEREST_ERRORS)) {
- enable();
- } else {
- disable();
- }
- }
- }
-
- public void enable() {
- CUIPlugin.getDefault().getProblemMarkerManager().addListener(this);
- }
-
- public void disable() {
- CUIPlugin.getDefault().getProblemMarkerManager().removeListener(this);
- }
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/InterestUpdateDeltaListener.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/InterestUpdateDeltaListener.java
deleted file mode 100644
index c2a86a1..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/InterestUpdateDeltaListener.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import org.eclipse.cdt.core.model.ElementChangedEvent;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.ICElementDelta;
-import org.eclipse.cdt.core.model.IElementChangedListener;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class InterestUpdateDeltaListener implements IElementChangedListener {
-
- private static boolean asyncExecMode = true;
-
- public void elementChanged(ElementChangedEvent event) {
- ICElementDelta delta = event.getDelta();
- handleDelta(delta.getAffectedChildren());
- }
-
- /**
- * Only handles first addition/removal
- */
- private void handleDelta(ICElementDelta[] delta) {
- try {
- ICElement added = null;
- ICElement removed = null;
- for (int i = 0; i < delta.length; i++) {
- ICElementDelta child = delta[i];
- if (child.getElement() instanceof ITranslationUnit) {
- // FIXME: not sure I modified this correctly from the java version
- if (((ITranslationUnit)child.getElement()).getParent() != null) {
- // see bug 195361, do not reduce interest of temporary working copy
- return;
- }
- }
-
- if (child.getKind() == ICElementDelta.ADDED) {
- if (added == null) {
- added = child.getElement();
- }
- } else if (child.getKind() == ICElementDelta.REMOVED) {
- if (removed == null) {
- removed = child.getElement();
- }
- }
- handleDelta(child.getAffectedChildren());
- }
-
- if (added != null && removed != null) {
- IInteractionElement element = ContextCorePlugin.getContextManager().getElement(
- CDTStructureBridge.getHandleForElement(removed));
- if (element != null) {
- resetHandle(element, CDTStructureBridge.getHandleForElement(added));
- }
- } else if (removed != null) {
-
- IInteractionElement element = ContextCorePlugin.getContextManager().getElement(
- CDTStructureBridge.getHandleForElement(removed));
- if (element != null) {
- delete(element);
- }
- }
- } catch (Throwable t) {
- StatusHandler.fail(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.deltaUpdateFailure"), t)); // $NON-NLS-1$
- }
- }
-
- private void resetHandle(final IInteractionElement element, final String newHandle) {
- if (!asyncExecMode) {
- ContextCorePlugin.getContextManager().updateHandle(element, newHandle);
- } else {
- IWorkbench workbench = PlatformUI.getWorkbench();
- if (workbench != null) {
- workbench.getDisplay().asyncExec(new Runnable() {
- public void run() {
- ContextCorePlugin.getContextManager().updateHandle(element, newHandle);
- }
- });
- }
- }
- }
-
- private void delete(final IInteractionElement element) {
- if (!asyncExecMode) {
- ContextCorePlugin.getContextManager().deleteElement(element);
- } else {
- IWorkbench workbench = PlatformUI.getWorkbench();
- if (workbench != null) {
- workbench.getDisplay().asyncExec(new Runnable() {
- public void run() {
- ContextCorePlugin.getContextManager().deleteElement(element);
- }
- });
- }
- }
- }
-
- /**
- * For testing
- */
- public static void setAsyncExecMode(boolean asyncExecMode) {
- InterestUpdateDeltaListener.asyncExecMode = asyncExecMode;
- }
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/LandmarkMarkerManager.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/LandmarkMarkerManager.java
deleted file mode 100644
index 35db7b2..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/LandmarkMarkerManager.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-/*
- * Created on Feb 16, 2005
- */
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.core.model.CModelException;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.IFunction;
-import org.eclipse.cdt.core.model.IMethod;
-import org.eclipse.cdt.core.model.ISourceRange;
-import org.eclipse.cdt.core.model.ISourceReference;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class LandmarkMarkerManager extends AbstractContextListener {
-
- private static final String ID_MARKER_LANDMARK = "org.eclipse.mylyn.context.ui.markers.landmark"; // $NON-NLS-1$
-
- private Map<IInteractionElement, Long> markerMap = new HashMap<IInteractionElement, Long>();
-
- public LandmarkMarkerManager() {
- super();
- }
-
- public void contextActivated(IInteractionContext taskscape) {
- modelUpdated();
- }
-
- public void contextDeactivated(IInteractionContext taskscape) {
- modelUpdated();
- }
-
- public void contextCleared(IInteractionContext context) {
- modelUpdated();
- }
-
- private void modelUpdated() {
- try {
- for (IInteractionElement node : markerMap.keySet()) {
- landmarkRemoved(node);
- }
- markerMap.clear();
- for (IInteractionElement node : ContextCorePlugin.getContextManager().getActiveLandmarks()) {
- landmarkAdded(node);
- }
- } catch (Throwable t) {
- StatusHandler.fail(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.landmarkUpdateFailure"), t)); // $NON-NLS-1$
- }
- }
-
- public void interestChanged(List<IInteractionElement> nodes) {
- // don't care when the interest changes
- }
-
- public void landmarkAdded(final IInteractionElement node) {
- if (node == null || node.getContentType() == null)
- return;
- if (node.getContentType().equals(CDTStructureBridge.CONTENT_TYPE)) {
- final ICElement element = CDTStructureBridge.getElementForHandle(node.getHandleIdentifier());
- if (element == null || !element.exists())
- return;
- if (element instanceof IMethod || element instanceof IFunction) {
- try {
- final ISourceRange range = ((ISourceReference) element).getSourceRange();
- final IResource resource = element.getUnderlyingResource();
- if (resource instanceof IFile) {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- IMarker marker = resource.createMarker(ID_MARKER_LANDMARK);
- if (marker != null && range != null) {
- marker.setAttribute(IMarker.CHAR_START, range.getStartPos());
- marker.setAttribute(IMarker.CHAR_END, range.getStartPos() + range.getLength());
- marker.setAttribute(IMarker.MESSAGE, CDTUIBridgePlugin.getResourceString("MylynCDT.landmark")); // $NON-NLS-1$
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
- markerMap.put(node, marker.getId());
- }
- }
- };
- resource.getWorkspace().run(runnable, null);
- }
- } catch (CModelException e) {
- StatusHandler.fail(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.markerUpdateFailure"), e)); // $NON-NLS-1$
- } catch (CoreException e) {
- StatusHandler.fail(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.markerUpdateFailure"), e)); // $NON-NLS-1$
- }
- }
- }
- }
-
- public void landmarkRemoved(final IInteractionElement node) {
- if (node == null)
- return;
- if (node.getContentType().equals(CDTStructureBridge.CONTENT_TYPE)) {
- ICElement element = CDTStructureBridge.getElementForHandle(node.getHandleIdentifier());
- if (element == null || !element.exists())
- return;
- if (element.getAncestor(ICElement.C_UNIT) != null // stuff
- // from
- // .class
- // files
- && element instanceof ISourceReference) {
- try {
- final IResource resource = element.getUnderlyingResource();
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- if (resource != null) {
- try {
- if (markerMap.containsKey(node)) {
- long id = markerMap.get(node);
- IMarker marker = resource.getMarker(id);
- if (marker != null)
- marker.delete();
- }
- } catch (NullPointerException e) {
- StatusHandler.log(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.log.markerUpdateFailure"), e)); // $NON-NLS-1$
- }
- }
- }
- };
- resource.getWorkspace().run(runnable, null);
- } catch (CModelException e) {
- // ignore the Java Model errors
- } catch (CoreException e) {
- StatusHandler.fail(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.landmarkUpdateFailure"), e)); // $NON-NLS-1$
- }
- }
- }
- }
-
- public void relationsChanged(IInteractionElement node) {
- // don't care when the relationships changed
- }
-
- public void elementDeleted(IInteractionElement node) {
- // don't care when a node is deleted
- }
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/PluginResources.properties b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/PluginResources.properties
deleted file mode 100644
index 0c1dd6a..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/PluginResources.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 Red Hat, Inc. and others
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Red Hat Incorporated - initial API and implementation
-#################################################################################
-MylynCDT.error=error
-MylynCDT.landmark=Mylyn Landmark
-MylynCDT.preferencesWindowTitle=Recommended Preferences
-MylynCDT.preferencesTitle=Mylyn C/C++ Preference Settings
-
-MylynCDT.missingElementLabel=<missing element>
-MylynCDT.containmentRelation=Containment
-
-MylynCDT.wizard.hyperLink.text=If this is your first time using Mylyn please watch the Getting Started video
-MylynCDT.wizard.autoFolding.text=Turn automatic C/C++ editor folding on
-MylynCDT.wizard.autoFolding.label=Toggle via toolbar button
-MylynCDT.wizard.contentAssist=Enable task-context ranked content assist, requires Eclipse restart.
-MylynCDT.wizard.contentAssistWarning=Toggle via Preferences->C/C++->Editor->Content Assist->Advanced
-MylynCDT.wizard.iconsHelp=For a legend of the icons used by Mylyn open: Help (menu) -> Mylyn UI Legend
-MylynCDT.wizard.description=You have activated a task for the first time.\nThe following C/C++ preferences are recommended for the Task-Focused UI.\n
-
-MylynCDT.log.updateModelFailed=Failed to update model based on selection.
-MylynCDT.log.noObjectForHandle=Could not create cdt element for handle: <{0}>.
-MylynCDT.log.getOutlineViewerFailure=Could not get Outline viewer.
-MylynCDT.log.markerUpdateFailure=Could not update markers.
-MylynCDT.log.activeFoldingFailure=Could not install active folding on provider: {0}, must extend {1}.
-
-
-MylynCDT.childAccessFailed=could not get child
-MylynCDT.cantFindElement=can't find ICElement for: {0}
-MylynCDT.outlineViewerFailure=could not get install Mylyn on Outline viewer
-MylynCDT.openEditorFailure=could not open editor for: {0}
-MylynCDT.autoCloseEditorFailure=could not auto close editor
-MylynCDT.findCElementFailure=could not find C/C++ element
-MylynCDT.updateMarkerFailure=could not update on marker change
-MylynCDT.deltaUpdateFailure=delta update failed
-MylynCDT.landmarkUpdateFailure=could not update landmark markers
-MylynCDT.markerUpdateFailure=could not update markers
-MylynCDT.initFoldingFailure=could not update folding, Mylyn is not correctly installed
-MylynCDT.updateFoldingFailure=could not update folding, Mylyn is not correctly installed
-MylynCDT.installAutoFoldingFailure=could not install auto folding, reflection denied
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/TypeHistoryManager.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/TypeHistoryManager.java
deleted file mode 100644
index 7062de2..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/TypeHistoryManager.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.cdt.mylyn.internal.ui;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.IStructureDeclaration;
-import org.eclipse.cdt.core.model.ITypeDef;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- * @author Jeff Johnston
- */
-public class TypeHistoryManager extends AbstractContextListener {
-
-// private TypeInfoFactory factory = new TypeInfoFactory();
-
- public void contextActivated(IInteractionContext context) {
- clearTypeHistory();
- for (IInteractionElement node : context.getInteresting())
- updateTypeHistory(node, true);
- }
-
- /**
- * Path has to be compatible with ITypeNameRequestor
- */
- private void updateTypeHistory(IInteractionElement node, boolean add) {
- ICElement element = CDTStructureBridge.getElementForHandle(node.getHandleIdentifier());
- //FIXME: are there other types we care about...e.g. enumeration?
- if (element instanceof IStructureDeclaration || element instanceof ITypeDef) {
- String typename = element.getElementName();
-// try {
-// // FIXME: What do we do here? Is this necessary?
-// if (element.exists()) {
-// JavaSearchTypeNameMatch typeNameMatch = new JavaSearchTypeNameMatch(type, type.getFlags());
-//
-// if (add && !OpenTypeHistory.getInstance().contains(typeNameMatch)) {
-// OpenTypeHistory.getInstance().accessed(typeNameMatch);
-// } else {
-// OpenTypeHistory.getInstance().remove(typeNameMatch);
-// }
-// }
-// } catch (CModelException e) {
-// StatusHandler.log(e, "failed to update history for a type");
-// }
- }
- }
-
- public void contextDeactivated(IInteractionContext context) {
- clearTypeHistory();
- }
-
- public void contextCleared(IInteractionContext context) {
- clearTypeHistory();
- }
-
- /**
- * Public for testing
- */
- public void clearTypeHistory() {
- //FIXME: Is this necessary?
-// TypeNameMatch[] typeInfos = OpenTypeHistory.getInstance().getTypeInfos();
-// for (int i = 0; i < typeInfos.length; i++) {
-// OpenTypeHistory.getInstance().remove(typeInfos[i]);
-// }
- }
-
- public void interestChanged(List<IInteractionElement> nodes) {
- for (IInteractionElement node : nodes) {
- updateTypeHistory(node, true);
- }
- }
-
- public void elementDeleted(IInteractionElement node) {
- updateTypeHistory(node, false);
- }
-
- public void elementsDeleted(List<IInteractionElement> elements) {
- for(IInteractionElement element: elements){
- updateTypeHistory(element, false);
- }
- }
-
- public void landmarkAdded(IInteractionElement node) {
- // ignore
- }
-
- public void landmarkRemoved(IInteractionElement node) {
- // ignore
- }
-
- public void relationsChanged(IInteractionElement node) {
- // ignore
- }
-
- public void contextPreActivated(IInteractionContext context) {
- // ignore
-
- }
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/actions/FocusCViewAction.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/actions/FocusCViewAction.java
deleted file mode 100644
index 815b4d3..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/actions/FocusCViewAction.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat Inc. - Modification for CDT usage
- *******************************************************************************/
-
-package org.eclipse.cdt.mylyn.internal.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.IMethod;
-import org.eclipse.cdt.internal.ui.actions.SelectionConverter;
-import org.eclipse.cdt.internal.ui.cview.CView;
-import org.eclipse.cdt.internal.ui.cview.ToggleLinkingAction;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.cdt.mylyn.internal.ui.CDTDeclarationsFilter;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.mylyn.context.ui.AbstractAutoFocusViewAction;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class FocusCViewAction extends AbstractAutoFocusViewAction {
-
- public FocusCViewAction() {
- super(new InterestFilter(), true, true, true);
- }
-
- @Override
- protected ISelection resolveSelection(IEditorPart part, ITextSelection changedSelection, StructuredViewer viewer)
- throws CoreException {
- Object elementToSelect = null;
- if (changedSelection instanceof TextSelection && part instanceof CEditor) {
- ICElement cdtElement = SelectionConverter.getElementAtOffset(((CEditor) part).getInputCElement(), changedSelection);
- elementToSelect = cdtElement;
- }
-
- if (elementToSelect != null) {
- StructuredSelection currentSelection = (StructuredSelection) viewer.getSelection();
- if (currentSelection.size() <= 1) {
- for (ViewerFilter filter : Arrays.asList(viewer.getFilters())) {
- if (filter instanceof CDTDeclarationsFilter && elementToSelect instanceof IMethod) {
- elementToSelect = ((IMethod) elementToSelect).getTranslationUnit();
- }
- }
- }
- return new StructuredSelection(elementToSelect);
- } else {
- return null;
- }
- }
-
- // TODO: should have better way of doing this
- protected void setManualFilteringAndLinkingEnabled(boolean enabled) {
- IViewPart part = super.getPartForAction();
- if (part instanceof CView) {
- for (IContributionItem item : ((CView) part).getViewSite()
- .getActionBars()
- .getToolBarManager()
- .getItems()) {
- if (item instanceof ActionContributionItem) {
- ActionContributionItem actionItem = (ActionContributionItem) item;
- if (actionItem.getAction() instanceof ToggleLinkingAction) {
- actionItem.getAction().setEnabled(enabled);
- }
- }
- }
- for (IContributionItem item : ((CView) part).getViewSite()
- .getActionBars()
- .getMenuManager()
- .getItems()) {
- if (item instanceof ActionContributionItem) {
- ActionContributionItem actionItem = (ActionContributionItem) item;
- // TODO: file bug asking for extensibility
- if (actionItem.getAction().getClass().getSimpleName().equals("ShowFilterDialogAction")) { // $NON-NLS-1$
- actionItem.getAction().setEnabled(enabled);
- }
- }
- // NOTE: turning off dynamically contributed filter items is not currently feasible
-// else if (item instanceof ContributionItem) {
-// ContributionItem contributionItem = (ContributionItem) item;
-//
-// if (contributionItem.getClass().getSimpleName().equals("FilterActionMenuContributionItem")) {
-// try {
-// Class<?> clazz = contributionItem.getClass();
-// Field field = clazz.getDeclaredField("fActionGroup");
-// field.setAccessible(true);
-// Object object = field.get(contributionItem);
-// if (object instanceof CustomFiltersActionGroup) {
-// CustomFiltersActionGroup group = (CustomFiltersActionGroup) object;
-// group.setFilters(new String[] { });
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
-// }
- }
- }
- }
-
- @Override
- protected void setDefaultLinkingEnabled(boolean on) {
- IViewPart part = super.getPartForAction();
- if (part instanceof CView) {
- ((CView) part).setLinkingEnabled(on);
- }
- }
-
- @Override
- protected boolean isDefaultLinkingEnabled() {
- IViewPart part = super.getPartForAction();
- if (part instanceof CView) {
- return ((CView) part).isLinkingEnabled();
- }
- return false;
- }
-
- @Override
- public List<StructuredViewer> getViewers() {
- List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
- // TODO: get from super
- IViewPart part = super.getPartForAction();
- if (part instanceof CView) {
- viewers.add(((CView) part).getViewer());
- }
- return viewers;
- }
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/actions/ShowFilteredChildrenAction.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/actions/ShowFilteredChildrenAction.java
deleted file mode 100644
index 1d922ee..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/actions/ShowFilteredChildrenAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.cdt.mylyn.internal.ui.actions;
-
-import org.eclipse.cdt.internal.ui.cview.CView;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.internal.context.ui.BrowseFilteredListener;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class ShowFilteredChildrenAction extends Action implements IObjectActionDelegate, IViewActionDelegate {
-
- private BrowseFilteredListener browseFilteredListener;
-
- private TreeViewer treeViewer;
-
- private IStructuredSelection selection;
-
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- if (targetPart instanceof CView) {
- treeViewer = ((CView) targetPart).getViewer();
- browseFilteredListener = new BrowseFilteredListener(treeViewer);
- }
- }
-
- public void init(IViewPart targetPart) {
- if (targetPart instanceof CView) {
- treeViewer = ((CView) targetPart).getViewer();
- browseFilteredListener = new BrowseFilteredListener(treeViewer);
- }
- }
-
- public void run(IAction action) {
- if (selection != null) {
- browseFilteredListener.unfilterSelection(treeViewer, selection);
- }
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- if (selection instanceof IStructuredSelection) {
- this.selection = (IStructuredSelection) selection;
- }
- }
-}
diff --git a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/editor/ActiveFoldingListener.java b/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/editor/ActiveFoldingListener.java
deleted file mode 100644
index b9b64e2..0000000
--- a/org.eclipse.mylyn.cdt.ui/src/org/eclipse/mylyn/internal/cdt/ui/editor/ActiveFoldingListener.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-/*
- * Created on May 16, 2005
- */
-package org.eclipse.cdt.mylyn.internal.ui.editor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.CModelException;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.IMethod;
-import org.eclipse.cdt.core.model.IParent;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.cdt.internal.ui.editor.CSourceViewer;
-import org.eclipse.cdt.mylyn.internal.ui.CDTStructureBridge;
-import org.eclipse.cdt.mylyn.internal.ui.CDTUIBridgePlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
-import org.eclipse.jface.text.source.projection.ProjectionViewer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-
-/**
- * @author Mik Kersten
- * @author Jeff Johnston
- */
-public class ActiveFoldingListener extends AbstractContextListener {
- private final CEditor editor;
-
- private ProjectionAnnotationModel updater;
-
- private static CDTStructureBridge bridge = (CDTStructureBridge) ContextCorePlugin.getDefault()
- .getStructureBridge(CDTStructureBridge.CONTENT_TYPE);
-
- private boolean enabled = false;
-
- private IPropertyChangeListener PREFERENCE_LISTENER = new IPropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
- if (event.getProperty().equals(CDTUIBridgePlugin.AUTO_FOLDING_ENABLED)) {
- if (event.getNewValue().equals(Boolean.TRUE.toString())) {
- enabled = true;
- } else {
- enabled = false;
- }
- updateFolding();
- }
- }
- };
-
- public ActiveFoldingListener(CEditor editor) {
- this.editor = editor;
- if (ContextUiPlugin.getDefault() == null) {
- StatusHandler.fail(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.initFoldingFailure"))); // $NON-NLS-1$
- } else {
- ContextCorePlugin.getContextManager().addListener(this);
- ContextUiPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(PREFERENCE_LISTENER);
-
- enabled = ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
- CDTUIBridgePlugin.AUTO_FOLDING_ENABLED);
- updateFolding();
- }
- }
-
- protected void collapseElements(ICElement[] elements) {
- for (int i = 0; i < elements.length; ++i) {
- collapse(elements[i]);
- }
- }
-
- private void collapse(ICElement element) {
- CSourceViewer viewer = (CSourceViewer)editor.getViewer();
- viewer.doOperation(ProjectionViewer.COLLAPSE);
- }
-
- protected void expandElements(ICElement[] elements) {
- for (int i = 0; i < elements.length; ++i) {
- expand(elements[i]);
- }
- }
-
- private void expand(ICElement element) {
- CSourceViewer viewer = (CSourceViewer)editor.getViewer();
- viewer.doOperation(ProjectionViewer.EXPAND);
- }
-
- public void dispose() {
- ContextCorePlugin.getContextManager().removeListener(this);
- ContextUiPlugin.getDefault().getPluginPreferences().removePropertyChangeListener(PREFERENCE_LISTENER);
- }
-
- public static void resetProjection(CEditor CEditor) {
- // XXX: ignore for 3.2, leave for 3.1?
- }
-
- public void updateFolding() {
- if (!enabled || !ContextCorePlugin.getContextManager().isContextActive()) {
- editor.resetProjection();
- } else if (editor.getInputCElement() == null) {
- return;
- } else {
- try {
- List<ICElement> toExpand = new ArrayList<ICElement>();
- List<ICElement> toCollapse = new ArrayList<ICElement>();
-
- ICElement element = editor.getInputCElement();
- if (element instanceof ITranslationUnit) {
- ITranslationUnit compilationUnit = (ITranslationUnit) element;
- List<ICElement> allChildren = getAllChildren(compilationUnit);
- for (ICElement child : allChildren) {
- IInteractionElement interactionElement = ContextCorePlugin.getContextManager().getElement(
- bridge.getHandleIdentifier(child));
- if (interactionElement != null && interactionElement.getInterest().isInteresting()) {
- toExpand.add(child);
- } else {
- toCollapse.add(child);
- }
- }
- }
-
- collapseElements(toCollapse.toArray(new ICElement[toCollapse.size()]));
- expandElements(toExpand.toArray(new ICElement[toExpand.size()]));
-
- } catch (Exception e) {
- StatusHandler.fail(new Status(IStatus.ERROR, CDTUIBridgePlugin.PLUGIN_ID,
- CDTUIBridgePlugin.getResourceString("MylynCDT.updateFoldingFailure"), e)); // $NON-NLS-1$
- }
- }
- }
-
- private static List<ICElement> getAllChildren(IParent parentElement) {
- List<ICElement> allChildren = new ArrayList<ICElement>();
- try {
- for (ICElement child : parentElement.getChildren()) {
- allChildren.add(child);
- if (child instanceof IParent) {
- allChildren.addAll(getAllChildren((IParent) child));
- }
- }
- } catch (CModelException e) {
- // ignore failures
- }
- return allChildren;
- }
-
- public void interestChanged(List<IInteractionElement> elements) {
- for (IInteractionElement element : elements) {
- if (updater == null || !enabled) {
- return;
- } else {
- Object object = bridge.getObjectForHandle(element.getHandleIdentifier());
- if (object instanceof IMethod) {
- IMethod member = (IMethod) object;
- if (element.getInterest().isInteresting()) {
- expandElements(new ICElement[] { member });
- // expand the next 2 children down (e.g. anonymous types)
- try {
- ICElement[] children = ((IParent) member).getChildren();
- if (children.length == 1) {
- expandElements(new ICElement[] { children[0] });
- if (children[0] instanceof IParent) {
- ICElement[] childsChildren = ((IParent) children[0]).getChildren();
- if (childsChildren.length == 1) {
- expandElements(new ICElement[] { childsChildren[0] });
- }
- }
- }
- } catch (CModelException e) {
- // ignore
- }
- } else {
- collapseElements(new ICElement[] { member });
- }
- }
- }
- }
- }
-
- public void contextActivated(IInteractionContext context) {
- if (ContextUiPlugin.getDefault()
- .getPreferenceStore()
- .getBoolean(CDTUIBridgePlugin.AUTO_FOLDING_ENABLED)) {
- updateFolding();
- }
- }
-
- public void contextDeactivated(IInteractionContext context) {
- if (ContextUiPlugin.getDefault()
- .getPreferenceStore()
- .getBoolean(CDTUIBridgePlugin.AUTO_FOLDING_ENABLED)) {
- updateFolding();
- }
- }
-
- public void contextCleared(IInteractionContext context) {
- if (ContextUiPlugin.getDefault()
- .getPreferenceStore()
- .getBoolean(CDTUIBridgePlugin.AUTO_FOLDING_ENABLED)) {
- updateFolding();
- }
- }
-
- public void landmarkAdded(IInteractionElement element) {
- // ignore
- }
-
- public void landmarkRemoved(IInteractionElement element) {
- // ignore
- }
-
- public void relationsChanged(IInteractionElement node) {
- // ignore
- }
-
- public void elementDeleted(IInteractionElement node) {
- // ignore
- }
-}
diff --git a/org.eclipse.mylyn.context-feature/about.html b/org.eclipse.mylyn.context-feature/about.html
index 28867b2..0dd939c 100644
--- a/org.eclipse.mylyn.context-feature/about.html
+++ b/org.eclipse.mylyn.context-feature/about.html
@@ -7,7 +7,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 7, 2008</p>
+<p>June 7, 2007</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
diff --git a/org.eclipse.mylyn.context-feature/feature.xml b/org.eclipse.mylyn.context-feature/feature.xml
index 8688070..03d50c9 100644
--- a/org.eclipse.mylyn.context-feature/feature.xml
+++ b/org.eclipse.mylyn.context-feature/feature.xml
@@ -11,7 +11,7 @@
</description>
<copyright>
- Copyright (c) 2004, 2008 Mylyn project committers and others.
+ Copyright (c) 2004 - 2007 Mylyn project committers and others.
</copyright>
<license url="license.html">
@@ -60,7 +60,7 @@
</license>
<url>
- <update label="Mylyn for Eclipse 3.4" url="http://download.eclipse.org/tools/mylyn/update/e3.4"/>
+ <update label="Mylyn for Eclipse 3.3" url="http://download.eclipse.org/tools/mylyn/update/e3.3"/>
</url>
<requires>
diff --git a/org.eclipse.mylyn.ide-feature/about.html b/org.eclipse.mylyn.ide-feature/about.html
index 28867b2..0dd939c 100644
--- a/org.eclipse.mylyn.ide-feature/about.html
+++ b/org.eclipse.mylyn.ide-feature/about.html
@@ -7,7 +7,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 7, 2008</p>
+<p>June 7, 2007</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
diff --git a/org.eclipse.mylyn.ide-feature/feature.xml b/org.eclipse.mylyn.ide-feature/feature.xml
index 691b663..c7f8d1e 100644
--- a/org.eclipse.mylyn.ide-feature/feature.xml
+++ b/org.eclipse.mylyn.ide-feature/feature.xml
@@ -11,7 +11,7 @@
</description>
<copyright>
- Copyright (c) 2004, 2008 Mylyn project committers and others.
+ Copyright (c) 2004, 2007 Mylyn project committers and others.
</copyright>
<license url="license.html">
@@ -60,10 +60,11 @@
</license>
<url>
- <update label="Mylyn for Eclipse 3.4" url="http://download.eclipse.org/tools/mylyn/update/e3.4"/>
+ <update label="Mylyn for Eclipse 3.3" url="http://download.eclipse.org/tools/mylyn/update/e3.3"/>
</url>
<requires>
+ <import plugin="org.eclipse.team.ui"/>
<import plugin="org.eclipse.team.core"/>
<import plugin="org.eclipse.team.cvs.ui"/>
<import plugin="org.eclipse.team.cvs.core"/>
@@ -71,6 +72,7 @@
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.ui.workbench"/>
+ <import plugin="org.eclipse.mylyn.monitor.core" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.mylyn.tasks.core" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.mylyn.tasks.ui" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.mylyn.team.ui" version="3.0.0" match="compatible"/>
@@ -79,15 +81,12 @@
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.ui.navigator"/>
- <import plugin="org.eclipse.ui.ide" version="3.4.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui.ide" version="3.3.0" match="equivalent"/>
<import plugin="org.eclipse.mylyn.context.ui" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.mylyn.commons.core" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.mylyn.commons.ui" version="3.0.0" match="compatible"/>
- <import feature="org.eclipse.mylyn.context_feature" version="3.0.0.qualifier" match="perfect"/>
+ <import feature="org.eclipse.mylyn.context_feature" version="3.0.0.qualifier"/>
<import feature="org.eclipse.mylyn.team_feature" version="3.0.0.qualifier" match="perfect"/>
- <import plugin="org.eclipse.team.ui"/>
- <import plugin="org.eclipse.mylyn.monitor.core" version="3.0.0" match="compatible"/>
- <import feature="org.eclipse.cvs" version="1.1.0" match="compatible"/>
</requires>
<plugin
diff --git a/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
index de4c40a..80e4ca4 100644
--- a/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
org.eclipse.core.runtime,
org.eclipse.jface.text,
org.eclipse.ui.navigator,
- org.eclipse.ui.ide;bundle-version="3.4.0",
+ org.eclipse.ui.ide;bundle-version="[3.3.0, 3.4.0)",
org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
diff --git a/org.eclipse.mylyn.ide.ui/plugin.xml b/org.eclipse.mylyn.ide.ui/plugin.xml
index 47efe76..10c0649 100644
--- a/org.eclipse.mylyn.ide.ui/plugin.xml
+++ b/org.eclipse.mylyn.ide.ui/plugin.xml
@@ -64,24 +64,6 @@
tooltip="Focus on Active Task">
</action>
</viewContribution>
-
- <viewContribution
- id="org.eclipse.mylyn.markers.all.contribution"
- targetID="org.eclipse.ui.views.AllMarkersView">
- <action
- class="org.eclipse.mylyn.internal.ide.ui.actions.FocusAllMarkersViewAction"
- disabledIcon="icons/elcl16/focus-disabled.gif"
- enablesFor="*"
- icon="icons/elcl16/focus.gif"
- id="org.eclipse.mylyn.ide.ui.actions.focus.markers.all"
- label="Focus on Active Task"
- menubarPath="mylyn"
- style="toggle"
- toolbarPath="mylyn"
- tooltip="Focus on Active Task">
- </action>
- </viewContribution>
-
<viewContribution
id="org.eclipse.mylyn.markers.tasks.contribution"
targetID="org.eclipse.ui.views.TaskList">
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java
index 4132b56..df77126 100644
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java
+++ b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java
@@ -8,24 +8,13 @@
package org.eclipse.mylyn.ide.ui;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin;
import org.eclipse.mylyn.internal.ide.ui.MarkerInterestFilter;
import org.eclipse.mylyn.internal.ide.ui.MarkerViewLabelProvider;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.internal.views.markers.ExtendedMarkersView;
-import org.eclipse.ui.internal.views.markers.MarkersTreeViewer;
import org.eclipse.ui.views.markers.internal.TableViewLabelProvider;
/**
@@ -60,35 +49,35 @@
}
}
- /**
- * HACK: changing accessibility
- */
- @Override
- public List<StructuredViewer> getViewers() {
- List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
- if (cachedViewer == null) {
- try {
- IViewPart viewPart = super.getPartForAction();
- if (viewPart != null) {
- // NOTE: following code is Eclipse 3.4 specific
- Class<?> clazz = ExtendedMarkersView.class;
- Field field = clazz.getDeclaredField("viewer");
- field.setAccessible(true);
- cachedViewer = (MarkersTreeViewer) field.get(viewPart);
- if (cachedViewer != null && !cachedViewer.getControl().isDisposed()) {
- updateMarkerViewLabelProvider(cachedViewer);
- }
- }
- } catch (Exception e) {
- StatusHandler.log(new Status(IStatus.ERROR, IdeUiBridgePlugin.ID_PLUGIN,
- "Could not get problems view viewer", e));
- }
- }
- if (cachedViewer != null) {
- viewers.add(cachedViewer);
- }
- return viewers;
- }
+// /**
+// * HACK: changing accessibility
+// */
+// @Override
+// public List<StructuredViewer> getViewers() {
+// List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
+// if (cachedViewer == null) {
+// try {
+// IViewPart viewPart = super.getPartForAction();
+// if (viewPart != null) {
+// // NOTE: following code is Eclipse 3.4 specific
+// Class<?> clazz = ExtendedMarkersView.class;
+// Field field = clazz.getDeclaredField("viewer");
+// field.setAccessible(true);
+// cachedViewer = (MarkersTreeViewer) field.get(viewPart);
+// if (!cachedViewer.getControl().isDisposed()) {
+// updateMarkerViewLabelProvider(cachedViewer);
+// }
+// }
+// } catch (Exception e) {
+// StatusHandler.log(new Status(IStatus.ERROR, IdeUiBridgePlugin.PLUGIN_ID,
+// "Could not get problems view viewer", e));
+// }
+// }
+// if (cachedViewer != null) {
+// viewers.add(cachedViewer);
+// }
+// return viewers;
+// }
@Override
public void update() {
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerInterestFilter.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerInterestFilter.java
index f8b0b30..9d19222 100644
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerInterestFilter.java
+++ b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerInterestFilter.java
@@ -11,48 +11,56 @@
package org.eclipse.mylyn.internal.ide.ui;
import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.ide.ui.AbstractMarkerInterestFilter;
-import org.eclipse.ui.views.markers.MarkerItem;
+import org.eclipse.mylyn.context.ui.InterestFilter;
+import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
+import org.eclipse.ui.views.markers.internal.ConcreteMarker;
+import org.eclipse.ui.views.markers.internal.ProblemMarker;
/**
* @author Mik Kersten
*/
-public class MarkerInterestFilter extends AbstractMarkerInterestFilter {
+public class MarkerInterestFilter extends InterestFilter {
@Override
public boolean select(Viewer viewer, Object parent, Object element) {
-
- if (element instanceof MarkerItem) {
- if (element.getClass().getSimpleName().equals("MarkerCategory")) {
-// Class<?> clazz;
-// try {
-// clazz = Class.forName("org.eclipse.ui.internal.views.markers.MarkerCategory");
-// Method method = clazz.getDeclaredMethod("getChildren", new Class[] {});
-// method.setAccessible(true);
-// Object result = method.invoke(element, new Object[] {});
-// } catch (Exception e) {
-// e.printStackTrace();
+ if (!(element instanceof ConcreteMarker)) {
+ return true;
+ // NOTE: code commented out below did a look-down the children, which may be too expensive
+// if (element instanceof MarkerNode) {
+// MarkerNode markerNode = (MarkerNode) element;
+// MarkerNode[] children = markerNode.getChildren();
+// for (int i = 0; i < children.length; i++) {
+// MarkerNode node = children[i];
+// if (node instanceof ConcreteMarker) {
+// return isInteresting((ConcreteMarker) node, viewer, parent);
+// } else {
+// return true;
+// }
// }
+// }
+ } else {
+ return isInteresting((ConcreteMarker) element, viewer, parent);
+ }
+ }
- return true;
- } else if (element.getClass().getSimpleName().equals("MarkerEntry")) {
- return isInteresting(((MarkerItem) element).getMarker(), viewer, parent);
+ private boolean isImplicitlyInteresting(ConcreteMarker marker) {
+ return (marker instanceof ProblemMarker) && ((ProblemMarker) marker).getSeverity() == IMarker.SEVERITY_ERROR;
+ }
+
+ private boolean isInteresting(ConcreteMarker marker, Viewer viewer, Object parent) {
+ if (isImplicitlyInteresting(marker)) {
+ return true;
+ } else {
+ String handle = ContextCorePlugin.getDefault()
+ .getStructureBridge(marker.getResource().getFileExtension())
+ .getHandleForOffsetInObject(marker, 0);
+ if (handle == null) {
+ return false;
+ } else {
+ return super.select(viewer, parent, ContextCorePlugin.getContextManager().getElement(handle));
}
}
- return false;
- }
-
- @Override
- protected boolean isImplicitlyInteresting(IMarker marker) {
- try {
- Object severity = marker.getAttribute(IMarker.SEVERITY);
- return severity != null && severity.equals(IMarker.SEVERITY_ERROR);
- } catch (CoreException e) {
- // ignore
- }
- return false;
}
}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/AbstractFocusMarkerViewAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/AbstractFocusMarkerViewAction.java
new file mode 100644
index 0000000..0ec1f0b
--- /dev/null
+++ b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/AbstractFocusMarkerViewAction.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Mylyn project committers and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.mylyn.internal.ide.ui.actions;
+
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
+import org.eclipse.mylyn.internal.ide.ui.MarkerInterestFilter;
+import org.eclipse.mylyn.internal.ide.ui.MarkerViewLabelProvider;
+import org.eclipse.ui.views.markers.internal.TableViewLabelProvider;
+
+/**
+ * @author Mik Kersten
+ */
+public abstract class AbstractFocusMarkerViewAction extends AbstractFocusViewAction {
+
+ protected StructuredViewer cachedViewer = null;
+
+ public AbstractFocusMarkerViewAction() {
+ super(new MarkerInterestFilter(), true, true, false);
+ }
+
+ /**
+ * HACK: should use platform decorating label provider
+ *
+ * @param viewer
+ */
+ protected void updateMarkerViewLabelProvider(StructuredViewer viewer) {
+ IBaseLabelProvider currentProvider = viewer.getLabelProvider();
+ if (currentProvider instanceof TableViewLabelProvider && !(currentProvider instanceof MarkerViewLabelProvider)) {
+ viewer.setLabelProvider(new MarkerViewLabelProvider((TableViewLabelProvider) currentProvider));
+ }
+ }
+
+ @Override
+ public void update() {
+ super.update();
+ cachedViewer = null;
+ for (StructuredViewer viewer : getViewers()) {
+ if (viewer instanceof TableViewer) {
+ TableViewer tableViewer = (TableViewer) viewer;
+ if (!(tableViewer.getLabelProvider() instanceof MarkerViewLabelProvider)) {
+ tableViewer.setLabelProvider(new MarkerViewLabelProvider(
+ (TableViewLabelProvider) tableViewer.getLabelProvider()));
+ }
+ }
+ }
+ }
+}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusAllMarkersViewAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusAllMarkersViewAction.java
deleted file mode 100644
index 359c23c..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusAllMarkersViewAction.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.ide.ui.actions;
-
-import org.eclipse.mylyn.ide.ui.AbstractFocusMarkerViewAction;
-
-/**
- * @author Mik Kersten
- */
-public class FocusAllMarkersViewAction extends AbstractFocusMarkerViewAction {
-
- public FocusAllMarkersViewAction() {
- super();
- }
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusBookmarkMarkersViewAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusBookmarkMarkersViewAction.java
index 08867c8..e5f8c5c 100644
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusBookmarkMarkersViewAction.java
+++ b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusBookmarkMarkersViewAction.java
@@ -8,14 +8,42 @@
package org.eclipse.mylyn.internal.ide.ui.actions;
-import org.eclipse.mylyn.ide.ui.AbstractFocusMarkerViewAction;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
-/**
- * @author Mik Kersten
- */
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.mylyn.commons.core.StatusHandler;
+import org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.views.markers.internal.BookmarkView;
+import org.eclipse.ui.views.markers.internal.TableView;
+
public class FocusBookmarkMarkersViewAction extends AbstractFocusMarkerViewAction {
- public FocusBookmarkMarkersViewAction() {
- super();
+ @Override
+ public List<StructuredViewer> getViewers() {
+ List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
+ if (cachedViewer == null) {
+ try {
+ IViewPart viewPart = super.getPartForAction();
+ if (viewPart instanceof BookmarkView) {
+ Class<?> infoClass = TableView.class;
+ Method method = infoClass.getDeclaredMethod("getViewer", new Class[] {});
+ method.setAccessible(true);
+ cachedViewer = (StructuredViewer) method.invoke(viewPart, new Object[] {});
+ updateMarkerViewLabelProvider(cachedViewer);
+ }
+ } catch (Exception e) {
+ StatusHandler.fail(new Status(IStatus.ERROR, IdeUiBridgePlugin.ID_PLUGIN,
+ "Could not get bookmarks view viewer", e));
+ }
+ }
+ if (cachedViewer != null) {
+ viewers.add(cachedViewer);
+ }
+ return viewers;
}
}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProblemsListAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProblemsListAction.java
index f2eb067..730afe3 100644
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProblemsListAction.java
+++ b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProblemsListAction.java
@@ -8,14 +8,67 @@
package org.eclipse.mylyn.internal.ide.ui.actions;
-import org.eclipse.mylyn.ide.ui.AbstractFocusMarkerViewAction;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.mylyn.commons.core.StatusHandler;
+import org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin;
+import org.eclipse.mylyn.internal.ide.ui.MarkerViewLabelProvider;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.views.markers.internal.TableView;
+import org.eclipse.ui.views.markers.internal.TableViewLabelProvider;
/**
* @author Mik Kersten
*/
public class FocusProblemsListAction extends AbstractFocusMarkerViewAction {
- public FocusProblemsListAction() {
- super();
+ /**
+ * HACK: changing accessibility
+ */
+ @Override
+ public List<StructuredViewer> getViewers() {
+ List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
+ if (cachedViewer == null) {
+ try {
+ IViewPart viewPart = super.getPartForAction();
+ if (viewPart != null) {
+ Class<?> infoClass = TableView.class;// problemView.getClass();
+ Method method = infoClass.getDeclaredMethod("getViewer", new Class[] {});
+ method.setAccessible(true);
+ cachedViewer = (StructuredViewer) method.invoke(viewPart, new Object[] {});
+ if (!cachedViewer.getControl().isDisposed()) {
+ updateMarkerViewLabelProvider(cachedViewer);
+ }
+ }
+ } catch (Exception e) {
+ StatusHandler.fail(new Status(IStatus.ERROR, IdeUiBridgePlugin.ID_PLUGIN,
+ "Could not get problems view viewer", e));
+ }
+ }
+ if (cachedViewer != null) {
+ viewers.add(cachedViewer);
+ }
+ return viewers;
+ }
+
+ @Override
+ public void update() {
+ super.update();
+ cachedViewer = null;
+ for (StructuredViewer viewer : getViewers()) {
+ if (viewer instanceof TableViewer) {
+ TableViewer tableViewer = (TableViewer) viewer;
+ if (!(tableViewer.getLabelProvider() instanceof MarkerViewLabelProvider)) {
+ tableViewer.setLabelProvider(new MarkerViewLabelProvider(
+ (TableViewLabelProvider) tableViewer.getLabelProvider()));
+ }
+ }
+ }
}
}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusTaskMarkersViewAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusTaskMarkersViewAction.java
index fd0ddea..72aa233 100644
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusTaskMarkersViewAction.java
+++ b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusTaskMarkersViewAction.java
@@ -8,14 +8,75 @@
package org.eclipse.mylyn.internal.ide.ui.actions;
-import org.eclipse.mylyn.ide.ui.AbstractFocusMarkerViewAction;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.mylyn.commons.core.StatusHandler;
+import org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.views.markers.internal.TableView;
+import org.eclipse.ui.views.markers.internal.TaskView;
/**
* @author Mik Kersten
*/
public class FocusTaskMarkersViewAction extends AbstractFocusMarkerViewAction {
- public FocusTaskMarkersViewAction() {
- super();
+ /**
+ * HACK: changing accessibility
+ */
+ @Override
+ public List<StructuredViewer> getViewers() {
+ List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
+ if (cachedViewer == null) {
+ try {
+ IViewPart viewPart = super.getPartForAction();
+ if (viewPart instanceof TaskView) {
+ Class<?> infoClass = TableView.class;
+ Method method = infoClass.getDeclaredMethod("getViewer", new Class[] {});
+ method.setAccessible(true);
+ cachedViewer = (StructuredViewer) method.invoke(viewPart, new Object[] {});
+ updateMarkerViewLabelProvider(cachedViewer);
+ }
+ } catch (Exception e) {
+ StatusHandler.fail(new Status(IStatus.ERROR, IdeUiBridgePlugin.ID_PLUGIN,
+ "Could not get task view list viewer", e));
+ }
+ }
+ if (cachedViewer != null) {
+ viewers.add(cachedViewer);
+ }
+ return viewers;
}
+
+// protected void updateMarkerViewLabelProvider(StructuredViewer viewer) {
+// IBaseLabelProvider currentProvider = viewer.getLabelProvider();
+// if (currentProvider instanceof TableViewLabelProvider && !(currentProvider instanceof MarkerViewLabelProvider)) {
+// viewer.setLabelProvider(new MarkerViewLabelProvider((TableViewLabelProvider) currentProvider));
+// }
+// }
+
+// public void propertyChange(PropertyChangeEvent event) {
+// // ignore
+// }
+
+// @Override
+// protected boolean installInterestFilter(final StructuredViewer viewer) {
+// super.installInterestFilter(viewer);
+// return true;
+// }
+//
+// @Override
+// protected void uninstallInterestFilter(StructuredViewer viewer) {
+// super.uninstallInterestFilter(viewer);
+// }
+
+// @Override
+// public List<Class> getPreservedFilters() {
+// return Collections.emptyList();
+// }
}
diff --git a/org.eclipse.mylyn.java-feature/about.html b/org.eclipse.mylyn.java-feature/about.html
index 28867b2..0dd939c 100644
--- a/org.eclipse.mylyn.java-feature/about.html
+++ b/org.eclipse.mylyn.java-feature/about.html
@@ -7,7 +7,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 7, 2008</p>
+<p>June 7, 2007</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
diff --git a/org.eclipse.mylyn.java-feature/feature.xml b/org.eclipse.mylyn.java-feature/feature.xml
index defad4d..a8b2ab9 100644
--- a/org.eclipse.mylyn.java-feature/feature.xml
+++ b/org.eclipse.mylyn.java-feature/feature.xml
@@ -11,7 +11,7 @@
</description>
<copyright>
- Copyright (c) 2004, 2008 Mylyn project committers and others.
+ Copyright (c) 2004 - 2007 Mylyn project committers and others.
</copyright>
<license url="license.html">
@@ -60,7 +60,7 @@
</license>
<url>
- <update label="Mylyn for Eclipse 3.4" url="http://download.eclipse.org/tools/mylyn/update/e3.4"/>
+ <update label="Mylyn for Eclipse 3.3" url="http://download.eclipse.org/tools/mylyn/update/e3.3"/>
</url>
<requires>
@@ -92,10 +92,9 @@
<import plugin="org.eclipse.mylyn.tasks.core" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.ui.navigator"/>
- <import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.ant.ui"/>
<import feature="org.eclipse.mylyn.context_feature" version="3.0.0.qualifier" match="perfect"/>
- <import feature="org.eclipse.jdt" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.ide" version="3.3.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.mylyn.pde-feature/about.html b/org.eclipse.mylyn.pde-feature/about.html
index 28867b2..0dd939c 100644
--- a/org.eclipse.mylyn.pde-feature/about.html
+++ b/org.eclipse.mylyn.pde-feature/about.html
@@ -7,7 +7,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 7, 2008</p>
+<p>June 7, 2007</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
diff --git a/org.eclipse.mylyn.pde-feature/feature.xml b/org.eclipse.mylyn.pde-feature/feature.xml
index 662f5ea..32803b9 100644
--- a/org.eclipse.mylyn.pde-feature/feature.xml
+++ b/org.eclipse.mylyn.pde-feature/feature.xml
@@ -11,7 +11,7 @@
</description>
<copyright>
- Copyright (c) 2004, 2008 Mylyn project committers and others.
+ Copyright (c) 2004 - 2007 Mylyn project committers and others.
</copyright>
<license url="license.html">
@@ -60,19 +60,17 @@
</license>
<url>
- <update label="Mylyn for Eclipse 3.4" url="http://download.eclipse.org/tools/mylyn/update/e3.4"/>
+ <update label="Mylyn for Eclipse 3.3" url="http://download.eclipse.org/tools/mylyn/update/e3.3"/>
</url>
<requires>
- <import plugin="org.eclipse.ui" version="3.4.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.ui.workbench.texteditor"/>
<import plugin="org.eclipse.ui.forms"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.pde.ui" version="3.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.pde.api.tools.ui"/>
<import plugin="org.eclipse.debug.ui"/>
<import plugin="org.eclipse.ui.editors"/>
<import plugin="org.eclipse.search"/>
@@ -89,7 +87,7 @@
<import plugin="org.eclipse.mylyn.resources.ui" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.mylyn.monitor.core" version="3.0.0" match="compatible"/>
<import feature="org.eclipse.mylyn.java_feature" version="3.0.0.qualifier" match="perfect"/>
- <import feature="org.eclipse.pde" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.pde.ui" version="3.3.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
index 3d8d7c6..ef6a3c5 100644
--- a/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
@@ -12,8 +12,7 @@
org.eclipse.ui.forms,
org.eclipse.jface.text,
org.eclipse.ui.ide,
- org.eclipse.pde.ui;bundle-version="3.4.0",
- org.eclipse.pde.api.tools.ui,
+ org.eclipse.pde.ui;bundle-version="[3.3.0,3.4.0)",
org.eclipse.debug.ui,
org.eclipse.ui.editors,
org.eclipse.search,
diff --git a/org.eclipse.mylyn.pde.ui/plugin.xml b/org.eclipse.mylyn.pde.ui/plugin.xml
index 8ea8aa3..d986d72 100644
--- a/org.eclipse.mylyn.pde.ui/plugin.xml
+++ b/org.eclipse.mylyn.pde.ui/plugin.xml
@@ -23,22 +23,6 @@
parentContentType="resource"/>
</extension>
-
- <extension
- id="apitools_javadoc_proposals"
- name="PDE API Tools Proposals (Focused)"
- point="org.eclipse.jdt.ui.javaCompletionProposalComputer">
- <javaCompletionProposalComputer
- activate="true"
- categoryId="org.eclipse.mylyn.java.ui.javaNoTypeProposalCategory"
- class="org.eclipse.pde.api.tools.ui.internal.completion.APIToolsJavadocCompletionProposalComputer">
- <partition
- type="__java_javadoc">
- </partition>
- </javaCompletionProposalComputer>
- </extension>
-
-
<extension
point="org.eclipse.debug.core.launchConfigurationTypes">
<launchConfigurationType
@@ -48,6 +32,14 @@
delegate="org.eclipse.mylyn.internal.pde.ui.junit.TaskContextPdeJUnitLaunchConfiguration"
modes="run, debug"
id="org.eclipse.mylyn.pde.junit.launchconfig">
+ <fileExtension
+ default="false"
+ extension="java">
+ </fileExtension>
+ <fileExtension
+ default="false"
+ extension="class">
+ </fileExtension>
</launchConfigurationType>
</extension>
@@ -70,4 +62,4 @@
</launchConfigurationTabGroup>
</extension>
-</plugin>
+</plugin>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java
index cedb05c..40f5867 100644
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java
+++ b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java
@@ -26,8 +26,8 @@
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.IPluginObject;
import org.eclipse.pde.internal.core.plugin.ImportObject;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
+import org.eclipse.pde.internal.core.text.IDocumentAttribute;
+import org.eclipse.pde.internal.core.text.IDocumentNode;
import org.eclipse.pde.internal.core.text.plugin.PluginModel;
import org.eclipse.pde.internal.core.text.plugin.PluginObjectNode;
import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
@@ -40,7 +40,6 @@
* @author Shawn Minto
* @author Mik Kersten
*/
-@SuppressWarnings("restriction")
public class PdeEditingMonitor extends AbstractUserInteractionMonitor {
public PdeEditingMonitor() {
@@ -129,12 +128,12 @@
}
}
- public static String getStringOfNode(IDocumentElementNode node) {
+ public static String getStringOfNode(IDocumentNode node) {
if (node == null) {
return null;
}
String s = node.getXMLTagName();
- for (IDocumentAttributeNode a : node.getNodeAttributes()) {
+ for (IDocumentAttribute a : node.getNodeAttributes()) {
s += a.getAttributeName() + "=" + a.getAttributeValue();
}
return s;
@@ -200,14 +199,14 @@
/**
* COPIED FROM ManifestSourcePage
*/
- private static IDocumentElementNode findNode(IPluginObject[] nodes, int offset, boolean hashCode) {
- for (IPluginObject node3 : nodes) {
- IDocumentElementNode node = (IDocumentElementNode) node3;
- IDocumentElementNode[] children = node.getChildNodes();
+ private static IDocumentNode findNode(IPluginObject[] nodes, int offset, boolean hashCode) {
+ for (IPluginObject element : nodes) {
+ IDocumentNode node = (IDocumentNode) element;
+ IDocumentNode[] children = node.getChildNodes();
// changed region - added to check the children to make it work
// properly
- IDocumentElementNode node2 = null;
+ IDocumentNode node2 = null;
if (children.length > 0) {
node2 = PdeEditingMonitor.findNode(children, offset, hashCode);
// end changed region
@@ -233,10 +232,10 @@
/**
* Copy of previous, taking different arguments
*/
- private static IDocumentElementNode findNode(IDocumentElementNode[] nodes, int offset, boolean hashCode) {
- for (IDocumentElementNode node : nodes) {
- IDocumentElementNode[] children = node.getChildNodes();
- IDocumentElementNode node2 = null;
+ private static IDocumentNode findNode(IDocumentNode[] nodes, int offset, boolean hashCode) {
+ for (IDocumentNode node : nodes) {
+ IDocumentNode[] children = node.getChildNodes();
+ IDocumentNode node2 = null;
if (children.length > 0) {
node2 = PdeEditingMonitor.findNode(children, offset, hashCode);
}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeStructureBridge.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeStructureBridge.java
index b39668b..a1205c9 100644
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeStructureBridge.java
+++ b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeStructureBridge.java
@@ -12,7 +12,6 @@
import java.util.List;
import org.eclipse.core.internal.resources.File;
-import org.eclipse.core.internal.resources.Marker;
import org.eclipse.core.internal.resources.Workspace;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
@@ -25,8 +24,8 @@
import org.eclipse.jface.text.IDocument;
import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
import org.eclipse.mylyn.context.core.IInteractionElement;
+import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
import org.eclipse.mylyn.internal.ide.ui.XmlNodeHelper;
import org.eclipse.pde.internal.core.text.build.BuildEntry;
import org.eclipse.pde.internal.core.text.plugin.PluginNode;
@@ -35,13 +34,12 @@
import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.markers.internal.ConcreteMarker;
+import org.eclipse.ui.views.markers.internal.ProblemMarker;
/**
* @author Mik Kersten
*
*/
-@SuppressWarnings("restriction")
public class PdeStructureBridge extends AbstractContextStructureBridge {
public final static String CONTENT_TYPE = "plugin.xml";
@@ -100,7 +98,8 @@
}
} else if (object instanceof IFile) {
// String fileHandle = parentBridge.getParentHandle(handle);
- AbstractContextStructureBridge parentBridge = ContextCore.getStructureBridge(parentContentType);
+ AbstractContextStructureBridge parentBridge = ContextCorePlugin.getDefault().getStructureBridge(
+ parentContentType);
return parentBridge.getParentHandle(handle);
} else {
return null;
@@ -118,7 +117,8 @@
int first = handle.indexOf(";");
String filename = "";
if (first == -1) {
- AbstractContextStructureBridge parentBridge = ContextCore.getStructureBridge(parentContentType);
+ AbstractContextStructureBridge parentBridge = ContextCorePlugin.getDefault().getStructureBridge(
+ parentContentType);
return parentBridge.getObjectForHandle(handle);
} else {
// extract the filename from the handle since it represents a node
@@ -285,28 +285,20 @@
}
@Override
- public String getHandleForOffsetInObject(Object object, int offset) {
- if (object == null) {
+ public String getHandleForOffsetInObject(Object resource, int offset) {
+ if (resource == null) {
return null;
}
+ if (resource instanceof ProblemMarker) {
+ ProblemMarker marker = (ProblemMarker) resource;
- IResource markerResource = null;
- try {
- if (object instanceof ConcreteMarker) {
- markerResource = ((ConcreteMarker) object).getMarker().getResource();
- } else if (object instanceof Marker) {
- markerResource = ((Marker) object).getResource();
- }
- } catch (Exception e) {
- return null;
- }
-
- if (markerResource != null) {
// we can only get a handle for a marker with the resource
// plugin.xml
try {
- if (markerResource instanceof IFile) {
- IFile file = (IFile) markerResource;
+ IResource res = marker.getResource();
+
+ if (res instanceof IFile) {
+ IFile file = (IFile) res;
if (file.getFullPath().toString().endsWith("plugin.xml")) {
return file.getFullPath().toString();
} else {
@@ -316,12 +308,12 @@
return null;
} catch (Throwable t) {
StatusHandler.log(new Status(IStatus.WARNING, PdeUiBridgePlugin.ID_PLUGIN,
- "Could not find element for: " + object));
+ "Could not find element for: " + marker));
return null;
}
- } else if (object instanceof IFile) {
+ } else if (resource instanceof IFile) {
try {
- IFile file = (IFile) object;
+ IFile file = (IFile) resource;
if (file.getFullPath().toString().endsWith("plugin.xml")) {
String content = XmlNodeHelper.getContents(file.getContents());
IDocument d = new Document(content);
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitLaunchConfiguration.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitLaunchConfiguration.java
index 763e38a..dad49c1 100644
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitLaunchConfiguration.java
+++ b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitLaunchConfiguration.java
@@ -24,7 +24,6 @@
/**
* @author Mik Kersten
*/
-@SuppressWarnings("restriction")
public class TaskContextPdeJUnitLaunchConfiguration extends JUnitLaunchConfigurationDelegate {
@Override
@@ -36,8 +35,8 @@
if (contextTestCases.isEmpty()) {
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
public void run() {
- MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Context Test Suite",
- "No test types found in the active task context.");
+ MessageDialog.openInformation(Display.getCurrent().getActiveShell(),
+ "Context Test Suite", "No test types found in the active task context.");
}
});
}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitTabGroup.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitTabGroup.java
index cb30fb5..b61e423 100644
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitTabGroup.java
+++ b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitTabGroup.java
@@ -25,7 +25,6 @@
*
* @author Mik Kersten
*/
-@SuppressWarnings("restriction")
public class TaskContextPdeJUnitTabGroup extends JUnitTabGroup {
@Override
diff --git a/org.eclipse.mylyn.team-feature/about.html b/org.eclipse.mylyn.team-feature/about.html
index 28867b2..0dd939c 100644
--- a/org.eclipse.mylyn.team-feature/about.html
+++ b/org.eclipse.mylyn.team-feature/about.html
@@ -7,7 +7,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 7, 2008</p>
+<p>June 7, 2007</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
diff --git a/org.eclipse.mylyn.team-feature/feature.xml b/org.eclipse.mylyn.team-feature/feature.xml
index bb58263..83ee80a 100644
--- a/org.eclipse.mylyn.team-feature/feature.xml
+++ b/org.eclipse.mylyn.team-feature/feature.xml
@@ -11,7 +11,7 @@
</description>
<copyright>
- Copyright (c) 2004, 2008 Mylyn project committers and others.
+ Copyright (c) 2004 - 2007 Mylyn project committers and others.
</copyright>
<license url="license.html">
@@ -60,7 +60,7 @@
</license>
<url>
- <update label="Mylyn for Eclipse 3.4" url="http://download.eclipse.org/tools/mylyn/update/e3.4"/>
+ <update label="Mylyn for Eclipse 3.3" url="http://download.eclipse.org/tools/mylyn/update/e3.3"/>
</url>
<requires>
