Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2014-02-03 08:59:44 +0000
committerUwe Stieber2014-02-03 08:59:44 +0000
commit08ddd8d9aaf48f4c35eb6c31482ccae8e0da0ac8 (patch)
tree79a6069955e4d24b8311c3d9e063d2719dd41fd4
parent0a4b69d943d532b9ba09b140eec415a431d6a2ac (diff)
downloadorg.eclipse.tcf-08ddd8d9aaf48f4c35eb6c31482ccae8e0da0ac8.tar.gz
org.eclipse.tcf-08ddd8d9aaf48f4c35eb6c31482ccae8e0da0ac8.tar.xz
org.eclipse.tcf-08ddd8d9aaf48f4c35eb6c31482ccae8e0da0ac8.zip
Target Explorer: Fix remote application launch bindings and step group
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml18
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTabSection.java8
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/ContextSelectorSectionControl.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProvider.java80
4 files changed, 14 insertions, 94 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml
index 3fbe5db4f..e136f2952 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml
@@ -77,11 +77,9 @@
<test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
</adapt>
<and>
+ <!-- binds to generic connections only -->
<instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode"/>
- <or>
- <test property="org.eclipse.tcf.te.tcf.locator.hasOfflineService" value="Processes"/>
- <test property="org.eclipse.tcf.te.tcf.locator.hasRemoteService" value="Processes"/>
- </or>
+ <test property="org.eclipse.tcf.te.tcf.locator.isOfType" value="null"/>
</and>
</or>
</with>
@@ -101,15 +99,9 @@
<test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
</adapt>
<and>
+ <!-- binds to generic connections only -->
<instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode"/>
- <or>
- <test property="org.eclipse.tcf.te.tcf.locator.hasOfflineService" value="Processes"/>
- <test property="org.eclipse.tcf.te.tcf.locator.hasRemoteService" value="Processes"/>
- </or>
- <or>
- <test property="org.eclipse.tcf.te.tcf.locator.hasOfflineService" value="RunControl"/>
- <test property="org.eclipse.tcf.te.tcf.locator.hasRemoteService" value="RunControl"/>
- </or>
+ <test property="org.eclipse.tcf.te.tcf.locator.isOfType" value="null"/>
</and>
</or>
</with>
@@ -147,6 +139,7 @@
label="%LaunchStepGroup.Remote.App.name"
iterator="org.eclipse.tcf.te.launch.core.steps.iterators.LaunchContextIterator">
<references>
+ <reference id="org.eclipse.tcf.te.tcf.locator.connectNoAttachStepGroup"/>
<reference id="org.eclipse.tcf.te.tcf.core.openChannelStep"/>
<reference id="org.eclipse.tcf.te.tcf.launch.core.fileTransferStepGroup"/>
<reference id="org.eclipse.tcf.te.tcf.launch.core.launchProcessStepGroup"/>
@@ -157,7 +150,6 @@
</with>
</enablement>
</reference>
- <reference id="org.eclipse.tcf.te.tcf.core.closeChannelStep"/>
<reference id="org.eclipse.tcf.te.launch.core.removeLaunchStep">
<enablement>
<not>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTabSection.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTabSection.java
index 6211968da..230a64ec6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTabSection.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTabSection.java
@@ -113,6 +113,10 @@ public class LaunchConfigurationMainTabSection extends AbstractSection implement
super.modifyText(e);
getManagedForm().dirtyStateChanged();
}
+ @Override
+ protected boolean isAdjustEditFieldControlWidthHint() {
+ return true;
+ }
};
processImage.setEditFieldLabel(Messages.LaunchConfigurationMainTabSection_processImage_label);
processImage.setIsGroup(false);
@@ -129,6 +133,10 @@ public class LaunchConfigurationMainTabSection extends AbstractSection implement
super.modifyText(e);
getManagedForm().dirtyStateChanged();
}
+ @Override
+ protected boolean isAdjustEditFieldControlWidthHint() {
+ return true;
+ }
};
processArguments.setEditFieldLabel(Messages.LaunchConfigurationMainTabSection_processArguments_label);
processArguments.setIsGroup(false);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/ContextSelectorSectionControl.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/ContextSelectorSectionControl.java
index 0128965e0..471d853a4 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/ContextSelectorSectionControl.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/ContextSelectorSectionControl.java
@@ -61,7 +61,7 @@ public class ContextSelectorSectionControl extends AbstractContextSelectorContro
*/
@Override
protected void doConfigureTreeContentAndLabelProvider(TreeViewer viewer) {
- viewer.setContentProvider(new ContentProvider(true));
+ viewer.setContentProvider(new ContentProvider());
DelegatingLabelProvider labelProvider = new DelegatingLabelProvider();
viewer.setLabelProvider(new DecoratingLabelProvider(labelProvider, labelProvider));
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProvider.java
index b21e87492..3bb6d34db 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProvider.java
@@ -81,79 +81,13 @@ public class ContentProvider implements ICommonContentProvider, ITreePathContent
// Internal map of PeerRedirectorGroupNodes per peer id
private final Map<String, PeerRedirectorGroupNode> roots = new HashMap<String, PeerRedirectorGroupNode>();
- // Flag to remember if invisible nodes are to be included in the list of
- // returned children.
- private final boolean showInvisible;
-
INavigatorFilterService navFilterService = null;
/**
* Constructor.
*/
public ContentProvider() {
- this(false);
- }
-
- /**
- * Constructor.
- *
- * @param showInvisible If <code>true</code>, {@link #getChildren(Object)} will include invisible nodes too.
- */
- public ContentProvider(boolean showInvisible) {
super();
- this.showInvisible = showInvisible;
- }
-
- /**
- * Determines if the given peer model node is a value-add.
- *
- * @param peerNode The peer model node. Must not be <code>null</code>.
- * @return <code>True</code> if the peer model node is a value-add, <code>false</code> otherwise.
- */
- /* default */ final boolean isValueAdd(IPeer peer) {
- Assert.isNotNull(peer);
-
- String value = peer.getAttributes().get("ValueAdd"); //$NON-NLS-1$
- boolean isValueAdd = value != null && ("1".equals(value.trim()) || Boolean.parseBoolean(value.trim())); //$NON-NLS-1$
-
- return isValueAdd;
- }
-
- /**
- * Determines if the given peer model node is filtered from the view completely.
- *
- * @param peerNode The peer model node. Must not be <code>null</code>.
- * @return <code>True</code> if filtered, <code>false</code> otherwise.
- */
- /* default */ final boolean isFiltered(IPeerNode peerNode) {
- Assert.isNotNull(peerNode);
-
- boolean filtered = false;
-
- if (!showInvisible) {
- filtered |= !peerNode.isVisible();
- }
-
- return filtered;
- }
-
- /**
- * Determines if the given peer node is filtered from the view completely.
- *
- * @param peerNode The peer node. Must not be <code>null</code>.
- * @return <code>True</code> if filtered, <code>false</code> otherwise.
- */
- /* default */ final boolean isFiltered(IPeer peer) {
- Assert.isNotNull(peer);
-
- boolean filtered = false;
-
- filtered |= isValueAdd(peer);
-
- filtered |= peer.getName() != null
- && (peer.getName().endsWith("Command Server") || peer.getName().endsWith("CLI Server")); //$NON-NLS-1$ //$NON-NLS-2$
-
- return filtered;
}
/* (non-Javadoc)
@@ -209,11 +143,6 @@ public class ContentProvider implements ICommonContentProvider, ITreePathContent
}
else if (IUIConstants.ID_CAT_MY_TARGETS.equals(catID)) {
for (IPeerNode peerNode : peerNodes) {
- // Check for filtered nodes (Value-add's and Proxies)
- if (isFiltered(peerNode)) {
- continue;
- }
-
ICategorizable categorizable = (ICategorizable)peerNode.getAdapter(ICategorizable.class);
if (categorizable == null) {
categorizable = (ICategorizable)Platform.getAdapterManager().getAdapter(peerNode, ICategorizable.class);
@@ -234,11 +163,6 @@ public class ContentProvider implements ICommonContentProvider, ITreePathContent
}
else if (IUIConstants.ID_CAT_NEIGHBORHOOD.equals(catID)) {
for (IPeer peer : ModelManager.getLocatorModel().getPeers()) {
- // Check for filtered nodes (Value-add's and Proxies)
- if (isFiltered(peer)) {
- continue;
- }
-
if (!candidates.contains(peer)) {
candidates.add(peer);
}
@@ -261,10 +185,6 @@ public class ContentProvider implements ICommonContentProvider, ITreePathContent
}
else {
for (IPeerNode peerNode : peerNodes) {
- // Check for filtered nodes (Value-add's and Proxies)
- if (isFiltered(peerNode)) {
- continue;
- }
if (!candidates.contains(peerNode)) {
candidates.add(peerNode);
}

Back to the top