Target Explorer: add "set as default connection" link to all tcf editor

pages

18 files changed, 585 insertions, 369 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/pages/LaunchExplorerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/pages/LaunchExplorerEditorPage.java
index e8fb06594..dbe0d9205 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/pages/LaunchExplorerEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/pages/LaunchExplorerEditorPage.java
@@ -1,64 +1,64 @@
-/*******************************************************************************

- * Copyright (c) 2011, 2012 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:

- * Wind River Systems - initial API and implementation

- *******************************************************************************/

-package org.eclipse.tcf.te.launch.ui.internal.pages;

-

-import org.eclipse.tcf.te.launch.ui.nls.Messages;

-import org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage;

-

-/**

- * The editor page to explore the launches.

- */

-public class LaunchExplorerEditorPage extends TreeViewerExplorerEditorPage {

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getViewerId()

-	 */

-	@Override

-	protected String getViewerId() {

-		return "org.eclipse.tcf.te.launch.ui.viewer.launches"; //$NON-NLS-1$

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#getFormTitle()

-	 */

-	@Override

-    protected String getFormTitle() {

-	    return Messages.LaunchExplorerEditorPage_PageTitle;

-    }

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getDoubleClickCommandId()

-	 */

-	@Override

-    protected String getDoubleClickCommandId() {

-	    return "org.eclipse.ui.navigator.Open"; //$NON-NLS-1$

-    }

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#getContextHelpId()

-	 */

-	@Override

-    protected String getContextHelpId() {

-	    return "org.eclipse.tcf.te.launch.ui.LaunchEditorPage"; //$NON-NLS-1$

-    }

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getViewerInput()

-	 */

-	@Override

-    protected Object getViewerInput() {

-	    return getEditorInputNode();

-    }

-}

+/*******************************************************************************
+ * Copyright (c) 2011, 2012 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:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.launch.ui.internal.pages;
+
+import org.eclipse.tcf.te.launch.ui.nls.Messages;
+import org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage;
+
+/**
+ * The editor page to explore the launches.
+ */
+public class LaunchExplorerEditorPage extends AbstractTreeViewerExplorerEditorPage {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getViewerId()
+	 */
+	@Override
+	protected String getViewerId() {
+		return "org.eclipse.tcf.te.launch.ui.viewer.launches"; //$NON-NLS-1$
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#getFormTitle()
+	 */
+	@Override
+    protected String getFormTitle() {
+	    return Messages.LaunchExplorerEditorPage_PageTitle;
+    }
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getDoubleClickCommandId()
+	 */
+	@Override
+    protected String getDoubleClickCommandId() {
+	    return "org.eclipse.ui.navigator.Open"; //$NON-NLS-1$
+    }
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#getContextHelpId()
+	 */
+	@Override
+    protected String getContextHelpId() {
+	    return "org.eclipse.tcf.te.launch.ui.LaunchEditorPage"; //$NON-NLS-1$
+    }
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getViewerInput()
+	 */
+	@Override
+    protected Object getViewerInput() {
+	    return getEditorInputNode();
+    }
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEditorPage.java
index a80875e6e..d3dcb4bb6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/pages/FSExplorerEditorPage.java
@@ -13,15 +13,15 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.tcf.te.tcf.filesystem.core.model.FSModel;
 import org.eclipse.tcf.te.tcf.filesystem.ui.nls.Messages;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode;
-import org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage;
+import org.eclipse.tcf.te.tcf.ui.editor.AbstractTreeViewerExplorerEditorPage;
 /**
  * The editor page for the file system explorer.
  */
-public class FSExplorerEditorPage extends TreeViewerExplorerEditorPage {
+public class FSExplorerEditorPage extends AbstractTreeViewerExplorerEditorPage {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getDoubleClickCommandId()
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage#getDoubleClickCommandId()
 	 */
 	@Override
 	protected String getDoubleClickCommandId() {
@@ -30,7 +30,7 @@ public class FSExplorerEditorPage extends TreeViewerExplorerEditorPage {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getViewerId()
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage#getViewerId()
 	 */
 	@Override
 	protected String getViewerId() {
@@ -57,7 +57,7 @@ public class FSExplorerEditorPage extends TreeViewerExplorerEditorPage {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getViewerInput()
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage#getViewerInput()
 	 */
 	@Override
     protected Object getViewerInput() {
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/wizards/NewNodeWizard.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/wizards/NewNodeWizard.java
index 60920629f..87bb2f4f6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/wizards/NewNodeWizard.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/wizards/NewNodeWizard.java
@@ -22,7 +22,7 @@ import org.eclipse.tcf.te.tcf.filesystem.core.internal.operations.OpCreate;
 import org.eclipse.tcf.te.tcf.filesystem.core.model.FSTreeNode;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNodeProperties;
-import org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage;
+import org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage;
 import org.eclipse.tcf.te.ui.wizards.AbstractWizard;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
@@ -184,8 +184,8 @@ public abstract class NewNodeWizard extends AbstractWizard implements INewWizard
 				if (part instanceof FormEditor) {
 					FormEditor formEditor = (FormEditor) part;
 					IFormPage formPage = formEditor.getActivePageInstance();
-					if (formPage instanceof TreeViewerExplorerEditorPage) {
-						TreeViewerExplorerEditorPage viewerPage = (TreeViewerExplorerEditorPage) formPage;
+					if (formPage instanceof AbstractTreeViewerExplorerEditorPage) {
+						AbstractTreeViewerExplorerEditorPage viewerPage = (AbstractTreeViewerExplorerEditorPage) formPage;
 						return (TreeViewer) viewerPage.getTreeControl().getViewer();
 					}
 				} else if (part instanceof CommonNavigator) {
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java
index 7c82aa1ca..3c5834891 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java
@@ -9,6 +9,8 @@
  *******************************************************************************/
 package org.eclipse.tcf.te.tcf.launch.ui.editor;
 
+import java.util.EventObject;
+
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.Platform;
@@ -16,14 +18,28 @@ import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationListener;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jface.action.ControlContribution;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.tcf.te.launch.ui.editor.AbstractLaunchTabContainerEditorPage;
 import org.eclipse.tcf.te.runtime.concurrent.util.ExecutorsUtil;
+import org.eclipse.tcf.te.runtime.events.ChangeEvent;
+import org.eclipse.tcf.te.runtime.events.EventManager;
+import org.eclipse.tcf.te.runtime.interfaces.events.IEventListener;
 import org.eclipse.tcf.te.runtime.persistence.PersistenceManager;
 import org.eclipse.tcf.te.runtime.persistence.interfaces.IPersistenceDelegate;
 import org.eclipse.tcf.te.runtime.services.ServiceManager;
 import org.eclipse.tcf.te.runtime.services.interfaces.IPropertiesAccessService;
 import org.eclipse.tcf.te.tcf.launch.ui.activator.UIPlugin;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode;
+import org.eclipse.tcf.te.tcf.locator.interfaces.services.IDefaultContextService;
+import org.eclipse.tcf.te.tcf.ui.nls.Messages;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.events.IHyperlinkListener;
+import org.eclipse.ui.forms.widgets.ImageHyperlink;
 
 /**
  * TCF launch configuration tab container page implementation.
@@ -248,4 +264,67 @@ public abstract class AbstractTcfLaunchTabContainerEditorPage extends AbstractLa
 			}
 		}
 	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#doCreateLinkContribution(org.eclipse.jface.action.IToolBarManager)
+	 */
+	@Override
+	protected IContributionItem doCreateLinkContribution(final IToolBarManager tbManager) {
+		return new ControlContribution("SetAsDefaultContextLink") { //$NON-NLS-1$
+			IEventListener eventListener = null;
+			@Override
+			public void dispose() {
+				super.dispose();
+				if (eventListener == null) {
+					EventManager.getInstance().removeEventListener(eventListener);
+				}
+			}
+			@Override
+			protected Control createControl(Composite parent) {
+				final ImageHyperlink hyperlink = new ImageHyperlink(parent, SWT.NONE);
+				hyperlink.setText(Messages.AbstractCustomFormToolkitEditorPage_setAsDefault_link);
+				hyperlink.setUnderlined(true);
+				hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getForeground());
+				IPeerNode defaultNode = ServiceManager.getInstance().getService(IDefaultContextService.class).getDefaultContext(null);
+				setVisible(defaultNode == null || defaultNode != getEditorInputNode());
+				hyperlink.addHyperlinkListener(new IHyperlinkListener() {
+					@Override
+					public void linkActivated(HyperlinkEvent e) {
+						ServiceManager.getInstance().getService(IDefaultContextService.class).setDefaultContext((IPeerNode)getEditorInputNode());
+					}
+					@Override
+					public void linkEntered(HyperlinkEvent e) {
+						hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getActiveForeground());
+					}
+					@Override
+					public void linkExited(HyperlinkEvent e) {
+						hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getForeground());
+					}
+				});
+	
+				eventListener = new IEventListener() {
+					@Override
+					public void eventFired(EventObject event) {
+						if (event instanceof ChangeEvent) {
+							ChangeEvent changeEvent = (ChangeEvent)event;
+							if (changeEvent.getSource() instanceof IDefaultContextService) {
+								IPeerNode defaultNode = ServiceManager.getInstance().getService(IDefaultContextService.class).getDefaultContext(null);
+								setVisible(defaultNode == null || getEditorInputNode() == null || defaultNode != getEditorInputNode());
+								ExecutorsUtil.executeInUI(new Runnable() {
+									@Override
+									public void run() {
+										tbManager.update(true);
+									}
+								});
+							}
+						}
+					}
+				};
+	
+				EventManager.getInstance().addEventListener(eventListener, ChangeEvent.class);
+	
+				return hyperlink;
+			}
+		};
+	}
 }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEditorPage.java
index 8b032dd9e..183ab5d1c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEditorPage.java
@@ -27,16 +27,16 @@ import org.eclipse.tcf.te.tcf.processes.core.model.ModelManager;
 import org.eclipse.tcf.te.tcf.processes.ui.interfaces.IProcessMonitorUIDelegate;
 import org.eclipse.tcf.te.tcf.processes.ui.navigator.events.TreeViewerListener;
 import org.eclipse.tcf.te.tcf.processes.ui.nls.Messages;
+import org.eclipse.tcf.te.tcf.ui.editor.AbstractTreeViewerExplorerEditorPage;
 import org.eclipse.tcf.te.ui.trees.AbstractTreeControl;
 import org.eclipse.tcf.te.ui.trees.TreeControl;
 import org.eclipse.tcf.te.ui.trees.TreeViewerHeaderMenu;
-import org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage;
 import org.eclipse.ui.IEditorInput;
 
 /**
  * The editor page for Process Monitor.
  */
-public class ProcessMonitorEditorPage extends TreeViewerExplorerEditorPage {
+public class ProcessMonitorEditorPage extends AbstractTreeViewerExplorerEditorPage {
 	// The decorator used to decorate the title bar.
 	private ILabelDecorator decorator = new ProcessMonitorTitleDecorator();
 	// The event listener instance
@@ -45,7 +45,7 @@ public class ProcessMonitorEditorPage extends TreeViewerExplorerEditorPage {
 	/* default */ ITreeViewerListener treeListener = null;
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#dispose()
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage#dispose()
 	 */
 	@Override
 	public void dispose() {
@@ -57,7 +57,7 @@ public class ProcessMonitorEditorPage extends TreeViewerExplorerEditorPage {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getViewerId()
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage#getViewerId()
 	 */
 	@Override
 	protected String getViewerId() {
@@ -99,7 +99,7 @@ public class ProcessMonitorEditorPage extends TreeViewerExplorerEditorPage {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getTitleBarDecorator()
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage#getTitleBarDecorator()
 	 */
 	@Override
     protected ILabelDecorator getTitleBarDecorator() {
@@ -107,7 +107,7 @@ public class ProcessMonitorEditorPage extends TreeViewerExplorerEditorPage {
     }
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#doCreateTreeControl()
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage#doCreateTreeControl()
 	 */
 	@Override
 	protected TreeControl doCreateTreeControl() {
@@ -190,7 +190,7 @@ public class ProcessMonitorEditorPage extends TreeViewerExplorerEditorPage {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage#getViewerInput()
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage#getViewerInput()
 	 */
 	@Override
     protected Object getViewerInput() {
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java
index f6d55c4c7..a99f22526 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java
@@ -31,7 +31,6 @@ import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNodeProperties;
 import org.eclipse.tcf.te.tcf.ui.help.IContextHelpIds;
 import org.eclipse.tcf.te.tcf.ui.nls.Messages;
 import org.eclipse.tcf.te.tcf.ui.sections.SimulatorTypeSelectionSection;
-import org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.widgets.TableWrapData;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractCustomFormToolkitEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractCustomFormToolkitEditorPage.java
new file mode 100644
index 000000000..53f71c97e
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractCustomFormToolkitEditorPage.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2014 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:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.tcf.te.tcf.ui.editor;
+
+import java.util.EventObject;
+
+import org.eclipse.jface.action.ControlContribution;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.tcf.te.runtime.concurrent.util.ExecutorsUtil;
+import org.eclipse.tcf.te.runtime.events.ChangeEvent;
+import org.eclipse.tcf.te.runtime.events.EventManager;
+import org.eclipse.tcf.te.runtime.interfaces.events.IEventListener;
+import org.eclipse.tcf.te.runtime.services.ServiceManager;
+import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode;
+import org.eclipse.tcf.te.tcf.locator.interfaces.services.IDefaultContextService;
+import org.eclipse.tcf.te.tcf.ui.nls.Messages;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.events.IHyperlinkListener;
+import org.eclipse.ui.forms.widgets.ImageHyperlink;
+
+/**
+ * AbstractCustomFormToolkitEditorPage
+ */
+public abstract class AbstractCustomFormToolkitEditorPage extends org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#doCreateLinkContribution(org.eclipse.jface.action.IToolBarManager)
+	 */
+	@Override
+	protected IContributionItem doCreateLinkContribution(final IToolBarManager tbManager) {
+		return new ControlContribution("SetAsDefaultContextLink") { //$NON-NLS-1$
+			IEventListener eventListener = null;
+			@Override
+			public void dispose() {
+				super.dispose();
+				if (eventListener == null) {
+					EventManager.getInstance().removeEventListener(eventListener);
+				}
+			}
+			@Override
+			protected Control createControl(Composite parent) {
+				final ImageHyperlink hyperlink = new ImageHyperlink(parent, SWT.NONE);
+				hyperlink.setText(Messages.AbstractCustomFormToolkitEditorPage_setAsDefault_link);
+				hyperlink.setUnderlined(true);
+				hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getForeground());
+				IPeerNode defaultNode = ServiceManager.getInstance().getService(IDefaultContextService.class).getDefaultContext(null);
+				setVisible(defaultNode == null || defaultNode != getEditorInputNode());
+				hyperlink.addHyperlinkListener(new IHyperlinkListener() {
+					@Override
+					public void linkActivated(HyperlinkEvent e) {
+						ServiceManager.getInstance().getService(IDefaultContextService.class).setDefaultContext((IPeerNode)getEditorInputNode());
+					}
+					@Override
+					public void linkEntered(HyperlinkEvent e) {
+						hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getActiveForeground());
+					}
+					@Override
+					public void linkExited(HyperlinkEvent e) {
+						hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getForeground());
+					}
+				});
+
+				eventListener = new IEventListener() {
+					@Override
+					public void eventFired(EventObject event) {
+						if (event instanceof ChangeEvent) {
+							ChangeEvent changeEvent = (ChangeEvent)event;
+							if (changeEvent.getSource() instanceof IDefaultContextService) {
+								IPeerNode defaultNode = ServiceManager.getInstance().getService(IDefaultContextService.class).getDefaultContext(null);
+								setVisible(defaultNode == null || getEditorInputNode() == null || defaultNode != getEditorInputNode());
+								ExecutorsUtil.executeInUI(new Runnable() {
+									@Override
+									public void run() {
+										tbManager.update(true);
+									}
+								});
+							}
+						}
+					}
+				};
+
+				EventManager.getInstance().addEventListener(eventListener, ChangeEvent.class);
+
+				return hyperlink;
+			}
+		};
+	}
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractTreeViewerExplorerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractTreeViewerExplorerEditorPage.java
new file mode 100644
index 000000000..05ad13d9e
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractTreeViewerExplorerEditorPage.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2014 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:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.tcf.te.tcf.ui.editor;
+
+import java.util.EventObject;
+
+import org.eclipse.jface.action.ControlContribution;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.tcf.te.runtime.concurrent.util.ExecutorsUtil;
+import org.eclipse.tcf.te.runtime.events.ChangeEvent;
+import org.eclipse.tcf.te.runtime.events.EventManager;
+import org.eclipse.tcf.te.runtime.interfaces.events.IEventListener;
+import org.eclipse.tcf.te.runtime.services.ServiceManager;
+import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode;
+import org.eclipse.tcf.te.tcf.locator.interfaces.services.IDefaultContextService;
+import org.eclipse.tcf.te.tcf.ui.nls.Messages;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.events.IHyperlinkListener;
+import org.eclipse.ui.forms.widgets.ImageHyperlink;
+
+/**
+ * AbstractTreeViewerExplorerEditorPage
+ */
+public abstract class AbstractTreeViewerExplorerEditorPage extends org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#doCreateLinkContribution(org.eclipse.jface.action.IToolBarManager)
+	 */
+	@Override
+	protected IContributionItem doCreateLinkContribution(final IToolBarManager tbManager) {
+		return new ControlContribution("SetAsDefaultContextLink") { //$NON-NLS-1$
+			IEventListener eventListener = null;
+			@Override
+			public void dispose() {
+				super.dispose();
+				if (eventListener == null) {
+					EventManager.getInstance().removeEventListener(eventListener);
+				}
+			}
+			@Override
+			protected Control createControl(Composite parent) {
+				final ImageHyperlink hyperlink = new ImageHyperlink(parent, SWT.NONE);
+				hyperlink.setText(Messages.AbstractCustomFormToolkitEditorPage_setAsDefault_link);
+				hyperlink.setUnderlined(true);
+				hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getForeground());
+				IPeerNode defaultNode = ServiceManager.getInstance().getService(IDefaultContextService.class).getDefaultContext(null);
+				setVisible(defaultNode == null || defaultNode != getEditorInputNode());
+				hyperlink.addHyperlinkListener(new IHyperlinkListener() {
+					@Override
+					public void linkActivated(HyperlinkEvent e) {
+						ServiceManager.getInstance().getService(IDefaultContextService.class).setDefaultContext((IPeerNode)getEditorInputNode());
+					}
+					@Override
+					public void linkEntered(HyperlinkEvent e) {
+						hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getActiveForeground());
+					}
+					@Override
+					public void linkExited(HyperlinkEvent e) {
+						hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getForeground());
+					}
+				});
+
+				eventListener = new IEventListener() {
+					@Override
+					public void eventFired(EventObject event) {
+						if (event instanceof ChangeEvent) {
+							ChangeEvent changeEvent = (ChangeEvent)event;
+							if (changeEvent.getSource() instanceof IDefaultContextService) {
+								IPeerNode defaultNode = ServiceManager.getInstance().getService(IDefaultContextService.class).getDefaultContext(null);
+								setVisible(defaultNode == null || getEditorInputNode() == null || defaultNode != getEditorInputNode());
+								ExecutorsUtil.executeInUI(new Runnable() {
+									@Override
+									public void run() {
+										tbManager.update(true);
+									}
+								});
+							}
+						}
+					}
+				};
+
+				EventManager.getInstance().addEventListener(eventListener, ChangeEvent.class);
+
+				return hyperlink;
+			}
+		};
+	}
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/OverviewEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/OverviewEditorPage.java
index ca7d8cb7a..203c3748f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/OverviewEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/OverviewEditorPage.java
@@ -46,7 +46,6 @@ import org.eclipse.tcf.te.tcf.ui.help.IContextHelpIds;
 import org.eclipse.tcf.te.tcf.ui.internal.ImageConsts;
 import org.eclipse.tcf.te.tcf.ui.nls.Messages;
 import org.eclipse.tcf.te.ui.forms.CustomFormToolkit;
-import org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage;
 import org.eclipse.tcf.te.ui.views.extensions.LabelProviderDelegateExtensionPointManager;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
@@ -262,67 +261,4 @@ public class OverviewEditorPage extends AbstractCustomFormToolkitEditorPage {
 			});
 		}
 	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#doCreateLinkContribution(org.eclipse.jface.action.IToolBarManager)
-	 */
-	@Override
-	protected IContributionItem doCreateLinkContribution(final IToolBarManager tbManager) {
-		return new ControlContribution("SetAsDefaultContextLink") { //$NON-NLS-1$
-			IEventListener eventListener = null;
-			@Override
-			public void dispose() {
-				super.dispose();
-				if (eventListener == null) {
-					EventManager.getInstance().removeEventListener(eventListener);
-				}
-			}
-			@Override
-			protected Control createControl(Composite parent) {
-				final ImageHyperlink hyperlink = new ImageHyperlink(parent, SWT.NONE);
-				hyperlink.setText(Messages.OverviewEditorPage_setAsDefault_link);
-				hyperlink.setUnderlined(true);
-				hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getForeground());
-				IPeerNode defaultNode = ServiceManager.getInstance().getService(IDefaultContextService.class).getDefaultContext(null);
-				setVisible(defaultNode == null || defaultNode != getEditorInputNode());
-				hyperlink.addHyperlinkListener(new IHyperlinkListener() {
-					@Override
-					public void linkActivated(HyperlinkEvent e) {
-						ServiceManager.getInstance().getService(IDefaultContextService.class).setDefaultContext((IPeerNode)getEditorInputNode());
-					}
-					@Override
-					public void linkEntered(HyperlinkEvent e) {
-						hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getActiveForeground());
-					}
-					@Override
-					public void linkExited(HyperlinkEvent e) {
-						hyperlink.setForeground(getManagedForm().getToolkit().getHyperlinkGroup().getForeground());
-					}
-				});
-
-				eventListener = new IEventListener() {
-					@Override
-					public void eventFired(EventObject event) {
-						if (event instanceof ChangeEvent) {
-							ChangeEvent changeEvent = (ChangeEvent)event;
-							if (changeEvent.getSource() instanceof IDefaultContextService) {
-								IPeerNode defaultNode = ServiceManager.getInstance().getService(IDefaultContextService.class).getDefaultContext(null);
-								setVisible(defaultNode == null || getEditorInputNode() == null || defaultNode != getEditorInputNode());
-								ExecutorsUtil.executeInUI(new Runnable() {
-									@Override
-									public void run() {
-										tbManager.update(true);
-									}
-								});
-							}
-						}
-					}
-				};
-
-				EventManager.getInstance().addEventListener(eventListener, ChangeEvent.class);
-
-				return hyperlink;
-			}
-		};
-	}
 }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java
index 5ac8c992c..12550367a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java
@@ -55,7 +55,8 @@ public class Messages extends NLS {
 
 	public static String OverviewEditorPage_title;
 	public static String OverviewEditorPage_error_save;
-	public static String OverviewEditorPage_setAsDefault_link;
+
+	public static String AbstractCustomFormToolkitEditorPage_setAsDefault_link;
 
 	public static String GeneralInformationSection_title;
 	public static String GeneralInformationSection_description;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties
index 86fd75d19..10f7cca53 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties
@@ -14,7 +14,8 @@ ContentProvider_newNode=Create New Connection...
 
 OverviewEditorPage_title=Overview
 OverviewEditorPage_error_save=Failed to save connection: {0}.\n\n{1}
-OverviewEditorPage_setAsDefault_link=Set as default connection
+
+AbstractCustomFormToolkitEditorPage_setAsDefault_link=Set as default connection
 
 GeneralInformationSection_title=General Information
 GeneralInformationSection_description=This section describes general information about this target.
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
index a08ece38b..35b2af39e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
@@ -751,7 +751,7 @@
       </handler>
       
       <handler
-            class="org.eclipse.tcf.te.ui.views.handler.ViewQuickFilterHanlder"
+            class="org.eclipse.tcf.te.ui.views.handler.ViewQuickFilterHandler"
             commandId="org.eclipse.tcf.te.ui.views.command.quickfilter">
          <activeWhen>
             <with variable="activePartId">
@@ -768,7 +768,7 @@
       </handler>
       
       <handler
-            class="org.eclipse.tcf.te.ui.views.handler.ViewQuickFilterResetHanlder"
+            class="org.eclipse.tcf.te.ui.views.handler.ViewQuickFilterResetHandler"
             commandId="org.eclipse.tcf.te.ui.views.command.resetfilter">
          <activeWhen>
             <with variable="activePartId">
@@ -785,7 +785,7 @@
       </handler>
       
       <handler
-            class="org.eclipse.tcf.te.ui.views.handler.EditorQuickFilterHanlder"
+            class="org.eclipse.tcf.te.ui.views.handler.EditorQuickFilterHandler"
             commandId="org.eclipse.tcf.te.ui.views.command.quickfilter">
          <activeWhen>
             <with variable="activePartId">
@@ -800,7 +800,7 @@
       </handler>
       
       <handler
-            class="org.eclipse.tcf.te.ui.views.handler.EditorQuickFilterResetHanlder"
+            class="org.eclipse.tcf.te.ui.views.handler.EditorQuickFilterResetHandler"
             commandId="org.eclipse.tcf.te.ui.views.command.resetfilter">
          <activeWhen>
             <with variable="activePartId">
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/TreeViewerExplorerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractTreeViewerExplorerEditorPage.java
index 0c7e491d6..370ea63da 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/TreeViewerExplorerEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractTreeViewerExplorerEditorPage.java
@@ -66,7 +66,7 @@ import org.osgi.framework.Bundle;
 /**
  * Tree viewer based editor page implementation.
  */
-public abstract class TreeViewerExplorerEditorPage extends AbstractCustomFormToolkitEditorPage implements IDoubleClickListener {
+public abstract class AbstractTreeViewerExplorerEditorPage extends AbstractCustomFormToolkitEditorPage implements IDoubleClickListener {
 	// The references to the pages subcontrol's (needed for disposal)
 	private TreeControl treeControl;
 	private IToolBarManager toolbarMgr;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorQuickFilterHanlder.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorQuickFilterHandler.java
index d6cd982b8..0bfdee11b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorQuickFilterHanlder.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorQuickFilterHandler.java
@@ -1,46 +1,46 @@
-/*******************************************************************************

- * Copyright (c) 2011, 2012 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:

- * Wind River Systems - initial API and implementation

- *******************************************************************************/

-package org.eclipse.tcf.te.ui.views.handler;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.tcf.te.ui.utils.TreeViewerUtil;

-import org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.forms.editor.FormEditor;

-import org.eclipse.ui.forms.editor.IFormPage;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The quick filter handler for the properties editor.

- */

-public class EditorQuickFilterHanlder extends AbstractHandler {

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		IWorkbenchPart part = HandlerUtil.getActiveEditorChecked(event);

-		if(part instanceof FormEditor) {

-			FormEditor editor = (FormEditor)part;

-			IFormPage formPage = editor.getActivePageInstance();

-			if(formPage instanceof TreeViewerExplorerEditorPage) {

-				TreeViewerExplorerEditorPage page = (TreeViewerExplorerEditorPage) formPage;

-				TreeViewer viewer = (TreeViewer) page.getTreeControl().getViewer();

-				TreeViewerUtil.doEditorFilter(viewer);

-			}

-		}

-		return null;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2011, 2012 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:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.ui.views.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.tcf.te.ui.utils.TreeViewerUtil;
+import org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.editor.IFormPage;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The quick filter handler for the properties editor.
+ */
+public class EditorQuickFilterHandler extends AbstractHandler {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		IWorkbenchPart part = HandlerUtil.getActiveEditorChecked(event);
+		if(part instanceof FormEditor) {
+			FormEditor editor = (FormEditor)part;
+			IFormPage formPage = editor.getActivePageInstance();
+			if(formPage instanceof AbstractTreeViewerExplorerEditorPage) {
+				AbstractTreeViewerExplorerEditorPage page = (AbstractTreeViewerExplorerEditorPage) formPage;
+				TreeViewer viewer = (TreeViewer) page.getTreeControl().getViewer();
+				TreeViewerUtil.doEditorFilter(viewer);
+			}
+		}
+		return null;
+	}
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorQuickFilterResetHanlder.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorQuickFilterResetHandler.java
index 200ccdcbb..5a79f5873 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorQuickFilterResetHanlder.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorQuickFilterResetHandler.java
@@ -1,47 +1,47 @@
-/*******************************************************************************

- * Copyright (c) 2011, 2012 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:

- * Wind River Systems - initial API and implementation

- *******************************************************************************/

-package org.eclipse.tcf.te.ui.views.handler;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.tcf.te.ui.utils.TreeViewerUtil;

-import org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.forms.editor.FormEditor;

-import org.eclipse.ui.forms.editor.IFormPage;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The handler to reset the tree viewer from the quick filter.

- */

-public class EditorQuickFilterResetHanlder extends AbstractHandler {

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		IWorkbenchPart part = HandlerUtil.getActiveEditorChecked(event);

-		if(part instanceof FormEditor) {

-			FormEditor editor = (FormEditor)part;

-			IFormPage formPage = editor.getActivePageInstance();

-			if(formPage instanceof TreeViewerExplorerEditorPage) {

-				TreeViewerExplorerEditorPage page = (TreeViewerExplorerEditorPage) formPage;

-				TreeViewer viewer = (TreeViewer) page.getTreeControl().getViewer();

-				TreeViewerUtil.doReset(viewer);

-			}

-		}

-		return null;

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2011, 2012 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:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.ui.views.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.tcf.te.ui.utils.TreeViewerUtil;
+import org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.editor.IFormPage;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The handler to reset the tree viewer from the quick filter.
+ */
+public class EditorQuickFilterResetHandler extends AbstractHandler {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		IWorkbenchPart part = HandlerUtil.getActiveEditorChecked(event);
+		if(part instanceof FormEditor) {
+			FormEditor editor = (FormEditor)part;
+			IFormPage formPage = editor.getActivePageInstance();
+			if(formPage instanceof AbstractTreeViewerExplorerEditorPage) {
+				AbstractTreeViewerExplorerEditorPage page = (AbstractTreeViewerExplorerEditorPage) formPage;
+				TreeViewer viewer = (TreeViewer) page.getTreeControl().getViewer();
+				TreeViewerUtil.doReset(viewer);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorSearchHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorSearchHandler.java
index e25ddf334..ede6339e8 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorSearchHandler.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/EditorSearchHandler.java
@@ -1,45 +1,45 @@
-/*******************************************************************************

- * Copyright (c) 2011, 2012 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:

- * Wind River Systems - initial API and implementation

- *******************************************************************************/

-package org.eclipse.tcf.te.ui.views.handler;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.tcf.te.ui.utils.TreeViewerUtil;

-import org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.forms.editor.FormEditor;

-import org.eclipse.ui.forms.editor.IFormPage;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The search handler to search elements in the tree of the properties editor.

- */

-public class EditorSearchHandler extends AbstractHandler {

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		IWorkbenchPart part = HandlerUtil.getActiveEditorChecked(event);

-		if (part instanceof FormEditor) {

-			FormEditor editor = (FormEditor) part;

-			IFormPage formPage = editor.getActivePageInstance();

-			if (formPage instanceof TreeViewerExplorerEditorPage) {

-				TreeViewerExplorerEditorPage page = (TreeViewerExplorerEditorPage) formPage;

-				TreeViewer viewer = (TreeViewer) page.getTreeControl().getViewer();

-				TreeViewerUtil.doSearch(viewer);

-			}

-		}

-		return null;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2011, 2012 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:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.ui.views.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.tcf.te.ui.utils.TreeViewerUtil;
+import org.eclipse.tcf.te.ui.views.editor.pages.AbstractTreeViewerExplorerEditorPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.editor.IFormPage;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The search handler to search elements in the tree of the properties editor.
+ */
+public class EditorSearchHandler extends AbstractHandler {
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		IWorkbenchPart part = HandlerUtil.getActiveEditorChecked(event);
+		if (part instanceof FormEditor) {
+			FormEditor editor = (FormEditor) part;
+			IFormPage formPage = editor.getActivePageInstance();
+			if (formPage instanceof AbstractTreeViewerExplorerEditorPage) {
+				AbstractTreeViewerExplorerEditorPage page = (AbstractTreeViewerExplorerEditorPage) formPage;
+				TreeViewer viewer = (TreeViewer) page.getTreeControl().getViewer();
+				TreeViewerUtil.doSearch(viewer);
+			}
+		}
+		return null;
+	}
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ViewQuickFilterHanlder.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ViewQuickFilterHandler.java
index 582d805de..0e177659d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ViewQuickFilterHanlder.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ViewQuickFilterHandler.java
@@ -1,40 +1,40 @@
-/*******************************************************************************

- * Copyright (c) 2011, 2012 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:

- * Wind River Systems - initial API and implementation

- *******************************************************************************/

-package org.eclipse.tcf.te.ui.views.handler;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.tcf.te.ui.utils.TreeViewerUtil;

-import org.eclipse.tcf.te.ui.views.internal.View;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The quick filter handler for Target Explorer view.

- */

-public class ViewQuickFilterHanlder extends AbstractHandler {

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		IWorkbenchPart part = HandlerUtil.getActivePartChecked(event);

-		if (part instanceof View) {

-			View view = (View) part;

-			TreeViewer viewer = view.getCommonViewer();

-			TreeViewerUtil.doCommonViewerFilter(viewer);

-		}

-		return null;

-	}

+/*******************************************************************************
+ * Copyright (c) 2011, 2012 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:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.ui.views.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.tcf.te.ui.utils.TreeViewerUtil;
+import org.eclipse.tcf.te.ui.views.internal.View;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The quick filter handler for Target Explorer view.
+ */
+public class ViewQuickFilterHandler extends AbstractHandler {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		IWorkbenchPart part = HandlerUtil.getActivePartChecked(event);
+		if (part instanceof View) {
+			View view = (View) part;
+			TreeViewer viewer = view.getCommonViewer();
+			TreeViewerUtil.doCommonViewerFilter(viewer);
+		}
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ViewQuickFilterResetHanlder.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ViewQuickFilterResetHandler.java
index fca724126..1f4316ca5 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ViewQuickFilterResetHanlder.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ViewQuickFilterResetHandler.java
@@ -1,41 +1,41 @@
-/*******************************************************************************

- * Copyright (c) 2011, 2012 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:

- * Wind River Systems - initial API and implementation

- *******************************************************************************/

-package org.eclipse.tcf.te.ui.views.handler;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.tcf.te.ui.utils.TreeViewerUtil;

-import org.eclipse.tcf.te.ui.views.internal.View;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The handler to reset the tree viewer from the quick filter.

- */

-public class ViewQuickFilterResetHanlder extends AbstractHandler {

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		IWorkbenchPart part = HandlerUtil.getActivePartChecked(event);

-		if(part instanceof View) {

-			View view = (View)part;

-			TreeViewer viewer = view.getCommonViewer();

-			TreeViewerUtil.doReset(viewer);

-		}

-		return null;

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2011, 2012 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:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.ui.views.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.tcf.te.ui.utils.TreeViewerUtil;
+import org.eclipse.tcf.te.ui.views.internal.View;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The handler to reset the tree viewer from the quick filter.
+ */
+public class ViewQuickFilterResetHandler extends AbstractHandler {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		IWorkbenchPart part = HandlerUtil.getActivePartChecked(event);
+		if(part instanceof View) {
+			View view = (View)part;
+			TreeViewer viewer = view.getCommonViewer();
+			TreeViewerUtil.doReset(viewer);
+		}
+		return null;
+	}
+
+}