Bug 495251 - Expose the ImagePushProgressHandler in the API packages

- move ImageBuildProgressHandler, ImagePullProgressHandler,
  ImagePushProgressHandler, and ProgressJob from docker ui to
  internal docker core package
- add 3 new methods to IDockerConnection
  - getDefaultBuildImageProgressHandler
  - getDefaultPullImageProgressHandler
  - getDefaultPushImageProgressHandler
- implement said methods in DockerConnection
- move messages to core as needed

Change-Id: Iefc4743358e0ab47c9aa687d84beef8dcc501eed
Reviewed-on: https://git.eclipse.org/r/78903
Tested-by: Hudson CI
Reviewed-by: Xavier Coulon <xcoulon@redhat.com>

12 files changed, 184 insertions, 71 deletions

diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection2.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection2.java
new file mode 100644
index 0000000000..236142c934
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection2.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Red Hat.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - Initial Contribution
+ *******************************************************************************/
+package org.eclipse.linuxtools.docker.core;
+
+public interface IDockerConnection2 {
+
+	/**
+	 * Get the default progress handler for pulling images.
+	 * 
+	 * @param image
+	 *            name of image being pulled
+	 * @return progress handler
+	 * @since 2.1
+	 */
+	IDockerProgressHandler getDefaultPullImageProgressHandler(String image);
+
+	/**
+	 * Get the default progress handler for pushing images.
+	 * 
+	 * @param image
+	 *            name of image being pushed
+	 * @return progress handler
+	 * @since 2.1
+	 */
+	IDockerProgressHandler getDefaultPushImageProgressHandler(String image);
+
+	/**
+	 * Get the default progress handler for building images.
+	 * 
+	 * @param image
+	 *            name of image being built
+	 * @param lines
+	 *            number of lines in Dockerfile
+	 * @return progress handler
+	 * @since 2.1
+	 */
+	IDockerProgressHandler getDefaultBuildImageProgressHandler(String image,
+			int lines);
+
+}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ImageBuildProgressHandler.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultImageBuildProgressHandler.java
index 3bf00ed9c8..87d978e0f2 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ImageBuildProgressHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultImageBuildProgressHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Red Hat - Initial Contribution
  *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.ui.views;
+package org.eclipse.linuxtools.internal.docker.core;
 
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.linuxtools.docker.core.DockerException;
@@ -16,10 +16,8 @@ import org.eclipse.linuxtools.docker.core.DockerImageBuildFailedException;
 import org.eclipse.linuxtools.docker.core.IDockerConnection;
 import org.eclipse.linuxtools.docker.core.IDockerProgressHandler;
 import org.eclipse.linuxtools.docker.core.IDockerProgressMessage;
-import org.eclipse.linuxtools.internal.docker.core.DockerConnection;
-import org.eclipse.linuxtools.internal.docker.ui.ProgressJob;
 
-public class ImageBuildProgressHandler implements IDockerProgressHandler {
+public class DefaultImageBuildProgressHandler implements IDockerProgressHandler {
 
 	private final static String IMAGE_BUILD_COMPLETE = "ImageBuildComplete.msg"; //$NON-NLS-1$
 	private final static String IMAGE_BUILDING_JOBNAME = "ImageBuildingJobName.msg"; //$NON-NLS-1$
@@ -42,7 +40,7 @@ public class ImageBuildProgressHandler implements IDockerProgressHandler {
 	 * @param lines
 	 *            - number of lines in the Dockerfile
 	 */
-	public ImageBuildProgressHandler(IDockerConnection connection,
+	public DefaultImageBuildProgressHandler(IDockerConnection connection,
 			String image, int lines) {
 		this.image = image;
 		this.connection = (DockerConnection) connection;
@@ -60,14 +58,16 @@ public class ImageBuildProgressHandler implements IDockerProgressHandler {
 			// For image build, all the data is in the stream.
 			String status = message.stream();
 			if (status != null
-					&& status.startsWith(DVMessages
+					&& status.startsWith(DockerMessages
 							.getString(IMAGE_BUILD_COMPLETE))) {
 				// refresh images
 				connection.getImages(true);
 			} else {
 				ProgressJob newJob = new ProgressJob(
-						DVMessages.getFormattedString(IMAGE_BUILDING_JOBNAME,
-								image), DVMessages.getString(IMAGE_BUILDING));
+						DockerMessages.getFormattedString(
+								IMAGE_BUILDING_JOBNAME,
+								image),
+						DockerMessages.getString(IMAGE_BUILDING));
 				newJob.setUser(true);
 				newJob.setPriority(Job.LONG);
 				newJob.schedule();
@@ -77,16 +77,18 @@ public class ImageBuildProgressHandler implements IDockerProgressHandler {
 		} else {
 			String status = message.stream();
 			if (status != null
-					&& status.startsWith(DVMessages
+					&& status.startsWith(DockerMessages
 							.getString(IMAGE_BUILD_COMPLETE))) {
 				progressJob.setPercentageDone(100);
 				// refresh images
 				connection.getImages(true);
 			} else if (status != null
 					&& status
-							.startsWith(DVMessages.getString(IMAGE_BUILD_STEP))) {
+							.startsWith(DockerMessages
+									.getString(IMAGE_BUILD_STEP))) {
 				// Step number follows
-				String stepNumber = status.substring(DVMessages.getString(
+				String stepNumber = status.substring(
+						DockerMessages.getString(
 						IMAGE_BUILD_STEP).length());
 				// Need to separate step # from actual message.
 				String[] tokens = stepNumber.split(" ");
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ImagePullProgressHandler.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultImagePullProgressHandler.java
index 1c2c839c53..ad82f94b9a 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ImagePullProgressHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultImagePullProgressHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Red Hat - Initial Contribution
  *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.ui.views;
+package org.eclipse.linuxtools.internal.docker.core;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,10 +20,8 @@ import org.eclipse.linuxtools.docker.core.IDockerConnection;
 import org.eclipse.linuxtools.docker.core.IDockerProgressDetail;
 import org.eclipse.linuxtools.docker.core.IDockerProgressHandler;
 import org.eclipse.linuxtools.docker.core.IDockerProgressMessage;
-import org.eclipse.linuxtools.internal.docker.core.DockerConnection;
-import org.eclipse.linuxtools.internal.docker.ui.ProgressJob;
 
-public class ImagePullProgressHandler implements IDockerProgressHandler {
+public class DefaultImagePullProgressHandler implements IDockerProgressHandler {
 
 	private final static String IMAGE_DOWNLOAD_COMPLETE = "ImageDownloadComplete.msg"; //$NON-NLS-1$
 	private final static String IMAGE_DOWNLOADING_JOBNAME = "ImageDownloadingJobName.msg"; //$NON-NLS-1$
@@ -39,7 +37,7 @@ public class ImagePullProgressHandler implements IDockerProgressHandler {
 
 	private Map<String, ProgressJob> progressJobs = new HashMap<>();
 
-	public ImagePullProgressHandler(IDockerConnection connection, String image) {
+	public DefaultImagePullProgressHandler(IDockerConnection connection, String image) {
 		this.image = image;
 		this.connection = (DockerConnection) connection;
 	}
@@ -56,25 +54,25 @@ public class ImagePullProgressHandler implements IDockerProgressHandler {
 			ProgressJob p = progressJobs.get(id);
 			if (p == null) {
 				String status = message.status();
-				if (status.contains(DVMessages.getString(IMAGE_PULLING))) {
+				if (status.contains(DockerMessages.getString(IMAGE_PULLING))) {
 					// do nothing
 				} else if (status
-						.equals(DVMessages.getString(IMAGE_DOWNLOAD_COMPLETE))
-						|| status.contains(DVMessages
+						.equals(DockerMessages.getString(IMAGE_DOWNLOAD_COMPLETE))
+						|| status.contains(DockerMessages
 								.getString(IMAGE_DOWNLOADING_ALREADY_EXISTS))
-						|| status.contains(DVMessages
+						|| status.contains(DockerMessages
 								.getString(IMAGE_DOWNLOADING_VERIFIED))
 						|| status.equals(
-								DVMessages.getString(IMAGE_PULL_COMPLETE))) {
+								DockerMessages.getString(IMAGE_PULL_COMPLETE))) {
 					// an image is fully loaded, update the image list
 					connection.getImages(true);
 				} else if (status
-						.startsWith(DVMessages.getString(IMAGE_DOWNLOADING))) {
+						.startsWith(DockerMessages.getString(IMAGE_DOWNLOADING))) {
 					// we have a new download in progress, track it
 					ProgressJob newJob = new ProgressJob(
-							DVMessages.getFormattedString(
+							DockerMessages.getFormattedString(
 									IMAGE_DOWNLOADING_JOBNAME, image),
-							DVMessages.getFormattedString(
+							DockerMessages.getFormattedString(
 									IMAGE_DOWNLOADING_IMAGE, id));
 					// job.setUser(false) will show all pull job (one per image
 					// layer) in the progress
@@ -87,15 +85,15 @@ public class ImagePullProgressHandler implements IDockerProgressHandler {
 
 			} else {
 				String status = message.status();
-				if (status.equals(DVMessages.getString(IMAGE_DOWNLOAD_COMPLETE))
-						|| status.contains(DVMessages
+				if (status.equals(DockerMessages.getString(IMAGE_DOWNLOAD_COMPLETE))
+						|| status.contains(DockerMessages
 								.getString(IMAGE_DOWNLOADING_ALREADY_EXISTS))
-						|| status.contains(DVMessages
+						|| status.contains(DockerMessages
 								.getString(IMAGE_DOWNLOADING_VERIFIED))) {
 					p.setPercentageDone(100);
 					connection.getImages(true);
 				} else if (status
-						.startsWith(DVMessages.getString(IMAGE_DOWNLOADING))) {
+						.startsWith(DockerMessages.getString(IMAGE_DOWNLOADING))) {
 					IDockerProgressDetail detail = message.progressDetail();
 					if (detail != null) {
 						if (detail.current() > 0) {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ImagePushProgressHandler.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultImagePushProgressHandler.java
index 20d8f55812..b5b1f8f80c 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ImagePushProgressHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultImagePushProgressHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Red Hat - Initial Contribution
  *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.ui.views;
+package org.eclipse.linuxtools.internal.docker.core;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,10 +20,8 @@ import org.eclipse.linuxtools.docker.core.IDockerConnection;
 import org.eclipse.linuxtools.docker.core.IDockerProgressDetail;
 import org.eclipse.linuxtools.docker.core.IDockerProgressHandler;
 import org.eclipse.linuxtools.docker.core.IDockerProgressMessage;
-import org.eclipse.linuxtools.internal.docker.core.DockerConnection;
-import org.eclipse.linuxtools.internal.docker.ui.ProgressJob;
 
-public class ImagePushProgressHandler implements IDockerProgressHandler {
+public class DefaultImagePushProgressHandler implements IDockerProgressHandler {
 
 	private final static String IMAGE_UPLOAD_COMPLETE = "ImageUploadComplete.msg"; //$NON-NLS-1$
 	private final static String IMAGE_UPLOAD_ALREADY_COMPLETE = "ImageUploadAlreadyComplete.msg"; //$NON-NLS-1$
@@ -36,7 +34,7 @@ public class ImagePushProgressHandler implements IDockerProgressHandler {
 
 	private Map<String, ProgressJob> progressJobs = new HashMap<>();
 
-	public ImagePushProgressHandler(IDockerConnection connection, String image) {
+	public DefaultImagePushProgressHandler(IDockerConnection connection, String image) {
 		this.image = image;
 		this.connection = (DockerConnection) connection;
 	}
@@ -53,14 +51,14 @@ public class ImagePushProgressHandler implements IDockerProgressHandler {
 			ProgressJob p = progressJobs.get(id);
 			if (p == null) {
 				String status = message.status();
-				if (status.equals(DVMessages.getString(IMAGE_UPLOAD_COMPLETE))
-						|| status.contains(DVMessages.getString(IMAGE_UPLOAD_ALREADY_COMPLETE))) {
+				if (status.equals(DockerMessages.getString(IMAGE_UPLOAD_COMPLETE))
+						|| status.contains(DockerMessages.getString(IMAGE_UPLOAD_ALREADY_COMPLETE))) {
 					connection.getImages(true);
 				} else {
 					ProgressJob newJob = new ProgressJob(
-							DVMessages.getFormattedString(
+							DockerMessages.getFormattedString(
 									IMAGE_UPLOADING_JOBNAME, image),
-							DVMessages.getFormattedString(
+							DockerMessages.getFormattedString(
 									IMAGE_UPLOADING_IMAGE, id));
 					newJob.setUser(true);
 					newJob.setPriority(Job.LONG);
@@ -70,11 +68,11 @@ public class ImagePushProgressHandler implements IDockerProgressHandler {
 
 			} else {
 				String status = message.status();
-				if (status.equals(DVMessages.getString(IMAGE_UPLOAD_COMPLETE))
-						|| status.contains(DVMessages.getString(IMAGE_UPLOAD_ALREADY_COMPLETE))) {
+				if (status.equals(DockerMessages.getString(IMAGE_UPLOAD_COMPLETE))
+						|| status.contains(DockerMessages.getString(IMAGE_UPLOAD_ALREADY_COMPLETE))) {
 					p.setPercentageDone(100);
 					connection.getImages(true);
-				} else if (status.startsWith(DVMessages
+				} else if (status.startsWith(DockerMessages
 						.getString(IMAGE_UPLOADING))) {
 					IDockerProgressDetail detail = message.progressDetail();
 					if (detail != null) {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
index 0df7651955..11ae9c785f 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
@@ -54,6 +54,7 @@ import org.eclipse.linuxtools.docker.core.EnumDockerConnectionState;
 import org.eclipse.linuxtools.docker.core.EnumDockerLoggingStatus;
 import org.eclipse.linuxtools.docker.core.IDockerConfParameter;
 import org.eclipse.linuxtools.docker.core.IDockerConnection;
+import org.eclipse.linuxtools.docker.core.IDockerConnection2;
 import org.eclipse.linuxtools.docker.core.IDockerConnectionInfo;
 import org.eclipse.linuxtools.docker.core.IDockerConnectionSettings;
 import org.eclipse.linuxtools.docker.core.IDockerConnectionSettings.BindingType;
@@ -118,7 +119,8 @@ import com.spotify.docker.client.messages.Version;
  * 
  *
  */
-public class DockerConnection implements IDockerConnection, Closeable {
+public class DockerConnection
+		implements IDockerConnection, IDockerConnection2, Closeable {
 
 	// Builder allowing different binding modes (unix socket vs TCP connection)
 	public static class Builder {
@@ -1040,6 +1042,24 @@ public class DockerConnection implements IDockerConnection, Closeable {
 	}
 
 	@Override
+	public IDockerProgressHandler getDefaultBuildImageProgressHandler(
+			String image, int lines) {
+		return new DefaultImageBuildProgressHandler(this, image, lines);
+	}
+
+	@Override
+	public IDockerProgressHandler getDefaultPullImageProgressHandler(
+			String image) {
+		return new DefaultImagePullProgressHandler(this, image);
+	}
+
+	@Override
+	public IDockerProgressHandler getDefaultPushImageProgressHandler(
+			String image) {
+		return new DefaultImagePushProgressHandler(this, image);
+	}
+
+	@Override
 	public void pullImage(final String id, final IDockerProgressHandler handler)
 			throws DockerException, InterruptedException {
 		try {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerMessages.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerMessages.java
new file mode 100644
index 0000000000..f30d214881
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerMessages.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Red Hat.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - Initial Contribution
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.docker.core;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class DockerMessages {
+
+	private static final String BUNDLE_NAME = DockerMessages.class.getName();
+
+	public static String getString(String key) {
+		try {
+			return ResourceBundle.getBundle(BUNDLE_NAME).getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		} catch (NullPointerException e) {
+			return '#' + key + '#';
+		}
+	}
+
+	public static String getFormattedString(String key, String arg) {
+		return MessageFormat.format(getString(key), new Object[] { arg });
+	}
+
+	public static String getFormattedString(String key, String... args) {
+		return MessageFormat.format(getString(key), (Object[]) args);
+	}
+}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerMessages.properties b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerMessages.properties
new file mode 100644
index 0000000000..56ed190ac3
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerMessages.properties
@@ -0,0 +1,29 @@
+################################################################################
+# Copyright (c) 2016 Red Hat.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - Initial Contribution
+###############################################################################
+ImageDownloadComplete.msg=Download complete
+ImageDownloadingImage.msg=Downloading image id: {0}
+ImageDownloadingJobName.msg=Pulling docker image - {0}
+ImageDownloading.msg=Downloading
+ImagePulling.msg=Pulling
+ImagePullComplete.msg=Pull complete
+ImageDownloadingAlreadyExists.msg=Already exists
+ImageDownloadingVerified.msg=verified
+
+ImageUploadComplete.msg=Pushed
+ImageUploadAlreadyComplete.msg=already exists
+ImageUploadingImage.msg=Pushing image id: {0}
+ImageUploadingJobName.msg=Pushing Docker Image - {0}
+ImageUploading.msg=Pushing
+
+ImageBuildComplete.msg=Successfully built
+ImageBuildStep.msg=Step 
+ImageBuildingJobName.msg=Building Docker Image - {0}
+ImageBuilding.msg=Building image
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/ProgressJob.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProgressJob.java
index 6d73b9090d..9979d17c59 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/ProgressJob.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProgressJob.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Red Hat - Initial Contribution
  *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.ui;
+package org.eclipse.linuxtools.internal.docker.core;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PullImageCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PullImageCommandHandler.java
index 9c15c9d29b..cdb28e0f38 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PullImageCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PullImageCommandHandler.java
@@ -23,8 +23,8 @@ import org.eclipse.linuxtools.docker.core.IRegistry;
 import org.eclipse.linuxtools.docker.core.IRegistryAccount;
 import org.eclipse.linuxtools.docker.ui.wizards.ImageSearch;
 import org.eclipse.linuxtools.internal.docker.core.DockerConnection;
+import org.eclipse.linuxtools.internal.docker.core.DefaultImagePullProgressHandler;
 import org.eclipse.linuxtools.internal.docker.ui.views.DVMessages;
-import org.eclipse.linuxtools.internal.docker.ui.views.ImagePullProgressHandler;
 import org.eclipse.linuxtools.internal.docker.ui.wizards.ImagePull;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
@@ -84,18 +84,18 @@ public class PullImageCommandHandler extends AbstractHandler {
 				try {
 					if (registry == null) {
 						((DockerConnection) connection).pullImage(imageName,
-								new ImagePullProgressHandler(connection,
+								new DefaultImagePullProgressHandler(connection,
 										imageName));
 					} else {
 						String fullImageName = registry.getServerAddress() + '/' + imageName;
 						if (registry instanceof IRegistryAccount) {
 							IRegistryAccount account = (IRegistryAccount) registry;
 							((DockerConnection) connection).pullImage(fullImageName,
-									account, new ImagePullProgressHandler(
+									account, new DefaultImagePullProgressHandler(
 											connection, fullImageName));
 						} else {
 							((DockerConnection) connection).pullImage(fullImageName,
-									new ImagePullProgressHandler(connection,
+									new DefaultImagePullProgressHandler(connection,
 											fullImageName));
 						}
 					}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PushImageCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PushImageCommandHandler.java
index f893bc2a11..6bb55fa1b9 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PushImageCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PushImageCommandHandler.java
@@ -22,8 +22,8 @@ import org.eclipse.linuxtools.docker.core.IDockerConnection;
 import org.eclipse.linuxtools.docker.core.IDockerImage;
 import org.eclipse.linuxtools.docker.core.IRegistry;
 import org.eclipse.linuxtools.docker.core.IRegistryAccount;
+import org.eclipse.linuxtools.internal.docker.core.DefaultImagePushProgressHandler;
 import org.eclipse.linuxtools.internal.docker.ui.views.DVMessages;
-import org.eclipse.linuxtools.internal.docker.ui.views.ImagePushProgressHandler;
 import org.eclipse.linuxtools.internal.docker.ui.wizards.ImagePush;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
@@ -92,11 +92,11 @@ public class PushImageCommandHandler extends AbstractHandler {
 					if (info instanceof IRegistryAccount) {
 						IRegistryAccount acc = (IRegistryAccount) info;
 						connection.pushImage(tmpRegistryTag, acc,
-								new ImagePushProgressHandler(connection,
+								new DefaultImagePushProgressHandler(connection,
 										tmpRegistryTag));
 					} else {
 						connection.pushImage(tmpRegistryTag,
-								new ImagePushProgressHandler(connection,
+								new DefaultImagePushProgressHandler(connection,
 										tmpRegistryTag));
 					}
 				} catch (final DockerException e) {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DVMessages.properties b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DVMessages.properties
index ebc98650c9..0265356540 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DVMessages.properties
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DVMessages.properties
@@ -112,26 +112,6 @@ ContainerUnpause.msg=Unpausing Containers: <{0}>
 ContainerCommitting.msg=Committing Container: <{0}>
 ContainerLogging.msg=Displaying Logs for Containers: <{0}>
 
-ImageDownloadComplete.msg=Download complete
-ImageDownloadingImage.msg=Downloading image id: {0}
-ImageDownloadingJobName.msg=Pulling docker image - {0}
-ImageDownloading.msg=Downloading
-ImagePulling.msg=Pulling
-ImagePullComplete.msg=Pull complete
-ImageDownloadingAlreadyExists.msg=Already exists
-ImageDownloadingVerified.msg=verified
-
-ImageUploadComplete.msg=Pushed
-ImageUploadAlreadyComplete.msg=already exists
-ImageUploadingImage.msg=Pushing image id: {0}
-ImageUploadingJobName.msg=Pushing Docker Image - {0}
-ImageUploading.msg=Pushing
-
-ImageBuildComplete.msg=Successfully built
-ImageBuildStep.msg=Step 
-ImageBuildingJobName.msg=Building Docker Image - {0}
-ImageBuilding.msg=Building image
-
 ImageDeleteConfirm.msg=Confirm Remove Image
 ImageDeleteList.msg=Delete images: {0}?
 
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java
index aaaf4099a2..ec30759af2 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java
@@ -71,12 +71,12 @@ import org.eclipse.linuxtools.docker.core.IDockerImage;
 import org.eclipse.linuxtools.docker.core.IDockerImageInfo;
 import org.eclipse.linuxtools.docker.ui.Activator;
 import org.eclipse.linuxtools.docker.ui.wizards.ImageSearch;
+import org.eclipse.linuxtools.internal.docker.core.DefaultImagePullProgressHandler;
 import org.eclipse.linuxtools.internal.docker.core.RegistryInfo;
 import org.eclipse.linuxtools.internal.docker.ui.SWTImagesFactory;
 import org.eclipse.linuxtools.internal.docker.ui.commands.CommandUtils;
 import org.eclipse.linuxtools.internal.docker.ui.jobs.FindImageInfoRunnable;
 import org.eclipse.linuxtools.internal.docker.ui.views.DVMessages;
-import org.eclipse.linuxtools.internal.docker.ui.views.ImagePullProgressHandler;
 import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageRunSelectionModel.ContainerLinkModel;
 import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageRunSelectionModel.ExposedPortModel;
 import org.eclipse.swt.SWT;
@@ -943,7 +943,7 @@ public class ImageRunSelectionPage extends WizardPage {
 						1);
 				try {
 					connection.pullImage(imageName,
-							new ImagePullProgressHandler(connection,
+							new DefaultImagePullProgressHandler(connection,
 									imageName));
 				} catch (final DockerException e) {
 					Display.getDefault().syncExec(() -> MessageDialog.openError(