Skip to main content
summaryrefslogtreecommitdiffstats
path: root/launch
diff options
context:
space:
mode:
authorJeff Johnston2019-05-22 14:27:16 -0400
committerJonah Graham2019-05-22 20:51:11 -0400
commit292829c81711c9dedcb7b811d17ffc1f10cc6ef7 (patch)
tree21af1dc19d6b2b83ba96ef3643e9255c3e595af4 /launch
parent47ea958d5d151569e316e997f6aac45e0f15ea8a (diff)
downloadorg.eclipse.cdt-292829c81711c9dedcb7b811d17ffc1f10cc6ef7.tar.gz
org.eclipse.cdt-292829c81711c9dedcb7b811d17ffc1f10cc6ef7.tar.xz
org.eclipse.cdt-292829c81711c9dedcb7b811d17ffc1f10cc6ef7.zip
Bug 547442 - Launchbar shouldn't set newly added Container target active
- change ContainerTargetTypeProvider.changeEvent() to use the new ILaunchTargetManager2 interface to use addLaunchTargetNoNotify to add image targets from a new or enabled Docker connection so as to prevent scanner info jobs Change-Id: I2aef96c86c926790702a59853f0baf103c7115fc
Diffstat (limited to 'launch')
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerTargetTypeProvider.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerTargetTypeProvider.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerTargetTypeProvider.java
index 9e0deaa4e3..4491501dd6 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerTargetTypeProvider.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerTargetTypeProvider.java
@@ -39,6 +39,7 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.launchbar.core.ILaunchBarManager;
import org.eclipse.launchbar.core.target.ILaunchTarget;
import org.eclipse.launchbar.core.target.ILaunchTargetManager;
+import org.eclipse.launchbar.core.target.ILaunchTargetManager2;
import org.eclipse.launchbar.core.target.ILaunchTargetProvider;
import org.eclipse.launchbar.core.target.ILaunchTargetWorkingCopy;
import org.eclipse.launchbar.core.target.TargetStatus;
@@ -192,13 +193,14 @@ public class ContainerTargetTypeProvider implements ILaunchTargetProvider, IDock
}
target = targetManager.getLaunchTarget(TYPE_ID, imageName);
if (target != null) {
- if (target.getAttribute(IContainerLaunchTarget.ATTR_CONNECTION_URI, "")
+ if (target.getAttribute(IContainerLaunchTarget.ATTR_CONNECTION_URI, "") //$NON-NLS-1$
.equals(connection.getUri())) {
continue;
}
imageName = imageName2;
}
- target = targetManager.addLaunchTarget(TYPE_ID, imageName);
+ target = ((ILaunchTargetManager2) targetManager).addLaunchTargetNoNotify(TYPE_ID,
+ imageName);
ILaunchTargetWorkingCopy wc = target.getWorkingCopy();
wc.setAttribute(ILaunchTarget.ATTR_OS, CONTAINER_LINUX);
wc.setAttribute(ILaunchTarget.ATTR_ARCH, Platform.getOSArch());

Back to the top