JBIDE-20989: Fixing node preference validation for node64.exe

jbosstools · Dec 7, 2015 · 80b09a2 · 80b09a2
1 parent a8fbc18
commit 80b09a2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/plugins/org.jboss.tools.jst.js/src/org/jboss/tools/jst/js/bower/internal/BowerConstants.java b/plugins/org.jboss.tools.jst.js/src/org/jboss/tools/jst/js/bower/internal/BowerConstants.java
@@ -25,6 +25,7 @@ private BowerConstants() {
 	public static final String BOWER_COMPONENTS = "bower_components"; //$NON-NLS-1$
 	public static final String BOWER_JSON = "bower.json"; //$NON-NLS-1$
 	public static final String NODE = "node"; //$NON-NLS-1$
+	public static final String NODE_64_EXE = "node64.exe"; //$NON-NLS-1$
 	public static final String NODE_EXE = "node.exe"; //$NON-NLS-1$
 	public static final String NODE_JS = "nodejs"; //$NON-NLS-1$
 	public static final String NODE_MODULES = "node_modules"; //$NON-NLS-1$

diff --git a/...t.js/src/org/jboss/tools/jst/js/bower/internal/preference/editor/NodeHomeFieldEditor.java b/...t.js/src/org/jboss/tools/jst/js/bower/internal/preference/editor/NodeHomeFieldEditor.java
@@ -51,13 +51,21 @@ protected boolean doCheckState() {
 		File nodeExecutable = new File(selectedFile, nodeExecutableName);
 		if (!nodeExecutable.exists()) {
 
-			if (!PlatformUtil.isLinux()) {
+			if (PlatformUtil.isMacOS()) {
 				setErrorMessage(Messages.BowerPreferencePage_NotValidNodeError);
-				return false;				
-			} 
+				return false;
+			}
+
 			// JBIDE-20351 Bower tooling doesn't detect node when the binary is called 'nodejs'
 			// If "nodejs" is not detected try to detect "node"
-			nodeExecutableName = BowerConstants.NODE;
+			if (PlatformUtil.isLinux()) {
+				nodeExecutableName = BowerConstants.NODE;
+
+			//JBIDE-20988 Preference validation fails on windows if node executable called node64.exe
+			} else if (PlatformUtil.isWindows()) {
+				nodeExecutableName = BowerConstants.NODE_64_EXE;
+			}
+
 			nodeExecutable = new File(selectedFile, nodeExecutableName);
 			if (!nodeExecutable.exists()) {
 				setErrorMessage(Messages.BowerPreferencePage_NotValidNodeError);

diff --git a/...g.jboss.tools.jst.js/src/org/jboss/tools/jst/js/bower/internal/util/ExternalToolUtil.java b/...g.jboss.tools.jst.js/src/org/jboss/tools/jst/js/bower/internal/util/ExternalToolUtil.java
@@ -34,12 +34,21 @@ public static String getNodeExecutableLocation() {
 		String nodeExecutableLocation = null;
 		String nodeExecutableName = getNodeExecutableName();
 		File nodeExecutable = new File(BowerPreferenceHolder.getNodeLocation(), nodeExecutableName);
+
 		if (nodeExecutable.exists()) {
 			nodeExecutableLocation = nodeExecutable.getAbsolutePath();
-		} else if (PlatformUtil.isLinux()) {
+		} else if (!PlatformUtil.isMacOS()) {
+
 			// JBIDE-20351 Bower tooling doesn't detect node when the binary is called 'nodejs'
 			// If "nodejs" is not detected try to detect "node"
-			nodeExecutableName = BowerConstants.NODE; 
+			if (PlatformUtil.isLinux()) {
+				nodeExecutableName = BowerConstants.NODE;
+
+			//JBIDE-20988 Preference validation fails on windows if node executable called node64.exe
+			} else if (PlatformUtil.isWindows()) {
+				nodeExecutableName = BowerConstants.NODE_64_EXE;
+			}
+
 			nodeExecutable = new File(BowerPreferenceHolder.getNodeLocation(), nodeExecutableName);
 			if (nodeExecutable.exists()) {
 				nodeExecutableLocation = nodeExecutable.getAbsolutePath();