Target Explorer: Unify properties editor page save handling and provide StatusHandlerUtil

12 files changed, 279 insertions, 354 deletions

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 4a511b6b0..fe81e2d30 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
@@ -1,173 +1,230 @@
-/*******************************************************************************

- * 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.tcf.ui.editor;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.jface.dialogs.IMessageProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.tcf.te.tcf.ui.activator.UIPlugin;

-import org.eclipse.tcf.te.tcf.ui.editor.sections.AttributesSection;

-import org.eclipse.tcf.te.tcf.ui.editor.sections.GeneralInformationSection;

-import org.eclipse.tcf.te.tcf.ui.editor.sections.ServicesSection;

-import org.eclipse.tcf.te.tcf.ui.editor.sections.TransportSection;

-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.jface.interfaces.IValidatingContainer;

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

-import org.eclipse.ui.forms.widgets.ScrolledForm;

-import org.eclipse.ui.forms.widgets.TableWrapData;

-import org.eclipse.ui.forms.widgets.TableWrapLayout;

-

-/**

- * Peer overview page implementation.

- */

-public class OverviewEditorPage extends AbstractCustomFormToolkitEditorPage implements IValidatingContainer {

-	// References to the page sub sections

-	private GeneralInformationSection infoSection;

-	private TransportSection transportSection;

-	private ServicesSection servicesSection;

-	private AttributesSection attributesSection;

-

-	/* (non-Javadoc)

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

-	 */

-	@Override

-	public void dispose() {

-		if (infoSection != null) { infoSection.dispose(); infoSection = null; }

-		if (transportSection != null) { transportSection.dispose(); transportSection = null; }

-		if (servicesSection != null) { servicesSection.dispose(); servicesSection = null; }

-		if (attributesSection != null) { attributesSection.dispose(); attributesSection = null; }

-	    super.dispose();

-	}

-

-	/* (non-Javadoc)

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

-	 */

-	@Override

-	protected String getContextHelpId() {

-	    return IContextHelpIds.OVERVIEW_EDITOR_PAGE;

-	}

-

-	/* (non-Javadoc)

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

-	 */

-	@Override

-    protected String getFormTitle() {

-		return Messages.OverviewEditorPage_title;

-	}

-

-	/* (non-Javadoc)

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

-	 */

-	@Override

-	protected Image getFormImage() {

-	    return UIPlugin.getImage(ImageConsts.PEER);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#doCreateFormContent(org.eclipse.swt.widgets.Composite, org.eclipse.tcf.te.ui.forms.CustomFormToolkit)

-	 */

-	@Override

-    protected void doCreateFormContent(Composite parent, CustomFormToolkit toolkit) {

-		Assert.isNotNull(parent);

-		Assert.isNotNull(toolkit);

-

-		// Setup the main panel (using the table wrap layout)

-		Composite panel = toolkit.getFormToolkit().createComposite(parent);

-		TableWrapLayout layout = new TableWrapLayout();

-		layout.makeColumnsEqualWidth = true;

-		layout.numColumns = 2;

-		panel.setLayout(layout);

-		panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		infoSection = new GeneralInformationSection(getManagedForm(), panel);

-		infoSection.getSection().setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP));

-		getManagedForm().addPart(infoSection);

-

-		transportSection = new TransportSection(getManagedForm(), (Composite)infoSection.getSection().getClient());

-		((GridData)transportSection.getSection().getLayoutData()).horizontalSpan = 2;

-		getManagedForm().addPart(transportSection);

-

-		servicesSection = new ServicesSection(getManagedForm(), panel);

-		TableWrapData layoutData = new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP);

-		servicesSection.getSection().setLayoutData(layoutData);

-		getManagedForm().addPart(servicesSection);

-

-		attributesSection = new AttributesSection(getManagedForm(), panel);

-		layoutData = new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.FILL_GRAB);

-		layoutData.colspan = 2;

-		attributesSection.getSection().setLayoutData(layoutData);

-		getManagedForm().addPart(attributesSection);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ui.forms.editor.FormPage#setActive(boolean)

-	 */

-	@Override

-	public void setActive(boolean active) {

-	    super.setActive(active);

-	    if (infoSection != null) infoSection.setActive(active);

-	    if (transportSection != null) transportSection.setActive(active);

-	    if (servicesSection != null) servicesSection.setActive(active);

-	    if (attributesSection != null) attributesSection.setActive(active);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.tcf.te.ui.jface.interfaces.IValidatingContainer#validate()

-	 */

-	@Override

-	public void validate() {

-		// Get the scrolled form

-		ScrolledForm form = getManagedForm().getForm();

-

-		String message = null;

-		int messageType = IMessageProvider.NONE;

-

-		if (infoSection != null) {

-			infoSection.isValid();

-			if (infoSection.getMessageType() > messageType) {

-				message = infoSection.getMessage();

-				messageType = infoSection.getMessageType();

-			}

-		}

-

-		if (transportSection != null) {

-			transportSection.isValid();

-			if (transportSection.getMessageType() > messageType) {

-				message = transportSection.getMessage();

-				messageType = transportSection.getMessageType();

-			}

-		}

-

-		if (servicesSection != null) {

-			servicesSection.isValid();

-			if (servicesSection.getMessageType() > messageType) {

-				message = servicesSection.getMessage();

-				messageType = servicesSection.getMessageType();

-			}

-		}

-

-		if (attributesSection != null) {

-			attributesSection.isValid();

-			if (attributesSection.getMessageType() > messageType) {

-				message = attributesSection.getMessage();

-				messageType = attributesSection.getMessageType();

-			}

-		}

-

-		// Apply the message to the form

-		form.setMessage(message, messageType);

-	}

-}

+/*******************************************************************************
+ * 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.tcf.ui.editor;
+
+import java.io.IOException;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.tcf.protocol.Protocol;
+import org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService;
+import org.eclipse.tcf.te.runtime.services.ServiceManager;
+import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerUtil;
+import org.eclipse.tcf.te.runtime.utils.StatusHelper;
+import org.eclipse.tcf.te.tcf.locator.ScannerRunnable;
+import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
+import org.eclipse.tcf.te.tcf.ui.activator.UIPlugin;
+import org.eclipse.tcf.te.tcf.ui.editor.sections.AttributesSection;
+import org.eclipse.tcf.te.tcf.ui.editor.sections.GeneralInformationSection;
+import org.eclipse.tcf.te.tcf.ui.editor.sections.ServicesSection;
+import org.eclipse.tcf.te.tcf.ui.editor.sections.TransportSection;
+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.jface.interfaces.IValidatingContainer;
+import org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage;
+import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.ui.forms.widgets.TableWrapData;
+import org.eclipse.ui.forms.widgets.TableWrapLayout;
+
+/**
+ * Peer overview page implementation.
+ */
+public class OverviewEditorPage extends AbstractCustomFormToolkitEditorPage implements IValidatingContainer {
+	// References to the page sub sections
+	private GeneralInformationSection infoSection;
+	private TransportSection transportSection;
+	private ServicesSection servicesSection;
+	private AttributesSection attributesSection;
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#dispose()
+	 */
+	@Override
+	public void dispose() {
+		if (infoSection != null) { infoSection.dispose(); infoSection = null; }
+		if (transportSection != null) { transportSection.dispose(); transportSection = null; }
+		if (servicesSection != null) { servicesSection.dispose(); servicesSection = null; }
+		if (attributesSection != null) { attributesSection.dispose(); attributesSection = null; }
+	    super.dispose();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#getContextHelpId()
+	 */
+	@Override
+	protected String getContextHelpId() {
+	    return IContextHelpIds.OVERVIEW_EDITOR_PAGE;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#getFormTitle()
+	 */
+	@Override
+    protected String getFormTitle() {
+		return Messages.OverviewEditorPage_title;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#getFormImage()
+	 */
+	@Override
+	protected Image getFormImage() {
+	    return UIPlugin.getImage(ImageConsts.PEER);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#doCreateFormContent(org.eclipse.swt.widgets.Composite, org.eclipse.tcf.te.ui.forms.CustomFormToolkit)
+	 */
+	@Override
+    protected void doCreateFormContent(Composite parent, CustomFormToolkit toolkit) {
+		Assert.isNotNull(parent);
+		Assert.isNotNull(toolkit);
+
+		// Setup the main panel (using the table wrap layout)
+		Composite panel = toolkit.getFormToolkit().createComposite(parent);
+		TableWrapLayout layout = new TableWrapLayout();
+		layout.makeColumnsEqualWidth = true;
+		layout.numColumns = 2;
+		panel.setLayout(layout);
+		panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		infoSection = new GeneralInformationSection(getManagedForm(), panel);
+		infoSection.getSection().setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP));
+		getManagedForm().addPart(infoSection);
+
+		transportSection = new TransportSection(getManagedForm(), (Composite)infoSection.getSection().getClient());
+		((GridData)transportSection.getSection().getLayoutData()).horizontalSpan = 2;
+		getManagedForm().addPart(transportSection);
+
+		servicesSection = new ServicesSection(getManagedForm(), panel);
+		TableWrapData layoutData = new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP);
+		servicesSection.getSection().setLayoutData(layoutData);
+		getManagedForm().addPart(servicesSection);
+
+		attributesSection = new AttributesSection(getManagedForm(), panel);
+		layoutData = new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.FILL_GRAB);
+		layoutData.colspan = 2;
+		attributesSection.getSection().setLayoutData(layoutData);
+		getManagedForm().addPart(attributesSection);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.forms.editor.FormPage#setActive(boolean)
+	 */
+	@Override
+	public void setActive(boolean active) {
+	    super.setActive(active);
+	    if (infoSection != null) infoSection.setActive(active);
+	    if (transportSection != null) transportSection.setActive(active);
+	    if (servicesSection != null) servicesSection.setActive(active);
+	    if (attributesSection != null) attributesSection.setActive(active);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.jface.interfaces.IValidatingContainer#validate()
+	 */
+	@Override
+	public void validate() {
+		// Get the scrolled form
+		ScrolledForm form = getManagedForm().getForm();
+
+		String message = null;
+		int messageType = IMessageProvider.NONE;
+
+		if (infoSection != null) {
+			infoSection.isValid();
+			if (infoSection.getMessageType() > messageType) {
+				message = infoSection.getMessage();
+				messageType = infoSection.getMessageType();
+			}
+		}
+
+		if (transportSection != null) {
+			transportSection.isValid();
+			if (transportSection.getMessageType() > messageType) {
+				message = transportSection.getMessage();
+				messageType = transportSection.getMessageType();
+			}
+		}
+
+		if (servicesSection != null) {
+			servicesSection.isValid();
+			if (servicesSection.getMessageType() > messageType) {
+				message = servicesSection.getMessage();
+				messageType = servicesSection.getMessageType();
+			}
+		}
+
+		if (attributesSection != null) {
+			attributesSection.isValid();
+			if (attributesSection.getMessageType() > messageType) {
+				message = attributesSection.getMessage();
+				messageType = attributesSection.getMessageType();
+			}
+		}
+
+		// Apply the message to the form
+		form.setMessage(message, messageType);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractEditorPage#postDoSave(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	@Override
+	public void postDoSave(IProgressMonitor monitor) {
+		// If necessary, write the changed peer attributes
+		final Object input = getEditorInputNode();
+		if (input instanceof IPeerModel) {
+			Runnable runnable = new Runnable() {
+				@Override
+				public void run() {
+					try {
+						// Get the persistence service
+						IURIPersistenceService uRIPersistenceService = ServiceManager.getInstance().getService(IURIPersistenceService.class);
+						if (uRIPersistenceService == null) {
+							throw new IOException("Persistence service instance unavailable."); //$NON-NLS-1$
+						}
+						// Save the peer node to the new persistence storage
+						uRIPersistenceService.write(((IPeerModel)input).getPeer(), null);
+					} catch (IOException e) {
+						// Build up the message template
+						String template = NLS.bind(Messages.OverviewEditorPage_error_save, ((IPeerModel)input).getName(), Messages.PossibleCause);
+						// Handle the status
+						StatusHandlerUtil.handleStatus(StatusHelper.getStatus(e), input, template, null, IContextHelpIds.MESSAGE_SAVE_FAILED, OverviewEditorPage.this, null);
+					}
+				}
+			};
+			Assert.isTrue(!Protocol.isDispatchThread());
+			Protocol.invokeAndWait(runnable);
+
+			Protocol.invokeLater(new Runnable() {
+				@Override
+				public void run() {
+					// Trigger a change event for the original data node
+					((IPeerModel)input).fireChangeEvent("properties", null, ((IPeerModel)input).getProperties()); //$NON-NLS-1$
+					// And make sure the editor tabs are updated
+					((IPeerModel)input).fireChangeEvent("editor.refreshTab", Boolean.FALSE, Boolean.TRUE); //$NON-NLS-1$
+				}
+			});
+
+			// Force a scan of the peer
+			ScannerRunnable runnable2 = new ScannerRunnable(null, ((IPeerModel)input));
+			Protocol.invokeLater(runnable2);
+		}
+	}
+}
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 2cce11655..6e89290a6 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
@@ -9,7 +9,6 @@
  *******************************************************************************/
 package org.eclipse.tcf.te.tcf.ui.editor.sections;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -25,9 +24,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.tcf.protocol.IPeer;
 import org.eclipse.tcf.protocol.Protocol;
 import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
-import org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService;
 import org.eclipse.tcf.te.runtime.properties.PropertiesContainer;
-import org.eclipse.tcf.te.runtime.services.ServiceManager;
 import org.eclipse.tcf.te.tcf.core.peers.Peer;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProperties;
@@ -321,31 +318,6 @@ public class AttributesSection extends AbstractSection {
 
 		// Extract the data into the original data node
 		extractData(od);
-
-		// If the working copy and the original data copy differs at this point,
-		// the data changed really and we have to write the peer to the persistence
-		// storage.
-		if (!odc.equals(wc)) {
-			try {
-				// Get the persistence service
-				IURIPersistenceService uRIPersistenceService = ServiceManager.getInstance().getService(IURIPersistenceService.class);
-				if (uRIPersistenceService == null) {
-					throw new IOException("Persistence service instance unavailable."); //$NON-NLS-1$
-				}
-				// Save the peer node to the new persistence storage
-				uRIPersistenceService.write(od.getPeer(), null);
-			} catch (IOException e) {
-				// Pass on to the editor page
-			}
-
-			Protocol.invokeLater(new Runnable() {
-				@Override
-				public void run() {
-					// Trigger a change event for the original data node
-					od.fireChangeEvent("properties", null, od.getProperties()); //$NON-NLS-1$
-				}
-			});
-		}
 	}
 
 	/**
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 6687ce51e..630efdf39 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
@@ -16,6 +16,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.TypedEvent;
 import org.eclipse.swt.layout.GridData;
@@ -30,6 +31,8 @@ import org.eclipse.tcf.te.runtime.persistence.interfaces.IPersistableNodePropert
 import org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService;
 import org.eclipse.tcf.te.runtime.properties.PropertiesContainer;
 import org.eclipse.tcf.te.runtime.services.ServiceManager;
+import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerUtil;
+import org.eclipse.tcf.te.runtime.utils.StatusHelper;
 import org.eclipse.tcf.te.tcf.core.peers.Peer;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProperties;
@@ -37,6 +40,7 @@ import org.eclipse.tcf.te.tcf.locator.nodes.PeerRedirector;
 import org.eclipse.tcf.te.tcf.ui.activator.UIPlugin;
 import org.eclipse.tcf.te.tcf.ui.editor.controls.InfoSectionPeerIdControl;
 import org.eclipse.tcf.te.tcf.ui.editor.controls.InfoSectionPeerNameControl;
+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.parts.AbstractSection;
@@ -351,7 +355,7 @@ public class GeneralInformationSection extends AbstractSection {
 		// Extract the data into the original data node
 		extractData(od);
 
-		// If the name changed, trigger a save of the data
+		// If the name changed, trigger a delete of the old data
 		if (!oldName.equals(wc.getStringProperty(IPeer.ATTR_NAME))) {
 			try {
 				// Get the persistence service
@@ -365,19 +369,12 @@ public class GeneralInformationSection extends AbstractSection {
 					oldData.put(key, odc.getStringProperty(key));
 				}
 				uRIPersistenceService.delete(new Peer(oldData), null);
-				// Save the peer node to the new persistence storage
-				uRIPersistenceService.write(od.getPeer(), null);
 			} catch (IOException e) {
-				// Pass on to the editor page
+				// Build up the message template
+				String template = NLS.bind(Messages.GeneralInformationSection_error_delete, oldName, Messages.PossibleCause);
+				// Handle the status
+				StatusHandlerUtil.handleStatus(StatusHelper.getStatus(e), od, template, null, IContextHelpIds.MESSAGE_DELETE_FAILED, GeneralInformationSection.this, null);
 			}
-
-			Protocol.invokeLater(new Runnable() {
-				@Override
-				public void run() {
-					// Trigger a change event for the original data node
-					od.fireChangeEvent("properties", null, od.getProperties()); //$NON-NLS-1$
-				}
-			});
 		}
 	}
 
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 2ba13b44b..ea28fad7a 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
@@ -9,7 +9,6 @@
  *******************************************************************************/
 package org.eclipse.tcf.te.tcf.ui.editor.sections;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -27,13 +26,10 @@ import org.eclipse.tcf.protocol.IChannel;
 import org.eclipse.tcf.protocol.IPeer;
 import org.eclipse.tcf.protocol.Protocol;
 import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
-import org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService;
 import org.eclipse.tcf.te.runtime.properties.PropertiesContainer;
-import org.eclipse.tcf.te.runtime.services.ServiceManager;
 import org.eclipse.tcf.te.tcf.core.Tcf;
 import org.eclipse.tcf.te.tcf.core.interfaces.ITransportTypes;
 import org.eclipse.tcf.te.tcf.core.peers.Peer;
-import org.eclipse.tcf.te.tcf.locator.ScannerRunnable;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProperties;
 import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelUpdateService;
@@ -395,37 +391,6 @@ public class TransportSection extends AbstractSection {
 		}
 		// Extract the data into the original data node
 		extractData(od);
-
-		// If the working copy and the original data copy differs at this point,
-		// the data changed really and we have to write the peer to the persistence
-		// storage.
-		if (!odc.equals(wc)) {
-			try {
-				// Get the persistence service
-				IURIPersistenceService uRIPersistenceService = ServiceManager.getInstance().getService(IURIPersistenceService.class);
-				if (uRIPersistenceService == null) {
-					throw new IOException("Persistence service instance unavailable."); //$NON-NLS-1$
-				}
-				// Save the peer node to the new persistence storage
-				uRIPersistenceService.write(od.getPeer(), null);
-			} catch (IOException e) {
-				// Pass on to the editor page
-			}
-
-			Protocol.invokeLater(new Runnable() {
-				@Override
-				public void run() {
-					// Trigger a change event for the original data node
-					od.fireChangeEvent("properties", null, od.getProperties()); //$NON-NLS-1$
-					// And make sure the editor tabs are updated
-					od.fireChangeEvent("editor.refreshTab", Boolean.FALSE, Boolean.TRUE); //$NON-NLS-1$
-				}
-			});
-
-			// As the transport section changed, force a scan of the peer
-			ScannerRunnable runnable = new ScannerRunnable(null, od);
-			Protocol.invokeLater(runnable);
-		}
 	}
 
 	/**
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/DeleteHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/DeleteHandler.java
index ad8049a7a..1af79b087 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/DeleteHandler.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/DeleteHandler.java
@@ -33,17 +33,13 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.tcf.protocol.Protocol;
 import org.eclipse.tcf.te.runtime.callback.Callback;
 import org.eclipse.tcf.te.runtime.interfaces.callback.ICallback;
-import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
 import org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService;
-import org.eclipse.tcf.te.runtime.properties.PropertiesContainer;
 import org.eclipse.tcf.te.runtime.services.ServiceManager;
-import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerManager;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandler;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandlerConstants;
+import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerUtil;
+import org.eclipse.tcf.te.runtime.utils.StatusHelper;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
 import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelRefreshService;
 import org.eclipse.tcf.te.tcf.locator.model.Model;
-import org.eclipse.tcf.te.tcf.ui.activator.UIPlugin;
 import org.eclipse.tcf.te.tcf.ui.help.IContextHelpIds;
 import org.eclipse.tcf.te.tcf.ui.nls.Messages;
 import org.eclipse.tcf.te.ui.views.Managers;
@@ -330,21 +326,9 @@ public class DeleteHandler extends AbstractHandler {
 						op.execute();
 					}
 				} catch (Exception e) {
-					// Create the status
-					IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
-									Messages.DeleteHandler_error_deleteFailed, e);
-
-					// Fill in the status handler custom data
-					IPropertiesContainer data = new PropertiesContainer();
-					data.setProperty(IStatusHandlerConstants.PROPERTY_TITLE, Messages.DeleteHandler_error_title);
-					data.setProperty(IStatusHandlerConstants.PROPERTY_CONTEXT_HELP_ID, IContextHelpIds.MESSAGE_DELETE_FAILED);
-					data.setProperty(IStatusHandlerConstants.PROPERTY_CALLER, this);
-
-					// Get the status handler
-					IStatusHandler[] handler = StatusHandlerManager.getInstance().getHandler(selection);
-					if (handler.length > 0) {
-						handler[0].handleStatus(status, data, null);
-					}
+					String template = NLS.bind(Messages.DeleteHandler_error_deleteFailed, Messages.PossibleCause);
+					StatusHandlerUtil.handleStatus(StatusHelper.getStatus(e), selection, template,
+													Messages.DeleteHandler_error_title, IContextHelpIds.MESSAGE_DELETE_FAILED, this, null);
 				}
 
 				if (refreshModel) {
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/OfflineCommandHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/OfflineCommandHandler.java
index 485d7756e..9b977d45e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/OfflineCommandHandler.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/OfflineCommandHandler.java
@@ -29,13 +29,9 @@ import org.eclipse.tcf.protocol.IPeer;
 import org.eclipse.tcf.protocol.Protocol;
 import org.eclipse.tcf.te.runtime.callback.Callback;
 import org.eclipse.tcf.te.runtime.interfaces.callback.ICallback;
-import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
 import org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService;
-import org.eclipse.tcf.te.runtime.properties.PropertiesContainer;
 import org.eclipse.tcf.te.runtime.services.ServiceManager;
-import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerManager;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandler;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandlerConstants;
+import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerUtil;
 import org.eclipse.tcf.te.tcf.core.peers.Peer;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
 import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelRefreshService;
@@ -66,17 +62,8 @@ public class OfflineCommandHandler extends AbstractHandler {
 			@Override
 			protected void internalDone(Object caller, IStatus status) {
 				if (status.getSeverity() == IStatus.ERROR) {
-					// Fill in the status handler custom data
-					IPropertiesContainer data = new PropertiesContainer();
-					data.setProperty(IStatusHandlerConstants.PROPERTY_TITLE, Messages.OfflineCommandHandler_error_title);
-					data.setProperty(IStatusHandlerConstants.PROPERTY_CONTEXT_HELP_ID, IContextHelpIds.MESSAGE_MAKEOFFLINE_FAILED);
-					data.setProperty(IStatusHandlerConstants.PROPERTY_CALLER, this);
-
-					// Get the status handler
-					IStatusHandler[] handler = StatusHandlerManager.getInstance().getHandler(selection);
-					if (handler.length > 0) {
-						handler[0].handleStatus(status, data, null);
-					}
+					StatusHandlerUtil.handleStatus(status, selection, null,
+													Messages.OfflineCommandHandler_error_title, IContextHelpIds.MESSAGE_MAKEOFFLINE_FAILED, OfflineCommandHandler.this, null);
 				}
 
 				// Trigger a refresh of the model
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/RedirectHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/RedirectHandler.java
index d6d9b52e4..6266827e4 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/RedirectHandler.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/RedirectHandler.java
@@ -20,8 +20,6 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -29,14 +27,12 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.tcf.protocol.Protocol;
-import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
 import org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService;
-import org.eclipse.tcf.te.runtime.properties.PropertiesContainer;
 import org.eclipse.tcf.te.runtime.services.ServiceManager;
-import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerManager;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandler;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandlerConstants;
+import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerUtil;
+import org.eclipse.tcf.te.runtime.utils.StatusHelper;
 import org.eclipse.tcf.te.tcf.core.peers.Peer;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProperties;
@@ -44,7 +40,6 @@ import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelRefreshSe
 import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelUpdateService;
 import org.eclipse.tcf.te.tcf.locator.model.Model;
 import org.eclipse.tcf.te.tcf.locator.nodes.PeerRedirector;
-import org.eclipse.tcf.te.tcf.ui.activator.UIPlugin;
 import org.eclipse.tcf.te.tcf.ui.dialogs.RedirectAgentSelectionDialog;
 import org.eclipse.tcf.te.tcf.ui.help.IContextHelpIds;
 import org.eclipse.tcf.te.tcf.ui.nls.Messages;
@@ -175,21 +170,9 @@ public class RedirectHandler extends AbstractHandler {
 				}
 			});
 		} catch (IOException e) {
-			// Create the status
-			IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
-							Messages.RedirectHandler_error_redirectFailed, e);
-
-			// Fill in the status handler custom data
-			IPropertiesContainer data = new PropertiesContainer();
-			data.setProperty(IStatusHandlerConstants.PROPERTY_TITLE, Messages.RedirectHandler_error_title);
-			data.setProperty(IStatusHandlerConstants.PROPERTY_CONTEXT_HELP_ID, IContextHelpIds.MESSAGE_REDIRECT_FAILED);
-			data.setProperty(IStatusHandlerConstants.PROPERTY_CALLER, this);
-
-			// Get the status handler
-			IStatusHandler[] handler = StatusHandlerManager.getInstance().getHandler(peerModel);
-			if (handler.length > 0) {
-				handler[0].handleStatus(status, data, null);
-			}
+			String template = NLS.bind(Messages.RedirectHandler_error_redirectFailed, Messages.PossibleCause);
+			StatusHandlerUtil.handleStatus(StatusHelper.getStatus(e), peerModel, template,
+											Messages.RedirectHandler_error_title, IContextHelpIds.MESSAGE_REDIRECT_FAILED, this, null);
 		}
 	}
 }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/RenameHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/RenameHandler.java
index 559c7e2a3..2f13024a2 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/RenameHandler.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/RenameHandler.java
@@ -32,14 +32,11 @@ import org.eclipse.tcf.protocol.IPeer;
 import org.eclipse.tcf.protocol.Protocol;
 import org.eclipse.tcf.te.runtime.callback.Callback;
 import org.eclipse.tcf.te.runtime.interfaces.callback.ICallback;
-import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
 import org.eclipse.tcf.te.runtime.persistence.interfaces.IPersistableNodeProperties;
 import org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService;
-import org.eclipse.tcf.te.runtime.properties.PropertiesContainer;
 import org.eclipse.tcf.te.runtime.services.ServiceManager;
-import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerManager;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandler;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandlerConstants;
+import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerUtil;
+import org.eclipse.tcf.te.runtime.utils.StatusHelper;
 import org.eclipse.tcf.te.tcf.core.peers.Peer;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.ILocatorModel;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
@@ -47,7 +44,6 @@ import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProperties;
 import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelRefreshService;
 import org.eclipse.tcf.te.tcf.locator.model.Model;
 import org.eclipse.tcf.te.tcf.locator.nodes.PeerRedirector;
-import org.eclipse.tcf.te.tcf.ui.activator.UIPlugin;
 import org.eclipse.tcf.te.tcf.ui.help.IContextHelpIds;
 import org.eclipse.tcf.te.tcf.ui.nls.Messages;
 import org.eclipse.tcf.te.ui.dialogs.RenameDialog;
@@ -158,21 +154,9 @@ public class RenameHandler extends AbstractHandler {
 									});
 
 								} catch (IOException e) {
-									// Create the status
-									IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
-																Messages.RenameHandler_error_renameFailed, e);
-
-									// Fill in the status handler custom data
-									IPropertiesContainer data = new PropertiesContainer();
-									data.setProperty(IStatusHandlerConstants.PROPERTY_TITLE, Messages.RenameHandler_error_title);
-									data.setProperty(IStatusHandlerConstants.PROPERTY_CONTEXT_HELP_ID, IContextHelpIds.MESSAGE_RENAME_FAILED);
-									data.setProperty(IStatusHandlerConstants.PROPERTY_CALLER, this);
-
-									// Get the status handler
-									IStatusHandler[] handler = StatusHandlerManager.getInstance().getHandler(selection);
-									if (handler.length > 0) {
-										handler[0].handleStatus(status, data, null);
-									}
+									String template = NLS.bind(Messages.RenameHandler_error_renameFailed, Messages.PossibleCause);
+									StatusHandlerUtil.handleStatus(StatusHelper.getStatus(e), selection, template,
+																	Messages.RenameHandler_error_title, IContextHelpIds.MESSAGE_RENAME_FAILED, this, null);
 								}
 							}
 						}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/ResetRedirectHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/ResetRedirectHandler.java
index 2704f5abf..c126bf42a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/ResetRedirectHandler.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/ResetRedirectHandler.java
@@ -17,26 +17,21 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.tcf.protocol.IPeer;
 import org.eclipse.tcf.protocol.Protocol;
-import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
 import org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService;
-import org.eclipse.tcf.te.runtime.properties.PropertiesContainer;
 import org.eclipse.tcf.te.runtime.services.ServiceManager;
-import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerManager;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandler;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandlerConstants;
+import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerUtil;
+import org.eclipse.tcf.te.runtime.utils.StatusHelper;
 import org.eclipse.tcf.te.tcf.core.peers.Peer;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProperties;
 import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelRefreshService;
 import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelUpdateService;
 import org.eclipse.tcf.te.tcf.locator.model.Model;
-import org.eclipse.tcf.te.tcf.ui.activator.UIPlugin;
 import org.eclipse.tcf.te.tcf.ui.help.IContextHelpIds;
 import org.eclipse.tcf.te.tcf.ui.nls.Messages;
 import org.eclipse.ui.handlers.HandlerUtil;
@@ -115,21 +110,9 @@ public class ResetRedirectHandler extends AbstractHandler {
 					}
 				});
 			} catch (IOException e) {
-				// Create the status
-				IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
-								Messages.ResetRedirectHandler_error_resetRedirectFailed, e);
-
-				// Fill in the status handler custom data
-				IPropertiesContainer data = new PropertiesContainer();
-				data.setProperty(IStatusHandlerConstants.PROPERTY_TITLE, Messages.ResetRedirectHandler_error_title);
-				data.setProperty(IStatusHandlerConstants.PROPERTY_CONTEXT_HELP_ID, IContextHelpIds.MESSAGE_RESET_REDIRECT_FAILED);
-				data.setProperty(IStatusHandlerConstants.PROPERTY_CALLER, this);
-
-				// Get the status handler
-				IStatusHandler[] handler = StatusHandlerManager.getInstance().getHandler(peerModel);
-				if (handler.length > 0) {
-					handler[0].handleStatus(status, data, null);
-				}
+				String template = NLS.bind(Messages.ResetRedirectHandler_error_resetRedirectFailed, Messages.PossibleCause);
+				StatusHandlerUtil.handleStatus(StatusHelper.getStatus(e), peerModel, template,
+												Messages.ResetRedirectHandler_error_title, IContextHelpIds.MESSAGE_RESET_REDIRECT_FAILED, this, null);
 			}
 		}
 	}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/help/IContextHelpIds.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/help/IContextHelpIds.java
index 18b130da7..ce19cfe2a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/help/IContextHelpIds.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/help/IContextHelpIds.java
@@ -17,7 +17,7 @@ import org.eclipse.tcf.te.tcf.ui.activator.UIPlugin;
 public interface IContextHelpIds {
 
 	/**
-	 * TCF UI plug-in common context help id prefix.
+	 * UI plug-in common context help id prefix.
 	 */
 	public final static String PREFIX = UIPlugin.getUniqueIdentifier() + "."; //$NON-NLS-1$
 
@@ -73,4 +73,9 @@ public interface IContextHelpIds {
 	 * Offline command handler: Make offline operation failed.
 	 */
 	public final static String MESSAGE_MAKEOFFLINE_FAILED = PREFIX + ".status.messageMakeOfflineFailed"; //$NON-NLS-1$
+
+	/**
+	 * Overview editor: Save operation failed.
+	 */
+	public final static String MESSAGE_SAVE_FAILED = PREFIX + ".status.messageSaveFailed"; //$NON-NLS-1$
 }
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 756e19902..628b34df7 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
@@ -49,7 +49,10 @@ public class Messages extends NLS {
 
 	// **** Declare externalized string id's down here *****
 
+	public static String PossibleCause;
+
 	public static String OverviewEditorPage_title;
+	public static String OverviewEditorPage_error_save;
 
 	public static String GeneralInformationSection_title;
 	public static String GeneralInformationSection_description;
@@ -60,6 +63,7 @@ public class Messages extends NLS {
 	public static String GeneralInformationSection_state_1;
 	public static String GeneralInformationSection_state_2;
 	public static String GeneralInformationSection_state_3;
+	public static String GeneralInformationSection_error_delete;
 
 	public static String LabelProviderDelegate_state_0;
 	public static String LabelProviderDelegate_state_1;
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 fab741b7c..bcf21384a 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
@@ -8,7 +8,10 @@
 # Wind River Systems - initial API and implementation
 ###############################################################################
 
+PossibleCause=Possible Cause:\n{0}
+
 OverviewEditorPage_title=Overview
+OverviewEditorPage_error_save=Failed to save target: {0}.\n\n{1}
 
 GeneralInformationSection_title=General Information
 GeneralInformationSection_description=This section describes general information about this target.
@@ -19,6 +22,7 @@ GeneralInformationSection_state_0=Reachable
 GeneralInformationSection_state_1=Communicating
 GeneralInformationSection_state_2=Not Reachable. Connection attempt timed out.
 GeneralInformationSection_state_3=Not Reachable. Connection attempt failed.
+GeneralInformationSection_error_delete=Failed to remove old target: {0}.\n\n{1}
 
 LabelProviderDelegate_state_0=Reachable
 LabelProviderDelegate_state_1=Communicating
@@ -84,7 +88,7 @@ PeerAttributesTablePart_edit_title=Edit Attribute
 PeerAttributesTablePart_edit_message=Edit the selected target attribute.
 
 DeleteHandler_error_title=Error
-DeleteHandler_error_deleteFailed=Failed to delete static target.
+DeleteHandler_error_deleteFailed=Failed to delete static target.\n\n{0}
 DeleteHandlerDelegate_DialogTitle=Confirm Delete
 DeleteHandlerDelegate_MsgDeleteMultiplePeers=Are you sure you want to delete these {0} targets?
 DeleteHandlerDelegate_MsgDeleteOnePeer=Are you sure you want to delete target ''{0}''?