Author: ehillenius
Date: Mon Apr 16 21:49:32 2007
New Revision: 529484
URL: http://svn.apache.org/viewvc?view=rev&rev=529484
Log:
removed unused (and distracting) code
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java?view=diff&rev=529484&r1=529483&r2=529484
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java
Mon Apr 16 21:49:32 2007
@@ -34,7 +34,6 @@
import org.apache.wicket.request.AbstractRequestCycleProcessor;
import org.apache.wicket.request.IRequestCodingStrategy;
import org.apache.wicket.request.RequestParameters;
-import
org.apache.wicket.request.target.component.IBookmarkablePageRequestTarget;
import org.apache.wicket.util.string.Strings;
/**
@@ -82,8 +81,6 @@
// we need to check if this request has been
flagged as
// process-only-if-path-is-active and if so
make sure this
// condition is met
-
-
if
(requestParameters.isOnlyProcessIfPathActive())
{
// this request has indeed been flagged
as
@@ -133,9 +130,7 @@
{
// TODO also this should work..
}
-
}
-
}
if (processRequest)
{
@@ -170,28 +165,7 @@
if (target == null)
{
// still null? check for a mount
- IRequestTarget mounted =
requestCodingStrategy.targetForRequest(requestParameters);
-
- // If we've found a mount, only use it if the
componentPath is null.
- // Otherwise, we'll service it later with the
components.
- if (mounted != null)
- {
- target = mounted;
-
- if (mounted instanceof
IBookmarkablePageRequestTarget)
- {
- IBookmarkablePageRequestTarget
bookmarkableTarget = (IBookmarkablePageRequestTarget)mounted;
- if
(requestParameters.getComponentPath() != null
- &&
requestParameters.getInterfaceName() != null)
- {
- final String componentPath =
requestParameters.getComponentPath();
- final Page page =
Session.get().getPage(requestParameters.getPageMapName(),
- componentPath,
requestParameters.getVersionNumber());
- target =
resolveListenerInterfaceTarget(requestCycle, page, componentPath,
-
requestParameters.getInterfaceName(), requestParameters);
- }
- }
- }
+ target =
requestCodingStrategy.targetForRequest(requestParameters);
}
else
{
