diff options
| author | Tobias Schwarz | 2012-05-09 08:47:47 +0000 |
|---|---|---|
| committer | Uwe Stieber | 2012-05-09 08:47:47 +0000 |
| commit | da9e07abcd689081e53d768b2ae97c98fcc3e568 (patch) | |
| tree | 77f5ca22afff8532b35bb4587cc6d662c86faba3 /target_explorer/plugins/org.eclipse.tcf.te.launch.ui | |
| parent | 2e8a163e00d1585e940ad8877376b47b08f715f0 (diff) | |
| download | org.eclipse.tcf-da9e07abcd689081e53d768b2ae97c98fcc3e568.tar.gz org.eclipse.tcf-da9e07abcd689081e53d768b2ae97c98fcc3e568.tar.xz org.eclipse.tcf-da9e07abcd689081e53d768b2ae97c98fcc3e568.zip | |
Target Explorer: FIX action visibility and enablement, launch reuse, npe
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.launch.ui')
3 files changed, 25 insertions, 21 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml index 38a3aed8e..70c3f82c7 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml +++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml @@ -17,7 +17,7 @@ class="org.eclipse.tcf.te.launch.ui.internal.LaunchNodePropertyTester"
id="org.eclipse.tcf.te.launch.ui.propertytester.launchNode"
namespace="org.eclipse.tcf.te.launch.ui.model"
- properties="isLaunchConfig,isLaunchConfigType,canDelete,canRefresh,hasLaunchMode,isValidLaunchConfig"
+ properties="isLaunchConfig,isLaunchConfigType,canDelete,canRefresh,isValidLaunchConfig"
type="org.eclipse.tcf.te.launch.ui.model.LaunchNode">
</propertyTester>
</extension>
@@ -584,10 +584,7 @@ <iterate
operator="and"
ifEmpty="false">
- <and>
- <test property="org.eclipse.tcf.te.launch.ui.model.hasLaunchMode" value="run"/>
- <test property="org.eclipse.tcf.te.launch.ui.model.isValidLaunchConfig" value="run"/>
- </and>
+ <test property="org.eclipse.tcf.te.launch.ui.model.isValidLaunchConfig" value="run"/>
</iterate>
</with>
</enabledWhen>
@@ -608,10 +605,7 @@ <iterate
operator="and"
ifEmpty="false">
- <and>
- <test property="org.eclipse.tcf.te.launch.ui.model.hasLaunchMode" value="debug"/>
- <test property="org.eclipse.tcf.te.launch.ui.model.isValidLaunchConfig" value="debug"/>
- </and>
+ <test property="org.eclipse.tcf.te.launch.ui.model.isValidLaunchConfig" value="debug"/>
</iterate>
</with>
</enabledWhen>
@@ -720,10 +714,13 @@ <iterate
ifEmpty="false"
operator="and">
- <or>
- <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfig"/>
- <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfigType"/>
- </or>
+ <and>
+ <instanceof value="org.eclipse.tcf.te.launch.ui.model.LaunchNode"/>
+ <or>
+ <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfig"/>
+ <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfigType"/>
+ </or>
+ </and>
</iterate>
</with>
</definition>
@@ -733,7 +730,10 @@ <iterate
ifEmpty="false"
operator="and">
- <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfig"/>
+ <and>
+ <instanceof value="org.eclipse.tcf.te.launch.ui.model.LaunchNode"/>
+ <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfig"/>
+ </and>
</iterate>
</with>
</definition>
@@ -742,7 +742,10 @@ <iterate
ifEmpty="false"
operator="and">
- <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfig"/>
+ <and>
+ <instanceof value="org.eclipse.tcf.te.launch.ui.model.LaunchNode"/>
+ <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfig"/>
+ </and>
</iterate>
</with>
</definition>
@@ -752,7 +755,10 @@ <iterate
ifEmpty="false"
operator="and">
- <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfigType"/>
+ <and>
+ <instanceof value="org.eclipse.tcf.te.launch.ui.model.LaunchNode"/>
+ <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfigType"/>
+ </and>
</iterate>
</with>
</definition>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/LaunchNodePropertyTester.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/LaunchNodePropertyTester.java index cca15c2c2..dc73b596d 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/LaunchNodePropertyTester.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/LaunchNodePropertyTester.java @@ -43,11 +43,6 @@ public class LaunchNodePropertyTester extends PropertyTester { else if (property.equals("canRefresh")) { //$NON-NLS-1$
return refreshHandler.canRefresh(receiver);
}
- else if (property.equals("hasLaunchMode")) { //$NON-NLS-1$
- if (expectedValue != null && LaunchNode.TYPE_LAUNCH_CONFIG.equals(node.getType())) {
- return node.getLaunchConfigurationType().supportsMode(expectedValue.toString());
- }
- }
else if (property.equals("isValidLaunchConfig")) { //$NON-NLS-1$
if (expectedValue instanceof String) {
return node.isValidFor((String)expectedValue);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/model/LaunchNode.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/model/LaunchNode.java index e47f5c7ff..749a4ed50 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/model/LaunchNode.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/model/LaunchNode.java @@ -132,6 +132,9 @@ public class LaunchNode extends ContainerModelNode { modes = Arrays.asList(LaunchConfigHelper.getLaunchConfigTypeModes(getLaunchConfigurationType(), false));
}
for (String m : modes) {
+ if (!getLaunchConfigurationType().supportsMode(m)) {
+ return false;
+ }
ILaunchManagerDelegate delegate = LaunchManager.getInstance().getLaunchManagerDelegate(getLaunchConfigurationType(), m);
if (delegate != null) {
try {
|