diff options
author | Roland Grunberg | 2016-03-01 18:38:26 +0000 |
---|---|---|
committer | Jeff Johnston | 2016-03-17 18:49:44 +0000 |
commit | e992a681f0d24a165c877a23a3775d0f5e2baee7 (patch) | |
tree | f377c0fdfb6787db342274afb1c57a95a8e25b2a | |
parent | 2075fc1f752cbfc7b5e17943d21f9f9c45136c1b (diff) | |
download | org.eclipse.linuxtools-e992a681f0d24a165c877a23a3775d0f5e2baee7.tar.gz org.eclipse.linuxtools-e992a681f0d24a165c877a23a3775d0f5e2baee7.tar.xz org.eclipse.linuxtools-e992a681f0d24a165c877a23a3775d0f5e2baee7.zip |
Fix Image Tag Removal.
Regression was introduced in 221656.
Change-Id: I74f4b66aee93ad012b4393eb7bb6e0df47c28dd6
Reviewed-on: https://git.eclipse.org/r/67622
Tested-by: Hudson CI
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
Reviewed-on: https://git.eclipse.org/r/68702
2 files changed, 12 insertions, 9 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTag.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTag.java index 10e3845458..cbf7b910ae 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTag.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTag.java @@ -37,11 +37,6 @@ public class ImageRemoveTag extends Wizard { } @Override - public boolean canFinish() { - return this.mainPage.isPageComplete(); - } - - @Override public boolean performFinish() { return true; } diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTagPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTagPage.java index bee8e644bc..df131eae88 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTagPage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTagPage.java @@ -18,6 +18,8 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.linuxtools.docker.core.IDockerImage; import org.eclipse.linuxtools.internal.docker.ui.SWTImagesFactory; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; @@ -31,7 +33,7 @@ public class ImageRemoveTagPage extends WizardPage { private final static String REMOVE_TAG_LABEL = "ImageRemoveTagName.label"; //$NON-NLS-1$ private final static String REMOVE_TAG_TOOLTIP = "ImageRemoveTagName.toolTip"; //$NON-NLS-1$ - private Combo tagCombo; + private String selectedTag; private IDockerImage image; public ImageRemoveTagPage(IDockerImage image) { @@ -43,7 +45,7 @@ public class ImageRemoveTagPage extends WizardPage { } public String getTag() { - return tagCombo.getText(); + return selectedTag; } @Override @@ -59,18 +61,24 @@ public class ImageRemoveTagPage extends WizardPage { repoLabel.setText(WizardMessages.getString(REMOVE_TAG_LABEL)); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER) .grab(false, false).applyTo(repoLabel); - tagCombo = new Combo(container, SWT.BORDER | SWT.READ_ONLY); + final Combo tagCombo = new Combo(container, SWT.BORDER | SWT.READ_ONLY); tagCombo.setToolTipText(WizardMessages.getString(REMOVE_TAG_TOOLTIP)); + tagCombo.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + selectedTag = tagCombo.getText(); + } + }); // Set up combo with repoTags that can be removed final List<String> repoTags = image.repoTags(); tagCombo.setItems(repoTags.toArray(new String[0])); tagCombo.select(0); + selectedTag = tagCombo.getItem(0); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER) .grab(true, false).applyTo(tagCombo); setControl(container); - setPageComplete(false); } } |