Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2016-03-14 19:18:18 +0000
committerJeff Johnston2016-03-14 20:52:27 +0000
commit13622ce99f43eb7e319dcc09b7978f311ff49ddc (patch)
tree118340d3dfef549ce79e02ca7a37f432fd2019ba
parentfb23cd093bcdab80658224cd340015816f247823 (diff)
downloadorg.eclipse.linuxtools-13622ce99f43eb7e319dcc09b7978f311ff49ddc.tar.gz
org.eclipse.linuxtools-13622ce99f43eb7e319dcc09b7978f311ff49ddc.tar.xz
org.eclipse.linuxtools-13622ce99f43eb7e319dcc09b7978f311ff49ddc.zip
Bug 489583 - Push dialog for selected item does not show pull-down
- Fix ImagePushHandler to look for selected image to pass to ImagePush Wizard Change-Id: Iae693fb4b30723ce2316119b1728e8aeeabaaea3 Reviewed-on: https://git.eclipse.org/r/68390 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> (cherry picked from commit 649a17cbb1fa86b6d16a9edf077533e8b4a2bbe4) Reviewed-on: https://git.eclipse.org/r/68394
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PushImageCommandHandler.java6
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/WizardMessages.properties2
2 files changed, 6 insertions, 2 deletions
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 a173153fed..716696413a 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
@@ -19,6 +19,7 @@ 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.internal.docker.core.DockerConnection;
import org.eclipse.linuxtools.internal.docker.ui.views.DVMessages;
import org.eclipse.linuxtools.internal.docker.ui.views.DockerImagesView;
@@ -39,7 +40,9 @@ public class PushImageCommandHandler extends AbstractHandler {
@Override
public Object execute(final ExecutionEvent event) {
final IWorkbenchPart activePart = HandlerUtil.getActivePart(event);
- final ImagePush wizard = new ImagePush();
+ final IDockerImage selectedImage = RunImageCommandHandler
+ .getSelectedImage(activePart);
+ final ImagePush wizard = new ImagePush(selectedImage);
final boolean pushImage = CommandUtils.openWizard(wizard,
HandlerUtil.getActiveShell(event));
if (pushImage) {
@@ -94,4 +97,5 @@ public class PushImageCommandHandler extends AbstractHandler {
}
+
}
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 75e5219497..39ba20f0b9 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
@@ -91,7 +91,7 @@ ImagePull.name.invalidformat.msg=Image name is invalid.\nExpected [REGISTRY_HOST
ImagePull.assumeLatest.msg=Assuming image tag is 'latest' since none was specified
ImagePush.label=Push an image:
-ImagePush.desc=Specify the name of an image to push to the host.
+ImagePush.desc=Specify the image tag to push to the host.
ImagePush.title=Push Image
ImagePush.name=Push Image

Back to the top