Bug 503040 - NoStackTrace in Activator.logErrorMessage

Same as in 489111: marking the Activator#logErrorMessage(String)
as deprecated and logging a proper exception instead of a
standalone error message.

Change-Id: Ib06c4f6bf9fc2077c5c8e96814e76209126db504
Signed-off-by: Xavier Coulon <xcoulon@redhat.com>
Reviewed-on: https://git.eclipse.org/r/82351
Tested-by: Hudson CI
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>

12 files changed, 35 insertions, 24 deletions

diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/Activator.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/Activator.java
index 549f7d4130..a9ed506f5a 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/Activator.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/Activator.java
@@ -56,6 +56,10 @@ public class Activator extends AbstractUIPlugin {
 		Activator.getDefault().getLog().log(status);
 	}
 
+	/**
+	 * @deprecated see https://bugs.eclipse.org/bugs/show_bug.cgi?id=503040
+	 */
+	@Deprecated
 	public static void logErrorMessage(final String message) {
 		log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, message, null));
 	}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/BaseImagesCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/BaseImagesCommandHandler.java
index a87b247f63..05961f00c5 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/BaseImagesCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/BaseImagesCommandHandler.java
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.linuxtools.docker.core.DockerException;
 import org.eclipse.linuxtools.docker.core.IDockerConnection;
 import org.eclipse.linuxtools.docker.core.IDockerImage;
 import org.eclipse.linuxtools.docker.ui.Activator;
@@ -45,8 +46,8 @@ public abstract class BaseImagesCommandHandler extends AbstractHandler {
 		final List<IDockerImage> selectedImages = getSelectedImages(activePart);
 		final IDockerConnection connection = getCurrentConnection(activePart);
 		if (connection == null || selectedImages.isEmpty()) {
-			Activator.logErrorMessage(CommandMessages
-					.getString("Command.missing.selection.failure")); //$NON-NLS-1$
+			Activator.log(new DockerException(CommandMessages
+					.getString("Command.missing.selection.failure"))); //$NON-NLS-1$
 			return null;
 		}
 		final Job job = new Job(getJobName(selectedImages)) {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RemoveTagCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RemoveTagCommandHandler.java
index 6f87afc07b..db7b5f50d2 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RemoveTagCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RemoveTagCommandHandler.java
@@ -45,8 +45,8 @@ public class RemoveTagCommandHandler extends AbstractHandler {
 		final IDockerConnection connection = CommandUtils
 				.getCurrentConnection(activePart);
 		if (selectedImages.size() != 1 || connection == null) {
-			Activator.logErrorMessage(CommandMessages
-					.getString("Command.missing.selection.failure")); //$NON-NLS-1$
+			Activator.log(new DockerException(CommandMessages
+					.getString("Command.missing.selection.failure"))); //$NON-NLS-1$
 			return null;
 		}
 		final IDockerImage image = selectedImages.get(0);
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RunImageCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RunImageCommandHandler.java
index 973ef4e1bf..020146ed36 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RunImageCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RunImageCommandHandler.java
@@ -56,8 +56,8 @@ public class RunImageCommandHandler extends AbstractHandler {
 		final IDockerImage selectedImage = CommandUtils
 				.getSelectedImage(activePart);
 		if (selectedImage == null) {
-			Activator.logErrorMessage(
-					DVMessages.getString("RunImageUnableToRetrieveError.msg")); //$NON-NLS-1$
+			Activator.log(new DockerException(
+					DVMessages.getString("RunImageUnableToRetrieveError.msg"))); //$NON-NLS-1$
 		} else {
 			try {
 				final ImageRun wizard = new ImageRun(selectedImage);
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/ShowInSystemExplorerCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/ShowInSystemExplorerCommandHandler.java
index a26eb82e1a..5dae240f74 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/ShowInSystemExplorerCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/ShowInSystemExplorerCommandHandler.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.util.Util;
+import org.eclipse.linuxtools.docker.core.DockerException;
 import org.eclipse.linuxtools.docker.ui.Activator;
 import org.eclipse.linuxtools.internal.docker.ui.views.DockerExplorerContentProvider.DockerContainerVolume;
 import org.eclipse.ui.IWorkbenchPart;
@@ -65,10 +66,10 @@ public class ShowInSystemExplorerCommandHandler extends AbstractHandler {
 					final Process p = getLaunchProcess(launchCmd, hostFile);
 					final int retCode = p.waitFor();
 					if (retCode != 0 && !Util.isWindows()) {
-						Activator.logErrorMessage(
+						Activator.log(new DockerException(
 								CommandMessages.getFormattedString(
 										"command.showIn.systemExplorer.failure.command.execute", //$NON-NLS-1$
-										launchCmd, Integer.toString(retCode)));
+										launchCmd, Integer.toString(retCode))));
 					}
 				} catch (IOException | InterruptedException e) {
 					Activator
@@ -115,9 +116,9 @@ public class ShowInSystemExplorerCommandHandler extends AbstractHandler {
 	 */
 	private String getShowInSystemExplorerCommand(final File path) {
 		String command = ShowInSystemExplorerHandler.getDefaultCommand();
-		if ("".equals(command)) {
-			Activator.logErrorMessage(CommandMessages.getString(
-					"command.showIn.systemExplorer.failure.command_unavailable"));
+		if ("".equals(command)) { //$NON-NLS-1$
+			Activator.log(new DockerException(CommandMessages.getString(
+					"command.showIn.systemExplorer.failure.command_unavailable"))); //$NON-NLS-1$
 			return null;
 		}
 		try {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/TagImageCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/TagImageCommandHandler.java
index 970c094554..1072534ec8 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/TagImageCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/TagImageCommandHandler.java
@@ -49,8 +49,8 @@ public class TagImageCommandHandler extends AbstractHandler {
 		final IDockerConnection connection = CommandUtils
 				.getCurrentConnection(activePart);
 		if (selectedImages.size() != 1 || connection == null) {
-			Activator.logErrorMessage(CommandMessages
-					.getString("Command.missing.selection.failure")); //$NON-NLS-1$
+			Activator.log(new DockerException(CommandMessages
+					.getString("Command.missing.selection.failure"))); //$NON-NLS-1$
 			return null;
 		}
 		final IDockerImage image = selectedImages.get(0);
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/DockerComposeUpJob.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/DockerComposeUpJob.java
index aa863ed65a..548b6c56b6 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/DockerComposeUpJob.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/DockerComposeUpJob.java
@@ -96,8 +96,9 @@ public class DockerComposeUpJob extends Job {
 						.setDockerComposeProcess(dockerComposeProcess); // $NON-NLS-1$
 				final int exitCode = dockerComposeSystemProcess.waitFor();
 				if (exitCode != 0) {
-					Activator.logErrorMessage(
-							"'docker-compose up' exited with code " + exitCode); //$NON-NLS-1$
+					Activator.log(new DockerException(JobMessages
+							.getFormattedString("DockerComposeUp.exit", //$NON-NLS-1$
+									Integer.toString(exitCode))));
 				}
 			} catch (DockerException | InterruptedException e) {
 				Display.getDefault()
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/JobMessages.properties b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/JobMessages.properties
index 18fb293086..0aee2c1a2c 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/JobMessages.properties
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/JobMessages.properties
@@ -16,6 +16,7 @@ SkipEmptydockerfile.msg=Skipping empty Docker build file.
 RetrieveImageHierarchyJob.title=Retrieving Docker Image hierarchy
 DockerCompose.dialog.title=Docker Compose
 DockerComposeUp.title=Running 'docker-compose up' command
+DockerComposeUp.exit='docker-compose up' exited with code {0}
 DockerComposeStop.title=Stopping Docker Compose...
 DockerComposeStop.error=Docker Compose failed to stop
 RetrieveImageHierarchyJob.error=The selected element is not an Image nor a Container
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/RetrieveImageHierarchyJob.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/RetrieveImageHierarchyJob.java
index 3c9f16efb2..68b367457c 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/RetrieveImageHierarchyJob.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/jobs/RetrieveImageHierarchyJob.java
@@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.linuxtools.docker.core.DockerException;
 import org.eclipse.linuxtools.docker.core.IDockerConnection2;
 import org.eclipse.linuxtools.docker.core.IDockerContainer;
 import org.eclipse.linuxtools.docker.core.IDockerImage;
@@ -71,8 +72,8 @@ public class RetrieveImageHierarchyJob extends Job {
 				this.imageHierarchy = connection
 						.resolveImageHierarchy((IDockerImage) selectedElement);
 			} else {
-				Activator.logErrorMessage(JobMessages
-						.getString("RetrieveImageHierarchyJob.error")); //$NON-NLS-1$
+				Activator.log(new DockerException(JobMessages
+						.getString("RetrieveImageHierarchyJob.error"))); //$NON-NLS-1$
 			}
 		} finally {
 			monitor.done();
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/BuildDockerImageShortcut.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/BuildDockerImageShortcut.java
index d7c2189f33..81c59c7a97 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/BuildDockerImageShortcut.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/BuildDockerImageShortcut.java
@@ -22,6 +22,7 @@ import org.eclipse.debug.ui.ILaunchShortcut;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.linuxtools.docker.core.DockerConnectionManager;
+import org.eclipse.linuxtools.docker.core.DockerException;
 import org.eclipse.linuxtools.docker.ui.Activator;
 import org.eclipse.linuxtools.internal.docker.ui.commands.CommandUtils;
 import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageBuildDialog;
@@ -64,9 +65,8 @@ public class BuildDockerImageShortcut
 		if (config != null) {
 			DebugUITools.launch(config, mode);
 		} else {
-			Activator.logErrorMessage(
-					LaunchMessages.getString(
-							"BuildDockerImageShortcut.launchconfig.error")); //$NON-NLS-1$
+			Activator.log(new DockerException(LaunchMessages
+					.getString("BuildDockerImageShortcut.launchconfig.error"))); //$NON-NLS-1$
 		}
 	}
 	
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeUpShortcut.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeUpShortcut.java
index a17db9632f..4caf0e868b 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeUpShortcut.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeUpShortcut.java
@@ -22,6 +22,7 @@ import org.eclipse.debug.ui.ILaunchShortcut;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.linuxtools.docker.core.DockerConnectionManager;
+import org.eclipse.linuxtools.docker.core.DockerException;
 import org.eclipse.linuxtools.docker.ui.Activator;
 import org.eclipse.linuxtools.internal.docker.ui.commands.CommandUtils;
 import org.eclipse.linuxtools.internal.docker.ui.wizards.DockerComposeUpDialog;
@@ -64,8 +65,8 @@ public class DockerComposeUpShortcut extends BaseResourceAwareLaunchShortcut {
 		if (config != null) {
 			DebugUITools.launch(config, mode);
 		} else {
-			Activator.logErrorMessage(LaunchMessages
-					.getString("DockerComposeUpShortcut.launchconfig.error")); //$NON-NLS-1$
+			Activator.log(new DockerException(LaunchMessages
+					.getString("DockerComposeUpShortcut.launchconfig.error"))); //$NON-NLS-1$
 		}
 	}
 
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerExplorerContentProvider.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerExplorerContentProvider.java
index 21f35c0f2f..9128e106ca 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerExplorerContentProvider.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerExplorerContentProvider.java
@@ -182,8 +182,9 @@ public class DockerExplorerContentProvider implements ITreeContentProvider {
 					connection.ping();
 					return Status.OK_STATUS;
 				} catch (DockerException e) {
-					Activator.logErrorMessage(DVMessages.getFormattedString(
-							"PingJobError.msg", connection.getUri())); //$NON-NLS-1$
+					Activator.log(
+							new DockerException(DVMessages.getFormattedString(
+									"PingJobError.msg", connection.getUri()))); //$NON-NLS-1$
 					return Status.CANCEL_STATUS;
 				}
 			}