Attachment #96675 for bug #227572




 *
 * Contributors:
 * Yu-Fen Kuo (MontaVista) - initial API and implementation
 * Yu-Fen Kuo (MontaVista) - [227572] RSE Terminal doesn't reset the "connected" state when the shell exits
 ********************************************************************************/

package org.eclipse.rse.subsystems.terminals.core;

import java.util.ArrayList;
import java.util.Iterator;

import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents;

        Display.getDefault().asyncExec(new Refresh(this));
    }

    public void removeChild(String terminalTitle) {
        if (children != null) {
            TerminalElement element = getChild(terminalTitle);
            if (element != null){
                children.remove(element);
                if (children == null) {
                    getConnectorService().removeCommunicationsListener(this);
                }
                Display.getDefault().asyncExec(new Refresh(this));
            }
        }
        
    }
    public TerminalElement getChild(String terminalTitle) {
        if (children != null) {
            Iterator iterator = children.iterator();
            while (iterator.hasNext()){
                TerminalElement element = (TerminalElement)iterator.next();
                if (element.getName().equals(terminalTitle))
                    return element;
            }
        }
        return null;
    }
    public Object[] getChildren() {
        if (children != null)
            return children.toArray();

Lines 6-11 Link Here

(-)src/org/eclipse/rse/subsystems/terminals/core/ITerminalServiceSubSystem.java (+5 lines)
6	*	6	*
7	* Contributors:	7	* Contributors:
8	* Yu-Fen Kuo (MontaVista) - initial API and implementation	8	* Yu-Fen Kuo (MontaVista) - initial API and implementation
		9	* Yu-Fen Kuo (MontaVista) - [227572] RSE Terminal doesn't reset the "connected" state when the shell exits
9	********************************************************************************/	10	********************************************************************************/
10	package org.eclipse.rse.subsystems.terminals.core;	11	package org.eclipse.rse.subsystems.terminals.core;
11		12
Lines 16-19 Link Here
16	public void addChild(TerminalElement element);	17	public void addChild(TerminalElement element);
17		18
18	public void removeChild(TerminalElement element);	19	public void removeChild(TerminalElement element);
		20
		21	public void removeChild(String terminalTitle);
		22
		23	public TerminalElement getChild(String terminalTitle);
19	}	24	}




 * Contributors:
 * Yu-Fen Kuo (MontaVista)      - initial API and implementation
 * Anna Dushistova (MontaVista) - initial API and implementation
 * Yu-Fen Kuo (MontaVista)      - [227572] RSE Terminal doesn't reset the "connected" state when the shell exits
 ********************************************************************************/
package org.eclipse.rse.subsystems.terminals.core.elements;

import org.eclipse.rse.core.subsystems.AbstractResource;
import org.eclipse.rse.internal.services.terminals.ITerminalShell;
import org.eclipse.rse.subsystems.terminals.core.ITerminalServiceSubSystem;

public class TerminalElement extends AbstractResource {
    private String name;
    private ITerminalShell terminalShell;
    public String getName() {
        return name;
    }

    public TerminalElement(String name,
            ITerminalServiceSubSystem terminalServiceSubSystem) {
        super(terminalServiceSubSystem);
        this.name = name;
    }
    
    public String getName() {
        return name;
    }


    public String toString() {
        return getName();


    public boolean equals(Object obj) {
        if (obj instanceof TerminalElement) {
            if (obj == this)
                return true;
            return name.equals(((TerminalElement) obj).getName())
                    && terminalShell == ((TerminalElement) obj)
                            .getTerminalShell();
        }
        return super.equals(obj);
    }

    public int hashCode() {
        if (terminalShell != null)
            return terminalShell.hashCode() + name.hashCode();
        return name.hashCode() ;
    }

    public ITerminalShell getTerminalShell() {
        return terminalShell;
    }

    public void setTerminalShell(ITerminalShell terminalShell) {
        this.terminalShell = terminalShell;
    }

}

Lines 15-20 Link Here

(-)src/org/eclipse/rse/internal/terminals/ui/views/TerminalViewTab.java (-5 / +51 lines)
15	* David McKnight (IBM) - [165680] "Show in Remote Shell View" does not work	15	* David McKnight (IBM) - [165680] "Show in Remote Shell View" does not work
16	* Yu-Fen Kuo (MontaVista) - Adapted from CommandsViewWorkbook	16	* Yu-Fen Kuo (MontaVista) - Adapted from CommandsViewWorkbook
17	* Anna Dushistova (MontaVista) - Adapted from CommandsViewWorkbook	17	* Anna Dushistova (MontaVista) - Adapted from CommandsViewWorkbook
		18	* Yu-Fen Kuo (MontaVista) - [227572] RSE Terminal doesn't reset the "connected" state when the shell exits
18	********************************************************************************/	19	********************************************************************************/
19	package org.eclipse.rse.internal.terminals.ui.views;	20	package org.eclipse.rse.internal.terminals.ui.views;
20		21
Lines 23-30 Link Here
23	import org.eclipse.jface.action.IMenuManager;	24	import org.eclipse.jface.action.IMenuManager;
24	import org.eclipse.jface.action.MenuManager;	25	import org.eclipse.jface.action.MenuManager;
25	import org.eclipse.jface.action.Separator;	26	import org.eclipse.jface.action.Separator;
		27	import org.eclipse.rse.core.RSECorePlugin;
		28	import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
		29	import org.eclipse.rse.core.events.SystemResourceChangeEvent;
26	import org.eclipse.rse.core.model.IHost;	30	import org.eclipse.rse.core.model.IHost;
		31	import org.eclipse.rse.core.model.ISystemRegistry;
27	import org.eclipse.rse.internal.terminals.ui.TerminalServiceHelper;	32	import org.eclipse.rse.internal.terminals.ui.TerminalServiceHelper;
		33	import org.eclipse.rse.subsystems.terminals.core.ITerminalServiceSubSystem;
		34	import org.eclipse.rse.subsystems.terminals.core.TerminalServiceSubSystem;
		35	import org.eclipse.rse.subsystems.terminals.core.elements.TerminalElement;
28	import org.eclipse.rse.ui.view.ISystemViewElementAdapter;	36	import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
29	import org.eclipse.swt.SWT;	37	import org.eclipse.swt.SWT;
30	import org.eclipse.swt.custom.CTabFolder;	38	import org.eclipse.swt.custom.CTabFolder;
Lines 38-43 Link Here
38	import org.eclipse.swt.layout.GridData;	46	import org.eclipse.swt.layout.GridData;
39	import org.eclipse.swt.widgets.Composite;	47	import org.eclipse.swt.widgets.Composite;
40	import org.eclipse.swt.widgets.Control;	48	import org.eclipse.swt.widgets.Control;
		49	import org.eclipse.swt.widgets.Display;
41	import org.eclipse.swt.widgets.Menu;	50	import org.eclipse.swt.widgets.Menu;
42	import org.eclipse.tm.internal.terminal.actions.TerminalAction;	51	import org.eclipse.tm.internal.terminal.actions.TerminalAction;
43	import org.eclipse.tm.internal.terminal.actions.TerminalActionClearAll;	52	import org.eclipse.tm.internal.terminal.actions.TerminalActionClearAll;
Lines 203-209 Link Here
203	;	212	;
204	}	213	}
205	item.setData(DATA_KEY_CONTROL, terminalControl);	214	item.setData(DATA_KEY_CONTROL, terminalControl);
206
207	}	215	}
208	item.setControl(c);	216	item.setControl(c);
209	tabFolder.setSelection(item);	217	tabFolder.setSelection(item);
Lines 361-372 Link Here
361	.getAdapter(ISystemViewElementAdapter.class);	369	.getAdapter(ISystemViewElementAdapter.class);
362	if (va != null) {	370	if (va != null) {
363	updateWithUniqueTitle(va.getName(root), titem);	371	updateWithUniqueTitle(va.getName(root), titem);
		372	setTabImage(root, titem);
		373	}
		374	}
		375	private void setTabImage(IAdaptable root, CTabItem titem) {
		376	ISystemViewElementAdapter va = (ISystemViewElementAdapter) root
		377	.getAdapter(ISystemViewElementAdapter.class);
		378	if (va != null) {
		379	if (root instanceof IHost){
		380	ITerminalServiceSubSystem terminalServiceSubSystem = TerminalServiceHelper.getTerminalSubSystem((IHost)root);
		381	TerminalElement element = terminalServiceSubSystem.getChild(titem.getText());
		382	if (element != null){
		383	va = (ISystemViewElementAdapter) element.getAdapter(ISystemViewElementAdapter.class);
		384	titem.setImage(va.getImageDescriptor(element).createImage());
		385	return;
		386	}
		387	}
		388
364	titem.setImage(va.getImageDescriptor(root).createImage());	389	titem.setImage(va.getImageDescriptor(root).createImage());
365	}	390	}
366	}	391	}
		392	public void setState(final TerminalState state) {
		393	if (state == TerminalState.CLOSED \|\| state == TerminalState.CONNECTED){
		394	Display.getDefault().asyncExec(new Runnable(){
		395	public void run() {
		396	CTabItem item = tabFolder.getSelection();
		397	if (item != null && !item.isDisposed()){
		398	Object data = item.getData();
		399	if (data instanceof IHost){
		400	IHost host = (IHost)data;
		401	final ITerminalServiceSubSystem terminalServiceSubSystem = TerminalServiceHelper.getTerminalSubSystem(host);
		402
		403	if (state == TerminalState.CONNECTED)
		404	TerminalServiceHelper.updateTerminalShellForTerminalElement(item);
		405
		406	setTabImage(host, item);
		407	ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
		408	registry.fireEvent(new SystemResourceChangeEvent(terminalServiceSubSystem,
		409	ISystemResourceChangeEvents.EVENT_REFRESH, terminalServiceSubSystem));
		410	}
		411	}
		412	}
		413	});
		414	}
367		415
368	public void setState(TerminalState state) {
369	// terminalControl.setState(state);
370	}	416	}
371		417
372	public void setTerminalTitle(String title) {	418	public void setTerminalTitle(String title) {
Lines 386-397 Link Here
386		432
387	public void onTerminalConnect() {	433	public void onTerminalConnect() {
388	// TODO Auto-generated method stub	434	// TODO Auto-generated method stub
389		435
390	}	436	}
391		437
392	public void onTerminalDisconnect() {	438	public void onTerminalDisconnect() {
393	// TODO Auto-generated method stub	439	// TODO Auto-generated method stub
394		440
395	}	441	}
396		442
397	public void onTerminalFontChanged() {	443	public void onTerminalFontChanged() {




 * Xuan Chen        (IBM)        - [223126] [api][breaking] Remove API related to User Actions in RSE Core/UI
 * Yu-Fen Kuo      (MontaVista)  - Adopted from SystemViewRemoteOutputAdapter
 * Anna Dushistova (MontaVista)  - Adopted from SystemViewRemoteOutputAdapter
 * Yu-Fen Kuo      (MontaVista)  - [227572] RSE Terminal doesn't reset the "connected" state when the shell exits
 *******************************************************************************/
package org.eclipse.rse.internal.terminals.ui.views;


import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.internal.services.terminals.ITerminalShell;
import org.eclipse.rse.internal.terminals.ui.Activator;
import org.eclipse.rse.internal.terminals.ui.actions.RemoveTerminalAction;
import org.eclipse.rse.internal.terminals.ui.actions.ShowInTerminalViewAction;

    }

    public ImageDescriptor getImageDescriptor(Object element) {
        if (element instanceof TerminalElement){
            TerminalElement terminalElement = (TerminalElement)element;
            ITerminalShell terminalShell = terminalElement.getTerminalShell();
            if (terminalShell != null){
                if (terminalShell.isActive())
                    return Activator.getDefault().getImageDescriptor(
                            Activator.ICON_ID_TERMINAL_SUBSYSTEM_LIVE);
            }
        }
        return Activator.getDefault().getImageDescriptor(
                Activator.ICON_ID_TERMINAL_SUBSYSTEM);
    }

    public Object getParent(Object element) {

Lines 6-11 Link Here

(-)src/org/eclipse/rse/internal/terminals/ui/views/RSETerminalConnectorImpl.java (+5 lines)
6	*	6	*
7	* Contributors:	7	* Contributors:
8	* Anna Dushistova (MontaVista) - initial API and implementation	8	* Anna Dushistova (MontaVista) - initial API and implementation
		9	* Yu-Fen Kuo (MontaVista) - [227572] RSE Terminal doesn't reset the "connected" state when the shell exits
9	********************************************************************************/	10	********************************************************************************/
10	package org.eclipse.rse.internal.terminals.ui.views;	11	package org.eclipse.rse.internal.terminals.ui.views;
11		12
Lines 86-89 Link Here
86	this.shell = shell;	87	this.shell = shell;
87	}	88	}
88		89
		90	public ITerminalShell getTerminalHostShell() {
		91	return shell;
		92	}
		93
89	}	94	}

Lines 6-11 Link Here

(-)src/org/eclipse/rse/internal/terminals/ui/TerminalServiceHelper.java (-3 / +36 lines)
6	*	6	*
7	* Contributors:	7	* Contributors:
8	* Yu-Fen Kuo (MontaVista) - initial API and implementation	8	* Yu-Fen Kuo (MontaVista) - initial API and implementation
		9	* Yu-Fen Kuo (MontaVista) - [227572] RSE Terminal doesn't reset the "connected" state when the shell exits
9	********************************************************************************/	10	********************************************************************************/
10		11
11	package org.eclipse.rse.internal.terminals.ui;	12	package org.eclipse.rse.internal.terminals.ui;
Lines 17-26 Link Here
17	import org.eclipse.rse.core.model.IHost;	18	import org.eclipse.rse.core.model.IHost;
18	import org.eclipse.rse.core.model.ISystemRegistry;	19	import org.eclipse.rse.core.model.ISystemRegistry;
19	import org.eclipse.rse.core.subsystems.ISubSystem;	20	import org.eclipse.rse.core.subsystems.ISubSystem;
		21	import org.eclipse.rse.internal.services.terminals.ITerminalShell;
		22	import org.eclipse.rse.internal.terminals.ui.views.RSETerminalConnector;
		23	import org.eclipse.rse.internal.terminals.ui.views.TerminalViewTab;
20	import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;	24	import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
21	import org.eclipse.rse.subsystems.terminals.core.ITerminalServiceSubSystem;	25	import org.eclipse.rse.subsystems.terminals.core.ITerminalServiceSubSystem;
22	import org.eclipse.rse.subsystems.terminals.core.elements.TerminalElement;	26	import org.eclipse.rse.subsystems.terminals.core.elements.TerminalElement;
23	import org.eclipse.swt.custom.CTabItem;	27	import org.eclipse.swt.custom.CTabItem;
		28	import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
		29	import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
24		30
25	public class TerminalServiceHelper {	31	public class TerminalServiceHelper {
26		32
Lines 49-55 Link Here
49	ISystemRegistry systemRegistry = RSECorePlugin.getTheSystemRegistry();	55	ISystemRegistry systemRegistry = RSECorePlugin.getTheSystemRegistry();
50	ISubSystem[] subsystems = systemRegistry.getSubSystems(connection);	56	ISubSystem[] subsystems = systemRegistry.getSubSystems(connection);
51	for (int i = 0; i < subsystems.length; i++) {	57	for (int i = 0; i < subsystems.length; i++) {
52	if ("ssh.terminals".equals(subsystems[i].getSubSystemConfiguration().getId())) {	58	if ("ssh.terminals".equals(subsystems[i]
		59	.getSubSystemConfiguration().getId())) {
53	ITerminalServiceSubSystem subSystem = (ITerminalServiceSubSystem) subsystems[i];	60	ITerminalServiceSubSystem subSystem = (ITerminalServiceSubSystem) subsystems[i];
54	return subSystem;	61	return subSystem;
55	}	62	}
Lines 82-91 Link Here
82	public static void removeTerminalElementFromHost(CTabItem item, IHost host) {	89	public static void removeTerminalElementFromHost(CTabItem item, IHost host) {
83	ITerminalServiceSubSystem terminalServiceSubSystem = getTerminalSubSystem(host);	90	ITerminalServiceSubSystem terminalServiceSubSystem = getTerminalSubSystem(host);
84	if (terminalServiceSubSystem != null) {	91	if (terminalServiceSubSystem != null) {
85	TerminalElement element = new TerminalElement(item.getText(),	92	TerminalElement element = terminalServiceSubSystem.getChild(item.getText());
86	terminalServiceSubSystem);
87	terminalServiceSubSystem.removeChild(element);	93	terminalServiceSubSystem.removeChild(element);
88	}	94	}
89		95
90	}	96	}
		97
		98	public static void updateTerminalShellForTerminalElement(CTabItem item) {
		99	Object data = item.getData();
		100	if (data instanceof IHost){
		101	IHost host = (IHost) data;
		102	ITerminalServiceSubSystem terminalServiceSubSystem = TerminalServiceHelper.getTerminalSubSystem(host);
		103	TerminalElement element = terminalServiceSubSystem.getChild(item.getText());
		104	if (element != null){
		105	ITerminalShell terminalShell = getTerminalShellFromTab(item);
		106	if (element.getTerminalShell() != terminalShell){
		107	element.setTerminalShell(terminalShell);
		108	}
		109	}
		110	}
		111	}
		112	private static ITerminalShell getTerminalShellFromTab(CTabItem item) {
		113	ITerminalShell terminalShell = null;
		114	ITerminalViewControl terminalViewControl = (ITerminalViewControl) item
		115	.getData(TerminalViewTab.DATA_KEY_CONTROL);
		116	ITerminalConnector terminalConnector = terminalViewControl
		117	.getTerminalConnector();
		118	if (terminalConnector instanceof RSETerminalConnector) {
		119	RSETerminalConnector rseTerminalConnector = (RSETerminalConnector) terminalConnector;
		120	terminalShell = rseTerminalConnector.getTerminalHostShell();
		121	}
		122	return terminalShell;
		123	}
91	}	124	}

Return to bug 227572

Lines 27-32 Link Here

(-)src/org/eclipse/rse/internal/terminals/ui/views/TerminalViewElementAdapter.java (-2 / +12 lines)
27	* Xuan Chen (IBM) - [223126] [api][breaking] Remove API related to User Actions in RSE Core/UI	27	* Xuan Chen (IBM) - [223126] [api][breaking] Remove API related to User Actions in RSE Core/UI
28	* Yu-Fen Kuo (MontaVista) - Adopted from SystemViewRemoteOutputAdapter	28	* Yu-Fen Kuo (MontaVista) - Adopted from SystemViewRemoteOutputAdapter
29	* Anna Dushistova (MontaVista) - Adopted from SystemViewRemoteOutputAdapter	29	* Anna Dushistova (MontaVista) - Adopted from SystemViewRemoteOutputAdapter
		30	* Yu-Fen Kuo (MontaVista) - [227572] RSE Terminal doesn't reset the "connected" state when the shell exits
30	*******************************************************************************/	31	*******************************************************************************/
31	package org.eclipse.rse.internal.terminals.ui.views;	32	package org.eclipse.rse.internal.terminals.ui.views;
32		33
Lines 37-42 Link Here
37	import org.eclipse.core.runtime.IProgressMonitor;	38	import org.eclipse.core.runtime.IProgressMonitor;
38	import org.eclipse.jface.resource.ImageDescriptor;	39	import org.eclipse.jface.resource.ImageDescriptor;
39	import org.eclipse.jface.viewers.IStructuredSelection;	40	import org.eclipse.jface.viewers.IStructuredSelection;
		41	import org.eclipse.rse.internal.services.terminals.ITerminalShell;
40	import org.eclipse.rse.internal.terminals.ui.Activator;	42	import org.eclipse.rse.internal.terminals.ui.Activator;
41	import org.eclipse.rse.internal.terminals.ui.actions.RemoveTerminalAction;	43	import org.eclipse.rse.internal.terminals.ui.actions.RemoveTerminalAction;
42	import org.eclipse.rse.internal.terminals.ui.actions.ShowInTerminalViewAction;	44	import org.eclipse.rse.internal.terminals.ui.actions.ShowInTerminalViewAction;
Lines 101-109 Link Here
101	}	103	}
102		104
103	public ImageDescriptor getImageDescriptor(Object element) {	105	public ImageDescriptor getImageDescriptor(Object element) {
104	// TODO different image for different state?	106	if (element instanceof TerminalElement){
		107	TerminalElement terminalElement = (TerminalElement)element;
		108	ITerminalShell terminalShell = terminalElement.getTerminalShell();
		109	if (terminalShell != null){
		110	if (terminalShell.isActive())
		111	return Activator.getDefault().getImageDescriptor(
		112	Activator.ICON_ID_TERMINAL_SUBSYSTEM_LIVE);
		113	}
		114	}
105	return Activator.getDefault().getImageDescriptor(	115	return Activator.getDefault().getImageDescriptor(
106	Activator.ICON_ID_TERMINAL_SUBSYSTEM_LIVE);	116	Activator.ICON_ID_TERMINAL_SUBSYSTEM);
107	}	117	}
108		118
109	public Object getParent(Object element) {	119	public Object getParent(Object element) {