mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

Merge commit 'b4250143312d4821916a0322574070545042e56d' into 4.0_mars_bugfix

Browse source
This commit is contained in:
Martin Oberhuber 2015-06-03 16:17:38 +02:00
commit 6076d2f016
3 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.tm.terminal.view.ui/plugin.properties
View file

@ -16,7 +16,7 @@ providerName = Eclipse.org - Target Management
ViewCategory.name=Terminal
TerminalsView.name=Terminal
TerminalsView.name.old=Terminal (Old)
TerminalsView.name.old=Terminals (Old)
TerminalsView.context.name=In Terminal View
TerminalsView.context.description=Show modified keyboard shortcuts in context menu

17
plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
View file

@ -21,7 +21,8 @@
name="%TerminalsView.name">
</view>
<!-- Contribute another view with the old ID to handle the ID change -->
<!-- Bug 466644: Contribute another view with the old (TCF) ID to handle the ID change -->
<!-- The sole purpose of this view is to close itself when it's in an old workspace/persepctive -->
<view
allowMultiple="true"
class="org.eclipse.tm.terminal.view.ui.view.OldTerminalsViewHandler"
@ -137,7 +138,7 @@
class="org.eclipse.tm.terminal.view.ui.internal.PropertyTester"
id="org.eclipse.tm.terminal.view.ui.PropertyTester"
namespace="org.eclipse.tm.terminal.view.ui"
properties="oldViewActivityEnabled,hasApplicableLauncherDelegates,canDisconnect"
properties="hasApplicableLauncherDelegates,canDisconnect"
type="java.lang.Object">
</propertyTester>
</extension>
@ -334,23 +335,19 @@
<defaultEnablement
id="org.eclipse.tm.terminal.view.ui.activity.views">
</defaultEnablement>
<!-- Hide the old TCF Terminals (Migration Only) View from the View Shortcuts Menu -->
<activity
id="org.eclipse.tm.terminal.view.ui.activity.oldview"
name="Terminal Views (Old)">
<enabledWhen>
<test
property="org.eclipse.tm.terminal.view.ui.oldViewActivityEnabled"
value="true">
</test>
</enabledWhen>
</activity>
<activityPatternBinding
activityId="org.eclipse.tm.terminal.view.ui.activity.oldview"
pattern=".*/org\.eclipse\.tcf\.te\.ui\.terminals\.TerminalsView">
</activityPatternBinding>
<!-- TBD Remove this category binding to hide the Migration Capability from the Preferences -->
<categoryActivityBinding
activityId="org.eclipse.tm.terminal.view.ui.activity.oldview"
categoryId="org.eclipse.tm.terminal.view.ui.category">

4
plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java
View file

@ -31,10 +31,6 @@ public class PropertyTester extends org.eclipse.core.expressions.PropertyTester
@SuppressWarnings("cast")
@Override
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
// This property is supposed to return always false
if ("oldViewActivityEnabled".equals(property)) { //$NON-NLS-1$
return false;
}
if ("hasApplicableLauncherDelegates".equals(property)) { //$NON-NLS-1$
ISelection selection = receiver instanceof ISelection ? (ISelection)receiver : new StructuredSelection(receiver);