You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2009/10/11 02:23:33 UTC

svn commit: r823985 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/ng/ main/java/org/apache/wicket/ng/markup/html/link/ main/java/org/apache/wicket/ng/model/ main/java/org/apache/wicket/ng/protocol/http/ main/java/org/apache/wicket/ng/reque...

Author: ivaynberg
Date: Sun Oct 11 00:23:30 2009
New Revision: 823985

URL: http://svn.apache.org/viewvc?rev=823985&view=rev
Log:
remove ng util package

Removed:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/string/
Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/link/Link.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/model/IModel.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/ServletWebRequest.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/WicketFilter.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestParameters.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageFactory.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountParameters.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/CombinedRequestParametersAdapter.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/EmptyRequestParameters.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/WebResponse.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/session/HttpSessionStore.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Check.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamHybridUrlCodingStrategy.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderComponent1.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderComponent2.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_11.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_3.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_6.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/UrlTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/UrlRendererTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/ComponentInfoTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfoTest.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component.java Sun Oct 11 00:23:30 2009
@@ -7,7 +7,7 @@
 import org.apache.wicket.ng.behavior.IBehavior;
 import org.apache.wicket.ng.request.component.RequestableComponent;
 import org.apache.wicket.ng.request.component.RequestablePage;
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.Strings;
 
 /**
  * Naive component implementation. Should be enough for some basic tests
@@ -19,26 +19,26 @@
 	private static final long serialVersionUID = 1L;
 
 	private final String id;
-	
+
 	public Component(String id)
 	{
 		this.id = id;
 	}
 
-	private List<Component> children = new ArrayList<Component>();
-	
+	private final List<Component> children = new ArrayList<Component>();
+
 	public List<Component> getChildren()
 	{
 		return Collections.unmodifiableList(children);
 	}
-	
+
 	private Component parent;
-	
+
 	public Component getParent()
 	{
 		return parent;
 	}
-	
+
 	public void remove(Component component)
 	{
 		if (component == null)
@@ -52,7 +52,7 @@
 		children.remove(component);
 		component.parent = null;
 	}
-	
+
 	public void add(Component component)
 	{
 		if (component == null)
@@ -67,23 +67,24 @@
 		{
 			if (c.getId().equals(component.getId()))
 			{
-				throw new IllegalStateException("Component with same id already added to this component.");
+				throw new IllegalStateException(
+					"Component with same id already added to this component.");
 			}
 		}
 		component.parent = this;
 		children.add(component);
 	}
-	
+
 	public boolean isEnabled()
 	{
 		return true;
 	}
-	
+
 	public boolean isVisible()
 	{
 		return true;
 	}
-	
+
 	public boolean canCallListenerInterface()
 	{
 		if (!isEnabled() || !isVisible())
@@ -100,8 +101,8 @@
 		}
 	}
 
-	private static final char PATH_SEPARATOR = ':'; 
-	
+	private static final char PATH_SEPARATOR = ':';
+
 	public Component get(String path)
 	{
 		String first = Strings.firstPathComponent(path, PATH_SEPARATOR);
@@ -123,13 +124,13 @@
 		return null;
 	}
 
-	private List<IBehavior> behaviors = new ArrayList<IBehavior>();
-	
+	private final List<IBehavior> behaviors = new ArrayList<IBehavior>();
+
 	public void add(IBehavior behavior)
 	{
 		behaviors.add(behavior);
 	}
-	
+
 	public List<IBehavior> getBehaviors()
 	{
 		return Collections.unmodifiableList(behaviors);
@@ -141,7 +142,7 @@
 	}
 
 	private String markupId;
-	
+
 	public String getMarkupId(boolean createIfDoesNotExist)
 	{
 		if (markupId == null && createIfDoesNotExist)
@@ -177,9 +178,9 @@
 
 	protected void onDetach()
 	{
-		
+
 	}
-	
+
 	public void detach()
 	{
 		for (Component c : getChildren())
@@ -196,7 +197,7 @@
 			c.prepareForRender(setRenderingFlag);
 		}
 	}
-	
+
 	public void renderComponent()
 	{
 		for (Component c : children)

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/link/Link.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/link/Link.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/link/Link.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/link/Link.java Sun Oct 11 00:23:30 2009
@@ -7,7 +7,7 @@
 import org.apache.wicket.ng.request.handler.impl.BookmarkableListenerInterfaceRequestHandler;
 import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
 import org.apache.wicket.ng.request.response.Response;
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.Strings;
 
 @SuppressWarnings("serial")
 // Very simple and naive link component

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/model/IModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/model/IModel.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/model/IModel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/model/IModel.java Sun Oct 11 00:23:30 2009
@@ -16,6 +16,9 @@
  */
 package org.apache.wicket.ng.model;
 
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+
 
 /**
  * A IModel wraps the actual model Object used by a Component. IModel implementations are used as a

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/ServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/ServletWebRequest.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/ServletWebRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/ServletWebRequest.java Sun Oct 11 00:23:30 2009
@@ -35,8 +35,8 @@
 import org.apache.wicket.ng.request.Url.QueryParameter;
 import org.apache.wicket.ng.util.io.Streams;
 import org.apache.wicket.ng.util.lang.Check;
-import org.apache.wicket.ng.util.string.StringValue;
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.string.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/WicketFilter.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/WicketFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/WicketFilter.java Sun Oct 11 00:23:30 2009
@@ -34,7 +34,8 @@
 import org.apache.wicket.ng.WicketRuntimeException;
 import org.apache.wicket.ng.request.cycle.RequestCycle;
 import org.apache.wicket.ng.request.response.ServletWebResponse;
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.protocol.http.WicketServlet;
+import org.apache.wicket.util.string.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestParameters.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestParameters.java Sun Oct 11 00:23:30 2009
@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.wicket.ng.util.string.StringValue;
+import org.apache.wicket.util.string.StringValue;
 
 /**
  * Represents request parameters.

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java Sun Oct 11 00:23:30 2009
@@ -25,8 +25,8 @@
 import org.apache.wicket.ng.protocol.http.WicketURLEncoder;
 import org.apache.wicket.ng.util.lang.Check;
 import org.apache.wicket.ng.util.lang.Objects;
-import org.apache.wicket.ng.util.string.StringValue;
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.string.Strings;
 
 /**
  * Represents the URL part after Wicket Filter.

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageFactory.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageFactory.java Sun Oct 11 00:23:30 2009
@@ -16,6 +16,7 @@
  */
 package org.apache.wicket.ng.request.component;
 
+import org.apache.wicket.IPageFactory;
 import org.apache.wicket.ng.Page;
 import org.apache.wicket.ng.Session;
 import org.apache.wicket.ng.WicketRuntimeException;

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java Sun Oct 11 00:23:30 2009
@@ -11,7 +11,7 @@
 import org.apache.wicket.ng.request.RequestMapper;
 import org.apache.wicket.ng.util.lang.Check;
 import org.apache.wicket.ng.util.lang.Objects;
-import org.apache.wicket.ng.util.string.StringValue;
+import org.apache.wicket.util.string.StringValue;
 
 /**
  * Mutable class that holds parameters of a Page. Page parameters consist of indexed parameters and

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java Sun Oct 11 00:23:30 2009
@@ -28,7 +28,7 @@
 import org.apache.wicket.ng.request.mapper.parameters.PageParametersEncoder;
 import org.apache.wicket.ng.util.lang.Check;
 import org.apache.wicket.ng.util.lang.Classes;
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.Strings;
 
 /**
  * Convenience class for implementing page/components related encoders.

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java Sun Oct 11 00:23:30 2009
@@ -21,7 +21,7 @@
 import org.apache.wicket.ng.request.Url;
 import org.apache.wicket.ng.request.Url.QueryParameter;
 import org.apache.wicket.ng.resource.ResourceReference;
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.Strings;
 
 /**
  * Base class for encoding and decoding {@link ResourceReference}s

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java Sun Oct 11 00:23:30 2009
@@ -17,7 +17,7 @@
 package org.apache.wicket.ng.request.mapper.info;
 
 import org.apache.wicket.ng.util.lang.Check;
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.Strings;
 
 /**
  * Encodes listener inteface and component path in form of

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java Sun Oct 11 00:23:30 2009
@@ -17,7 +17,7 @@
 package org.apache.wicket.ng.request.mapper.info;
 
 import org.apache.wicket.ng.util.lang.Check;
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.Strings;
 
 /**
  * Encapsulates both page and component info.

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java Sun Oct 11 00:23:30 2009
@@ -18,7 +18,7 @@
 
 import org.apache.wicket.ng.request.component.RequestablePage;
 import org.apache.wicket.ng.util.lang.Check;
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.Strings;
 
 /**
  * Possible string representation of PageInfo:

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java Sun Oct 11 00:23:30 2009
@@ -6,7 +6,7 @@
 import org.apache.wicket.ng.request.Url;
 import org.apache.wicket.ng.request.mapper.AbstractMapper;
 import org.apache.wicket.ng.util.lang.Check;
-import org.apache.wicket.ng.util.string.StringValue;
+import org.apache.wicket.util.string.StringValue;
 
 /**
  * {@link RequestMapper} that can mount requests onto urls. TODO docs and unit test

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountParameters.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountParameters.java Sun Oct 11 00:23:30 2009
@@ -4,7 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.wicket.ng.util.string.StringValue;
+import org.apache.wicket.util.string.StringValue;
 
 /**
  * Mount parameters

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java Sun Oct 11 00:23:30 2009
@@ -22,7 +22,7 @@
 import org.apache.wicket.ng.request.Url;
 import org.apache.wicket.ng.request.Url.QueryParameter;
 import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.util.string.StringValue;
+import org.apache.wicket.util.string.StringValue;
 
 /**
  * Simple encoder with direct indexed/named parameters mapping.

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/CombinedRequestParametersAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/CombinedRequestParametersAdapter.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/CombinedRequestParametersAdapter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/CombinedRequestParametersAdapter.java Sun Oct 11 00:23:30 2009
@@ -7,7 +7,7 @@
 import java.util.Set;
 
 import org.apache.wicket.ng.request.RequestParameters;
-import org.apache.wicket.ng.util.string.StringValue;
+import org.apache.wicket.util.string.StringValue;
 
 public class CombinedRequestParametersAdapter implements RequestParameters
 {

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/EmptyRequestParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/EmptyRequestParameters.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/EmptyRequestParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/EmptyRequestParameters.java Sun Oct 11 00:23:30 2009
@@ -5,7 +5,7 @@
 import java.util.Set;
 
 import org.apache.wicket.ng.request.RequestParameters;
-import org.apache.wicket.ng.util.string.StringValue;
+import org.apache.wicket.util.string.StringValue;
 
 public class EmptyRequestParameters implements RequestParameters
 {

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java Sun Oct 11 00:23:30 2009
@@ -27,7 +27,7 @@
 import org.apache.wicket.ng.request.Url.QueryParameter;
 import org.apache.wicket.ng.util.lang.Check;
 import org.apache.wicket.ng.util.lang.Objects;
-import org.apache.wicket.ng.util.string.StringValue;
+import org.apache.wicket.util.string.StringValue;
 
 /**
  * Utility class that expresses query parameters from {@link Url} as {@link RequestParameters}.

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/WebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/WebResponse.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/WebResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/WebResponse.java Sun Oct 11 00:23:30 2009
@@ -18,7 +18,7 @@
 
 import javax.servlet.http.Cookie;
 
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.Strings;
 
 
 /**

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/session/HttpSessionStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/session/HttpSessionStore.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/session/HttpSessionStore.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/session/HttpSessionStore.java Sun Oct 11 00:23:30 2009
@@ -32,6 +32,7 @@
 import org.apache.wicket.ng.protocol.http.ServletWebRequest;
 import org.apache.wicket.ng.protocol.http.WebApplication;
 import org.apache.wicket.ng.request.Request;
+import org.apache.wicket.session.ISessionStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Check.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Check.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Check.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Check.java Sun Oct 11 00:23:30 2009
@@ -1,6 +1,6 @@
 package org.apache.wicket.ng.util.lang;
 
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.Strings;
 
 public class Check
 {

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamHybridUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamHybridUrlCodingStrategy.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamHybridUrlCodingStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamHybridUrlCodingStrategy.java Sun Oct 11 00:23:30 2009
@@ -20,17 +20,17 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.wicket.Page;
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.RequestCycle;
-import org.apache.wicket.Page;
 import org.apache.wicket.protocol.http.WebRequest;
 import org.apache.wicket.util.string.AppendingStringBuffer;
 import org.apache.wicket.util.string.Strings;
 import org.apache.wicket.util.value.ValueMap;
-import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-
-import javax.servlet.http.HttpServletRequest;
+import org.slf4j.LoggerFactory;
 
 /**
  * Url coding strategy for bookmarkable pages with Ajax components that encodes a set of given

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java Sun Oct 11 00:23:30 2009
@@ -20,17 +20,17 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.RequestCycle;
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.wicket.Page;
 import org.apache.wicket.PageMap;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.RequestCycle;
 import org.apache.wicket.protocol.http.WebRequest;
 import org.apache.wicket.util.string.AppendingStringBuffer;
 import org.apache.wicket.util.value.ValueMap;
-import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-
-import javax.servlet.http.HttpServletRequest;
+import org.slf4j.LoggerFactory;
 
 /**
  * Url coding strategy for bookmarkable pages that encodes a set of given parameters in the url's

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderComponent1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderComponent1.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderComponent1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderComponent1.java Sun Oct 11 00:23:30 2009
@@ -16,7 +16,6 @@
  */
 package org.apache.wicket.markup.html.border;
 
-import org.apache.wicket.markup.html.border.Border;
 
 
 /**

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderComponent2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderComponent2.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderComponent2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderComponent2.java Sun Oct 11 00:23:30 2009
@@ -16,7 +16,6 @@
  */
 package org.apache.wicket.markup.html.border;
 
-import org.apache.wicket.markup.html.border.Border;
 
 
 /**

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java Sun Oct 11 00:23:30 2009
@@ -21,7 +21,6 @@
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.MarkupException;
-import org.apache.wicket.markup.html.border.Border;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.protocol.http.MockHttpServletRequest;

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_11.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_11.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_11.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_11.java Sun Oct 11 00:23:30 2009
@@ -18,7 +18,6 @@
 
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.border.Border;
 import org.apache.wicket.model.Model;
 
 

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_3.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_3.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_3.java Sun Oct 11 00:23:30 2009
@@ -17,7 +17,6 @@
 package org.apache.wicket.markup.html.border;
 
 import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.border.Border;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.util.value.ValueMap;

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_6.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_6.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_6.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_6.java Sun Oct 11 00:23:30 2009
@@ -17,7 +17,6 @@
 package org.apache.wicket.markup.html.border;
 
 import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.border.Border;
 
 
 /**

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java Sun Oct 11 00:23:30 2009
@@ -17,7 +17,6 @@
 package org.apache.wicket.markup.html.border;
 
 import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.border.Border;
 import org.apache.wicket.markup.html.panel.Fragment;
 
 

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java Sun Oct 11 00:23:30 2009
@@ -17,7 +17,6 @@
 package org.apache.wicket.markup.html.border;
 
 import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.border.Border;
 import org.apache.wicket.markup.html.panel.Fragment;
 
 

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java Sun Oct 11 00:23:30 2009
@@ -20,7 +20,6 @@
 import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.border.Border;
 
 /**
  * @author jcompagner

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java Sun Oct 11 00:23:30 2009
@@ -22,7 +22,7 @@
 import org.apache.wicket.ng.behavior.IBehavior;
 import org.apache.wicket.ng.request.component.RequestableComponent;
 import org.apache.wicket.ng.request.component.RequestablePage;
-import org.apache.wicket.ng.util.string.Strings;
+import org.apache.wicket.util.string.Strings;
 
 /**
  * Simple {@link RequestableComponent} implementation for testing purposes

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/UrlTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/UrlTest.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/UrlTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/UrlTest.java Sun Oct 11 00:23:30 2009
@@ -22,7 +22,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.wicket.ng.request.Url;
 import org.apache.wicket.ng.request.Url.QueryParameter;
 
 /**

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/UrlRendererTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/UrlRendererTest.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/UrlRendererTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/UrlRendererTest.java Sun Oct 11 00:23:30 2009
@@ -19,7 +19,6 @@
 import junit.framework.TestCase;
 
 import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.cycle.UrlRenderer;
 
 /**
  * @author MAtej Knopp

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java Sun Oct 11 00:23:30 2009
@@ -30,9 +30,6 @@
 import org.apache.wicket.ng.request.handler.impl.BookmarkablePageRequestHandler;
 import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
 import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
-import org.apache.wicket.ng.request.mapper.BookmarkableMapper;
-import org.apache.wicket.ng.request.mapper.MapperContext;
-import org.apache.wicket.ng.request.mapper.StalePageException;
 
 /**
  * @author Matej Knopp

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java Sun Oct 11 00:23:30 2009
@@ -31,9 +31,6 @@
 import org.apache.wicket.ng.request.handler.impl.BookmarkablePageRequestHandler;
 import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
 import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
-import org.apache.wicket.ng.request.mapper.MapperContext;
-import org.apache.wicket.ng.request.mapper.MountedMapper;
-import org.apache.wicket.ng.request.mapper.StalePageException;
 
 /**
  * @author Matej Knopp

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java Sun Oct 11 00:23:30 2009
@@ -26,9 +26,6 @@
 import org.apache.wicket.ng.request.handler.PageRequestHandler;
 import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
 import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
-import org.apache.wicket.ng.request.mapper.MapperContext;
-import org.apache.wicket.ng.request.mapper.PageInstanceMapper;
-import org.apache.wicket.ng.request.mapper.StalePageException;
 
 /**
  * 

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java Sun Oct 11 00:23:30 2009
@@ -23,8 +23,6 @@
 import org.apache.wicket.ng.request.component.PageParameters;
 import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
 import org.apache.wicket.ng.request.handler.resource.ResourceRequestHandler;
-import org.apache.wicket.ng.request.mapper.MapperContext;
-import org.apache.wicket.ng.request.mapper.ResourceReferenceMapper;
 
 /**
  * @author Matej Knopp

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java Sun Oct 11 00:23:30 2009
@@ -21,7 +21,6 @@
 import org.apache.wicket.ng.request.component.PageParameters;
 import org.apache.wicket.ng.request.component.RequestablePage;
 import org.apache.wicket.ng.request.listener.RequestListenerInterface;
-import org.apache.wicket.ng.request.mapper.MapperContext;
 import org.apache.wicket.ng.resource.ResourceReferenceRegistry;
 
 /**

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/ComponentInfoTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/ComponentInfoTest.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/ComponentInfoTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/ComponentInfoTest.java Sun Oct 11 00:23:30 2009
@@ -16,8 +16,6 @@
  */
 package org.apache.wicket.ng.request.mapper.info;
 
-import org.apache.wicket.ng.request.mapper.info.ComponentInfo;
-
 import junit.framework.TestCase;
 
 /**

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfoTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfoTest.java?rev=823985&r1=823984&r2=823985&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfoTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfoTest.java Sun Oct 11 00:23:30 2009
@@ -16,8 +16,6 @@
  */
 package org.apache.wicket.ng.request.mapper.info;
 
-import org.apache.wicket.ng.request.mapper.info.PageComponentInfo;
-
 import junit.framework.TestCase;
 
 /**