Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Torregrosa Paez2016-02-16 16:06:28 +0000
committerPablo Torregrosa Paez2016-02-16 16:06:28 +0000
commit2555324e54280195a1901d6f22757b70adc1d43b (patch)
tree74f8dee8e0d1e06599449d78ea77aaaa1cc100c9 /target_explorer/plugins
parentd25a18cdb5565d14ae58125f495e10e1f66b2e76 (diff)
downloadorg.eclipse.tcf-2555324e54280195a1901d6f22757b70adc1d43b.tar.gz
org.eclipse.tcf-2555324e54280195a1901d6f22757b70adc1d43b.tar.xz
org.eclipse.tcf-2555324e54280195a1901d6f22757b70adc1d43b.zip
Target Explorer: Shared Pathmaps must not be set
Change-Id: I7ff4563382bb0a47153917ddb64aaf51b9b2ce83 Signed-off-by: Pablo Torregrosa Paez <pablo.torregrosa@windriver.com>
Diffstat (limited to 'target_explorer/plugins')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/services/PathMapService.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/services/PathMapService.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/services/PathMapService.java
index b27d870e7..71972ab2f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/services/PathMapService.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/services/PathMapService.java
@@ -60,6 +60,8 @@ import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNodeProvider;
*/
@SuppressWarnings("restriction")
public class PathMapService extends AbstractService implements IPathMapService {
+ private final static String PATH_MAP_PROP_SHARED = "Shared"; //$NON-NLS-1$
+
// Lock to handle multi thread access
private final Lock lock = new ReentrantLock();
@@ -224,6 +226,7 @@ public class PathMapService extends AbstractService implements IPathMapService {
Map<String, Object> props = new LinkedHashMap<String, Object>();
props.put(IPathMap.PROP_SOURCE, rule.getSource());
props.put(IPathMap.PROP_DESTINATION, rule.getDestination());
+ props.put(PATH_MAP_PROP_SHARED, rule.getProperties().get(PATH_MAP_PROP_SHARED));
rulesToAdd.add(new org.eclipse.tcf.internal.debug.launch.TCFLaunchDelegate.PathMapRule(props));
}
@@ -285,6 +288,7 @@ public class PathMapService extends AbstractService implements IPathMapService {
Map<String, Object> props = new LinkedHashMap<String, Object>();
props.put(IPathMap.PROP_SOURCE, rule.getSource());
props.put(IPathMap.PROP_DESTINATION, rule.getDestination());
+ props.put(PATH_MAP_PROP_SHARED, rule.getProperties().get(PATH_MAP_PROP_SHARED));
rulesList.add(new org.eclipse.tcf.internal.debug.launch.TCFLaunchDelegate.PathMapRule(props));
}
@@ -685,7 +689,7 @@ public class PathMapService extends AbstractService implements IPathMapService {
Iterator<PathMapRule> iter = map.iterator();
while (iter.hasNext()) {
PathMapRule rule = iter.next();
- if ("agent".equalsIgnoreCase(rule.getID())) { //$NON-NLS-1$
+ if ("agent".equalsIgnoreCase(rule.getID()) || Boolean.parseBoolean((String) rule.getProperties().get(PATH_MAP_PROP_SHARED))) { //$NON-NLS-1$
iter.remove();
}
}

Back to the top