Target Explorer: Fix transient peer handling

4 files changed, 165 insertions, 165 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/listener/LocatorListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/listener/LocatorListener.java
index 3d134dec3..3fca7dd00 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/listener/LocatorListener.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/listener/LocatorListener.java
@@ -87,11 +87,9 @@ public class LocatorListener implements ILocator.LocatorListener {
 				if (isStatic) {
 					boolean changed = peerNode.setChangeEventsEnabled(false);
 					// Merge user configured properties between the peers
-					IPeer oldPeer = peerNode.getPeer();
-					peerNode.setProperty(IPeerModelProperties.PROP_INSTANCE, peer);
-					model.getService(ILocatorModelUpdateService.class).mergeUserDefinedAttributes(peerNode, oldPeer, true);
+					model.getService(ILocatorModelUpdateService.class).mergeUserDefinedAttributes(peerNode, peer, true);
 					if (changed) peerNode.setChangeEventsEnabled(true);
-					peerNode.fireChangeEvent(IPeerModelProperties.PROP_INSTANCE, oldPeer, peer);
+					peerNode.fireChangeEvent(IPeerModelProperties.PROP_INSTANCE, peer, peerNode.getPeer());
 				} else {
 					peerNode.setProperty(IPeerModelProperties.PROP_INSTANCE, peer);
 				}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/persistence/GsonPeerPersistenceDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/persistence/GsonPeerPersistenceDelegate.java
index 9e129f8bf..1f19645e1 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/persistence/GsonPeerPersistenceDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/persistence/GsonPeerPersistenceDelegate.java
@@ -1,147 +1,147 @@
-/*******************************************************************************

- * Copyright (c) 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.locator.persistence;

-

-import java.io.IOException;

-import java.util.HashMap;

-import java.util.Map;

-import java.util.Map.Entry;

-import java.util.concurrent.atomic.AtomicReference;

-

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

-import org.eclipse.tcf.core.TransientPeer;

-import org.eclipse.tcf.protocol.IPeer;

-import org.eclipse.tcf.protocol.Protocol;

-import org.eclipse.tcf.te.runtime.model.interfaces.IModelNode;

-import org.eclipse.tcf.te.runtime.persistence.GsonMapPersistenceDelegate;

-import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;

-import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProvider;

-import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelLookupService;

-import org.eclipse.tcf.te.tcf.locator.model.Model;

-import org.eclipse.tcf.te.tcf.locator.nodes.PeerModel;

-

-/**

- * Peer to string persistence delegate implementation.

- */

-public class GsonPeerPersistenceDelegate extends GsonMapPersistenceDelegate {

-

-	/**

-	 * Constructor.

-	 */

-	public GsonPeerPersistenceDelegate() {

-		super("json"); //$NON-NLS-1$

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.tcf.te.runtime.persistence.interfaces.IPersistenceDelegate#getPersistedClass(java.lang.Object)

-	 */

-	@Override

-	public Class<?> getPersistedClass(Object context) {

-		return IPeer.class;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.tcf.te.tcf.locator.persistence.AbstractPropertiesToStringPersistenceDelegate#read(java.lang.Object, java.lang.Object, java.lang.String)

-	 */

-	@Override

-	public Object read(final Object context, final Object container, String key) throws IOException {

-		Assert.isNotNull(context);

-		Assert.isNotNull(container);

-

-		final IPeer peer = (IPeer)super.read(context, container, key);

-

-		if (peer != null) {

-			if (context instanceof IPeer || IPeer.class.equals(context)) {

-				return peer;

-			}

-			else if (context instanceof Class && (((Class<?>)context).isAssignableFrom(IPeerModel.class))) {

-				final AtomicReference<IPeerModel> model = new AtomicReference<IPeerModel>();

-

-				Runnable runnable = new Runnable() {

-					@Override

-					public void run() {

-						// Get the id of the decoded attributes

-						String id = peer.getID();

-						if (id != null) {

-							// Lookup the id within the model

-							IPeerModel peerModel = Model.getModel().getService(ILocatorModelLookupService.class).lkupPeerModelById(id);

-							if (peerModel == null) {

-								// Not found in the model -> create a ghost object

-								peerModel = new PeerModel(Model.getModel(), peer);

-								peerModel.setProperty(IModelNode.PROPERTY_IS_GHOST, true);

-							}

-

-							model.set(peerModel);

-						}

-					}

-				};

-

-				if (Protocol.isDispatchThread()) {

-					runnable.run();

-				}

-				else {

-					Protocol.invokeAndWait(runnable);

-				}

-

-				return model.get();

-			}

-		}

-

-		return null;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.tcf.te.runtime.persistence.AbstractPropertiesPersistenceDelegate#toMap(java.lang.Object)

-	 */

-	@Override

-	protected Map<String, Object> toMap(final Object context) throws IOException {

-		IPeer peer = getPeer(context);

-		if (peer != null) {

-			return super.toMap(peer.getAttributes());

-		}

-

-		return new HashMap<String, Object>();

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.tcf.te.runtime.persistence.AbstractPropertiesPersistenceDelegate#fromMap(java.util.Map, java.lang.Object)

-	 */

-	@Override

-	protected Object fromMap(Map<String, Object> map, Object context) throws IOException {

-		Map<String,String> attrs = new HashMap<String,String>();

-		for (Entry<String, Object> entry : map.entrySet()) {

-			attrs.put(entry.getKey(), entry.getValue().toString());

-		}

-

-		return new TransientPeer(attrs);

-	}

-

-	/**

-	 * Get a peer from the given context.

-	 *

-	 * @param context The context. Must not be <code>null</code>.

-	 * @return The peer or <code>null</code>.

-	 */

-	protected IPeer getPeer(Object context) {

-		IPeer peer = null;

-

-		if (context instanceof IPeer) {

-			peer = (IPeer)context;

-		}

-		else if (context instanceof IPeerModel) {

-			peer = ((IPeerModel)context).getPeer();

-		}

-		else if (context instanceof IPeerModelProvider) {

-			peer = ((IPeerModelProvider)context).getPeerModel().getPeer();

-		}

-

-		return peer;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 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.locator.persistence;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.tcf.protocol.IPeer;
+import org.eclipse.tcf.protocol.Protocol;
+import org.eclipse.tcf.te.runtime.model.interfaces.IModelNode;
+import org.eclipse.tcf.te.runtime.persistence.GsonMapPersistenceDelegate;
+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.IPeerModelProvider;
+import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelLookupService;
+import org.eclipse.tcf.te.tcf.locator.model.Model;
+import org.eclipse.tcf.te.tcf.locator.nodes.PeerModel;
+
+/**
+ * Peer to string persistence delegate implementation.
+ */
+public class GsonPeerPersistenceDelegate extends GsonMapPersistenceDelegate {
+
+	/**
+	 * Constructor.
+	 */
+	public GsonPeerPersistenceDelegate() {
+		super("json"); //$NON-NLS-1$
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.runtime.persistence.interfaces.IPersistenceDelegate#getPersistedClass(java.lang.Object)
+	 */
+	@Override
+	public Class<?> getPersistedClass(Object context) {
+		return IPeer.class;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.tcf.locator.persistence.AbstractPropertiesToStringPersistenceDelegate#read(java.lang.Object, java.lang.Object, java.lang.String)
+	 */
+	@Override
+	public Object read(final Object context, final Object container, String key) throws IOException {
+		Assert.isNotNull(context);
+		Assert.isNotNull(container);
+
+		final IPeer peer = (IPeer)super.read(context, container, key);
+
+		if (peer != null) {
+			if (context instanceof IPeer || IPeer.class.equals(context)) {
+				return peer;
+			}
+			else if (context instanceof Class && (((Class<?>)context).isAssignableFrom(IPeerModel.class))) {
+				final AtomicReference<IPeerModel> model = new AtomicReference<IPeerModel>();
+
+				Runnable runnable = new Runnable() {
+					@Override
+					public void run() {
+						// Get the id of the decoded attributes
+						String id = peer.getID();
+						if (id != null) {
+							// Lookup the id within the model
+							IPeerModel peerModel = Model.getModel().getService(ILocatorModelLookupService.class).lkupPeerModelById(id);
+							if (peerModel == null) {
+								// Not found in the model -> create a ghost object
+								peerModel = new PeerModel(Model.getModel(), peer);
+								peerModel.setProperty(IModelNode.PROPERTY_IS_GHOST, true);
+							}
+
+							model.set(peerModel);
+						}
+					}
+				};
+
+				if (Protocol.isDispatchThread()) {
+					runnable.run();
+				}
+				else {
+					Protocol.invokeAndWait(runnable);
+				}
+
+				return model.get();
+			}
+		}
+
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.runtime.persistence.AbstractPropertiesPersistenceDelegate#toMap(java.lang.Object)
+	 */
+	@Override
+	protected Map<String, Object> toMap(final Object context) throws IOException {
+		IPeer peer = getPeer(context);
+		if (peer != null) {
+			return super.toMap(peer.getAttributes());
+		}
+
+		return new HashMap<String, Object>();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.runtime.persistence.AbstractPropertiesPersistenceDelegate#fromMap(java.util.Map, java.lang.Object)
+	 */
+	@Override
+	protected Object fromMap(Map<String, Object> map, Object context) throws IOException {
+		Map<String,String> attrs = new HashMap<String,String>();
+		for (Entry<String, Object> entry : map.entrySet()) {
+			attrs.put(entry.getKey(), entry.getValue().toString());
+		}
+
+		return new Peer(attrs);
+	}
+
+	/**
+	 * Get a peer from the given context.
+	 *
+	 * @param context The context. Must not be <code>null</code>.
+	 * @return The peer or <code>null</code>.
+	 */
+	protected IPeer getPeer(Object context) {
+		IPeer peer = null;
+
+		if (context instanceof IPeer) {
+			peer = (IPeer)context;
+		}
+		else if (context instanceof IPeerModel) {
+			peer = ((IPeerModel)context).getPeer();
+		}
+		else if (context instanceof IPeerModelProvider) {
+			peer = ((IPeerModelProvider)context).getPeerModel().getPeer();
+		}
+
+		return peer;
+	}
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java
index 48061eb3c..1e4c1dfa3 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java
@@ -24,7 +24,6 @@ import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.tcf.core.TransientPeer;
 import org.eclipse.tcf.protocol.IPeer;
 import org.eclipse.tcf.protocol.Protocol;
 import org.eclipse.tcf.services.ILocator;
@@ -33,6 +32,7 @@ import org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService;
 import org.eclipse.tcf.te.runtime.services.ServiceManager;
 import org.eclipse.tcf.te.runtime.utils.net.IPAddressUtil;
 import org.eclipse.tcf.te.tcf.core.Tcf;
+import org.eclipse.tcf.te.tcf.core.peers.Peer;
 import org.eclipse.tcf.te.tcf.locator.ScannerRunnable;
 import org.eclipse.tcf.te.tcf.locator.activator.CoreBundleActivator;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.ILocatorModel;
@@ -314,7 +314,7 @@ public class LocatorModelRefreshService extends AbstractLocatorModelService impl
 							// If the redirect property is not set, create the peer right away
 							if (attrs.get(IPeerModelProperties.PROP_REDIRECT_PROXY) == null) {
 								// Construct the peer from the attributes
-								IPeer peer = new TransientPeer(attrs);
+								IPeer peer = new Peer(attrs);
 								// Add the constructed peer to the peers map
 								peers.put(peer.getID(), peer);
 							} else {
@@ -366,7 +366,7 @@ public class LocatorModelRefreshService extends AbstractLocatorModelService impl
 						// Proxy not available -> reset redirection
 						attrs.remove(IPeerModelProperties.PROP_REDIRECT_PROXY);
 						// Construct the peer from the attributes
-						IPeer peer = new TransientPeer(attrs);
+						IPeer peer = new Peer(attrs);
 						// Add the constructed peer to the peers map
 						peers.put(peer.getID(), peer);
 					}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelUpdateService.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelUpdateService.java
index f261447ad..c0cf58678 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelUpdateService.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelUpdateService.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.Assert;
 import org.eclipse.tcf.core.AbstractPeer;
 import org.eclipse.tcf.protocol.IPeer;
 import org.eclipse.tcf.protocol.Protocol;
+import org.eclipse.tcf.te.tcf.core.peers.Peer;
 import org.eclipse.tcf.te.tcf.locator.interfaces.IModelListener;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.ILocatorModel;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
@@ -186,7 +187,7 @@ public class LocatorModelUpdateService extends AbstractLocatorModelService imple
 		// We can merge the peer attributes only if the destination peer is a AbstractPeer
 		IPeer dst = node.getPeer();
 		// If not of correct type, than we cannot update the attributes
-		if (!(dst instanceof AbstractPeer) && !(dst instanceof PeerRedirector)) return;
+		if (!(dst instanceof AbstractPeer) && !(dst instanceof PeerRedirector) && !(dst instanceof Peer)) return;
 		// If destination and source peer are the same objects(!) nothing to do here
 		if (dst == peer) return;
 
@@ -199,10 +200,9 @@ public class LocatorModelUpdateService extends AbstractLocatorModelService imple
 		// Get a modifiable copy of the source peer attributes
 		Map<String, String> srcAttrs = new HashMap<String, String>(peer.getAttributes());
 
-		// A user defined name overwrites a discovered name
-		String name = srcAttrs.get(IPeer.ATTR_NAME);
-		if (name != null && !"".equals(name)) { //$NON-NLS-1$
-			dstAttrs.put(IPeer.ATTR_NAME, name);
+		// Names are not updated
+		if (srcAttrs.containsKey(IPeer.ATTR_NAME)) {
+			srcAttrs.remove(IPeer.ATTR_NAME);
 		}
 
 		// If the source is a RemotePeer and the destination not, attributes from
@@ -224,17 +224,19 @@ public class LocatorModelUpdateService extends AbstractLocatorModelService imple
 		// Copy all remaining attributes from source to destination
 		if (!srcAttrs.isEmpty()) dstAttrs.putAll(srcAttrs);
 
+		// If the ID's are different between the peers to merge and force is set,
+		// we have set the ID in dstAttrs to the original one as set in the destination peer.
+		if (force && !dst.getID().equals(dstAttrs.get(IPeer.ATTR_ID))) {
+			dstAttrs.put(IPeer.ATTR_ID, dst.getID());
+		}
+
 		// And update the destination peer attributes
 		if (dst instanceof AbstractPeer) {
-			// If the ID's are different between the peers to merge and force is set,
-			// we have set the ID in dstAttrs to the original one as set in the destination peer.
-			if (force && !dst.getID().equals(dstAttrs.get(IPeer.ATTR_ID))) {
-				dstAttrs.put(IPeer.ATTR_ID, dst.getID());
-			}
-			// Update the attributes now
 			((AbstractPeer)dst).updateAttributes(dstAttrs);
 		} else if (dst instanceof PeerRedirector) {
 			((PeerRedirector)dst).updateAttributes(dstAttrs);
+		} else if (dst instanceof Peer) {
+			((Peer)dst).updateAttributes(dstAttrs);
 		}
 	}
 }