Attachment #104803 for bug #172483

Lines 549-554 Link Here

(-)src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java (+3 lines)
549	public Control getControl() {	549	public Control getControl() {
550	return fCtlText;	550	return fCtlText;
551	}	551	}
		552	public Control getRootControl() {
		553	return fWndParent;
		554	}
552	protected void setupControls(Composite parent) {	555	protected void setupControls(Composite parent) {
553	// The Terminal view now aims to be an ANSI-conforming terminal emulator, so it	556	// The Terminal view now aims to be an ANSI-conforming terminal emulator, so it
554	// can't have a horizontal scroll bar (but a vertical one is ok). Also, do	557	// can't have a horizontal scroll bar (but a vertical one is ok). Also, do

Lines 48-54 Link Here

(-)src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java (+7 lines)
48	void setFont(Font font);	48	void setFont(Font font);
49	void setInvertedColors(boolean invert);	49	void setInvertedColors(boolean invert);
50	Font getFont();	50	Font getFont();
		51	/**
		52	* @return the text control
		53	*/
51	Control getControl();	54	Control getControl();
		55	/**
		56	* @return the root of all controls
		57	*/
		58	Control getRootControl();
52	boolean isDisposed();	59	boolean isDisposed();
53	void selectAll();	60	void selectAll();
54	void clearTerminal();	61	void clearTerminal();




 * Michael Scharf (Wind River) - [217999] Duplicate context menu entries in Terminal
 * Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin
 * Martin Oberhuber (Wind River) - [168186] Add Terminal User Docs
 * Michael Scharf (Wind River) - [172483] switch between connections
 *******************************************************************************/
package org.eclipse.tm.internal.terminal.view;


import java.util.Set;

import org.eclipse.core.runtime.Preferences;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;

import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MenuEvent;
import org.eclipse.swt.events.MenuListener;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;

import org.eclipse.tm.internal.terminal.actions.TerminalActionConnect;
import org.eclipse.tm.internal.terminal.actions.TerminalActionDisconnect;
import org.eclipse.tm.internal.terminal.actions.TerminalActionNewTerminal;
import org.eclipse.tm.internal.terminal.actions.TerminalActionPin;
import org.eclipse.tm.internal.terminal.actions.TerminalActionRemove;
import org.eclipse.tm.internal.terminal.actions.TerminalActionSelectionDropDown;
import org.eclipse.tm.internal.terminal.actions.TerminalActionSettings;
import org.eclipse.tm.internal.terminal.actions.TerminalActionToggleCommandInputField;
import org.eclipse.tm.internal.terminal.control.CommandInputFieldWithHistory;
import org.eclipse.tm.internal.terminal.control.ITerminalListener;
import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
import org.eclipse.tm.internal.terminal.control.TerminalViewControlFactory;

import org.eclipse.tm.internal.terminal.provisional.api.Logger;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
import org.eclipse.tm.internal.terminal.view.ITerminalViewConnectionManager.ITerminalViewConnectionFactory;
import org.eclipse.tm.internal.terminal.view.ITerminalViewConnectionManager.TerminalViewConnectionListener;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IViewReference;
import org.eclipse.ui.IViewSite;

import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;

public class TerminalView extends ViewPart implements ITerminalView, TerminalViewConnectionListener {
    private static final String STORE_CONNECTION_TYPE = "ConnectionType"; //$NON-NLS-1$

    private static final String STORE_SETTING_SUMMARY = "SettingSummary"; //$NON-NLS-1$
    
    private static final String STORE_PINNED = "Pinned"; //$NON-NLS-1$

	private static final String STORE_COMMAND_INPUT_FIELD_HISTORY = "CommandInputFieldHistory"; //$NON-NLS-1$

	private static final String STORE_TITLE = "Title"; //$NON-NLS-1$



	protected ITerminalViewControl fCtlTerminal;

	// TODO (scharf): this decorator is only there to deal wit the common
	// actions. Find a better solution.
	TerminalViewControlDecorator fCtlDecorator=new TerminalViewControlDecorator();
	
	protected TerminalAction fActionTerminalNewTerminal;

	protected TerminalAction fActionTerminalConnect;


	protected TerminalPropertyChangeHandler fPropertyChangeHandler;

	protected Action fActionTerminalDropDown;
	protected Action fActionTerminalPin;
	protected Action fActionTerminalRemove;

	protected boolean fMenuAboutToShow;

	private SettingsStore fStore;

	private final ITerminalViewConnectionManager fMultiConnectionManager=new TerminalViewConnectionManager();

	/**
	 * Listens to changes in the preferences
	 */

			}
		}
	};

	private PageBook fPageBook;

	private boolean fPinned=true;

	/**
	 * This listener updates both, the view and the 
	 * ITerminalViewConnection.
	 *
	 */
	class TerminalListener implements ITerminalListener {
		volatile ITerminalViewConnection fConnection;
		void setConnection(ITerminalViewConnection connection) {
			fConnection=connection;
		}
		public void setState(final TerminalState state) {
			runInDisplayThread(new Runnable() {
				public void run() {
					fConnection.setState(state);
					// if the current connection changes, update the view
					if(fConnection==fMultiConnectionManager.getCurrentConnection()) {
						updateStatus();
					}
				}
			});
		}
		public void setTerminalTitle(final String title) {
			runInDisplayThread(new Runnable() {
				public void run() {
					fConnection.setTerminalTitle(title);
					// if the current connection changes, update the view
					if(fConnection==fMultiConnectionManager.getCurrentConnection()) {
						updateSummary();
					}
				}
			});
		}
		/**
		 * @param runnable run in display thread
		 */
		private void runInDisplayThread(Runnable runnable) {
			if(Thread.currentThread()==Display.getDefault().getThread())
				runnable.run();
			else
				Display.getDefault().syncExec(runnable);
		}
		
	}
	
	public TerminalView() {
		Logger
				.log("==============================================================="); //$NON-NLS-1$
		fMultiConnectionManager.addListener(this);
	}

	/**
	 * @param title
	 * @return a unique part name
	 */
	String findUniqueTitle(String title) {
		IWorkbenchPage[] pages = getSite().getWorkbenchWindow().getPages();
		String id=	getViewSite().getId();

//		if(!limitOutput)
//			bufferLineLimit=-1;
		int bufferLineLimit = preferences.getInt(TerminalPreferencePage.PREF_BUFFERLINES);
		boolean invert=preferences.getBoolean(TerminalPreferencePage.PREF_INVERT_COLORS);
		// update the preferences for all controls
		ITerminalViewConnection[] conn=fMultiConnectionManager.getConnections();
		for (int i = 0; i < conn.length; i++) {
			conn[i].getCtlTerminal().setBufferLineLimit(bufferLineLimit);
			conn[i].getCtlTerminal().setInvertedColors(invert);
		}
				updateStatus();
				onTerminalStatus();
			}
		};
		if(Thread.currentThread()==Display.getDefault().getThread())
			runnable.run();
		else
			Display.getDefault().syncExec(runnable);
	}


	/**
	 * Display a new Terminal view.  This method is called when the user clicks the New
	 * Terminal button in any Terminal view's toolbar.
	 */
	public void onTerminalNewTerminal() {
		Logger.log("creating new Terminal instance."); //$NON-NLS-1$
		if(isPinned()) {
			try {
				// The second argument to showView() is a unique String identifying the
				// secondary view instance.  If it ever matches a previously used secondary
				// view identifier, then this call will not create a new Terminal view,
				// which is undesirable.  Therefore, we append the current time in
				// milliseconds to the secondary view identifier to ensure it is always
				// unique.  This code runs only when the user clicks the New Terminal
				// button, so there is no risk that this code will run twice in a single
				// millisecond.

				getSite().getPage().showView(
						"org.eclipse.tm.terminal.view.TerminalView",//$NON-NLS-1$
						"SecondaryTerminal" + System.currentTimeMillis(), //$NON-NLS-1$
						IWorkbenchPage.VIEW_ACTIVATE);
			} catch (PartInitException ex) {
				Logger.logException(ex);
			}
		} else {
			setupControls();
			if(newConnection()==null) {
				fMultiConnectionManager.removeCurrent();
			}
		}
	}

	
	public void onTerminalConnect() {
		//if (isConnected())
		if (fCtlTerminal.getState()!=TerminalState.CLOSED)

		updateTerminalConnect();
		updateTerminalDisconnect();
		updateTerminalSettings();
		fActionToggleCommandInputField.setChecked(hasCommandInputField());
		updateSummary();
	}

	public void updateTerminalConnect() {

	}

	public void onTerminalSettings() {
		newConnection();
	}

	private ITerminalConnector newConnection() {
		ITerminalConnector c=showSettingsDialog();
		if(c!=null) {
			setConnector(c);

			onTerminalConnect();
		}
		return c;
	}

	private ITerminalConnector showSettingsDialog() {

		// persistent settings.

		TerminalSettingsDlg dlgTerminalSettings = new TerminalSettingsDlg(getViewSite().getShell(),fCtlTerminal.getConnectors(),fCtlTerminal.getTerminalConnector());
		dlgTerminalSettings.setTerminalTitle(getCurrentConnection().getPartName());
		Logger.log("opening Settings dialog."); //$NON-NLS-1$

		if (dlgTerminalSettings.open() == Window.CANCEL) {

		// When the settings dialog is closed, we persist the Terminal settings.

		saveSettings(dlgTerminalSettings.getConnector());
		setViewTitle(dlgTerminalSettings.getTerminalTitle());
		return dlgTerminalSettings.getConnector();
	}



		fActionTerminalSettings.setEnabled(bEnabled);
	}
	private void setViewTitle(String title) {
		setPartName(title);
		getCurrentConnection().setPartName(title);
	}
	private void setViewSummary(String summary) {
		setContentDescription(summary);
			// When parameter 'data' is not null, it is a String containing text to
			// display in the view's content description line.  This is used by class
			// TerminalText when it processes an ANSI OSC escape sequence that commands
			// the terminal to display text in its title bar.
		} else if(fCtlTerminal.getTerminalConnector()==null){
			strTitle=ViewMessages.NO_CONNECTION_SELECTED;
		} else {
			// When parameter 'data' is null, we construct a descriptive string to
			// display in the content description line.
			String strConnected = getStateDisplayName(fCtlTerminal.getState());
			String summary = getSettingsSummary();
			//TODO Title should use an NLS String and com.ibm.icu.MessageFormat
			//In order to make the logic of assembling, and the separators, better adapt to foreign languages
			if(summary.length()>0)
				summary=summary+" - ";  //$NON-NLS-1$
			String name=fCtlTerminal.getTerminalConnector().getName();
			if(name.length()>0) {
				name+=": "; //$NON-NLS-1$
			}
			strTitle = name + "("+ summary + strConnected + ")"; //$NON-NLS-1$ //$NON-NLS-2$
		}

		setContentDescription(strTitle);
		getViewSite().getActionBars().getStatusLineManager().setMessage(
				summary);
		setTitleToolTip(getPartName()+": "+summary); //$NON-NLS-1$
		
	}
	public void updateSummary() {
		setViewSummary(getCurrentConnection().getFullSummary());
	 * has not been initialized, use the last stored state.
	 */
	private String getSettingsSummary() {
		// TODO: use another mechanism than "?" for the magic non initialized state
		// see TerminalConnectorProxy.getSettingsSummary
		String summary="?"; //$NON-NLS-1$
		if(fCtlTerminal.getTerminalConnector()!=null)
			summary=fCtlTerminal.getSettingsSummary();
		if("?".equals(summary)) { //$NON-NLS-1$
			summary=fStore.get(STORE_SETTING_SUMMARY, ""); //$NON-NLS-1$
		}
		return summary;
	}
	public void onTerminalStatus() {
		setTerminalTitle(null);
	}

	private String getStateDisplayName(TerminalState state) {
		if(state==TerminalState.CONNECTED) {
			return ViewMessages.STATE_CONNECTED;
		} else if(state==TerminalState.CONNECTING) {
			return ViewMessages.STATE_CONNECTING;
		} else if(state==TerminalState.OPENED) {
			return ViewMessages.STATE_OPENED;
		} else if(state==TerminalState.CLOSED) {
			return ViewMessages.STATE_CLOSED;
		} else {
			throw new IllegalStateException(state.toString());
		}
	}

	public void onTerminalFontChanged() {
		// set the font for all 
		Font font=JFaceResources.getFont(FONT_DEFINITION);
		ITerminalViewConnection[] conn=fMultiConnectionManager.getConnections();
		for (int i = 0; i < conn.length; i++) {
			conn[i].getCtlTerminal().setFont(font);
		}
	}

	// ViewPart interface

		// Bind plugin.xml key bindings to this plugin.  Overrides global Control-W key
		// sequence.

		fPageBook=new PageBook(wndParent,SWT.NONE);
		ISettingsStore s=new SettingStorePrefixDecorator(fStore,"connectionManager"); //$NON-NLS-1$
		fMultiConnectionManager.loadState(s,new ITerminalViewConnectionFactory() {
			public ITerminalViewConnection create() {
				return makeViewConnection();
			}
		});
		// if there is no connection loaded, create at least one
		// needed to read old states from the old terminal
		if(fMultiConnectionManager.size()==0) {
			ITerminalViewConnection conn = makeViewConnection();
			fMultiConnectionManager.addConnection(conn);
			fMultiConnectionManager.setConnection(conn);
			fPageBook.showPage(fCtlTerminal.getRootControl());
		}
		setTerminalControl(fMultiConnectionManager.getCurrentConnection().getCtlTerminal());
		setViewTitle(findUniqueTitle(ViewMessages.PROP_TITLE));
		setupActions();
		setupLocalToolBars();
		// setup all context menus
		ITerminalViewConnection[] conn=fMultiConnectionManager.getConnections();
		for (int i = 0; i < conn.length; i++) {
			setupContextMenus(conn[i].getCtlTerminal().getControl());
		}
		setupListeners(wndParent);

		PlatformUI.getWorkbench().getHelpSystem().setHelp(wndParent, TerminalViewPlugin.HELPPREFIX + "terminal_page"); //$NON-NLS-1$

		legacyLoadState();
		legacySetTitle();

		refresh();
		onTerminalFontChanged();

	}

	public void dispose() {
		Logger.log("entered."); //$NON-NLS-1$

		TerminalViewPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(fPreferenceListener);

		JFaceResources.getFontRegistry().removeListener(fPropertyChangeHandler);
		
		// dispose all connections
		ITerminalViewConnection[] conn=fMultiConnectionManager.getConnections();
		for (int i = 0; i < conn.length; i++) {
			conn[i].getCtlTerminal().disposeTerminal();
		}
		super.dispose();
	}
	/**

	/**
	 * This method creates the top-level control for the Terminal view.
	 */
	protected void setupControls() {
		ITerminalViewConnection conn = makeViewConnection();
		fMultiConnectionManager.addConnection(conn);
		fMultiConnectionManager.setConnection(conn);
		setupContextMenus(fCtlTerminal.getControl());
	}

	private ITerminalViewConnection makeViewConnection() {
		ITerminalConnector[] connectors = makeConnectors();
		TerminalListener listener=new TerminalListener();
		ITerminalViewControl ctrl = TerminalViewControlFactory.makeControl(listener, fPageBook, connectors);
		setTerminalControl(ctrl);
		ITerminalViewConnection conn = new TerminalViewConnection(fCtlTerminal);
		listener.setConnection(conn);
		conn.setPartName(getPartName());
		String connectionType=fStore.get(STORE_CONNECTION_TYPE);
		for (int i = 0; i < connectors.length; i++) {
			connectors[i].load(getStore(connectors[i]));
			if(connectors[i].getId().equals(connectionType))
				ctrl.setConnector(connectors[i]);
		}
		setCommandInputField("true".equals(fStore.get(STORE_HAS_COMMAND_INPUT_FIELD))); //$NON-NLS-1$
		updatePreferences();
		TerminalViewPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(fPreferenceListener);
		
		return conn;
		String title=fStore.get(STORE_TITLE);
		if(title!=null && title.length()>0)
			setPartName(title);
	}

	/**

	public void init(IViewSite site, IMemento memento) throws PartInitException {
		super.init(site, memento);
		fStore=new SettingsStore(memento);
		// have we stored the pinned status?
		if(fStore.get(STORE_PINNED)!=null)
			setPinned("true".equals(fStore.get(STORE_PINNED))); //$NON-NLS-1$
	}

	public void saveState(IMemento memento) {
		super.saveState(memento);
		fStore.put(STORE_PINNED, isPinned()?"true":"false"); //$NON-NLS-1$ //$NON-NLS-2$
			fStore.put(STORE_COMMAND_INPUT_FIELD_HISTORY, fCommandInputField.getHistory());
		fStore.put(STORE_HAS_COMMAND_INPUT_FIELD,hasCommandInputField()?"true":"false");   //$NON-NLS-1$//$NON-NLS-2$
		fStore.put(STORE_SETTING_SUMMARY, getSettingsSummary());
		fStore.put(STORE_TITLE,getPartName());
		fMultiConnectionManager.saveState(new SettingStorePrefixDecorator(fStore,"connectionManager")); //$NON-NLS-1$
		fStore.saveState(memento);
	}
	private ISettingsStore getStore(ITerminalConnector connector) {

	}

	protected void setupActions() {
		fActionTerminalDropDown = new TerminalActionSelectionDropDown(fMultiConnectionManager);
		fActionTerminalPin=new TerminalActionPin(this);
		fActionTerminalPin.setChecked(isPinned());
		fActionTerminalRemove=new TerminalActionRemove(fMultiConnectionManager);
		fActionTerminalNewTerminal = new TerminalActionNewTerminal(this);
//		fActionTerminalScrollLock = new TerminalActionScrollLock(this);
		fActionTerminalConnect = new TerminalActionConnect(this);
		fActionTerminalDisconnect = new TerminalActionDisconnect(this);
		fActionTerminalSettings = new TerminalActionSettings(this);
		fActionEditCopy = new TerminalActionCopy(fCtlDecorator);
		fActionEditCut = new TerminalActionCut(fCtlDecorator);
		fActionEditPaste = new TerminalActionPaste(fCtlDecorator);
		fActionEditClearAll = new TerminalActionClearAll(fCtlDecorator);
		fActionEditSelectAll = new TerminalActionSelectAll(fCtlDecorator);
		fActionToggleCommandInputField = new TerminalActionToggleCommandInputField(this);
	}
	protected void setupLocalToolBars() {
		IToolBarManager toolBarMgr = getViewSite().getActionBars().getToolBarManager();

		toolBarMgr.add(fActionTerminalNewTerminal);
//		toolBarMgr.add(fActionTerminalScrollLock);
		toolBarMgr.add(fActionTerminalConnect);
		toolBarMgr.add(fActionTerminalDisconnect);
		toolBarMgr.add(fActionTerminalSettings);
		toolBarMgr.add(fActionToggleCommandInputField);
		toolBarMgr.add(new Separator("fixedGroup")); //$NON-NLS-1$
		toolBarMgr.add(fActionTerminalPin);
		toolBarMgr.add(fActionTerminalDropDown);
		toolBarMgr.add(fActionTerminalNewTerminal);
		toolBarMgr.add(fActionTerminalRemove);
	}

	protected void setupContextMenus(Control ctlText) {
		Control ctlText;
		MenuManager menuMgr;
		Menu menu;
		TerminalContextMenuHandler contextMenuHandler;

		ctlText = fCtlTerminal.getControl();
		menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
		menu = menuMgr.createContextMenu(ctlText);
		loadContextMenus(menuMgr);

	}

	public boolean hasCommandInputField() {
		return getCurrentConnection().hasCommandInputField();
	}

	public void setCommandInputField(boolean on) {
		getCurrentConnection().setCommandInputField(on);
		if(fCommandInputField!=null) {
			fStore.put(STORE_COMMAND_INPUT_FIELD_HISTORY, fCommandInputField.getHistory());
			fCommandInputField=null;
		}
		if(on) {
			// TODO make history size configurable
			fCommandInputField=new CommandInputFieldWithHistory(100);
			fCommandInputField.setHistory(fStore.get(STORE_COMMAND_INPUT_FIELD_HISTORY));
		}
		fCtlTerminal.setCommandInputField(fCommandInputField);
	}

	public boolean isScrollLock() {

	public void setScrollLock(boolean on) {
		fCtlTerminal.setScrollLock(on);
	}

	private ITerminalViewConnection getCurrentConnection() {
		return fMultiConnectionManager.getCurrentConnection();
	}
	/**
	 * @param ctrl this control becomes the currently used one
	 */
	private void setTerminalControl(ITerminalViewControl ctrl) {
		fCtlTerminal=ctrl;
		fCtlDecorator.setViewContoler(ctrl);
	}
	public void connectionsChanged() {
		if(getCurrentConnection()!=null) {
			// update the current {@link ITerminalViewControl}
			ITerminalViewControl ctrl = getCurrentConnection().getCtlTerminal();
			if(fCtlTerminal!=ctrl) {
				setTerminalControl(ctrl);
				refresh();
			}
		}	
	}

	/**
	 * Show the current {@link ITerminalViewControl} in the view
	 */
	private void refresh() {
		fPageBook.showPage(fCtlTerminal.getRootControl());
		updateStatus();
		setPartName(getCurrentConnection().getPartName());
	}

	public void setPinned(boolean pinned) {
		fPinned=pinned;
	}
	public boolean isPinned() {
		return fPinned;
	}

	/**
	 * TODO REMOVE This code (added 2008-06-11)
	 * Legacy code to real the old state. Once the state of the
	 * terminal has been saved this method is not needed anymore.
	 * Remove this code with eclipse 3.5.
	 */
	private void legacyLoadState() {
		// TODO legacy: load the old title....
		String summary=fStore.get(STORE_SETTING_SUMMARY);
		if(summary!=null) {
			getCurrentConnection().setSummary(summary);
			fStore.put(STORE_SETTING_SUMMARY,null);
		}
	}
	/**
	 * TODO REMOVE This code (added 2008-06-11)
	 * Legacy code to real the old state. Once the state of the
	 * terminal has been saved this method is not needed anymore.
	 * Remove this code with eclipse 3.5.
	 */
	private void legacySetTitle() {
		// restore the title of this view
		String title=fStore.get(STORE_TITLE);
		if(title!=null && title.length()>0) {
			setViewTitle(title);
			fStore.put(STORE_TITLE, null);
		}
	}

}

Lines 8-13 Link Here

(-)src/org/eclipse/tm/internal/terminal/view/ITerminalView.java (+3 lines)
8	* Contributors:	8	* Contributors:
9	* Michael Scharf (Wind River) - initial API and implementation	9	* Michael Scharf (Wind River) - initial API and implementation
10	* Martin Oberhuber (Wind River) - [227537] moved actions from terminal.view to terminal plugin	10	* Martin Oberhuber (Wind River) - [227537] moved actions from terminal.view to terminal plugin
		11	* Michael Scharf (Wind River) - [172483] switch between connections
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.tm.internal.terminal.view;	13	package org.eclipse.tm.internal.terminal.view;
13		14
Lines 26-29 Link Here
26	public void setCommandInputField(boolean on);	27	public void setCommandInputField(boolean on);
27	public boolean isScrollLock();	28	public boolean isScrollLock();
28	public void setScrollLock(boolean b);	29	public void setScrollLock(boolean b);
		30	public void setPinned(boolean pin);
		31	public boolean isPinned();
29	}	32	}




 * Michael Scharf (Wind River) - extracted from TerminalConsts
 * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
 * Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin
 * Michael Scharf (Wind River) - [172483] added some more icons
 *******************************************************************************/
package org.eclipse.tm.internal.terminal.view;

public interface ImageConsts
{
    public final static String  IMAGE_DIR_ROOT                 = "icons/"; //$NON-NLS-1$
    public final static String  IMAGE_DIR_CTOOL                = "ctool16/";   // basic colors - size 16x16 //$NON-NLS-1$
    public final static String  IMAGE_DIR_LOCALTOOL            = "clcl16/";    // basic colors - size 16x16 //$NON-NLS-1$
    public final static String  IMAGE_DIR_DLCL                 = "dlcl16/";    // disabled - size 16x16 //$NON-NLS-1$
    public final static String  IMAGE_DIR_ELCL                 = "elcl16/";    // enabled - size 16x16 //$NON-NLS-1$
    public final static String  IMAGE_DIR_OBJECT               = "obj16/";     // basic colors - size 16x16 //$NON-NLS-1$
    public final static String  IMAGE_DIR_WIZBAN               = "wizban/";    // basic colors - size 16x16 //$NON-NLS-1$
    public final static String  IMAGE_DIR_OVR                  = "ovr16/";     // basic colors - size 7x8 //$NON-NLS-1$
    public final static String  IMAGE_DIR_VIEW                 = "cview16/";   // views //$NON-NLS-1$
    public final static String  IMAGE_DIR_EVIEW                = "eview16/";   // views //$NON-NLS-1$

    public static final String  IMAGE_NEW_TERMINAL             = "TerminalViewNewTerminal"; //$NON-NLS-1$
    public static final String  IMAGE_TERMINAL_VIEW            = "TerminalView"; //$NON-NLS-1$
    public static final String  IMAGE_CLCL_CONNECT             = "ImageClclConnect"; //$NON-NLS-1$
    public static final String  IMAGE_CLCL_DISCONNECT          = "ImageClclDisconnect"; //$NON-NLS-1$
    public static final String  IMAGE_CLCL_SETTINGS            = "ImageClclSettings"; //$NON-NLS-1$
    public static final String  IMAGE_CLCL_SCROLL_LOCK         = "ImageClclScrollLock"; //$NON-NLS-1$
    public static final String  IMAGE_CLCL_PIN         	       = "ImageClclPin"; //$NON-NLS-1$

    public static final String  IMAGE_DLCL_CONNECT             = "ImageDlclConnect"; //$NON-NLS-1$
    public static final String  IMAGE_DLCL_DISCONNECT          = "ImageDlclDisconnect"; //$NON-NLS-1$
    public static final String  IMAGE_DLCL_SETTINGS            = "ImageDlclSettings"; //$NON-NLS-1$
    public static final String  IMAGE_DLCL_SCROLL_LOCK         = "ImageDlclScrollLock"; //$NON-NLS-1$
    public static final String  IMAGE_DLCL_PIN         	       = "ImageDlclPin"; //$NON-NLS-1$
    public static final String  IMAGE_DLCL_REMOVE         	   = "ImageDlclRemove"; //$NON-NLS-1$

    public static final String  IMAGE_ELCL_CONNECT             = "ImageElclConnect"; //$NON-NLS-1$
    public static final String  IMAGE_ELCL_DISCONNECT          = "ImageElclDisconnect"; //$NON-NLS-1$
    public static final String  IMAGE_ELCL_SETTINGS            = "ImageElclSettings"; //$NON-NLS-1$
    public static final String  IMAGE_ELCL_SCROLL_LOCK         = "ImageElclScrollLock"; //$NON-NLS-1$
    public static final String  IMAGE_ELCL_PIN         	       = "ImageElclPin"; //$NON-NLS-1$
    public static final String  IMAGE_ELCL_REMOVE         	   = "ImageElclRemove"; //$NON-NLS-1$
	public static final String  IMAGE_CLCL_COMMAND_INPUT_FIELD        = "ImageClclCommandInputField";//$NON-NLS-1$
	public static final String  IMAGE_ELCL_COMMAND_INPUT_FIELD        = "ImageDlclCommandInputField";//$NON-NLS-1$
	public static final String  IMAGE_DLCL_COMMAND_INPUT_FIELD        = "ImageDlclCommandInputField";//$NON-NLS-1$

Lines 15-20 Link Here

(-)src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java (-1 / +14 lines)
15	* Martin Oberhuber (Wind River) - fixed copyright headers and beautified	15	* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
16	* Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin	16	* Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin
17	* Martin Oberhuber (Wind River) - [168186] Add Terminal User Docs	17	* Martin Oberhuber (Wind River) - [168186] Add Terminal User Docs
		18	* Michael Scharf (Wind River) - [172483] switch between connections
18	*******************************************************************************/	19	*******************************************************************************/
19	package org.eclipse.tm.internal.terminal.view;	20	package org.eclipse.tm.internal.terminal.view;
20		21
Lines 53-58 Link Here
53	map.put(ImageConsts.IMAGE_CLCL_SETTINGS, "properties_tsk.gif"); //$NON-NLS-1$	54	map.put(ImageConsts.IMAGE_CLCL_SETTINGS, "properties_tsk.gif"); //$NON-NLS-1$
54	map.put(ImageConsts.IMAGE_CLCL_COMMAND_INPUT_FIELD, "command_input_field.gif"); //$NON-NLS-1$	55	map.put(ImageConsts.IMAGE_CLCL_COMMAND_INPUT_FIELD, "command_input_field.gif"); //$NON-NLS-1$
55	map.put(ImageConsts.IMAGE_CLCL_SCROLL_LOCK, "lock_co.gif"); //$NON-NLS-1$	56	map.put(ImageConsts.IMAGE_CLCL_SCROLL_LOCK, "lock_co.gif"); //$NON-NLS-1$
		57	map.put(ImageConsts.IMAGE_CLCL_PIN, "pin.gif"); //$NON-NLS-1$
56		58
57	loadImageRegistry(imageRegistry, ImageConsts.IMAGE_DIR_LOCALTOOL, map);	59	loadImageRegistry(imageRegistry, ImageConsts.IMAGE_DIR_LOCALTOOL, map);
58		60
Lines 65-71 Link Here
65	map.put(ImageConsts.IMAGE_ELCL_SETTINGS, "properties_tsk.gif"); //$NON-NLS-1$	67	map.put(ImageConsts.IMAGE_ELCL_SETTINGS, "properties_tsk.gif"); //$NON-NLS-1$
66	map.put(ImageConsts.IMAGE_ELCL_COMMAND_INPUT_FIELD, "command_input_field.gif"); //$NON-NLS-1$	68	map.put(ImageConsts.IMAGE_ELCL_COMMAND_INPUT_FIELD, "command_input_field.gif"); //$NON-NLS-1$
67	map.put(ImageConsts.IMAGE_ELCL_SCROLL_LOCK, "lock_co.gif"); //$NON-NLS-1$	69	map.put(ImageConsts.IMAGE_ELCL_SCROLL_LOCK, "lock_co.gif"); //$NON-NLS-1$
68		70	map.put(ImageConsts.IMAGE_ELCL_PIN, "pin.gif"); //$NON-NLS-1$
		71	map.put(ImageConsts.IMAGE_ELCL_REMOVE, "rem_co.gif"); //$NON-NLS-1$
		72
69	loadImageRegistry(imageRegistry, ImageConsts.IMAGE_DIR_ELCL, map);	73	loadImageRegistry(imageRegistry, ImageConsts.IMAGE_DIR_ELCL, map);
70		74
71	map.clear();	75	map.clear();
Lines 77-86 Link Here
77	map.put(ImageConsts.IMAGE_DLCL_SETTINGS, "properties_tsk.gif"); //$NON-NLS-1$	81	map.put(ImageConsts.IMAGE_DLCL_SETTINGS, "properties_tsk.gif"); //$NON-NLS-1$
78	map.put(ImageConsts.IMAGE_DLCL_COMMAND_INPUT_FIELD, "command_input_field.gif"); //$NON-NLS-1$	82	map.put(ImageConsts.IMAGE_DLCL_COMMAND_INPUT_FIELD, "command_input_field.gif"); //$NON-NLS-1$
79	map.put(ImageConsts.IMAGE_DLCL_SCROLL_LOCK, "lock_co.gif"); //$NON-NLS-1$	83	map.put(ImageConsts.IMAGE_DLCL_SCROLL_LOCK, "lock_co.gif"); //$NON-NLS-1$
		84	map.put(ImageConsts.IMAGE_DLCL_PIN, "pin.gif"); //$NON-NLS-1$
		85	map.put(ImageConsts.IMAGE_DLCL_REMOVE, "rem_co.gif"); //$NON-NLS-1$
80		86
81	loadImageRegistry(imageRegistry, ImageConsts.IMAGE_DIR_DLCL, map);	87	loadImageRegistry(imageRegistry, ImageConsts.IMAGE_DIR_DLCL, map);
82		88
83	map.clear();	89	map.clear();
		90
		91	map.put(ImageConsts.IMAGE_TERMINAL_VIEW, "terminal_view.gif"); //$NON-NLS-1$
		92
		93	loadImageRegistry(imageRegistry, ImageConsts.IMAGE_DIR_EVIEW, map);
		94
		95	map.clear();
		96
84	} catch (MalformedURLException malformedURLException) {	97	} catch (MalformedURLException malformedURLException) {
85	malformedURLException.printStackTrace();	98	malformedURLException.printStackTrace();
86	}	99	}

Lines 14-19 Link Here

(-)src/org/eclipse/tm/internal/terminal/actions/ActionMessages.properties (+7 lines)
14	# Michael Scharf (Wind River) - split into core, view and connector plugins	14	# Michael Scharf (Wind River) - split into core, view and connector plugins
15	# Martin Oberhuber (Wind River) - fixed copyright headers and beautified	15	# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
16	# Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin	16	# Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin
		17	# Michael Scharf (Wind River) - [172483] switch between connections
17	###############################################################################	18	###############################################################################
18	NEW_TERMINAL = New Terminal	19	NEW_TERMINAL = New Terminal
19	CONNECT = Connect	20	CONNECT = Connect
Lines 23-25 Link Here
23	SCROLL_LOCK_1 = Scroll Lock	24	SCROLL_LOCK_1 = Scroll Lock
24	SETTINGS = Settings	25	SETTINGS = Settings
25	TOGGLE_COMMAND_INPUT_FIELD= Toggle Command Input Field	26	TOGGLE_COMMAND_INPUT_FIELD= Toggle Command Input Field
		27	REMOVE = Remove Terminal
		28	PIN = Pin Terminal
		29
		30	ConsoleDropDownAction_0=Select Connection
		31	ConsoleDropDownAction_1=Display Selected Connections
		32

Lines 20-25 Link Here

(-)src/org/eclipse/tm/internal/terminal/actions/ActionMessages.java (+6 lines)
20	import org.eclipse.osgi.util.NLS;	20	import org.eclipse.osgi.util.NLS;
21		21
22	public class ActionMessages extends NLS {	22	public class ActionMessages extends NLS {
		23
23	static {	24	static {
24	NLS.initializeMessages(ActionMessages.class.getName(), ActionMessages.class);	25	NLS.initializeMessages(ActionMessages.class.getName(), ActionMessages.class);
25	}	26	}
Lines 30-35 Link Here
30	public static String SETTINGS_ELLIPSE;	31	public static String SETTINGS_ELLIPSE;
31	public static String SCROLL_LOCK_0;	32	public static String SCROLL_LOCK_0;
32	public static String SCROLL_LOCK_1;	33	public static String SCROLL_LOCK_1;
		34	public static String REMOVE;
		35	public static String PIN;
		36
		37	public static String ConsoleDropDownAction_0;
		38	public static String ConsoleDropDownAction_1;
33		39
34	public static String SETTINGS;	40	public static String SETTINGS;
35		41




/*******************************************************************************
 * Copyright (c) 2008 Wind River Systems, 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
 *
 * Initial Contributors:
 * The following Wind River employees contributed to the Terminal component
 * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb,
 * Helmut Haigermoser and Ted Williams.
 *
 * Contributors:
 * Michael Scharf (Wind River) - initial contribution
 *******************************************************************************/
package org.eclipse.tm.internal.terminal.actions;

import org.eclipse.jface.action.IAction;
import org.eclipse.tm.internal.terminal.view.ITerminalView;
import org.eclipse.tm.internal.terminal.view.ImageConsts;

public class TerminalActionPin extends TerminalAction
{
    public TerminalActionPin(ITerminalView target)
    {
        super(target,
              TerminalActionPin.class.getName(),IAction.AS_RADIO_BUTTON);

        setupAction(ActionMessages.PIN,
                    ActionMessages.PIN,
                    ImageConsts.IMAGE_CLCL_PIN,
                    ImageConsts.IMAGE_ELCL_PIN,
                    ImageConsts.IMAGE_DLCL_PIN,
                    true);
		setChecked(fTarget.isPinned());
   }
	public void run() {
		fTarget.setPinned(!fTarget.isPinned());
		setChecked(fTarget.isPinned());
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Wind River Systems, 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: 
 * Michael Scharf (Wind River) - initial API and implementation
 *******************************************************************************/
package org.eclipse.tm.internal.terminal.actions;

import org.eclipse.jface.action.Action;
import org.eclipse.tm.internal.terminal.view.ITerminalViewConnection;
import org.eclipse.tm.internal.terminal.view.ITerminalViewConnectionManager;

/**
 * Shows a specific console in the console view
 */
public class ShowConsoleAction extends Action {
	
	private final ITerminalViewConnection fConnection;
	private final ITerminalViewConnectionManager fConnectionManager;

	/**
	 * Constructs an action to display the given console.
	 * 
	 * @param manager the console view in which the given console is contained
	 * @param console the console
	 */
	public ShowConsoleAction(ITerminalViewConnectionManager manager, ITerminalViewConnection console) {
		super(quoteName(buildName(manager,console)), AS_RADIO_BUTTON);
		fConnection = console;
		fConnectionManager = manager;
		setImageDescriptor(console.getImageDescriptor());
	}
	/**
	 * the tab at the end quotes '@' chars?!? see 
	 * {@link #setText(String)}
	 * @param name
	 * @return a quoted sting
	 */
	private static String quoteName(String name) {
		return name+"\t"; //$NON-NLS-1$
	}
	/**
	 * Builds the name. It uses the summary. If the connections have different
	 * partNames (the names showed in the view title) then this name is perfixed.
	 * @param m the connection manager
	 * @param console the console for which the name should me extracted
	 * @return The name to be displayed
	 */
	private static String buildName(ITerminalViewConnectionManager m,ITerminalViewConnection console) {
		String name = console.getFullSummary();
		if(!checkIfAllPartNamesTheSame(m))
			name=console.getPartName()+" - " +name; //$NON-NLS-1$
		return name;
	}
	/**
	 * @param m the connection manager
	 * @return true if the part names of all connections are the same
	 */
	private static boolean checkIfAllPartNamesTheSame(ITerminalViewConnectionManager m) {
		ITerminalViewConnection[] connections = m.getConnections();
		if(connections.length>1) {
			String partName=connections[0].getPartName();
			for (int i = 1; i < connections.length; i++) {
				if(!partName.equals(connections[i].getPartName())) {
					return false;
				}			
			}
			
		}
		return true;
	}
	/* (non-Javadoc)
	 * @see org.eclipse.jface.action.IAction#run()
	 */
	public void run() {
		fConnectionManager.setConnection(fConnection);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Wind River Systems, 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: 
 * Michael Scharf (Wind River) - initial API and implementation
 *******************************************************************************/
package org.eclipse.tm.internal.terminal.view;

import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;


/**
 * Supports multiple connections
 *
 */
public interface ITerminalViewConnectionManager {
	/**
	 * Notifies any change in the state of the connections:
	 * <ul>
	 * <li> a connection is added or removed
	 * <li> the current connection has changed
	 * </ul>
	 *
	 */
	interface TerminalViewConnectionListener {
		void connectionsChanged();
	}
	/**
	 * Used to create instances of the ITerminalViewConnection 
	 * when the state is read from the {@link ISettingsStore}
	 *
	 */
	interface ITerminalViewConnectionFactory {
		ITerminalViewConnection create();
	}
	/**
	 * @return a list of all connections this view can display
	 */
	ITerminalViewConnection[] getConnections();
	/**
	 * If more than two connections are available, remove the current connection
	 */
	void removeCurrent();

	/**
	 * @param conn adds a new connection
	 */
	void addConnection(ITerminalViewConnection conn);
	/**
	 * @return the number of connections
	 */
	int size();
	/**
	 * @return th connection the view is showing at the moment
	 */
	ITerminalViewConnection getCurrentConnection();

	/**
	 * @param conn make this connection the current connection
	 */
	void setConnection(ITerminalViewConnection conn);

	/**
	 * If there are more than two connections toggle between this and the
	 * previously shown connection
	 */
	void swapConnection();

	void addListener(TerminalViewConnectionListener listener);
	void removeListener(TerminalViewConnectionListener listener);
	
	void saveState(ISettingsStore store);
	/**
	 * @param store
	 */
	void loadState(ISettingsStore store,ITerminalViewConnectionFactory factory);
	
}




/*******************************************************************************
 * Copyright (c) 2008 Wind River Systems, 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: 
 * Michael Scharf (Wind River) - initial API and implementation
 *******************************************************************************/
package org.eclipse.tm.internal.terminal.view;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;

/**
 * Represents a connection. The connection might be connected
 * or not.
 *
 */
public interface ITerminalViewConnection {

	/**
	 * @return the summary shown in the status line and
	 * in the drop down box of the connections
	 */
	String getFullSummary();

	/**
	 * @param name the name of the view
	 */
	void setPartName(String name);
	/**
	 * @return the name of the view (never null)
	 */
	String getPartName();
	
	/**
	 * @return an image that represents this connection
	 */
	ImageDescriptor getImageDescriptor();
	/**
	 * @return the control of this connection
	 */
	ITerminalViewControl getCtlTerminal();

	void saveState(ISettingsStore store);

	void loadState(ISettingsStore store);
	
	/**
	 * @return true if the input field is visible 
	 */
	boolean hasCommandInputField();
	/**
	 * @param on turns the input field on
	 */
	void setCommandInputField(boolean on);

	/**
	 * @param state changes of the state (might change the summary)
	 */
	void setState(TerminalState state);

	/**
	 * @param title used in the summary. If null the summary
	 * is created automatically
	 */
	void setTerminalTitle(String title);

	/**
	 * TODO: legacy (needed to read the old state)
	 * @param summary
	 */
	void setSummary(String summary);
}




/*******************************************************************************
 * Copyright (c) 2008 Wind River Systems, 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: 
 * Michael Scharf (Wind River) - initial API and implementation
 *******************************************************************************/
package org.eclipse.tm.internal.terminal.view;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;

public class TerminalViewConnectionManager implements ITerminalViewConnectionManager {
	private static final String STORE_CONNECTION_PREFIX = "c"; //$NON-NLS-1$
	private static final String STORE_SIZE = "size"; //$NON-NLS-1$
	private static final String STORE_CURRENT_CONNECTION = "current"; //$NON-NLS-1$
	/**
	 * The list of {@link ITerminalViewConnection} in the order they were cerated.
	 * Ordered by creation time
	 */
	private final List fConnections=new ArrayList();
	/**
	 * The currently displayed connection
	 */
	private ITerminalViewConnection fCurrentConnection;
	/**
	 * The list of {@link ITerminalViewConnection} in the order they
	 * were made the current connection. The most recently accessed
	 * connection is at the beginning of the list.
	 */
	private final List fConnectionHistory=new ArrayList();
	/**
	 * The {@link TerminalViewConnectionListener}
	 */
	private final List fListeners=new ArrayList();

	public ITerminalViewConnection[] getConnections() {
		return (ITerminalViewConnection[]) fConnections.toArray(new ITerminalViewConnection[fConnections.size()]);
	}

	public int size() {		// TODO Auto-generated method stub
		return fConnections.size();
	}
	
	public ITerminalViewConnection getCurrentConnection() {
		return fCurrentConnection;
	}
	public void setConnection(ITerminalViewConnection conn) {
		fCurrentConnection=conn;
		// put the connection at the end of the history list
		fConnectionHistory.remove(conn);
		fConnectionHistory.add(0,conn);

		fireListeners();
	}

	public void swapConnection() {
		ITerminalViewConnection conn=getPreviousConnection();
		if(conn!=null)
			setConnection(conn);
	}

	/**
	 * @return the connection that was most recently the current connection or null if there is
	 * no previous connection
	 */
	private ITerminalViewConnection getPreviousConnection() {
		// find the first connection that is not the current connection in
		// the list
		for (Iterator iterator = fConnectionHistory.iterator(); iterator.hasNext();) {
			ITerminalViewConnection conn = (ITerminalViewConnection) iterator.next();
			if(conn!=fCurrentConnection) {
				return conn;
			}
		}
		return null;
	}

	public void addConnection(ITerminalViewConnection conn) {
		fConnections.add(conn);
		fireListeners();
	}
	public void removeConnection(ITerminalViewConnection conn) {
		fConnections.remove(conn);
		fConnectionHistory.remove(conn);
		fireListeners();
	}

	public void addListener(TerminalViewConnectionListener listener) {
		fListeners.add(listener);
	}

	public void removeListener(TerminalViewConnectionListener listener) {
		fListeners.remove(listener);
	}
	protected void fireListeners() {
		TerminalViewConnectionListener[] listeners=(TerminalViewConnectionListener[]) fListeners.toArray(new TerminalViewConnectionListener[fListeners.size()]);
		for (int i = 0; i < listeners.length; i++) {
			listeners[i].connectionsChanged();
		}
	}

	public void saveState(ISettingsStore store) {
		store.put(STORE_SIZE,""+fConnections.size()); //$NON-NLS-1$
		// save all connections
		int n=0;
		for (Iterator iterator = fConnections.iterator(); iterator.hasNext();) {
			// the name under which we store the connection
			String prefix=STORE_CONNECTION_PREFIX+n;
			n++;
			ITerminalViewConnection connection = (ITerminalViewConnection) iterator.next();
			// remember the current connection by its prefix
			if(connection.equals(fCurrentConnection))
				store.put(STORE_CURRENT_CONNECTION,prefix);
			connection.saveState(new SettingStorePrefixDecorator(store,prefix)); 
		}
	}

	public void loadState(ISettingsStore store,ITerminalViewConnectionFactory factory) {
		int size=0;
		try {
			size=Integer.parseInt(store.get(STORE_SIZE));
		} catch(Exception e) {
			// ignore
		}
		if(size>0) {
			// a slot for the connections
			String current=store.get(STORE_CURRENT_CONNECTION);
			int n=0;
			for (int i=0;i<size;i++) {
				// the name under which we stored the connection
				String prefix=STORE_CONNECTION_PREFIX+n;
				n++;
				try {
					ITerminalViewConnection connection = factory.create();
					fConnections.add(connection);
					fConnectionHistory.add(connection);
					if(prefix.equals(current))
						fCurrentConnection=connection;
					connection.loadState(new SettingStorePrefixDecorator(store,prefix));
				} catch(RuntimeException e) {
					// in case something goes wrong, make sure we can read the other
					// connections....
					TerminalViewPlugin.getDefault().getLog().log(
							new Status(
									IStatus.WARNING, 
									TerminalViewPlugin.getDefault().getBundle().getSymbolicName(), 
									0, 
									e.getLocalizedMessage(), 
									e
					));
				}
			}
		}
	}

	public void removeCurrent() {
		if(fConnections.size()>1) {
			fConnections.remove(fCurrentConnection);
			fConnectionHistory.remove(fCurrentConnection);
			
			// make sure connection is not null....
			fCurrentConnection=getPreviousConnection();
			// if there is no previous connection then make
			// the first connection the list the current connection
			if(fCurrentConnection==null)
				fCurrentConnection=(ITerminalViewConnection) fConnections.get(0);
				
			fireListeners();			
		}
	}
}




/*******************************************************************************
 * Copyright (c) 20078 Wind River Systems, 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: 
 * Michael Scharf (Wind River) - initial API and implementation
 *******************************************************************************/
/**
 * 
 */
package org.eclipse.tm.internal.terminal.view;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.tm.internal.terminal.control.CommandInputFieldWithHistory;
import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;

/**
 * This class represents one connection. The connection might be
 * closed or open. 
 *
 */
class TerminalViewConnection implements ITerminalViewConnection {
	private static final String STORE_SUMMARY = "Summary"; //$NON-NLS-1$
	private static final String STORE_PART_NAME = "PartName"; //$NON-NLS-1$
	private static final String STORE_CONNECTION_TYPE = "ConnectionType"; //$NON-NLS-1$
    private static final String STORE_HAS_COMMAND_INPUT_FIELD = "HasCommandInputField"; //$NON-NLS-1$
	private static final String STORE_COMMAND_INPUT_FIELD_HISTORY = "CommandInputFieldHistory"; //$NON-NLS-1$

	final private ITerminalViewControl fCtlTerminal;
	private String fTitle;
	private String fSummary;
	private String fHistory;
	private CommandInputFieldWithHistory fCommandInputField;
	private String fPartName;
	
	public TerminalViewConnection(ITerminalViewControl ctl) {
		fCtlTerminal = ctl;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tm.internal.terminal.actions.ITerminalViewConnection#getName()
	 */
	public String getFullSummary() {
		if(fTitle==null)
			return makeTitle();
		return fTitle;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tm.internal.terminal.view.ITerminalViewConnection#getImageDescriptor()
	 */
	public ImageDescriptor getImageDescriptor() {
		return TerminalViewPlugin.getDefault().getImageRegistry().getDescriptor(ImageConsts.IMAGE_TERMINAL_VIEW);
	}

	public ITerminalViewControl getCtlTerminal() {
		return fCtlTerminal;
	}
	private ISettingsStore getStore(ISettingsStore store,ITerminalConnector connector) {
		return new SettingStorePrefixDecorator(store,connector.getId()+"."); //$NON-NLS-1$
	}
	public void loadState(ISettingsStore store) {
		fPartName=store.get(STORE_PART_NAME);
		fSummary=store.get(STORE_SUMMARY);
		fHistory=store.get(STORE_COMMAND_INPUT_FIELD_HISTORY);
		ITerminalConnector[] connectors=fCtlTerminal.getConnectors();
		String connectionType=store.get(STORE_CONNECTION_TYPE);
		for (int i = 0; i < connectors.length; i++) {
			connectors[i].load(getStore(store,connectors[i]));
			if(connectors[i].getId().equals(connectionType))
				fCtlTerminal.setConnector(connectors[i]);
		}
		if("true".equals(store.get(STORE_HAS_COMMAND_INPUT_FIELD))) //$NON-NLS-1$
			setCommandInputField(true);
	}

	public void saveState(ISettingsStore store) {
		store.put(STORE_PART_NAME, fPartName);
		store.put(STORE_SUMMARY,fSummary);
		store.put(STORE_COMMAND_INPUT_FIELD_HISTORY, fHistory);
		if(fCommandInputField!=null)
			store.put(STORE_COMMAND_INPUT_FIELD_HISTORY, fCommandInputField.getHistory());
		else
			store.put(STORE_COMMAND_INPUT_FIELD_HISTORY, fHistory);
		store.put(STORE_HAS_COMMAND_INPUT_FIELD,hasCommandInputField()?"true":"false");   //$NON-NLS-1$//$NON-NLS-2$
		ITerminalConnector[] connectors=fCtlTerminal.getConnectors();
		for (int i = 0; i < connectors.length; i++) {
			connectors[i].save(getStore(store,connectors[i]));
		}
		if(fCtlTerminal.getTerminalConnector()!=null) {
			store.put(STORE_CONNECTION_TYPE,fCtlTerminal.getTerminalConnector().getId());
		}
	}
	public boolean hasCommandInputField() {
		return fCommandInputField!=null;
	}
	public void setCommandInputField(boolean on) {
		// save the old history
		if(fCommandInputField!=null) {
			fHistory= fCommandInputField.getHistory();
			fCommandInputField=null;
		}
		if(on) {
			// TODO make history size configurable
			fCommandInputField=new CommandInputFieldWithHistory(100);
			fCommandInputField.setHistory(fHistory);
		}
		fCtlTerminal.setCommandInputField(fCommandInputField);
	}

	public void setState(TerminalState state) {
		// update the title....
		fTitle=null;		
	}

	public void setTerminalTitle(String title) {
		// When parameter 'title' is not null, it is a String containing text to
		// display in the view's content description line.  This is used by class
		// TerminalText when it processes an ANSI OSC escape sequence that commands
		// the terminal to display text in its title bar.
		fTitle=title;
	}

	private String getStateDisplayName(TerminalState state) {
		if(state==TerminalState.CONNECTED) {
			return ViewMessages.STATE_CONNECTED;
		} else if(state==TerminalState.CONNECTING) {
			return ViewMessages.STATE_CONNECTING;
		} else if(state==TerminalState.OPENED) {
			return ViewMessages.STATE_OPENED;
		} else if(state==TerminalState.CLOSED) {
			return ViewMessages.STATE_CLOSED;
		} else {
			throw new IllegalStateException(state.toString());
		}
	}

	private String makeTitle() {
		String strTitle = ""; //$NON-NLS-1$
		if(fCtlTerminal.getTerminalConnector()==null){
			strTitle=ViewMessages.NO_CONNECTION_SELECTED;
		} else {
			// When parameter 'data' is null, we construct a descriptive string to
			// display in the content description line.
			String strConnected = getStateDisplayName(fCtlTerminal.getState());
			String summary = getSettingsSummary();
			//TODO Title should use an NLS String and com.ibm.icu.MessageFormat
			//In order to make the logic of assembling, and the separators, better adapt to foreign languages
			if(summary.length()>0)
				summary=summary+" - ";  //$NON-NLS-1$
			String name=fCtlTerminal.getTerminalConnector().getName();
			if(name.length()>0) {
				name+=": "; //$NON-NLS-1$
			}
			strTitle = name + "("+ summary + strConnected + ")"; //$NON-NLS-1$ //$NON-NLS-2$
		}
		return strTitle;
	}
	/**
	 * @return the setting summary. If there is no connection, or the connection
	 * has not been initialized, use the last stored state.
	 */
	private String getSettingsSummary() {
		if(fCtlTerminal.getTerminalConnector().isInitialized())
			fSummary=fCtlTerminal.getSettingsSummary();
		if(fSummary==null)
			return ""; //$NON-NLS-1$
		return fSummary;
	}

	public void setSummary(String summary) {
		fSummary=summary;
	}

	public String getPartName() {
		return fPartName==null?ViewMessages.PROP_TITLE:fPartName;
	}

	public void setPartName(String name) {
		fPartName=name;
		
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Wind River Systems, 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
 *
 * Initial Contributors:
 * The following Wind River employees contributed to the Terminal component
 * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb,
 * Helmut Haigermoser and Ted Williams.
 *
 * Contributors:
 * Michael Scharf (Wind River) - initial contribution
 *******************************************************************************/
package org.eclipse.tm.internal.terminal.actions;

import org.eclipse.tm.internal.terminal.view.ITerminalViewConnectionManager;
import org.eclipse.tm.internal.terminal.view.ImageConsts;
import org.eclipse.tm.internal.terminal.view.ITerminalViewConnectionManager.TerminalViewConnectionListener;

public class TerminalActionRemove extends TerminalAction implements TerminalViewConnectionListener 
{
	private final ITerminalViewConnectionManager fConnectionManager;
    public TerminalActionRemove(ITerminalViewConnectionManager target)
    {
        super(null,
              TerminalActionRemove.class.getName());
        fConnectionManager=target;
        setupAction(ActionMessages.REMOVE,
                    ActionMessages.REMOVE,
                    null,
                    ImageConsts.IMAGE_ELCL_REMOVE,
                    ImageConsts.IMAGE_DLCL_REMOVE,
                    true);
		fConnectionManager.addListener(this);
		connectionsChanged();
    }
	public void run() {
		fConnectionManager.removeCurrent();
	}
	public void connectionsChanged() {
		setEnabled(fConnectionManager.size()>1);
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 * IBM Corporation - initial API and implementation
 * Michael Scharf (Wind River) - [172483] switch between connections
 *                               (Adapted from org.eclipse.ui.internal.console.ConsoleDropDownAction)
 *******************************************************************************/
package org.eclipse.tm.internal.terminal.actions;


import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IMenuCreator;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.tm.internal.terminal.view.ITerminalViewConnection;
import org.eclipse.tm.internal.terminal.view.ITerminalViewConnectionManager;
import org.eclipse.tm.internal.terminal.view.ImageConsts;
import org.eclipse.tm.internal.terminal.view.TerminalViewPlugin;
import org.eclipse.tm.internal.terminal.view.ITerminalViewConnectionManager.TerminalViewConnectionListener;

/**
 * Drop down action in the console to select the console to display.
 */
public class TerminalActionSelectionDropDown extends Action implements IMenuCreator, TerminalViewConnectionListener {
	private ITerminalViewConnectionManager fConnections;
	private Menu fMenu;
	public TerminalActionSelectionDropDown(ITerminalViewConnectionManager view) {
		fConnections= view;
		setText(ActionMessages.ConsoleDropDownAction_0); 
		setToolTipText(ActionMessages.ConsoleDropDownAction_1); 
		setImageDescriptor(TerminalViewPlugin.getDefault().getImageRegistry().getDescriptor(ImageConsts.IMAGE_TERMINAL_VIEW));
//		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CONSOLE_DISPLAY_CONSOLE_ACTION);
		setMenuCreator(this);
		fConnections.addListener(this);
		connectionsChanged();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.action.IMenuCreator#dispose()
	 */
	public void dispose() {
		if (fMenu != null) {
			fMenu.dispose();
		}
		fConnections.removeListener(this);
		fConnections= null;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
	 */
	public Menu getMenu(Menu parent) {
		return null;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
	 */
	public Menu getMenu(Control parent) {
		if (fMenu != null) {
			fMenu.dispose();
		}
		
		fMenu= new Menu(parent);
		ITerminalViewConnection[] consoles= fConnections.getConnections();
		ITerminalViewConnection current = fConnections.getCurrentConnection();
		for (int i = 0; i < consoles.length; i++) {
			ITerminalViewConnection console = consoles[i];
			Action action = new ShowConsoleAction(fConnections, console);
			action.setChecked(console.equals(current));
			addActionToMenu(fMenu, action, i + 1);
		}
		return fMenu;
	}
	
	private void addActionToMenu(Menu parent, Action action, int accelerator) {
	    if (accelerator < 10) {
		    StringBuffer label= new StringBuffer();
			//add the numerical accelerator
			label.append('&');
			label.append(accelerator);
			label.append(' ');
			label.append(action.getText());
			action.setText(label.toString());
		}
		ActionContributionItem item= new ActionContributionItem(action);
		item.fill(parent, -1);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.action.IAction#run()
	 */
	public void run() {
		fConnections.swapConnection();
	}

	public void connectionsChanged() {
		ITerminalViewConnection[] consoles= fConnections.getConnections();
		setEnabled(consoles.length > 1);
	}
}




/*******************************************************************************
 * Copyright (c) 2007 Wind River Systems, 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: 
 * Michael Scharf (Wind River) - initial API and implementation
 *******************************************************************************/
package org.eclipse.tm.internal.terminal.view;

import java.io.UnsupportedEncodingException;

import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Control;
import org.eclipse.tm.internal.terminal.control.ICommandInputField;
import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;

// TODO (scharf): this decorator is only there to deal wit the common
// actions. Find a better solution.
public class TerminalViewControlDecorator implements ITerminalViewControl {
	ITerminalViewControl fViewContoler;

	public void clearTerminal() {
		fViewContoler.clearTerminal();
	}

	public void connectTerminal() {
		fViewContoler.connectTerminal();
	}

	public void copy() {
		fViewContoler.copy();
	}

	public void disconnectTerminal() {
		fViewContoler.disconnectTerminal();
	}

	public void disposeTerminal() {
		fViewContoler.disposeTerminal();
	}

	public int getBufferLineLimit() {
		return fViewContoler.getBufferLineLimit();
	}

	public Clipboard getClipboard() {
		return fViewContoler.getClipboard();
	}

	public ICommandInputField getCommandInputField() {
		return fViewContoler.getCommandInputField();
	}

	public ITerminalConnector[] getConnectors() {
		return fViewContoler.getConnectors();
	}

	public Control getControl() {
		return fViewContoler.getControl();
	}

	public String getEncoding() {
		return fViewContoler.getEncoding();
	}

	public Font getFont() {
		return fViewContoler.getFont();
	}

	public Control getRootControl() {
		return fViewContoler.getRootControl();
	}

	public String getSelection() {
		return fViewContoler.getSelection();
	}

	public String getSettingsSummary() {
		return fViewContoler.getSettingsSummary();
	}

	public TerminalState getState() {
		return fViewContoler.getState();
	}

	public ITerminalConnector getTerminalConnector() {
		return fViewContoler.getTerminalConnector();
	}

	public boolean isConnected() {
		return fViewContoler.isConnected();
	}

	public boolean isDisposed() {
		return fViewContoler.isDisposed();
	}

	public boolean isEmpty() {
		return fViewContoler.isEmpty();
	}

	public boolean isScrollLock() {
		return fViewContoler.isScrollLock();
	}

	public void paste() {
		fViewContoler.paste();
	}

	public boolean pasteString(String string) {
		return fViewContoler.pasteString(string);
	}

	public void selectAll() {
		fViewContoler.selectAll();
	}

	public void sendKey(char arg0) {
		fViewContoler.sendKey(arg0);
	}

	public void setBufferLineLimit(int bufferLineLimit) {
		fViewContoler.setBufferLineLimit(bufferLineLimit);
	}

	public void setCommandInputField(ICommandInputField inputField) {
		fViewContoler.setCommandInputField(inputField);
	}

	public void setConnector(ITerminalConnector connector) {
		fViewContoler.setConnector(connector);
	}

	public void setEncoding(String encoding) throws UnsupportedEncodingException {
		fViewContoler.setEncoding(encoding);
	}

	public void setFocus() {
		fViewContoler.setFocus();
	}

	public void setFont(Font font) {
		fViewContoler.setFont(font);
	}

	public void setInvertedColors(boolean invert) {
		fViewContoler.setInvertedColors(invert);
	}

	public void setScrollLock(boolean on) {
		fViewContoler.setScrollLock(on);
	}

	public ITerminalViewControl getViewContoler() {
		return fViewContoler;
	}

	public void setViewContoler(ITerminalViewControl viewContoler) {
		fViewContoler = viewContoler;
	}
}

Return to bug 172483

Lines 14-50 Link Here

(-)src/org/eclipse/tm/internal/terminal/view/ImageConsts.java (-4 / +7 lines)
14	* Michael Scharf (Wind River) - extracted from TerminalConsts	14	* Michael Scharf (Wind River) - extracted from TerminalConsts
15	* Martin Oberhuber (Wind River) - fixed copyright headers and beautified	15	* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
16	* Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin	16	* Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin
		17	* Michael Scharf (Wind River) - [172483] added some more icons
17	*******************************************************************************/	18	*******************************************************************************/
18	package org.eclipse.tm.internal.terminal.view;	19	package org.eclipse.tm.internal.terminal.view;
19		20
20	public interface ImageConsts	21	public interface ImageConsts
21	{	22	{
22	public final static String IMAGE_DIR_ROOT = "icons/"; //$NON-NLS-1$	23	public final static String IMAGE_DIR_ROOT = "icons/"; //$NON-NLS-1$
23	public final static String IMAGE_DIR_CTOOL = "ctool16/"; // basic colors - size 16x16 //$NON-NLS-1$
24	public final static String IMAGE_DIR_LOCALTOOL = "clcl16/"; // basic colors - size 16x16 //$NON-NLS-1$	24	public final static String IMAGE_DIR_LOCALTOOL = "clcl16/"; // basic colors - size 16x16 //$NON-NLS-1$
25	public final static String IMAGE_DIR_DLCL = "dlcl16/"; // disabled - size 16x16 //$NON-NLS-1$	25	public final static String IMAGE_DIR_DLCL = "dlcl16/"; // disabled - size 16x16 //$NON-NLS-1$
26	public final static String IMAGE_DIR_ELCL = "elcl16/"; // enabled - size 16x16 //$NON-NLS-1$	26	public final static String IMAGE_DIR_ELCL = "elcl16/"; // enabled - size 16x16 //$NON-NLS-1$
27	public final static String IMAGE_DIR_OBJECT = "obj16/"; // basic colors - size 16x16 //$NON-NLS-1$
28	public final static String IMAGE_DIR_WIZBAN = "wizban/"; // basic colors - size 16x16 //$NON-NLS-1$
29	public final static String IMAGE_DIR_OVR = "ovr16/"; // basic colors - size 7x8 //$NON-NLS-1$
30	public final static String IMAGE_DIR_VIEW = "cview16/"; // views //$NON-NLS-1$	27	public final static String IMAGE_DIR_VIEW = "cview16/"; // views //$NON-NLS-1$
31	public final static String IMAGE_DIR_EVIEW = "eview16/"; // views //$NON-NLS-1$	28	public final static String IMAGE_DIR_EVIEW = "eview16/"; // views //$NON-NLS-1$
32		29
33	public static final String IMAGE_NEW_TERMINAL = "TerminalViewNewTerminal"; //$NON-NLS-1$	30	public static final String IMAGE_NEW_TERMINAL = "TerminalViewNewTerminal"; //$NON-NLS-1$
		31	public static final String IMAGE_TERMINAL_VIEW = "TerminalView"; //$NON-NLS-1$
34	public static final String IMAGE_CLCL_CONNECT = "ImageClclConnect"; //$NON-NLS-1$	32	public static final String IMAGE_CLCL_CONNECT = "ImageClclConnect"; //$NON-NLS-1$
35	public static final String IMAGE_CLCL_DISCONNECT = "ImageClclDisconnect"; //$NON-NLS-1$	33	public static final String IMAGE_CLCL_DISCONNECT = "ImageClclDisconnect"; //$NON-NLS-1$
36	public static final String IMAGE_CLCL_SETTINGS = "ImageClclSettings"; //$NON-NLS-1$	34	public static final String IMAGE_CLCL_SETTINGS = "ImageClclSettings"; //$NON-NLS-1$
37	public static final String IMAGE_CLCL_SCROLL_LOCK = "ImageClclScrollLock"; //$NON-NLS-1$	35	public static final String IMAGE_CLCL_SCROLL_LOCK = "ImageClclScrollLock"; //$NON-NLS-1$
		36	public static final String IMAGE_CLCL_PIN = "ImageClclPin"; //$NON-NLS-1$
38		37
39	public static final String IMAGE_DLCL_CONNECT = "ImageDlclConnect"; //$NON-NLS-1$	38	public static final String IMAGE_DLCL_CONNECT = "ImageDlclConnect"; //$NON-NLS-1$
40	public static final String IMAGE_DLCL_DISCONNECT = "ImageDlclDisconnect"; //$NON-NLS-1$	39	public static final String IMAGE_DLCL_DISCONNECT = "ImageDlclDisconnect"; //$NON-NLS-1$
41	public static final String IMAGE_DLCL_SETTINGS = "ImageDlclSettings"; //$NON-NLS-1$	40	public static final String IMAGE_DLCL_SETTINGS = "ImageDlclSettings"; //$NON-NLS-1$
42	public static final String IMAGE_DLCL_SCROLL_LOCK = "ImageDlclScrollLock"; //$NON-NLS-1$	41	public static final String IMAGE_DLCL_SCROLL_LOCK = "ImageDlclScrollLock"; //$NON-NLS-1$
		42	public static final String IMAGE_DLCL_PIN = "ImageDlclPin"; //$NON-NLS-1$
		43	public static final String IMAGE_DLCL_REMOVE = "ImageDlclRemove"; //$NON-NLS-1$
43		44
44	public static final String IMAGE_ELCL_CONNECT = "ImageElclConnect"; //$NON-NLS-1$	45	public static final String IMAGE_ELCL_CONNECT = "ImageElclConnect"; //$NON-NLS-1$
45	public static final String IMAGE_ELCL_DISCONNECT = "ImageElclDisconnect"; //$NON-NLS-1$	46	public static final String IMAGE_ELCL_DISCONNECT = "ImageElclDisconnect"; //$NON-NLS-1$
46	public static final String IMAGE_ELCL_SETTINGS = "ImageElclSettings"; //$NON-NLS-1$	47	public static final String IMAGE_ELCL_SETTINGS = "ImageElclSettings"; //$NON-NLS-1$
47	public static final String IMAGE_ELCL_SCROLL_LOCK = "ImageElclScrollLock"; //$NON-NLS-1$	48	public static final String IMAGE_ELCL_SCROLL_LOCK = "ImageElclScrollLock"; //$NON-NLS-1$
		49	public static final String IMAGE_ELCL_PIN = "ImageElclPin"; //$NON-NLS-1$
		50	public static final String IMAGE_ELCL_REMOVE = "ImageElclRemove"; //$NON-NLS-1$
48	public static final String IMAGE_CLCL_COMMAND_INPUT_FIELD = "ImageClclCommandInputField";//$NON-NLS-1$	51	public static final String IMAGE_CLCL_COMMAND_INPUT_FIELD = "ImageClclCommandInputField";//$NON-NLS-1$
49	public static final String IMAGE_ELCL_COMMAND_INPUT_FIELD = "ImageDlclCommandInputField";//$NON-NLS-1$	52	public static final String IMAGE_ELCL_COMMAND_INPUT_FIELD = "ImageDlclCommandInputField";//$NON-NLS-1$
50	public static final String IMAGE_DLCL_COMMAND_INPUT_FIELD = "ImageDlclCommandInputField";//$NON-NLS-1$	53	public static final String IMAGE_DLCL_COMMAND_INPUT_FIELD = "ImageDlclCommandInputField";//$NON-NLS-1$

Added Link Here

(-)src/org/eclipse/tm/internal/terminal/actions/TerminalActionPin.java (+41 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Wind River Systems, Inc. and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Initial Contributors:
9	* The following Wind River employees contributed to the Terminal component
10	* that contains this file: Chris Thew, Fran Litterio, Stephen Lamb,
11	* Helmut Haigermoser and Ted Williams.
12	*
13	* Contributors:
14	* Michael Scharf (Wind River) - initial contribution
15	*******************************************************************************/
16	package org.eclipse.tm.internal.terminal.actions;
17
18	import org.eclipse.jface.action.IAction;
19	import org.eclipse.tm.internal.terminal.view.ITerminalView;
20	import org.eclipse.tm.internal.terminal.view.ImageConsts;
21
22	public class TerminalActionPin extends TerminalAction
23	{
24	public TerminalActionPin(ITerminalView target)
25	{
26	super(target,
27	TerminalActionPin.class.getName(),IAction.AS_RADIO_BUTTON);
28
29	setupAction(ActionMessages.PIN,
30	ActionMessages.PIN,
31	ImageConsts.IMAGE_CLCL_PIN,
32	ImageConsts.IMAGE_ELCL_PIN,
33	ImageConsts.IMAGE_DLCL_PIN,
34	true);
35	setChecked(fTarget.isPinned());
36	}
37	public void run() {
38	fTarget.setPinned(!fTarget.isPinned());
39	setChecked(fTarget.isPinned());
40	}
41	}

Added Link Here

(-)src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java (+190 lines)
1	/*******************************************************************************
2	* Copyright (c) 20078 Wind River Systems, Inc. and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Michael Scharf (Wind River) - initial API and implementation
10	*******************************************************************************/
11	/**
12	*
13	*/
14	package org.eclipse.tm.internal.terminal.view;
15
16	import org.eclipse.jface.resource.ImageDescriptor;
17	import org.eclipse.tm.internal.terminal.control.CommandInputFieldWithHistory;
18	import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
19	import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
20	import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
21	import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
22
23	/**
24	* This class represents one connection. The connection might be
25	* closed or open.
26	*
27	*/
28	class TerminalViewConnection implements ITerminalViewConnection {
29	private static final String STORE_SUMMARY = "Summary"; //$NON-NLS-1$
30	private static final String STORE_PART_NAME = "PartName"; //$NON-NLS-1$
31	private static final String STORE_CONNECTION_TYPE = "ConnectionType"; //$NON-NLS-1$
32	private static final String STORE_HAS_COMMAND_INPUT_FIELD = "HasCommandInputField"; //$NON-NLS-1$
33	private static final String STORE_COMMAND_INPUT_FIELD_HISTORY = "CommandInputFieldHistory"; //$NON-NLS-1$
34
35	final private ITerminalViewControl fCtlTerminal;
36	private String fTitle;
37	private String fSummary;
38	private String fHistory;
39	private CommandInputFieldWithHistory fCommandInputField;
40	private String fPartName;
41
42	public TerminalViewConnection(ITerminalViewControl ctl) {
43	fCtlTerminal = ctl;
44	}
45
46	/* (non-Javadoc)
47	* @see org.eclipse.tm.internal.terminal.actions.ITerminalViewConnection#getName()
48	*/
49	public String getFullSummary() {
50	if(fTitle==null)
51	return makeTitle();
52	return fTitle;
53	}
54
55	/* (non-Javadoc)
56	* @see org.eclipse.tm.internal.terminal.view.ITerminalViewConnection#getImageDescriptor()
57	*/
58	public ImageDescriptor getImageDescriptor() {
59	return TerminalViewPlugin.getDefault().getImageRegistry().getDescriptor(ImageConsts.IMAGE_TERMINAL_VIEW);
60	}
61
62	public ITerminalViewControl getCtlTerminal() {
63	return fCtlTerminal;
64	}
65	private ISettingsStore getStore(ISettingsStore store,ITerminalConnector connector) {
66	return new SettingStorePrefixDecorator(store,connector.getId()+"."); //$NON-NLS-1$
67	}
68	public void loadState(ISettingsStore store) {
69	fPartName=store.get(STORE_PART_NAME);
70	fSummary=store.get(STORE_SUMMARY);
71	fHistory=store.get(STORE_COMMAND_INPUT_FIELD_HISTORY);
72	ITerminalConnector[] connectors=fCtlTerminal.getConnectors();
73	String connectionType=store.get(STORE_CONNECTION_TYPE);
74	for (int i = 0; i < connectors.length; i++) {
75	connectors[i].load(getStore(store,connectors[i]));
76	if(connectors[i].getId().equals(connectionType))
77	fCtlTerminal.setConnector(connectors[i]);
78	}
79	if("true".equals(store.get(STORE_HAS_COMMAND_INPUT_FIELD))) //$NON-NLS-1$
80	setCommandInputField(true);
81	}
82
83	public void saveState(ISettingsStore store) {
84	store.put(STORE_PART_NAME, fPartName);
85	store.put(STORE_SUMMARY,fSummary);
86	store.put(STORE_COMMAND_INPUT_FIELD_HISTORY, fHistory);
87	if(fCommandInputField!=null)
88	store.put(STORE_COMMAND_INPUT_FIELD_HISTORY, fCommandInputField.getHistory());
89	else
90	store.put(STORE_COMMAND_INPUT_FIELD_HISTORY, fHistory);
91	store.put(STORE_HAS_COMMAND_INPUT_FIELD,hasCommandInputField()?"true":"false"); //$NON-NLS-1$//$NON-NLS-2$
92	ITerminalConnector[] connectors=fCtlTerminal.getConnectors();
93	for (int i = 0; i < connectors.length; i++) {
94	connectors[i].save(getStore(store,connectors[i]));
95	}
96	if(fCtlTerminal.getTerminalConnector()!=null) {
97	store.put(STORE_CONNECTION_TYPE,fCtlTerminal.getTerminalConnector().getId());
98	}
99	}
100	public boolean hasCommandInputField() {
101	return fCommandInputField!=null;
102	}
103	public void setCommandInputField(boolean on) {
104	// save the old history
105	if(fCommandInputField!=null) {
106	fHistory= fCommandInputField.getHistory();
107	fCommandInputField=null;
108	}
109	if(on) {
110	// TODO make history size configurable
111	fCommandInputField=new CommandInputFieldWithHistory(100);
112	fCommandInputField.setHistory(fHistory);
113	}
114	fCtlTerminal.setCommandInputField(fCommandInputField);
115	}
116
117	public void setState(TerminalState state) {
118	// update the title....
119	fTitle=null;
120	}
121
122	public void setTerminalTitle(String title) {
123	// When parameter 'title' is not null, it is a String containing text to
124	// display in the view's content description line. This is used by class
125	// TerminalText when it processes an ANSI OSC escape sequence that commands
126	// the terminal to display text in its title bar.
127	fTitle=title;
128	}
129
130	private String getStateDisplayName(TerminalState state) {
131	if(state==TerminalState.CONNECTED) {
132	return ViewMessages.STATE_CONNECTED;
133	} else if(state==TerminalState.CONNECTING) {
134	return ViewMessages.STATE_CONNECTING;
135	} else if(state==TerminalState.OPENED) {
136	return ViewMessages.STATE_OPENED;
137	} else if(state==TerminalState.CLOSED) {
138	return ViewMessages.STATE_CLOSED;
139	} else {
140	throw new IllegalStateException(state.toString());
141	}
142	}
143
144	private String makeTitle() {
145	String strTitle = ""; //$NON-NLS-1$
146	if(fCtlTerminal.getTerminalConnector()==null){
147	strTitle=ViewMessages.NO_CONNECTION_SELECTED;
148	} else {
149	// When parameter 'data' is null, we construct a descriptive string to
150	// display in the content description line.
151	String strConnected = getStateDisplayName(fCtlTerminal.getState());
152	String summary = getSettingsSummary();
153	//TODO Title should use an NLS String and com.ibm.icu.MessageFormat
154	//In order to make the logic of assembling, and the separators, better adapt to foreign languages
155	if(summary.length()>0)
156	summary=summary+" - "; //$NON-NLS-1$
157	String name=fCtlTerminal.getTerminalConnector().getName();
158	if(name.length()>0) {
159	name+=": "; //$NON-NLS-1$
160	}
161	strTitle = name + "("+ summary + strConnected + ")"; //$NON-NLS-1$ //$NON-NLS-2$
162	}
163	return strTitle;
164	}
165	/**
166	* @return the setting summary. If there is no connection, or the connection
167	* has not been initialized, use the last stored state.
168	*/
169	private String getSettingsSummary() {
170	if(fCtlTerminal.getTerminalConnector().isInitialized())
171	fSummary=fCtlTerminal.getSettingsSummary();
172	if(fSummary==null)
173	return ""; //$NON-NLS-1$
174	return fSummary;
175	}
176
177	public void setSummary(String summary) {
178	fSummary=summary;
179	}
180
181	public String getPartName() {
182	return fPartName==null?ViewMessages.PROP_TITLE:fPartName;
183	}
184
185	public void setPartName(String name) {
186	fPartName=name;
187
188	}
189
190	}

Added Link Here

(-)src/org/eclipse/tm/internal/terminal/actions/TerminalActionSelectionDropDown.java (+107 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	* Michael Scharf (Wind River) - [172483] switch between connections
11	* (Adapted from org.eclipse.ui.internal.console.ConsoleDropDownAction)
12	*******************************************************************************/
13	package org.eclipse.tm.internal.terminal.actions;
14
15
16	import org.eclipse.jface.action.Action;
17	import org.eclipse.jface.action.ActionContributionItem;
18	import org.eclipse.jface.action.IMenuCreator;
19	import org.eclipse.swt.widgets.Control;
20	import org.eclipse.swt.widgets.Menu;
21	import org.eclipse.tm.internal.terminal.view.ITerminalViewConnection;
22	import org.eclipse.tm.internal.terminal.view.ITerminalViewConnectionManager;
23	import org.eclipse.tm.internal.terminal.view.ImageConsts;
24	import org.eclipse.tm.internal.terminal.view.TerminalViewPlugin;
25	import org.eclipse.tm.internal.terminal.view.ITerminalViewConnectionManager.TerminalViewConnectionListener;
26
27	/**
28	* Drop down action in the console to select the console to display.
29	*/
30	public class TerminalActionSelectionDropDown extends Action implements IMenuCreator, TerminalViewConnectionListener {
31	private ITerminalViewConnectionManager fConnections;
32	private Menu fMenu;
33	public TerminalActionSelectionDropDown(ITerminalViewConnectionManager view) {
34	fConnections= view;
35	setText(ActionMessages.ConsoleDropDownAction_0);
36	setToolTipText(ActionMessages.ConsoleDropDownAction_1);
37	setImageDescriptor(TerminalViewPlugin.getDefault().getImageRegistry().getDescriptor(ImageConsts.IMAGE_TERMINAL_VIEW));
38	// PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CONSOLE_DISPLAY_CONSOLE_ACTION);
39	setMenuCreator(this);
40	fConnections.addListener(this);
41	connectionsChanged();
42	}
43
44	/* (non-Javadoc)
45	* @see org.eclipse.jface.action.IMenuCreator#dispose()
46	*/
47	public void dispose() {
48	if (fMenu != null) {
49	fMenu.dispose();
50	}
51	fConnections.removeListener(this);
52	fConnections= null;
53	}
54
55	/* (non-Javadoc)
56	* @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
57	*/
58	public Menu getMenu(Menu parent) {
59	return null;
60	}
61
62	/* (non-Javadoc)
63	* @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
64	*/
65	public Menu getMenu(Control parent) {
66	if (fMenu != null) {
67	fMenu.dispose();
68	}
69
70	fMenu= new Menu(parent);
71	ITerminalViewConnection[] consoles= fConnections.getConnections();
72	ITerminalViewConnection current = fConnections.getCurrentConnection();
73	for (int i = 0; i < consoles.length; i++) {
74	ITerminalViewConnection console = consoles[i];
75	Action action = new ShowConsoleAction(fConnections, console);
76	action.setChecked(console.equals(current));
77	addActionToMenu(fMenu, action, i + 1);
78	}
79	return fMenu;
80	}
81
82	private void addActionToMenu(Menu parent, Action action, int accelerator) {
83	if (accelerator < 10) {
84	StringBuffer label= new StringBuffer();
85	//add the numerical accelerator
86	label.append('&');
87	label.append(accelerator);
88	label.append(' ');
89	label.append(action.getText());
90	action.setText(label.toString());
91	}
92	ActionContributionItem item= new ActionContributionItem(action);
93	item.fill(parent, -1);
94	}
95
96	/* (non-Javadoc)
97	* @see org.eclipse.jface.action.IAction#run()
98	*/
99	public void run() {
100	fConnections.swapConnection();
101	}
102
103	public void connectionsChanged() {
104	ITerminalViewConnection[] consoles= fConnections.getConnections();
105	setEnabled(consoles.length > 1);
106	}
107	}

Added Link Here

(-)src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java (+167 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 Wind River Systems, Inc. and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Michael Scharf (Wind River) - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.tm.internal.terminal.view;
12
13	import java.io.UnsupportedEncodingException;
14
15	import org.eclipse.swt.dnd.Clipboard;
16	import org.eclipse.swt.graphics.Font;
17	import org.eclipse.swt.widgets.Control;
18	import org.eclipse.tm.internal.terminal.control.ICommandInputField;
19	import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
20	import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
21	import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
22
23	// TODO (scharf): this decorator is only there to deal wit the common
24	// actions. Find a better solution.
25	public class TerminalViewControlDecorator implements ITerminalViewControl {
26	ITerminalViewControl fViewContoler;
27
28	public void clearTerminal() {
29	fViewContoler.clearTerminal();
30	}
31
32	public void connectTerminal() {
33	fViewContoler.connectTerminal();
34	}
35
36	public void copy() {
37	fViewContoler.copy();
38	}
39
40	public void disconnectTerminal() {
41	fViewContoler.disconnectTerminal();
42	}
43
44	public void disposeTerminal() {
45	fViewContoler.disposeTerminal();
46	}
47
48	public int getBufferLineLimit() {
49	return fViewContoler.getBufferLineLimit();
50	}
51
52	public Clipboard getClipboard() {
53	return fViewContoler.getClipboard();
54	}
55
56	public ICommandInputField getCommandInputField() {
57	return fViewContoler.getCommandInputField();
58	}
59
60	public ITerminalConnector[] getConnectors() {
61	return fViewContoler.getConnectors();
62	}
63
64	public Control getControl() {
65	return fViewContoler.getControl();
66	}
67
68	public String getEncoding() {
69	return fViewContoler.getEncoding();
70	}
71
72	public Font getFont() {
73	return fViewContoler.getFont();
74	}
75
76	public Control getRootControl() {
77	return fViewContoler.getRootControl();
78	}
79
80	public String getSelection() {
81	return fViewContoler.getSelection();
82	}
83
84	public String getSettingsSummary() {
85	return fViewContoler.getSettingsSummary();
86	}
87
88	public TerminalState getState() {
89	return fViewContoler.getState();
90	}
91
92	public ITerminalConnector getTerminalConnector() {
93	return fViewContoler.getTerminalConnector();
94	}
95
96	public boolean isConnected() {
97	return fViewContoler.isConnected();
98	}
99
100	public boolean isDisposed() {
101	return fViewContoler.isDisposed();
102	}
103
104	public boolean isEmpty() {
105	return fViewContoler.isEmpty();
106	}
107
108	public boolean isScrollLock() {
109	return fViewContoler.isScrollLock();
110	}
111
112	public void paste() {
113	fViewContoler.paste();
114	}
115
116	public boolean pasteString(String string) {
117	return fViewContoler.pasteString(string);
118	}
119
120	public void selectAll() {
121	fViewContoler.selectAll();
122	}
123
124	public void sendKey(char arg0) {
125	fViewContoler.sendKey(arg0);
126	}
127
128	public void setBufferLineLimit(int bufferLineLimit) {
129	fViewContoler.setBufferLineLimit(bufferLineLimit);
130	}
131
132	public void setCommandInputField(ICommandInputField inputField) {
133	fViewContoler.setCommandInputField(inputField);
134	}
135
136	public void setConnector(ITerminalConnector connector) {
137	fViewContoler.setConnector(connector);
138	}
139
140	public void setEncoding(String encoding) throws UnsupportedEncodingException {
141	fViewContoler.setEncoding(encoding);
142	}
143
144	public void setFocus() {
145	fViewContoler.setFocus();
146	}
147
148	public void setFont(Font font) {
149	fViewContoler.setFont(font);
150	}
151
152	public void setInvertedColors(boolean invert) {
153	fViewContoler.setInvertedColors(invert);
154	}
155
156	public void setScrollLock(boolean on) {
157	fViewContoler.setScrollLock(on);
158	}
159
160	public ITerminalViewControl getViewContoler() {
161	return fViewContoler;
162	}
163
164	public void setViewContoler(ITerminalViewControl viewContoler) {
165	fViewContoler = viewContoler;
166	}
167	}