Auto-detect Dart SDK in preference page does not work for existing

workspace eclipse#83 Signed-off-by: Lakshminarayana Nekkanti <[email protected]>
lak-proddev · Jul 9, 2019 · 00a495e · 00a495e
1 parent 9cb40fd
commit 00a495e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/org.eclipse.dartboard/src/org/eclipse/dartboard/preference/DartPreferencePage.java b/org.eclipse.dartboard/src/org/eclipse/dartboard/preference/DartPreferencePage.java
@@ -21,6 +21,7 @@
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.dartboard.Constants;
 import org.eclipse.dartboard.Messages;
+import org.eclipse.dartboard.util.StringUtil;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.preference.DirectoryFieldEditor;
 import org.eclipse.jface.preference.FieldEditor;
@@ -104,6 +105,9 @@ public boolean performOk() {
 	 * @return
 	 */
 	private Path getPath(String location) {
+		if (StringUtil.isNullOrEmpty(location)) {
+			return null;
+		}
 		Path path = Paths.get(location);
 		if (Files.exists(path)) {
 			try {

diff --git a/org.eclipse.dartboard/src/org/eclipse/dartboard/preference/DartSDKLocationFieldEditor.java b/org.eclipse.dartboard/src/org/eclipse/dartboard/preference/DartSDKLocationFieldEditor.java
@@ -1,10 +1,10 @@
 package org.eclipse.dartboard.preference;
 
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.eclipse.dartboard.Messages;
+import org.eclipse.dartboard.util.StringUtil;
 import org.eclipse.jface.preference.DirectoryFieldEditor;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.widgets.Composite;
@@ -18,15 +18,16 @@ public DartSDKLocationFieldEditor(String preferencesKey, String label, Composite
 
 	@Override
 	protected boolean doCheckState() {
+		boolean isValid = true;
 		String location = getTextControl().getText();
-		Path path = Paths.get(location);
-		if (Files.exists(path)) {
-			return true;
-		} else {
+		if (StringUtil.isNullOrEmpty(location) || !Files.exists(Paths.get(location))) {
+			isValid = false;
+		}
+		if (!isValid) {
 			setErrorMessage(Messages.Preference_SDKNotFound_Message);
 			showErrorMessage();
-			return false;
 		}
+		return isValid;
 	}
 
 	protected void addModifyListener(ModifyListener listener) {

diff --git a/org.eclipse.dartboard/src/org/eclipse/dartboard/util/StringUtil.java b/org.eclipse.dartboard/src/org/eclipse/dartboard/util/StringUtil.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2019 vogella GmbH and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Lakshminarayana Nekkanti 
+ *******************************************************************************/
+package org.eclipse.dartboard.util;
+
+public class StringUtil {
+
+	public static boolean isNullOrEmpty(String string) {
+		return string == null || string.isEmpty();
+	}
+}