Merge pull request #20 from Fedict/master

Reorder search for Java VM locations when specific JVM version is required

Author: tofi86

src/universalJavaApplicationStub

@@ -310,15 +310,15 @@ elif [ ! -z ${JVMVersion} ] ; then
 	# first in "/usr/libexec/java_home" symlinks
 	if [ -x /usr/libexec/java_home ] && /usr/libexec/java_home -F -v ${JVMVersion} > /dev/null ; then
 		JAVACMD="`/usr/libexec/java_home -F -v ${JVMVersion} 2> /dev/null`/bin/java"
-	
-	# then in Apple JRE plugin
-	elif [ -x "${apple_jre_plugin}" ] && JavaVersionSatisfiesRequirement ${apple_jre_version} ${JVMVersion} ; then
-		JAVACMD="${apple_jre_plugin}"
-	
+
 	# then in Oracle JRE plugin
 	elif [ -x "${oracle_jre_plugin}" ] && JavaVersionSatisfiesRequirement ${oracle_jre_version} ${JVMVersion} ; then
 		JAVACMD="${oracle_jre_plugin}"
-	
+
+	# then in Apple JRE plugin
+	elif [ -x "${apple_jre_plugin}" ] && JavaVersionSatisfiesRequirement ${apple_jre_version} ${JVMVersion} ; then
+		JAVACMD="${apple_jre_plugin}"
+
 	else
 		# display error message with applescript
 		osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'\n\nNo suitable Java version found on your system!\nThis program requires Java ${JVMVersion}\nMake sure you install the required Java version.\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"