Propchange:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
(from r924078,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java?p2=wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java&r1=924078&r2=924086&rev=924086&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/cssLicense.txt
(from r924078,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/cssLicense.txt)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/cssLicense.txt?p2=wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/cssLicense.txt&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/cssLicense.txt&r1=924078&r2=924086&rev=924086&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/cssLicense.txt
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaLicense.txt
(from r924078,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/javaLicense.txt)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaLicense.txt?p2=wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaLicense.txt&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/javaLicense.txt&r1=924078&r2=924086&rev=924086&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaLicense.txt
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt
(from r924078,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt?p2=wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt&r1=924078&r2=924086&rev=924086&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt
(from r924078,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt?p2=wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt&r1=924078&r2=924086&rev=924086&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/velocityLicense.txt
(from r924078,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/velocityLicense.txt)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/velocityLicense.txt?p2=wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/velocityLicense.txt&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/velocityLicense.txt&r1=924078&r2=924086&rev=924086&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/velocityLicense.txt
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/xmlLicense.txt
(from r924078,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/xmlLicense.txt)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/xmlLicense.txt?p2=wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/xmlLicense.txt&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/license/xmlLicense.txt&r1=924078&r2=924086&rev=924086&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/xmlLicense.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Wed
Mar 17 01:28:07 2010
@@ -86,7 +86,6 @@ import org.apache.wicket.settings.ISecur
import org.apache.wicket.settings.ISessionSettings;
import org.apache.wicket.settings.Settings;
import org.apache.wicket.util.IProvider;
-import org.apache.wicket.util.convert.ConverterLocator;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.lang.PropertyResolver;
import org.apache.wicket.util.lang.WicketObjects;
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ConverterLocator.java (from
r924079,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ConverterLocator.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ConverterLocator.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java&r1=924079&r2=924086&rev=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ConverterLocator.java
Wed Mar 17 01:28:07 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.util.convert;
+package org.apache.wicket;
import java.lang.ref.WeakReference;
import java.math.BigDecimal;
@@ -23,7 +23,8 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import org.apache.wicket.IConverterLocator;
+import org.apache.wicket.util.convert.ConversionException;
+import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converter.BigDecimalConverter;
import org.apache.wicket.util.convert.converter.BooleanConverter;
import org.apache.wicket.util.convert.converter.ByteConverter;
Propchange:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ConverterLocator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/IConverterLocator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/IConverterLocator.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/IConverterLocator.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/IConverterLocator.java
Wed Mar 17 01:28:07 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket;
-import org.apache.wicket.util.convert.ConverterLocator;
import org.apache.wicket.util.convert.IConverter;
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
Wed Mar 17 01:28:07 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.authorization;
import org.apache.wicket.Component;
-import org.apache.wicket.util.lang.Classes;
+import org.apache.wicket.util.lang.WicketObjects;
/**
* Exception that is thrown when the creation of a component is not allowed.
@@ -52,6 +52,6 @@ public class UnauthorizedInstantiationEx
*/
public Class<? extends Component> getComponentClass()
{
- return Classes.resolveClass(componentClassName);
+ return WicketObjects.resolveClass(componentClassName);
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
Wed Mar 17 01:28:07 2010
@@ -21,7 +21,7 @@ import java.io.InputStream;
import java.util.Locale;
import org.apache.wicket.Component;
-import org.apache.wicket.util.lang.Classes;
+import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.resource.IFixedLocationResourceStream;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
@@ -189,7 +189,7 @@ public class MarkupResourceStream implem
*/
public Class<? extends Component> getMarkupClass()
{
- return Classes.resolveClass(markupClassName);
+ return WicketObjects.resolveClass(markupClassName);
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Wed Mar 17 01:28:07 2010
@@ -41,6 +41,7 @@ import org.apache.wicket.model.IProperty
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.lang.Classes;
+import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.string.PrependingStringBuffer;
import org.apache.wicket.util.string.StringList;
import org.apache.wicket.util.string.StringValue;
@@ -829,7 +830,7 @@ public abstract class FormComponent<T> e
@SuppressWarnings("unchecked")
public final Class<T> getType()
{
- return typeName == null ? null :
(Class<T>)Classes.resolveClass(typeName);
+ return typeName == null ? null :
(Class<T>)WicketObjects.resolveClass(typeName);
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
Wed Mar 17 01:28:07 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.li
import org.apache.wicket.Page;
import org.apache.wicket.request.component.PageParameters;
-import org.apache.wicket.util.lang.Classes;
+import org.apache.wicket.util.lang.WicketObjects;
/**
* Renders a stable link which can be cached in a web browser and used at a
later time.
@@ -103,7 +103,7 @@ public class BookmarkablePageLink<T> ext
*/
public final Class<? extends Page> getPageClass()
{
- return Classes.resolveClass(pageClassName);
+ return WicketObjects.resolveClass(pageClassName);
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
Wed Mar 17 01:28:07 2010
@@ -27,7 +27,7 @@ import org.apache.wicket.request.compone
import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.mapper.parameters.IPageParametersEncoder;
import org.apache.wicket.util.lang.Checks;
-import org.apache.wicket.util.lang.Classes;
+import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.string.Strings;
/**
@@ -196,7 +196,7 @@ public abstract class AbstractMapper imp
{
Checks.argumentNotEmpty(name, "name");
- return Classes.resolveClass(name);
+ return WicketObjects.resolveClass(name);
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
Wed Mar 17 01:28:07 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.request.handler
import org.apache.wicket.request.mapper.parameters.IPageParametersEncoder;
import org.apache.wicket.request.mapper.parameters.SimplePageParametersEncoder;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.util.lang.Classes;
+import org.apache.wicket.util.lang.WicketObjects;
/**
* Generic {...@link ResourceReference} encoder that encodes and decodes
non-mounted
@@ -110,7 +110,7 @@ class BasicResourceReferenceMapper exten
protected Class<?> resolveClass(String name)
{
- return Classes.resolveClass(name);
+ return WicketObjects.resolveClass(name);
}
protected String getClassName(Class<?> scope)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java
Wed Mar 17 01:28:07 2010
@@ -27,8 +27,8 @@ import org.apache.wicket.protocol.http.W
import org.apache.wicket.protocol.http.request.WebErrorCodeResponseHandler;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.basic.AbortRequestHandler;
-import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Packages;
+import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.resource.IResourceStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -117,7 +117,7 @@ public class PackageResource implements
*/
public final Class<?> getScope()
{
- return Classes.resolveClass(scopeName);
+ return WicketObjects.resolveClass(scopeName);
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
Wed Mar 17 01:28:07 2010
@@ -21,8 +21,8 @@ import java.util.Locale;
import org.apache.wicket.Application;
import org.apache.wicket.util.lang.Checks;
-import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Objects;
+import org.apache.wicket.util.lang.WicketObjects;
/**
* Reference to a resource. Can be used to reference global resources.
@@ -108,7 +108,7 @@ public abstract class ResourceReference
*/
public Class<?> getScope()
{
- return Classes.resolveClass(scope);
+ return WicketObjects.resolveClass(scope);
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/WicketObjects.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/WicketObjects.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/WicketObjects.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/WicketObjects.java
Wed Mar 17 01:28:07 2010
@@ -49,6 +49,38 @@ public class WicketObjects
}
/**
+ * @param <T>
+ * class type
+ * @param className
+ * Class to resolve
+ * @return Resolved class
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> Class<T> resolveClass(final String className)
+ {
+ if (className == null)
+ {
+ return null;
+ }
+ try
+ {
+ if (Application.exists())
+ {
+ return (Class<T>)Application.get()
+ .getApplicationSettings()
+ .getClassResolver()
+ .resolveClass(className);
+ }
+ return (Class<T>)Class.forName(className);
+ }
+ catch (ClassNotFoundException e)
+ {
+ log.warn("Could not resolve class: " + className);
+ return null;
+ }
+ }
+
+ /**
* Interface that enables users to plugin the way object sizes are
calculated with Wicket.
*/
public static interface IObjectSizeOfStrategy
@@ -397,7 +429,7 @@ public class WicketObjects
{
try
{
- Class<?> c = Classes.resolveClass(className);
+ Class<?> c =
WicketObjects.resolveClass(className);
if (c == null)
{
throw new
WicketRuntimeException("Unable to create " + className);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Wed Mar 17 01:28:07 2010
@@ -98,7 +98,6 @@ import org.apache.wicket.request.handler
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
import org.apache.wicket.util.IProvider;
-import org.apache.wicket.util.diff.DiffUtil;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DiffUtil.java
(from r924078,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DiffUtil.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DiffUtil.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java&r1=924078&r2=924086&rev=924086&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DiffUtil.java
Wed Mar 17 01:28:07 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.util.diff;
+package org.apache.wicket.util.tester;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -26,6 +26,9 @@ import junit.framework.Assert;
import org.apache.wicket.markup.MarkupParser;
import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.DifferentiationFailedException;
+import org.apache.wicket.util.diff.Revision;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.string.StringList;
Propchange:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DiffUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
Wed Mar 17 01:28:07 2010
@@ -33,7 +33,6 @@ import org.apache.wicket.feedback.Feedba
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.util.diff.DiffUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
Wed Mar 17 01:28:07 2010
@@ -27,7 +27,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebComponent;
-import org.apache.wicket.util.diff.DiffUtil;
+import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.ITestPageSource;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java
Wed Mar 17 01:28:07 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.ajax.markup.ht
import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.util.diff.DiffUtil;
+import org.apache.wicket.util.tester.DiffUtil;
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
Wed Mar 17 01:28:07 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.util.diff.DiffUtil;
+import org.apache.wicket.util.tester.DiffUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
Wed Mar 17 01:28:07 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.html.basic;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.util.diff.DiffUtil;
+import org.apache.wicket.util.tester.DiffUtil;
/**
* @author jcompagner
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
Wed Mar 17 01:28:07 2010
@@ -22,7 +22,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.request.component.PageParameters;
-import org.apache.wicket.util.diff.DiffUtil;
+import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.FormTester;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
Wed Mar 17 01:28:07 2010
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.util.diff.DiffUtil;
+import org.apache.wicket.util.tester.DiffUtil;
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
Wed Mar 17 01:28:07 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.li
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.util.diff.DiffUtil;
+import org.apache.wicket.util.tester.DiffUtil;
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
Wed Mar 17 01:28:07 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.li
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.util.diff.DiffUtil;
+import org.apache.wicket.util.tester.DiffUtil;
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
Wed Mar 17 01:28:07 2010
@@ -21,7 +21,7 @@ import org.apache.wicket.markup.html.lin
import
org.apache.wicket.protocol.http.documentvalidation.HtmlDocumentValidator;
import org.apache.wicket.protocol.http.documentvalidation.Tag;
import org.apache.wicket.protocol.http.documentvalidation.TextContent;
-import org.apache.wicket.util.diff.DiffUtil;
+import org.apache.wicket.util.tester.DiffUtil;
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
Wed Mar 17 01:28:07 2010
@@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.bor
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.InlinePanelPage_1;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.util.diff.DiffUtil;
+import org.apache.wicket.util.tester.DiffUtil;
/**
*
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
Wed Mar 17 01:28:07 2010
@@ -23,9 +23,9 @@ import java.util.Locale;
import junit.framework.TestCase;
+import org.apache.wicket.ConverterLocator;
import org.apache.wicket.IConverterLocator;
import org.apache.wicket.util.convert.ConversionException;
-import org.apache.wicket.util.convert.ConverterLocator;
import org.apache.wicket.util.convert.converter.BigDecimalConverter;
import org.apache.wicket.util.convert.converter.BooleanConverter;
import org.apache.wicket.util.convert.converter.ByteConverter;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java?rev=924086&r1=924085&r2=924086&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
Wed Mar 17 01:28:07 2010
@@ -25,10 +25,10 @@ import java.util.Locale;
import java.util.Map;
import java.util.Vector;
+import org.apache.wicket.ConverterLocator;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.convert.ConversionException;
-import org.apache.wicket.util.convert.ConverterLocator;
/**
* @author jcompagner
