From aedf6d8fa96c55c4e9fded7dba3c158a6493586f Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Sun, 19 Nov 2017 00:46:05 -0500 Subject: [PATCH] Expose org.eclipse.cdt.docker.launch directory as public - move ContainerCommandLauncher to org.eclipse.cdt.docker - update DockerLaunchUIPlugin to be noextend - update users of ContainerCommandLauncher appropriately Change-Id: I32ea6de3b3df12b6579249583303111bf6b7b957 --- launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF | 2 +- .../docker/launcher/ContainerCommandLauncher.java | 6 ++++-- .../docker/launcher/ContainerCommandLauncherFactory.java | 1 - .../eclipse/cdt/docker/launcher/DockerLaunchUIPlugin.java | 2 ++ .../cdt/internal/docker/launcher/ContainerPropertyTab.java | 1 + .../cdt/internal/docker/launcher/LaunchShortcut.java | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) rename launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/{internal => }/docker/launcher/ContainerCommandLauncher.java (98%) diff --git a/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF index 8eb9ae3603f..97b2ef01624 100644 --- a/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF +++ b/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF @@ -30,6 +30,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.databinding.property;bundle-version="1.6.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.cdt.docker.launcher;x-internal:=true, +Export-Package: org.eclipse.cdt.docker.launcher, org.eclipse.cdt.internal.docker.launcher;x-internal:=true, org.eclipse.cdt.internal.docker.launcher.ui.preferences;x-internal:=true diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncher.java similarity index 98% rename from launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java rename to launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncher.java index 79db65bd631..43a906fd8a2 100644 --- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java +++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncher.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.internal.docker.launcher; +package org.eclipse.cdt.docker.launcher; import java.io.File; import java.io.IOException; @@ -13,8 +13,9 @@ import java.util.Properties; import org.eclipse.cdt.core.ICommandLauncher; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.docker.launcher.DockerLaunchUIPlugin; import org.eclipse.cdt.internal.core.ProcessClosure; +import org.eclipse.cdt.internal.docker.launcher.Messages; +import org.eclipse.cdt.internal.docker.launcher.PreferenceConstants; import org.eclipse.cdt.managedbuilder.buildproperties.IOptionalBuildProperties; import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; @@ -80,6 +81,7 @@ public class ContainerCommandLauncher return fProject; } + @SuppressWarnings("unused") private String getImageName() { return fImageName; } diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java index 271f173beb0..fa1bae38e19 100644 --- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java +++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java @@ -25,7 +25,6 @@ import org.eclipse.cdt.core.settings.model.CIncludePathEntry; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICIncludePathEntry; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.internal.docker.launcher.ContainerCommandLauncher; import org.eclipse.cdt.internal.docker.launcher.Messages; import org.eclipse.cdt.managedbuilder.buildproperties.IOptionalBuildProperties; import org.eclipse.cdt.managedbuilder.core.IConfiguration; diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/DockerLaunchUIPlugin.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/DockerLaunchUIPlugin.java index 7025bda904e..edbed348a50 100644 --- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/DockerLaunchUIPlugin.java +++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/DockerLaunchUIPlugin.java @@ -21,6 +21,8 @@ import org.osgi.framework.BundleContext; /** * The activator class controls the plug-in life cycle + * + * @noextend This class is not intended to be subclassed by Clients */ public class DockerLaunchUIPlugin extends AbstractUIPlugin { diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java index cb892ea4526..623a4c5acea 100644 --- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java +++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java @@ -27,6 +27,7 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICMultiConfigDescription; import org.eclipse.cdt.core.settings.model.ICResourceDescription; import org.eclipse.cdt.core.settings.model.ICTargetPlatformSetting; +import org.eclipse.cdt.docker.launcher.ContainerCommandLauncher; import org.eclipse.cdt.internal.docker.launcher.ContainerPropertyVolumesModel.MountType; import org.eclipse.cdt.managedbuilder.buildproperties.IOptionalBuildProperties; import org.eclipse.cdt.managedbuilder.core.IConfiguration; diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/LaunchShortcut.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/LaunchShortcut.java index 5ad81d2dcde..21eb1de019a 100644 --- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/LaunchShortcut.java +++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/LaunchShortcut.java @@ -22,6 +22,7 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; +import org.eclipse.cdt.docker.launcher.ContainerCommandLauncher; import org.eclipse.cdt.docker.launcher.DockerLaunchUIPlugin; import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants;