Bug 475235 - Expose Search Images dialog

Moving ImageSearch wizard to a public package
but keeping the WizardPage in the internal package

Change-Id: Ie8de18357e031f0b6f25e0710b307aa67ae7659c
Signed-off-by: Xavier Coulon <xcoulon@redhat.com>
Reviewed-on: https://git.eclipse.org/r/55484
Tested-by: Hudson CI
Reviewed-by: Roland Grunberg <rgrunber@redhat.com>

6 files changed, 33 insertions, 14 deletions

diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearch.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/wizards/ImageSearch.java
index 376c6a4092..6e183d0e77 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearch.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/wizards/ImageSearch.java
@@ -9,12 +9,17 @@
  *     Red Hat - Initial Contribution
  *******************************************************************************/
 
-package org.eclipse.linuxtools.internal.docker.ui.wizards;
+package org.eclipse.linuxtools.docker.ui.wizards;
 
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.linuxtools.docker.core.IDockerConnection;
 import org.eclipse.linuxtools.docker.core.IDockerImageSearchResult;
+import org.eclipse.linuxtools.internal.docker.ui.wizards.DockerImageTagSearchResult;
+import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageSearchModel;
+import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageSearchPage;
+import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageTagSelectionPage;
+import org.eclipse.linuxtools.internal.docker.ui.wizards.WizardMessages;
 
 /**
  * Wizard to search for images.
@@ -34,7 +39,7 @@ public class ImageSearch extends Wizard {
 	 */
 	private final ImageSearchModel imageSearchModel;
 
-	/**
+	/*
 	 * Default Constructor
 	 */
 	public ImageSearch(final IDockerConnection connection) {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/wizards/package-info.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/wizards/package-info.java
new file mode 100644
index 0000000000..ea7cb7da59
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/wizards/package-info.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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 for exposed/public wizards
+ */
+package org.eclipse.linuxtools.docker.ui.wizards;
\ No newline at end of file
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 789e6c57f0..8d477ddd28 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
@@ -19,10 +19,10 @@ 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.ui.wizards.ImageSearch;
 import org.eclipse.linuxtools.internal.docker.core.DockerConnection;
 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.ImageSearch;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
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 45d0b778fb..fadb5ef083 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
@@ -252,6 +252,7 @@ public class DockerExplorerContentProvider implements ITreeContentProvider {
 
 	}
 	
+
 	public static class LoadingStub {
 		
 		private final Object element;
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 63a8ea3e31..147f521a14 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
@@ -59,6 +59,7 @@ import org.eclipse.linuxtools.docker.core.IDockerImage;
 import org.eclipse.linuxtools.docker.core.IDockerImageInfo;
 import org.eclipse.linuxtools.docker.core.IDockerImageSearchResult;
 import org.eclipse.linuxtools.docker.ui.Activator;
+import org.eclipse.linuxtools.docker.ui.wizards.ImageSearch;
 import org.eclipse.linuxtools.internal.docker.ui.SWTImagesFactory;
 import org.eclipse.linuxtools.internal.docker.ui.commands.CommandUtils;
 import org.eclipse.linuxtools.internal.docker.ui.utils.IRunnableWithResult;
@@ -694,16 +695,13 @@ public class ImageRunSelectionPage extends WizardPage {
 				final boolean completed = CommandUtils
 						.openWizard(imageSearchWizard, getShell());
 				if (completed) {
-					final IDockerImageSearchResult selectedSearchImage = imageSearchWizard
+					final IDockerImageSearchResult selectedImage = imageSearchWizard
 							.getSelectedImage();
-					if (selectedSearchImage.getName().contains(":")) {
-						model.setSelectedImageName(
-								selectedSearchImage.getName());
-					} else {
-						// assume tag is 'latest'
-						model.setSelectedImageName(
-								selectedSearchImage.getName() + ":latest"); //$NON-NLS-1$
-					}
+					final DockerImageTagSearchResult selectedImageTag = imageSearchWizard
+							.getSelectedImageTag();
+					model.setSelectedImageName(selectedImage.getName()
+ + ":" //$NON-NLS-1$
+							+ selectedImageTag.getName());
 				}
 			}
 		};
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/WizardMessages.properties b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/WizardMessages.properties
index e902ff3154..33be568246 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/WizardMessages.properties
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/WizardMessages.properties
@@ -236,9 +236,9 @@ ImageRunSelectionPage.aliasColumn=Alias
 ImageRunSelectionPage.openStdin=Keep STDIN open to Console even if not attached (-i)
 ImageRunSelectionPage.tty=Allocate pseudo-TTY from Console (-t)
 ImageRunSelectionPage.autoRemove=Automatically remove the container when it exits (--rm)
-ImageRunSelectionPage.pullingTask=Pulling image '{0}'
+ImageRunSelectionPage.pullingTask=Pulling image ''{0}''
 ImageRunSelectionPage.specifyImageMsg=Please specify the image to run.
-ImageRunSelectionPage.imageNotFoundMessage=Image named '{0}' does not exist locally. Click on the link under the 'Image' combo to start pulling it.
+ImageRunSelectionPage.imageNotFoundMessage=Image named ''{0}'' does not exist locally. Click on the link under the 'Image' combo to start pulling it.
 
 ImageRunResourceVolVarPage.title=Volumes, Environment Variables and Resource Limitations
 ImageRunResourceVolVarPage.enableLimitationButton=Enable resource limitations