Bug 501552: Warn when user specifies no image name.

- Fix some string externalizations
- Don't clear all messages just because the directory is valid, as we
  still would want to indicate warning if image name is empty. Instead,
  clear messages at the beginning

Change-Id: I181b58e42aa26197cd0b7879cc8de7afaf4f33f5
Reviewed-on: https://git.eclipse.org/r/103192
Tested-by: Hudson CI
Reviewed-by: Roland Grunberg <rgrunber@redhat.com>

2 files changed, 8 insertions, 5 deletions

diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildPage.java
index e38f59d718..67dc34bca4 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildPage.java
@@ -62,6 +62,7 @@ public class ImageBuildPage extends WizardPage {
 	private final static String UNREADABLE_DIRECTORY = "ErrorUnreadableDirectory.msg"; //$NON-NLS-1$
 	private final static String INVALID_ID = "ErrorInvalidImageId.msg"; //$NON-NLS-1$
 	private final static String NO_DOCKER_FILE = "ErrorNoDockerFile.msg"; //$NON-NLS-1$
+	private final static String IMAGE_NAME_EMPTY = "ImageBuild.name.empty"; //$NON-NLS-1$
 
 	private Text nameText;
 	private Text directoryText;
@@ -106,18 +107,20 @@ public class ImageBuildPage extends WizardPage {
 		boolean complete = true;
 		boolean error = false;
 
+		setMessage(null);
 		String name = nameText.getText();
 
-		if (name.length() > 0 && name.charAt(name.length() - 1) == ':') { //$NON-NLS-1$
-			//				&& (tag.length() > 0) || tag.contains(":")) { //$NON-NLS-1$
+		if (name.length() > 0 && name.charAt(name.length() - 1) == ':') {
 			setErrorMessage(WizardMessages.getString(INVALID_ID));
 			error = true;
 		} else {
-			if (name.contains(":")) { //$NON-NLS-$
+			if (name.contains(":")) { //$NON-NLS-1$
 				if (name.substring(name.indexOf(':') + 1).contains(":")) { //$NON-NLS-1$
 					setErrorMessage(WizardMessages.getString(INVALID_ID));
 					error = true;
 				}
+			} else if (name.isEmpty()) {
+				setMessage(WizardMessages.getString(IMAGE_NAME_EMPTY), WARNING);
 			}
 		}
 
@@ -149,7 +152,6 @@ public class ImageBuildPage extends WizardPage {
 						setMessage(WizardMessages.getString(NO_DOCKER_FILE),
 								IMessageProvider.INFORMATION);
 					} else {
-						setMessage(null, IMessageProvider.INFORMATION);
 						lastDirectoryPath = dir;
 					}
 
@@ -232,7 +234,7 @@ public class ImageBuildPage extends WizardPage {
 						s.detach(p, 100, 100, 500, 375);
 						dockerFileEditor.getEditorSite().getShell()
 								.setText(WizardMessages
-										.getString("ImageBuild.editor.name"));
+										.getString("ImageBuild.editor.name")); //$NON-NLS-1$
 						editors.add(dockerFileEditor);
 					} catch (PartInitException e1) {
 						Activator.log(e1);
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 37bb36e241..440548cb13 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
@@ -129,6 +129,7 @@ ImageBuildName.toolTip=Enter the name of the new image (either REPOSITORY or REP
 
 ImageBuildDirectory.label=Directory:
 ImageBuildDirectory.toolTip=Enter or choose a directory containing a valid Dockerfile to build an image from
+ImageBuild.name.empty=The image to be built should be given a name.
 
 ImageDirectoryValidate.msg=Validating the selected folder
 ErrorNonexistentDirectory.msg=Directory specified does not exist