Target Explorer: Close properties editor if a peer node gets removed from the tree

19 files changed, 58 insertions, 27 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/plugin.xml
index 9a51b9daf..4e9549458 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/plugin.xml
@@ -99,7 +99,7 @@
 <!-- Editor page contributions -->
    <extension point="org.eclipse.tcf.te.ui.views.editorPages">
       <editorPage
-            class="org.eclipse.tcf.te.ui.views.editor.TreeViewerExplorerEditorPage:org.eclipse.tcf.te.ui.controls.viewer.fs"
+            class="org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage:org.eclipse.tcf.te.ui.controls.viewer.fs"
             name="%FSExplorerEditorPage.name"
             id="org.eclipse.tcf.te.tcf.filesystem.FSExplorerEditorPage">
       </editorPage>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
index 3765dba21..f4e6cfbc8 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
@@ -5,7 +5,7 @@
 <!-- Target Explorer Details Editor page contributions -->

    <extension point="org.eclipse.tcf.te.ui.views.editorPages">

       <editorPage

-            class="org.eclipse.tcf.te.ui.views.editor.TreeViewerExplorerEditorPage:org.eclipse.tcf.te.ui.controls.viewer.processes"

+            class="org.eclipse.tcf.te.ui.views.editor.pages.TreeViewerExplorerEditorPage:org.eclipse.tcf.te.ui.controls.viewer.processes"

             name="%ProcessExplorerEditorPage.name"

             id="org.eclipse.tcf.te.tcf.processes.ui.ProcessExplorerEditorPage">

       </editorPage>

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 091b790fa..79c85fe7a 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
@@ -27,7 +27,7 @@ import org.eclipse.tcf.te.tcf.ui.nls.Messages;
 import org.eclipse.tcf.te.ui.forms.CustomFormToolkit;

 import org.eclipse.tcf.te.ui.forms.FormLayoutFactory;

 import org.eclipse.tcf.te.ui.jface.interfaces.IValidatingContainer;

-import org.eclipse.tcf.te.ui.views.editor.AbstractCustomFormToolkitEditorPage;

+import org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage;

 import org.eclipse.ui.IWorkbenchActionConstants;

 import org.eclipse.ui.PlatformUI;

 import org.eclipse.ui.forms.IManagedForm;

@@ -46,7 +46,7 @@ public class OverviewEditorPage extends AbstractCustomFormToolkitEditorPage impl
 	private AttributesSection attributesSection;

 

 	/* (non-Javadoc)

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

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

 	 */

 	@Override

 	public void dispose() {

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/AttributesSection.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/AttributesSection.java
index 3b4e32ba1..097b5f2cb 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/AttributesSection.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/AttributesSection.java
@@ -35,7 +35,7 @@ import org.eclipse.tcf.te.tcf.ui.controls.PeerAttributesTablePart;
 import org.eclipse.tcf.te.tcf.ui.nls.Messages;

 import org.eclipse.tcf.te.ui.forms.parts.AbstractSection;

 import org.eclipse.tcf.te.ui.swt.SWTControlUtil;

-import org.eclipse.tcf.te.ui.views.editor.AbstractEditorPage;

+import org.eclipse.tcf.te.ui.views.editor.pages.AbstractEditorPage;

 import org.eclipse.ui.forms.IManagedForm;

 import org.eclipse.ui.forms.widgets.FormToolkit;

 import org.eclipse.ui.forms.widgets.Section;

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/GeneralInformationSection.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/GeneralInformationSection.java
index 733cfad5f..92116bd0f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/GeneralInformationSection.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/GeneralInformationSection.java
@@ -42,7 +42,7 @@ 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.parts.AbstractSection;

 import org.eclipse.tcf.te.ui.swt.SWTControlUtil;

-import org.eclipse.tcf.te.ui.views.editor.AbstractEditorPage;

+import org.eclipse.tcf.te.ui.views.editor.pages.AbstractEditorPage;

 import org.eclipse.ui.forms.IManagedForm;

 import org.eclipse.ui.forms.widgets.FormToolkit;

 import org.eclipse.ui.forms.widgets.Section;

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/ServicesSection.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/ServicesSection.java
index f19dd879c..05b2620b0 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/ServicesSection.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/ServicesSection.java
@@ -26,7 +26,7 @@ import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProperties;
 import org.eclipse.tcf.te.tcf.ui.nls.Messages;

 import org.eclipse.tcf.te.ui.forms.parts.AbstractSection;

 import org.eclipse.tcf.te.ui.swt.SWTControlUtil;

-import org.eclipse.tcf.te.ui.views.editor.AbstractEditorPage;

+import org.eclipse.tcf.te.ui.views.editor.pages.AbstractEditorPage;

 import org.eclipse.ui.forms.IManagedForm;

 import org.eclipse.ui.forms.widgets.FormToolkit;

 import org.eclipse.ui.forms.widgets.Section;

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TransportSection.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TransportSection.java
index 3f41d28e3..459982a8c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TransportSection.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TransportSection.java
@@ -48,7 +48,7 @@ import org.eclipse.tcf.te.ui.forms.parts.AbstractSection;
 import org.eclipse.tcf.te.ui.interfaces.data.IDataExchangeNode;

 import org.eclipse.tcf.te.ui.interfaces.data.IDataExchangeNode3;

 import org.eclipse.tcf.te.ui.swt.SWTControlUtil;

-import org.eclipse.tcf.te.ui.views.editor.AbstractEditorPage;

+import org.eclipse.tcf.te.ui.views.editor.pages.AbstractEditorPage;

 import org.eclipse.ui.forms.IManagedForm;

 import org.eclipse.ui.forms.widgets.FormToolkit;

 import org.eclipse.ui.forms.widgets.Section;

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ModelListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ModelListener.java
index 961560c8b..ac4931be6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ModelListener.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ModelListener.java
@@ -15,6 +15,13 @@ import org.eclipse.swt.widgets.Tree;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.ILocatorModel;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
 import org.eclipse.tcf.te.tcf.locator.listener.ModelAdapter;
+import org.eclipse.tcf.te.ui.views.editor.EditorInput;
+import org.eclipse.tcf.te.ui.views.interfaces.IUIConstants;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.navigator.CommonViewer;
 
 
@@ -43,7 +50,7 @@ public class ModelListener extends ModelAdapter {
 	 * @see org.eclipse.tcf.te.tcf.locator.listener.ModelAdapter#locatorModelChanged(org.eclipse.tcf.te.tcf.locator.interfaces.nodes.ILocatorModel, org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel, boolean)
 	 */
 	@Override
-	public void locatorModelChanged(ILocatorModel model, IPeerModel peer, boolean added) {
+	public void locatorModelChanged(final ILocatorModel model, final IPeerModel peer, final boolean added) {
 		if (parentModel.equals(model)) {
 			Tree tree = viewer.getTree();
 			if (tree != null && !tree.isDisposed()) {
@@ -56,6 +63,30 @@ public class ModelListener extends ModelAdapter {
 						}
 					}
 				});
+
+				// If a peer model got removed, check if there is still an properties
+				// editor open, and if yes, close the editor.
+				if (!added && peer != null) {
+					display.asyncExec(new Runnable() {
+						@Override
+						public void run() {
+							// Get the currently active workbench window
+							IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+							if (window != null) {
+								// Get the active page
+								IWorkbenchPage page = window.getActivePage();
+								// Create the editor input object
+								IEditorInput input = new EditorInput(peer);
+								// Lookup the editors matching the editor input
+								IEditorReference[] editors = page.findEditors(input, IUIConstants.ID_EDITOR, IWorkbenchPage.MATCH_INPUT);
+								if (editors != null && editors.length > 0) {
+									// Close the editors
+									page.closeEditors(editors, true);
+								}
+							}
+						}
+					});
+				}
 			}
 		}
 	}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF
index 3b49fb8a8..36cd01b52 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF
@@ -22,6 +22,7 @@ Export-Package: org.eclipse.tcf.te.ui.views,
  org.eclipse.tcf.te.ui.views.actions,
  org.eclipse.tcf.te.ui.views.activator;x-internal:=true,
  org.eclipse.tcf.te.ui.views.editor,
+ org.eclipse.tcf.te.ui.views.editor.pages,
  org.eclipse.tcf.te.ui.views.events,
  org.eclipse.tcf.te.ui.views.expressions,
  org.eclipse.tcf.te.ui.views.extensions,
@@ -30,7 +31,6 @@ Export-Package: org.eclipse.tcf.te.ui.views,
  org.eclipse.tcf.te.ui.views.interfaces.tracing;x-internal:=true,
  org.eclipse.tcf.te.ui.views.interfaces.workingsets,
  org.eclipse.tcf.te.ui.views.internal;x-internal:=true,
- org.eclipse.tcf.te.ui.views.internal.editor;x-internal:=true,
  org.eclipse.tcf.te.ui.views.listeners,
  org.eclipse.tcf.te.ui.views.nls;x-internal:=true,
  org.eclipse.tcf.te.ui.views.perspective,
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 967a532ac..c9998610f 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
@@ -175,7 +175,7 @@
 <!-- Editor contributions -->
    <extension point="org.eclipse.ui.editors">
       <editor
-            class="org.eclipse.tcf.te.ui.views.internal.editor.Editor"
+            class="org.eclipse.tcf.te.ui.views.editor.Editor"
             default="false"
             icon="icons/eview16/prop_ps.gif"
             id="org.eclipse.tcf.te.ui.view.Editor"
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/schema/editorPages.exsd b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/schema/editorPages.exsd
index 093064efb..7f9357a49 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/schema/editorPages.exsd
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/schema/editorPages.exsd
@@ -71,7 +71,7 @@
          <attribute name="class" type="string" use="required">

             <annotation>

                <documentation>

-                  The class that implements &lt;code&gt;org.eclipse.tcf.te.ui.views.interfaces.IEditorPage&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.ui.views.editor.AbstractEditorPage&lt;/code&gt;.

+                  The class that implements &lt;code&gt;org.eclipse.tcf.te.ui.views.interfaces.IEditorPage&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.ui.views.editor.pages.AbstractEditorPage&lt;/code&gt;.

 &lt;p&gt;

 The editor page implementation class must be specified either by the class attribute or the class child element!

                </documentation>

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/internal/editor/Editor.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/Editor.java
index 8b4bf9622..02e3d89a2 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/internal/editor/Editor.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/Editor.java
@@ -7,7 +7,7 @@
  * Contributors:
  * Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tcf.te.ui.views.internal.editor;
+package org.eclipse.tcf.te.ui.views.editor;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,9 +36,9 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
 
 /**
- * Properties editor implementation.
+ * Editor implementation.
  */
-public class Editor extends FormEditor implements IPersistableEditor, ITabbedPropertySheetPageContributor {
+public final class Editor extends FormEditor implements IPersistableEditor, ITabbedPropertySheetPageContributor {
 
 	// The reference to an memento to restore once the editor got activated
 	private IMemento mementoToRestore;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/internal/editor/EditorEventListener.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/EditorEventListener.java
index 9fa83f8e4..15e9e2d19 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/internal/editor/EditorEventListener.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/EditorEventListener.java
@@ -7,7 +7,7 @@
  * Contributors:

  * Wind River Systems - initial API and implementation

  *******************************************************************************/

-package org.eclipse.tcf.te.ui.views.internal.editor;

+package org.eclipse.tcf.te.ui.views.editor;

 

 import java.util.EventObject;

 

@@ -28,7 +28,7 @@ import org.eclipse.ui.forms.editor.IFormPage;
  * The event listener is registered by an editor instance for a given editor input

  * and is supposed to receive events for the editor input only.

  */

-public class EditorEventListener extends AbstractEventListener implements IDisposable {

+public final class EditorEventListener extends AbstractEventListener implements IDisposable {

 	// Reference to the parent editor

 	private final Editor editor;

 

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/internal/editor/EditorInput.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/EditorInput.java
index 3c2349a6c..08b2e762e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/internal/editor/EditorInput.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/EditorInput.java
@@ -7,7 +7,7 @@
  * Contributors:
  * Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tcf.te.ui.views.internal.editor;
+package org.eclipse.tcf.te.ui.views.editor;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.Platform;
@@ -27,9 +27,9 @@ import org.eclipse.ui.navigator.CommonViewer;
 
 
 /**
- * Details editor input implementation.
+ * Editor input implementation.
  */
-public class EditorInput implements IEditorInput, IPersistableElement {
+public final class EditorInput implements IEditorInput, IPersistableElement {
 	// The parent editor id
 	private final String id;
 	// The editor input name, once determined
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/AbstractCustomFormToolkitEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractCustomFormToolkitEditorPage.java
index 105e7e7d8..510baa13f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/AbstractCustomFormToolkitEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractCustomFormToolkitEditorPage.java
@@ -7,7 +7,7 @@
  * Contributors:

  * Wind River Systems - initial API and implementation

  *******************************************************************************/

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

+package org.eclipse.tcf.te.ui.views.editor.pages;

 

 import org.eclipse.core.runtime.Assert;

 import org.eclipse.tcf.te.ui.forms.CustomFormToolkit;

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/AbstractEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractEditorPage.java
index c9608ed4c..ec1ed0ec3 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/AbstractEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractEditorPage.java
@@ -7,7 +7,7 @@
  * Contributors:
  * Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tcf.te.ui.views.editor;
+package org.eclipse.tcf.te.ui.views.editor.pages;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IConfigurationElement;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/TreeViewerExplorerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/TreeViewerExplorerEditorPage.java
index 091e8b407..43cfc8555 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/TreeViewerExplorerEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/TreeViewerExplorerEditorPage.java
@@ -7,7 +7,7 @@
  * Contributors:
  * Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tcf.te.ui.views.editor;
+package org.eclipse.tcf.te.ui.views.editor.pages;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IConfigurationElement;
@@ -22,7 +22,7 @@ import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 
 /**
- * Processes editor page implementation.
+ * Tree viewer based editor page implementation.
  */
 public class TreeViewerExplorerEditorPage extends AbstractCustomFormToolkitEditorPage {
 	// The references to the pages subcontrol's (needed for disposal)
@@ -44,7 +44,7 @@ public class TreeViewerExplorerEditorPage extends AbstractCustomFormToolkitEdito
 	@Override
 	protected void createFormContent(IManagedForm managedForm) {
 		super.createFormContent(managedForm);
-		
+
 		// Configure the managed form
 		configureManagedForm(managedForm);
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/expressions/EditorPropertyTester.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/expressions/EditorPropertyTester.java
index dbb3ac9cc..818f0e0a2 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/expressions/EditorPropertyTester.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/expressions/EditorPropertyTester.java
@@ -10,8 +10,8 @@
 package org.eclipse.tcf.te.ui.views.expressions;
 
 import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.tcf.te.ui.views.editor.EditorInput;
 import org.eclipse.tcf.te.ui.views.extensions.EditorPageBindingExtensionPointManager;
-import org.eclipse.tcf.te.ui.views.internal.editor.EditorInput;
 import org.eclipse.ui.IEditorInput;
 
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/PropertiesCommandHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/PropertiesCommandHandler.java
index 4ae5d4689..6828eee18 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/PropertiesCommandHandler.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/PropertiesCommandHandler.java
@@ -17,8 +17,8 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.tcf.te.ui.views.activator.UIPlugin;
+import org.eclipse.tcf.te.ui.views.editor.EditorInput;
 import org.eclipse.tcf.te.ui.views.interfaces.IUIConstants;
-import org.eclipse.tcf.te.ui.views.internal.editor.EditorInput;
 import org.eclipse.tcf.te.ui.views.nls.Messages;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IWorkbenchPage;