Author: ehillenius
Date: Tue Jun 5 23:13:42 2007
New Revision: 544739
URL: http://svn.apache.org/viewvc?view=rev&rev=544739
Log:
sorted
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java?view=diff&rev=544739&r1=544738&r2=544739
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
Tue Jun 5 23:13:42 2007
@@ -209,12 +209,6 @@
private static final int RESPOND = 4;
/**
- * True if the request cycle should automatically clear feedback
messages
- * after processing. True by default.
- */
- private boolean automaticallyClearFeedbackMessages = true;
-
- /**
* Gets request cycle for calling thread.
*
* @return Request cycle for calling thread
@@ -239,6 +233,12 @@
current.set(cycle);
}
+ /**
+ * True if the request cycle should automatically clear feedback
messages
+ * after processing. True by default.
+ */
+ private boolean automaticallyClearFeedbackMessages = true;
+
/** The current stage of event processing. */
private int currentStep = NOT_STARTED;
@@ -254,6 +254,9 @@
/** holds the stack of set [EMAIL PROTECTED] IRequestTarget}, the last
set op top. */
private transient final ArrayListStack requestTargets = new
ArrayListStack(3);
+ /** The session object. */
+ private Session session;
+
/** the time that this request cycle object was created. */
private final long startTime = System.currentTimeMillis();
@@ -269,9 +272,6 @@
/** The current response. */
protected Response response;
- /** The session object. */
- private Session session;
-
/**
* Constructor. This instance will be set as the current one for this
* thread.
@@ -351,16 +351,6 @@
}
/**
- * Gets whether the page for this request should be redirected.
- *
- * @return whether the page for this request should be redirected
- */
- public boolean isRedirect()
- {
- return redirect;
- }
-
- /**
* Gets the request.
*
* @return Request object
@@ -428,14 +418,6 @@
}
/**
- * @return True if a session exists for the calling thread
- */
- private boolean sessionExists()
- {
- return Session.exists();
- }
-
- /**
* Gets the session.
*
* @return Session object
@@ -458,6 +440,16 @@
}
/**
+ * Gets whether the page for this request should be redirected.
+ *
+ * @return whether the page for this request should be redirected
+ */
+ public boolean isRedirect()
+ {
+ return redirect;
+ }
+
+ /**
* Template method that is called when a runtime exception is thrown,
just
* before the actual handling of the runtime exception. This is called
by
* [EMAIL PROTECTED]
AbstractRequestCycleProcessor#respond(RuntimeException, RequestCycle)}.
@@ -687,6 +679,23 @@
}
/**
+ * Returns a bookmarkable URL that references a given page class using a
+ * given set of page parameters. Since the URL which is returned
contains
+ * all information necessary to instantiate and render the page, it can
be
+ * stored in a user's browser as a stable bookmark.
+ *
+ * @param pageClass
+ * Class of page
+ * @param parameters
+ * Parameters to page
+ * @return Bookmarkable URL to page
+ */
+ public final CharSequence urlFor(final Class pageClass, final
PageParameters parameters)
+ {
+ return urlFor(null, pageClass, parameters);
+ }
+
+ /**
* Returns a URL that references a given interface on a given behaviour
of a
* component. When the URL is requested from the server at a later
time, the
* interface on the behaviour will be called. A URL returned by this
method
@@ -780,23 +789,6 @@
* all information necessary to instantiate and render the page, it can
be
* stored in a user's browser as a stable bookmark.
*
- * @param pageClass
- * Class of page
- * @param parameters
- * Parameters to page
- * @return Bookmarkable URL to page
- */
- public final CharSequence urlFor(final Class pageClass, final
PageParameters parameters)
- {
- return urlFor(null, pageClass, parameters);
- }
-
- /**
- * Returns a bookmarkable URL that references a given page class using a
- * given set of page parameters. Since the URL which is returned
contains
- * all information necessary to instantiate and render the page, it can
be
- * stored in a user's browser as a stable bookmark.
- *
* @param pageMap
* Pagemap to use. If null is passed the default page map
will be
* used
@@ -1061,6 +1053,14 @@
throw new WicketRuntimeException("request cycle
processor must be not-null");
}
return processor;
+ }
+
+ /**
+ * @return True if a session exists for the calling thread
+ */
+ private boolean sessionExists()
+ {
+ return Session.exists();
}
/**
