diff options
| author | Uwe Stieber | 2012-10-11 09:01:31 +0000 |
|---|---|---|
| committer | Uwe Stieber | 2012-10-11 09:02:15 +0000 |
| commit | 289dd6dca7bb3c481a00ab4fd48a9653fa94db8f (patch) | |
| tree | 96ce9b62762a3e9102b164d3f5bf692a5b3c7e2d | |
| parent | eb0b9d53e2408c2bba955e3626920a878f7a4c38 (diff) | |
| download | org.eclipse.tcf-289dd6dca7bb3c481a00ab4fd48a9653fa94db8f.tar.gz org.eclipse.tcf-289dd6dca7bb3c481a00ab4fd48a9653fa94db8f.tar.xz org.eclipse.tcf-289dd6dca7bb3c481a00ab4fd48a9653fa94db8f.zip | |
Target Explorer: Improve name update on merge attributes
| -rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelUpdateService.java | 7 |
1 files changed, 2 insertions, 5 deletions
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 883a30f70..d8ec1376a 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 @@ -200,11 +200,6 @@ 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()); - // Names are not updated - if (srcAttrs.containsKey(IPeer.ATTR_NAME)) { - srcAttrs.remove(IPeer.ATTR_NAME); - } - // Determine the peer class String peerClassSimpleName = peer.getClass().getSimpleName(); if (peer.getAttributes().containsKey("remote.transient")) { //$NON-NLS-1$ @@ -216,6 +211,8 @@ public class LocatorModelUpdateService extends AbstractLocatorModelService imple if ("RemotePeer".equals(peerClassSimpleName) && !"RemotePeer".equals(dst.getClass().getSimpleName())) { //$NON-NLS-1$ //$NON-NLS-2$ // The ID is not merged from remote to local srcAttrs.remove(IPeer.ATTR_ID); + // The Name is not merged from remote to local + srcAttrs.remove(IPeer.ATTR_NAME); // Eliminate all attributes already set in the destination attributes map String merged = dstAttrs.get("remote.merged.transient"); //$NON-NLS-1$ |