tn5250j/src/org/tn5250j/tools/system OperatingSystem.java,1.3,1.4

"Kenneth J. Pouncey" <[email protected]> Wed, 30 Jun 2004 06:19:00 +0000
Newsgroups gmane.comp.java.tn5250j.cvs
Message-ID <[email protected]>
Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12998/tools/system

Modified Files:
	OperatingSystem.java 
Log Message:
Changed to use new logging factory

Index: OperatingSystem.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/system/OperatingSystem.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OperatingSystem.java	23 Jun 2004 14:50:06 -0000	1.3
--- OperatingSystem.java	30 Jun 2004 06:18:58 -0000	1.4
***************
*** 116,120 ****
     public static final boolean isUnix()
     {
!       return os == UNIX || os == MAC_OS_X;
     } //}}}
  
--- 116,129 ----
     public static final boolean isUnix()
     {
!       return os == UNIX || os == MAC_OS_X || os == LINUX;
!    } //}}}
! 
!    //{{{ isLinux() method
!    /**
!     * Returns if we're running Linux (this does not includ Unixes).
!     */
!    public static final boolean isLinux()
!    {
!       return os == LINUX;
     } //}}}
  
***************
*** 145,149 ****
        return java14;
     }
!    
     /**
      * From JavaWorld Tip 66 - http://www.javaworld.com/javaworld/javatips/jw-javatip66.html
--- 154,158 ----
        return java14;
     }
! 
     /**
      * From JavaWorld Tip 66 - http://www.javaworld.com/javaworld/javatips/jw-javatip66.html
***************
*** 195,199 ****
         }
     }
!    
   //}}}
  
--- 204,208 ----
         }
     }
! 
   //}}}
  
***************
*** 208,212 ****
      private static final String UNIX_PATH = "netscape";
      // The flag to display a url.
!     private static final String UNIX_FLAG = "-remote openURL";   
     private static final int UNIX = 0x31337;
     private static final int WINDOWS_9x = 0x640;
--- 217,221 ----
      private static final String UNIX_PATH = "netscape";
      // The flag to display a url.
!     private static final String UNIX_FLAG = "-remote openURL";
     private static final int UNIX = 0x31337;
     private static final int WINDOWS_9x = 0x640;
***************
*** 215,218 ****
--- 224,228 ----
     private static final int MAC_OS_X = 0xABC;
     private static final int UNKNOWN = 0xBAD;
+    private static final int LINUX = 0x1337;
  
     private static int os;
***************
*** 246,249 ****
--- 256,263 ----
              os = UNIX;
           }
+          else if(osName.toLowerCase().indexOf("linux") != -1)
+          {
+             os = LINUX;
+          }
           else
           {



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com