cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat JdkCompat.java

[billbarker]

billbarker    2004/04/02 22:47:24

  Modified:    util/java/org/apache/tomcat/util/compat JdkCompat.java
  Log:
  Add detection for JDK 1.5
  
  Revision  Changes    Path
  1.12      +9 -0      
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
  
  Index: JdkCompat.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JdkCompat.java    24 Feb 2004 08:50:05 -0000      1.11
  +++ JdkCompat.java    3 Apr 2004 06:47:24 -0000       1.12
  @@ -66,6 +66,10 @@
           return java14;
       }
   
  +    public static boolean isJava15() {
  +        return java15;
  +    }
  +
       // -------------------- Implementation --------------------
       
       // from ant
  @@ -74,10 +78,12 @@
       public static final String JAVA_1_2 = "1.2";
       public static final String JAVA_1_3 = "1.3";
       public static final String JAVA_1_4 = "1.4";
  +    public static final String JAVA_1_5 = "1.5";
   
       static String javaVersion;
       static boolean java2=false;
       static boolean java14=false;
  +    static boolean java15=false;
       static JdkCompat jdkCompat;
       
       static {
  @@ -97,6 +103,9 @@
               Class.forName("java.lang.CharSequence");
               javaVersion = JAVA_1_4;
               java14=true;
  +            Class.forName("java.lang.Appendable");
  +            javaVersion = JAVA_1_5;
  +            java15=true;
           } catch (ClassNotFoundException cnfe) {
               // swallow as we've hit the max class version that we have
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]