diff --git a/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties b/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties index a3a8cee7a38..97d71b8cdb9 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties +++ b/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties @@ -16,6 +16,7 @@ providerName = Eclipse.org - Target Management ViewCategory.name=Terminal TerminalsView.name=Terminal +TerminalsView.name.old=Terminal (Old) TerminalsView.context.name=In Terminal View TerminalsView.context.description=Show modified keyboard shortcuts in context menu diff --git a/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml index d0e996165f9..1dfa03b454d 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml @@ -27,8 +27,7 @@ class="org.eclipse.tm.terminal.view.ui.view.OldTerminalsViewHandler2" icon="icons/eview16/terminal_view.gif" id="org.eclipse.tcf.te.ui.terminals.TerminalsView" - name="%TerminalsView.name" - restorable="false"> + name="%TerminalsView.name.old"> @@ -349,9 +348,13 @@ + pattern=".*/org\.eclipse\.tcf\.te\.ui\.terminals\.TerminalsView"> + + diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java index 861cb8b50e6..64c931a81e3 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java @@ -31,8 +31,9 @@ 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 true; + return false; } if ("hasApplicableLauncherDelegates".equals(property)) { //$NON-NLS-1$ diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler2.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler2.java index be7a640a2d0..8a8025709eb 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler2.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler2.java @@ -10,17 +10,26 @@ package org.eclipse.tm.terminal.view.ui.view; import org.eclipse.swt.widgets.Composite; +import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; /** - * + * Old terminals view handler implementation. + *

+ * If invoked, the view implementation opens the new terminals view and + * closes itself afterwards. */ public class OldTerminalsViewHandler2 extends ViewPart { /** - * + * Constructor. */ public OldTerminalsViewHandler2() { + super(); } /* (non-Javadoc) @@ -28,6 +37,19 @@ public class OldTerminalsViewHandler2 extends ViewPart { */ @Override public void createPartControl(Composite parent) { + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage page = window != null ? window.getActivePage() : null; + + if (page != null) { + // Show the new view + try { + page.showView(IUIConstants.ID); + } + catch (PartInitException e) { /* ignored on purpose */ } + + // Hide ourself in the current perspective + page.hideView(this); + } } /* (non-Javadoc)