svn commit: r532113 - in /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: Application.java util/lang/Classes.java

[ehillenius]

Author: ehillenius
Date: Tue Apr 24 15:28:53 2007
New Revision: 532113

URL: http://svn.apache.org/viewvc?view=rev&rev=532113
Log:
WICKET-498

Modified:
    
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
    
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Classes.java

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java?view=diff&rev=532113&r1=532112&r2=532113
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
 Tue Apr 24 15:28:53 2007
@@ -187,14 +187,6 @@
        }
 
        /**
-        * @return True if the current thread is attached to an application.
-        */
-       public static boolean isAttached()
-       {
-               return current.get() != null;
-       }
-
-       /**
         * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT.
         * 
         * @param application
@@ -235,12 +227,12 @@
        /** Name of application subclass. */
        private final String name;
 
-       /** The session facade. */
-       private ISessionStore sessionStore;
-
        /** Request logger instance. */
        private IRequestLogger requestLogger;
 
+       /** The session facade. */
+       private ISessionStore sessionStore;
+
        /** Settings for this application. */
        private Settings settings;
 
@@ -536,11 +528,6 @@
        }
 
        /**
-        * @return Request cycle factory for this kind of session.
-        */
-       protected abstract IRequestCycleFactory getRequestCycleFactory();
-
-       /**
         * Gets the [EMAIL PROTECTED] RequestLogger}.
         * 
         * @return The RequestLogger
@@ -828,6 +815,11 @@
        {
                callDestroyers();
        }
+
+       /**
+        * @return Request cycle factory for this kind of session.
+        */
+       protected abstract IRequestCycleFactory getRequestCycleFactory();
 
        /**
         * Gets the factory for creating session instances.

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Classes.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Classes.java?view=diff&rev=532113&r1=532112&r2=532113
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Classes.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Classes.java
 Tue Apr 24 15:28:53 2007
@@ -66,7 +66,7 @@
         */
        public static Class resolveClass(final String className)
        {
-               if (Application.isAttached())
+               if (Application.exists())
                {
                        return 
Application.get().getApplicationSettings().getClassResolver().resolveClass(
                                        className);