[refactoring] move functions and add a function to generate comparable version numbers

Author: tofi86

src/universalJavaApplicationStub

@@ -46,7 +46,6 @@
 
 
 
-
 #
 # resolve symlinks
 ############################################
@@ -68,7 +67,6 @@ PROGDIR=`dirname "$PRG"`
 
 
 
-
 #
 # set files and folders
 ############################################
@@ -101,7 +99,6 @@ JVMVersion=""
 
 
 
-
 #
 # read Info.plist and extract JVM options
 ############################################
@@ -235,6 +232,7 @@ else
 fi
 
 
+
 #
 # internationalized messages
 #
@@ -280,6 +278,30 @@ else
 fi
 
 
+
+#
+# function: extract Java major version
+#           from java -version command
+############################################
+
+function extractJavaMajorVersion() {
+	"$1" -version
+  echo `"$1" -version 2>&1 | awk '/version/{print $NF}' | sed -E 's/"([0-9.]{3})[0-9_.]{5,6}"/\1/g'`
+}
+
+
+
+#
+# function: generate comparable Java version
+#           number from java version string
+############################################
+
+function comparableJavaVersionNumber() {
+  echo $1 | sed -E 's/[[:punct:]]//g'
+}
+
+
+
 #
 # function: Java version tester
 ############################################
@@ -300,8 +322,8 @@ function JavaVersionSatisfiesRequirement() {
 
   # e.g. 1.8+
   elif [[ ${java_req} =~ ^[0-9]\.[0-9]\+$ ]] ; then
-    java_req_num=`echo ${java_req} | sed -E 's/[[:punct:]]//g'`
-    java_ver_num=`echo ${java_ver} | sed -E 's/[[:punct:]]//g'`
+    java_req_num=$(comparableJavaVersionNumber ${java_req})
+    java_ver_num=$(comparableJavaVersionNumber ${java_ver})
     if [ ${java_ver_num} -ge ${java_req_num} ] ; then
       return 0
     else
@@ -323,16 +345,6 @@ function JavaVersionSatisfiesRequirement() {
 }
 
 
-#
-# function: extract Java major version
-#           from java -version command
-############################################
-
-function extractJavaMajorVersion() {
-  echo `"$1" -version 2>&1 | awk '/version/{print $NF}' | sed -E 's/"([0-9.]{3})[0-9_.]{5,6}"/\1/g'`
-}
-
-
 
 #
 # find installed Java versions
@@ -391,7 +403,6 @@ fi
 
 
 
-
 #
 # execute JAVA commandline and do some pre-checks
 ####################################################