[freenet-cvs] r10885 - trunk/contrib/fec/common/src/com/onionnetworks/util

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-11-11 16:23:22 +0000 (Sat, 11 Nov 2006)
New Revision: 10885

Modified:
   trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java
Log:
Contrib: FEC: cleaner code for NativeDeployer wich should work even on win64

Modified: 
trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java
===================================================================
--- trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java     
2006-11-11 16:10:03 UTC (rev 10884)
+++ trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java     
2006-11-11 16:23:22 UTC (rev 10885)
@@ -50,15 +50,13 @@

        public final static String OS_ARCH;
        static {
-               if(System.getProperty("os.name").startsWith("Windows "))
-                       OS_ARCH="win32-x32";
-               else{
-                       
if(System.getProperty("os.arch").toLowerCase().matches("(i?[x0-9]86_64|amd64)"))
-                               
OS_ARCH=System.getProperty("os.name").toLowerCase()+"-x86_64";
-                       else 
if(System.getProperty("os.arch").toLowerCase().indexOf("86") != -1)
-                               
OS_ARCH=System.getProperty("os.name").toLowerCase()+"-x86";
-                       else
-                               
OS_ARCH=System.getProperty("os.name").toLowerCase()+"-"+System.getProperty("os.arch").toLowerCase();
+               final String OS = 
System.getProperty("os.name").startsWith("Windows ") ? "win32" : 
System.getProperty("os.name").toLowerCase();
+               
if(System.getProperty("os.arch").toLowerCase().matches("(i?[x0-9]86_64|amd64)"))
+                       OS_ARCH=OS+"-x86_64";
+               else 
if(System.getProperty("os.arch").toLowerCase().indexOf("86") != -1)
+                       OS_ARCH=OS+"-x86";
+               else
+                       
OS_ARCH=OS+"-"+System.getProperty("os.arch").toLowerCase();
                }
        }