You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/03/07 11:42:23 UTC
[20/24] WICKET-4439 Move classes around so that there are no two
packages with the same name in different modules
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/CustomHomeMapper.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/CustomHomeMapper.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/CustomHomeMapper.java
index 154e23a..fafa5ec 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/CustomHomeMapper.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/CustomHomeMapper.java
@@ -24,11 +24,11 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
-import org.apache.wicket.request.handler.IPageRequestHandler;
-import org.apache.wicket.request.handler.PageProvider;
-import org.apache.wicket.request.handler.RenderPageRequestHandler;
-import org.apache.wicket.request.mapper.AbstractComponentMapper;
-import org.apache.wicket.request.mapper.HomePageMapper;
+import org.apache.wicket.core.request.handler.IPageRequestHandler;
+import org.apache.wicket.core.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
+import org.apache.wicket.core.request.mapper.AbstractComponentMapper;
+import org.apache.wicket.core.request.mapper.HomePageMapper;
/**
* An {@link IRequestMapper} that handles requests to the home page ('/') and appends the string
@@ -45,7 +45,7 @@ public class CustomHomeMapper extends AbstractComponentMapper
* If there is just one url segment (the locale?!) then return a bigger compatibility score than
* {@link HomePageMapper#getCompatibilityScore(Request)}
*
- * @see org.apache.wicket.request.mapper.HomePageMapper#getCompatibilityScore(org.apache.wicket.request.Request)
+ * @see org.apache.wicket.core.request.mapper.HomePageMapper#getCompatibilityScore(org.apache.wicket.request.Request)
*/
public int getCompatibilityScore(Request request)
{
@@ -53,7 +53,7 @@ public class CustomHomeMapper extends AbstractComponentMapper
}
/**
- * @see org.apache.wicket.request.mapper.HomePageMapper#mapHandler(org.apache.wicket.request.IRequestHandler)
+ * @see org.apache.wicket.core.request.mapper.HomePageMapper#mapHandler(org.apache.wicket.request.IRequestHandler)
*/
public Url mapHandler(IRequestHandler requestHandler)
{
@@ -75,7 +75,7 @@ public class CustomHomeMapper extends AbstractComponentMapper
}
/**
- * @see org.apache.wicket.request.mapper.HomePageMapper#mapRequest(org.apache.wicket.request.Request)
+ * @see org.apache.wicket.core.request.mapper.HomePageMapper#mapRequest(org.apache.wicket.request.Request)
*/
public IRequestHandler mapRequest(Request request)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java
index 706ebfd..8c65cd2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java
@@ -24,7 +24,7 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
-import org.apache.wicket.request.mapper.AbstractComponentMapper;
+import org.apache.wicket.core.request.mapper.AbstractComponentMapper;
import org.apache.wicket.util.string.Strings;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperApplication.java
index 0963485..80c82ec 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperApplication.java
@@ -19,13 +19,12 @@ package org.apache.wicket.examples.requestmapper;
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.Page;
-import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.examples.requestmapper.packageMount.PackageMountedPage;
import org.apache.wicket.protocol.https.HttpsConfig;
import org.apache.wicket.protocol.https.HttpsMapper;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.MountedMapper;
+import org.apache.wicket.core.request.mapper.MountedMapper;
/**
* @author mgrigorov
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
index e16ed28..e75af9a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.spring.common;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* domain object for demonstrations.
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java
index 7fc0f5e..57a5ec1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java
@@ -18,8 +18,6 @@ package org.apache.wicket.examples.spring.common;
import java.util.Iterator;
-import org.apache.wicket.examples.spring.common.QueryParam;
-
/**
* interface for retrieving contacts from a database
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java
index 5e88b3f..7fc6784 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.spring.common.web;
import org.apache.wicket.examples.spring.common.ContactDao;
-import org.apache.wicket.examples.spring.common.web.HomePage;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
index d03d0ad..3c131ff 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.examples.stockquote;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java
index fb8e374..72c7924 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java
@@ -18,7 +18,6 @@ package org.apache.wicket.examples.upload;
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
-import org.apache.wicket.request.mapper.MountedMapper;
import org.apache.wicket.util.file.Folder;
@@ -70,8 +69,8 @@ public class UploadApplication extends WicketExampleApplication
// Ensure folder exists
uploadFolder.mkdirs();
- getRootRequestMapperAsCompound().add(new MountedMapper("/multi", MultiUploadPage.class));
- getRootRequestMapperAsCompound().add(new MountedMapper("/single", UploadPage.class));
+ mountPage("/multi", MultiUploadPage.class);
+ mountPage("/single", UploadPage.class);
getApplicationSettings().setUploadProgressUpdatesEnabled(true);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
index 93a90df..fa2ff82 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
@@ -25,8 +25,7 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.util.MapModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.util.resource.IStringResourceStream;
-import org.apache.wicket.util.resource.PackageResourceStream;
+import org.apache.wicket.core.util.resource.PackageResourceStream;
import org.apache.wicket.velocity.markup.html.VelocityPanel;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
index d727ea9..01ee728 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
@@ -31,7 +31,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.resource.ResourceUtil;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.IStringResourceStream;
-import org.apache.wicket.util.resource.PackageResourceStream;
+import org.apache.wicket.core.util.resource.PackageResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.velocity.markup.html.VelocityPanel;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
index 06321c7..d63bbb1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
@@ -22,8 +22,8 @@ import java.util.List;
import org.apache.wicket.extensions.wizard.StaticContentStep;
import org.apache.wicket.extensions.wizard.Wizard;
import org.apache.wicket.extensions.wizard.WizardModel;
-import org.apache.wicket.extensions.wizard.WizardStep;
import org.apache.wicket.extensions.wizard.WizardModel.ICondition;
+import org.apache.wicket.extensions.wizard.WizardStep;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java
index b8190fc..add6916 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java
@@ -19,7 +19,7 @@ package org.apache.wicket.examples.wizard;
import java.util.HashSet;
import java.util.Set;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
index 6ac5744..503e3e4 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples;
+import com.meterware.httpunit.HttpUnitOptions;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
@@ -24,8 +25,6 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import com.meterware.httpunit.HttpUnitOptions;
-
/**
* Test decorator that starts a jetty instance
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java b/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
index 1222696..dad49c6 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
@@ -16,11 +16,10 @@
*/
package org.apache.wicket.examples;
-import org.junit.After;
-import org.junit.Before;
-
import com.meterware.httpunit.WebConversation;
import com.meterware.httpunit.WebResponse;
+import org.junit.After;
+import org.junit.Before;
/**
* WebTestCase for tests that need to run inside Jetty to test for example the wicket filter using
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java
index b393917..a682bea 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java
@@ -18,7 +18,7 @@ package org.apache.wicket.filtertest;
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
-import org.apache.wicket.request.mapper.MountedMapper;
+import org.apache.wicket.core.request.mapper.MountedMapper;
/**
* Application class.
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
index 8dab873..1e869ca 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
@@ -16,12 +16,11 @@
*/
package org.apache.wicket.filtertest;
+import com.meterware.httpunit.WebResponse;
import org.apache.wicket.examples.WicketWebTestCase;
import org.junit.Before;
import org.junit.Test;
-import com.meterware.httpunit.WebResponse;
-
/**
* jWebUnit test for Hello World.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
index b2bb468..2a77b16 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
@@ -16,12 +16,11 @@
*/
package org.apache.wicket.filtertest;
+import com.meterware.httpunit.WebResponse;
import org.apache.wicket.examples.WicketWebTestCase;
import org.junit.Before;
import org.junit.Test;
-import com.meterware.httpunit.WebResponse;
-
/**
* jWebUnit test for Hello World.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
index 1895620..a6d6e71 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.extensions.ajax.markup.html;
+import java.util.List;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.markup.ComponentTag;
@@ -32,8 +34,6 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.Strings;
-import java.util.List;
-
/**
* An inplace editor much like {@link AjaxEditableLabel}, but instead of a {@link TextField} a
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
index e35bfa5..bb2d60e 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
@@ -37,7 +37,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.IObjectClassAwareModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.convert.IConverter;
-import org.apache.wicket.util.string.JavaScriptUtils;
+import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.validation.IValidator;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
index 1556e11..ceeb91b 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.extensions.ajax.markup.html;
+import java.util.List;
+
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -29,8 +31,6 @@ import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import java.util.List;
-
/**
* An inplace editor much like {@link AjaxEditableLabel}, but now with support for multi line
* content and a {@link TextArea text area} as its editor.
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings.java
index 14ad769..4709ee7 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.ajax.markup.html.autocomplete;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* This class encapsulates various settings for {@link AbstractAutoCompleteBehavior}. See the
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/IAutoCompleteRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/IAutoCompleteRenderer.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/IAutoCompleteRenderer.java
index d477c65..c2d0a5f 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/IAutoCompleteRenderer.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/IAutoCompleteRenderer.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.extensions.ajax.markup.html.autocomplete;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.request.Response;
+import org.apache.wicket.util.io.IClusterable;
/**
* A renderer used to generate html output for the {@link AutoCompleteBehavior}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
index 9e9f692..dc78714 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
@@ -17,7 +17,7 @@
package org.apache.wicket.extensions.ajax.markup.html.modal;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
@@ -33,8 +33,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.PageProvider;
-import org.apache.wicket.request.handler.RenderPageRequestHandler;
+import org.apache.wicket.core.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java
index 4da8710..3bd185d 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java
@@ -19,7 +19,7 @@ package org.apache.wicket.extensions.breadcrumb;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModel.java
index 8ed359f..5d6f0f7 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModel.java
@@ -18,8 +18,8 @@ package org.apache.wicket.extensions.breadcrumb;
import java.util.List;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.extensions.breadcrumb.panel.BreadCrumbPanel;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModelListener.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModelListener.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModelListener.java
index dd49251..8d5b8d8 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModelListener.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModelListener.java
@@ -18,7 +18,7 @@ package org.apache.wicket.extensions.breadcrumb;
import java.util.EventListener;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Bread crumb model listeners get notified by {@link IBreadCrumbModel bread crumb models} of
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java
index c02da0b..8a4dc59 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java
@@ -17,8 +17,8 @@
package org.apache.wicket.extensions.breadcrumb;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.extensions.breadcrumb.panel.BreadCrumbPanel;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/IBreadCrumbPanelFactory.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/IBreadCrumbPanelFactory.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/IBreadCrumbPanelFactory.java
index 2fce496..749f9b8 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/IBreadCrumbPanelFactory.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/IBreadCrumbPanelFactory.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.extensions.breadcrumb.panel;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
index d44c4d7..3817c8e 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
@@ -32,10 +32,10 @@ import java.util.Arrays;
import java.util.List;
import java.util.Random;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.resource.DynamicImageResource;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.time.Time;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
index 51ac2b1..59ebc90 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.util.convert.IConverter;
-import org.apache.wicket.util.string.JavaScriptUtils;
+import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.value.IValueMap;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/IOptionRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/IOptionRenderer.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/IOptionRenderer.java
index bb5d3f7..3103924 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/IOptionRenderer.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/IOptionRenderer.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.extensions.markup.html.form.select;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.io.IClusterable;
/**
* @param <T>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java
index e912340..4fea7bc 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.data.grid;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IDetachable;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.io.IClusterable;
/**
* Represents an object that is capable of populating an {@link Item} container representing a cell
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortState.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortState.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortState.java
index 0d2c474..3f7b701 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortState.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortState.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.data.sort;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Interface used by OrderByLink to interact with any object that keeps track of sorting state
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator.java
index 56c0fc0..a185515 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.data.sort;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
index 71fc522..26c0883 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
@@ -17,10 +17,10 @@
package org.apache.wicket.extensions.markup.html.repeater.data.sort;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
index 26d042b..02e605d 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
@@ -17,7 +17,7 @@
package org.apache.wicket.extensions.markup.html.repeater.data.table;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.navigation.paging.IPageableItems;
import org.apache.wicket.model.Model;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
index 0da0d56..a4ef23c 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
@@ -21,9 +21,9 @@ import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.util.string.Strings;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java
index fe085bd..1f96d43 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java
@@ -20,7 +20,7 @@ import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.ResourceModel;
-import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects;
/**
* Filter component that generates a 'go' and 'clear' buttons.
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilterStateLocator.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilterStateLocator.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilterStateLocator.java
index 748d160..37741f2 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilterStateLocator.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilterStateLocator.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.data.table.filter;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Locator that locates the object that represents the state of the filter. Usually it is convenient
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeColumn.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeColumn.java
index 6b24f58..54cf5fa 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeColumn.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeColumn.java
@@ -18,7 +18,6 @@ package org.apache.wicket.extensions.markup.html.repeater.tree.table;
import org.apache.wicket.Component;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.tree.TableTree;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java
index 0837d9f..453bb05 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.util;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Args;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java
index 4206d2f..93b1696 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.util;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Args;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java
index 24db02e..501dc6f 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.extensions.markup.html.tabs;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.io.IClusterable;
/**
* Interface used to represent a single tab in a TabbedPanel
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/BaseTree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/BaseTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/BaseTree.java
index 446543c..452cd24 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/BaseTree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/BaseTree.java
@@ -19,7 +19,7 @@ package org.apache.wicket.extensions.markup.html.tree;
import javax.swing.tree.TreeModel;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
index b28e869..cdbbb9d 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
@@ -20,7 +20,6 @@ import javax.swing.tree.TreeModel;
import javax.swing.tree.TreeNode;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
@@ -40,6 +39,7 @@ import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandle
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.util.io.IClusterable;
/**
* Tree class that contains convenient functions related to presentation of the tree, which includes
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultTreeState.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultTreeState.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultTreeState.java
index a26113a..c8b9cf2 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultTreeState.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultTreeState.java
@@ -23,8 +23,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.model.IDetachable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Default implementation of TreeState.
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractPropertyColumn.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractPropertyColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractPropertyColumn.java
index 4b65bf6..cdc3fcf 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractPropertyColumn.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractPropertyColumn.java
@@ -23,7 +23,7 @@ import javax.swing.tree.TreeNode;
import org.apache.wicket.Application;
import org.apache.wicket.Session;
import org.apache.wicket.util.convert.IConverter;
-import org.apache.wicket.util.lang.PropertyResolver;
+import org.apache.wicket.core.util.lang.PropertyResolver;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/ColumnLocation.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/ColumnLocation.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/ColumnLocation.java
index 3ba11d7..4d9a4e3 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/ColumnLocation.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/ColumnLocation.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.markup.html.tree.table;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.EnumeratedType;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/IColumn.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/IColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/IColumn.java
index 07f772e..8d617b2 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/IColumn.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/IColumn.java
@@ -19,8 +19,8 @@ package org.apache.wicket.extensions.markup.html.tree.table;
import javax.swing.tree.TreeNode;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/IRenderable.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/IRenderable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/IRenderable.java
index 54baf98..33aca29 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/IRenderable.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/IRenderable.java
@@ -18,8 +18,8 @@ package org.apache.wicket.extensions.markup.html.tree.table;
import javax.swing.tree.TreeNode;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.request.Response;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
index caf2150..aed371a 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
@@ -20,7 +20,6 @@ import javax.swing.tree.TreeModel;
import javax.swing.tree.TreeNode;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.extensions.markup.html.tree.AbstractTree;
@@ -37,6 +36,7 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizard.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizard.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizard.java
index 05d73f3..9cded62 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizard.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizard.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.wizard;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Interface for the wizard component. This interface is here for ultimate flexibility, though it
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModel.java
index ddf1b82..0177546 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModel.java
@@ -18,7 +18,7 @@ package org.apache.wicket.extensions.wizard;
import java.util.Iterator;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* This interface defines the model for wizards. This model knows about the wizard's steps and the
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModelListener.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModelListener.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModelListener.java
index 503c84a..b0638f8 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModelListener.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModelListener.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.wizard;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Recieves notifications for wizard model state changes.
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java
index bf2ec4f..03f7a17 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java
@@ -17,7 +17,7 @@
package org.apache.wicket.extensions.wizard;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Models one step in a wizard, and is the equivalent of one panel in a wizard from an end-user's
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java
index 69c973f..2dec471 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java
@@ -21,7 +21,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.collections.ArrayListStack;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/Contact.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/Contact.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/Contact.java
index 88dcf46..7a0d480 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/Contact.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/Contact.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.data.table;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* domain object for demonstrations.
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
index 9b127e4..1c72ee4 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
@@ -17,7 +17,6 @@
package org.apache.wicket.extensions.markup.html.repeater.tree.table;
import junit.framework.Assert;
-
import org.apache.wicket.model.IModel;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
index 31e90a0..8e18ddc 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
import java.util.List;
import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
-import org.apache.wicket.extensions.markup.html.repeater.util.ProviderSubset;
import org.apache.wicket.model.IModel;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java
index 840481b..4f86372 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java
@@ -22,7 +22,6 @@ import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.MutableTreeNode;
-import org.apache.wicket.extensions.markup.html.repeater.util.TreeModelProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/TreeTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/TreeTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/TreeTest.java
index 68dab56..0e82c20 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/TreeTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/TreeTest.java
@@ -23,8 +23,6 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.extensions.markup.html.tree.AbstractTree;
-import org.apache.wicket.extensions.markup.html.tree.LinkTree;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.resource.IResourceStream;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
index 02b3660..3d7b4a8 100644
--- a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
+++ b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.guice;
+import com.google.inject.Guice;
+import com.google.inject.ImplementedBy;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+import com.google.inject.Stage;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IBehaviorInstantiationListener;
@@ -25,12 +30,6 @@ import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.injection.IFieldValueFactory;
import org.apache.wicket.model.Model;
-import com.google.inject.Guice;
-import com.google.inject.ImplementedBy;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-import com.google.inject.Stage;
-
/**
* Injects field members of components and behaviors using Guice.
* <p>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
index e19bd54..ed4789c 100644
--- a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
+++ b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
@@ -20,14 +20,13 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
+import com.google.inject.BindingAnnotation;
+import com.google.inject.Inject;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.injection.IFieldValueFactory;
import org.apache.wicket.proxy.IProxyTargetLocator;
import org.apache.wicket.proxy.LazyInitProxyFactory;
-import com.google.inject.BindingAnnotation;
-import com.google.inject.Inject;
-
/**
*
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
index 28108bf..1f9d2e3 100644
--- a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
+++ b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
@@ -16,10 +16,9 @@
*/
package org.apache.wicket.guice;
-import org.apache.wicket.IClusterable;
-import org.apache.wicket.MetaDataKey;
-
import com.google.inject.Injector;
+import org.apache.wicket.MetaDataKey;
+import org.apache.wicket.util.io.IClusterable;
/**
* This is a holder for the Injector. The reason we need a holder is that metadata only supports
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java
index 4df9178..8c8bdaa 100644
--- a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java
+++ b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java
@@ -20,14 +20,13 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
-import org.apache.wicket.Application;
-import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.proxy.IProxyTargetLocator;
-import org.apache.wicket.util.lang.WicketObjects;
-
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.TypeLiteral;
+import org.apache.wicket.Application;
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.proxy.IProxyTargetLocator;
+import org.apache.wicket.core.util.lang.WicketObjects;
class GuiceProxyTargetLocator implements IProxyTargetLocator
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
index 8509724..8621093 100644
--- a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
+++ b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
@@ -18,15 +18,14 @@ package org.apache.wicket.guice;
import javax.servlet.ServletContext;
-import org.apache.wicket.protocol.http.IWebApplicationFactory;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WicketFilter;
-import org.apache.wicket.util.string.Strings;
-
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Stage;
+import org.apache.wicket.protocol.http.IWebApplicationFactory;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.protocol.http.WicketFilter;
+import org.apache.wicket.util.string.Strings;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
index bb8007c..e7f9c08 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
@@ -19,6 +19,10 @@ package org.apache.wicket.guice;
import java.util.HashMap;
import java.util.Map;
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.Provider;
+import com.google.inject.TypeLiteral;
import org.apache.wicket.Session;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.mock.MockApplication;
@@ -26,15 +30,10 @@ import org.apache.wicket.mock.MockWebRequest;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.mock.MockServletContext;
import org.apache.wicket.request.Url;
-import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects;
import org.junit.Assert;
import org.junit.Test;
-import com.google.inject.Binder;
-import com.google.inject.Module;
-import com.google.inject.Provider;
-import com.google.inject.TypeLiteral;
-
/**
*/
public class GuiceInjectorTest extends Assert
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
index a8d6783..a48b740 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
@@ -21,14 +21,13 @@ import java.util.Enumeration;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
+import com.google.inject.AbstractModule;
import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WicketFilter;
import org.apache.wicket.protocol.http.mock.MockServletContext;
import org.junit.Test;
-import com.google.inject.AbstractModule;
-
/**
*/
public class GuiceWebApplicationFactoryTest
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java
index fb28441..39687f4 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java
@@ -20,9 +20,8 @@ import java.util.Map;
import javax.inject.Inject;
-import org.apache.wicket.Component;
-
import com.google.inject.Provider;
+import org.apache.wicket.Component;
/**
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestNoComponent.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestNoComponent.java b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestNoComponent.java
index ee62297..dedd945 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestNoComponent.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestNoComponent.java
@@ -19,8 +19,8 @@ package org.apache.wicket.guice;
import javax.inject.Inject;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.injection.Injector;
+import org.apache.wicket.util.io.IClusterable;
/**
* Tests injection of services in classes which do not extend {@link Component}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java b/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
index 3d99d7b..603534b 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
@@ -16,12 +16,11 @@
*/
package org.apache.wicket.guice;
+import com.google.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
import org.junit.Assert;
-import com.google.inject.Inject;
-
/**
* A behavior that will be use injected services
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java b/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
index 15884e1..aecc313 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
@@ -18,11 +18,10 @@ package org.apache.wicket.guice;
import java.util.Map;
-import org.apache.wicket.Component;
-
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.name.Named;
+import org.apache.wicket.Component;
/**
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-guice/src/test/java/org/apache/wicket/guice/TestNoComponent.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/TestNoComponent.java b/wicket-guice/src/test/java/org/apache/wicket/guice/TestNoComponent.java
index 14540b1..29e4cdf 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/TestNoComponent.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/TestNoComponent.java
@@ -16,11 +16,10 @@
*/
package org.apache.wicket.guice;
+import com.google.inject.Inject;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.injection.Injector;
-
-import com.google.inject.Inject;
+import org.apache.wicket.util.io.IClusterable;
/**
* Tests injection of services in classes which do not extend {@link Component}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-ioc/src/main/java/org/apache/wicket/proxy/ILazyInitProxy.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/main/java/org/apache/wicket/proxy/ILazyInitProxy.java b/wicket-ioc/src/main/java/org/apache/wicket/proxy/ILazyInitProxy.java
index ab24dc7..dea3543 100644
--- a/wicket-ioc/src/main/java/org/apache/wicket/proxy/ILazyInitProxy.java
+++ b/wicket-ioc/src/main/java/org/apache/wicket/proxy/ILazyInitProxy.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.proxy;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Interface the lazy init proxies implement to make identification of the proxy and retrival of
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-ioc/src/main/java/org/apache/wicket/proxy/IProxyTargetLocator.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/main/java/org/apache/wicket/proxy/IProxyTargetLocator.java b/wicket-ioc/src/main/java/org/apache/wicket/proxy/IProxyTargetLocator.java
index 5f39566..2b8eb25 100644
--- a/wicket-ioc/src/main/java/org/apache/wicket/proxy/IProxyTargetLocator.java
+++ b/wicket-ioc/src/main/java/org/apache/wicket/proxy/IProxyTargetLocator.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.proxy;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Represents a service locator for lazy init proxies. When the first method invocation occurs on
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java b/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
index 4f77e3f..c96d654 100644
--- a/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
+++ b/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
@@ -30,11 +30,10 @@ import net.sf.cglib.core.Predicate;
import net.sf.cglib.proxy.Enhancer;
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
-
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects;
/**
* A factory class that creates lazy init proxies given a type and a {@link IProxyTargetLocator}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java b/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
index 7252989..976e223 100644
--- a/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
+++ b/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
@@ -24,7 +24,7 @@ import org.apache.wicket.proxy.util.IInterface;
import org.apache.wicket.proxy.util.IObjectMethodTester;
import org.apache.wicket.proxy.util.InterfaceObject;
import org.apache.wicket.proxy.util.ObjectMethodTester;
-import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationMBean.java
----------------------------------------------------------------------
diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationMBean.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationMBean.java
index c86cc92..5df0fa4 100644
--- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationMBean.java
+++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationMBean.java
@@ -18,7 +18,6 @@ package org.apache.wicket.jmx;
import java.io.IOException;
-import org.apache.wicket.Application;
import org.apache.wicket.RuntimeConfigurationType;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/InstrumentationObjectSizeOfStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/InstrumentationObjectSizeOfStrategy.java b/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/InstrumentationObjectSizeOfStrategy.java
index bef4cf7..65f418e 100644
--- a/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/InstrumentationObjectSizeOfStrategy.java
+++ b/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/InstrumentationObjectSizeOfStrategy.java
@@ -22,7 +22,7 @@ import java.io.OutputStream;
import java.io.Serializable;
import java.lang.instrument.Instrumentation;
-import org.apache.wicket.util.lang.WicketObjects.IObjectSizeOfStrategy;
+import org.apache.wicket.core.util.lang.WicketObjects.IObjectSizeOfStrategy;
/**
* Object size of strategy that is based on instrumentation.
@@ -104,7 +104,7 @@ public class InstrumentationObjectSizeOfStrategy implements IObjectSizeOfStrateg
* object to calculate size of
* @return object size
*
- * @see org.apache.wicket.util.lang.WicketObjects.IObjectSizeOfStrategy#sizeOf(java.io.Serializable)
+ * @see org.apache.wicket.core.util.lang.WicketObjects.IObjectSizeOfStrategy#sizeOf(java.io.Serializable)
*/
public long sizeOf(Serializable obj)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/ObjectSizeOfAgent.java
----------------------------------------------------------------------
diff --git a/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/ObjectSizeOfAgent.java b/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/ObjectSizeOfAgent.java
index b463878..474556a 100644
--- a/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/ObjectSizeOfAgent.java
+++ b/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/ObjectSizeOfAgent.java
@@ -18,8 +18,8 @@ package org.apache.wicket.util.instrument;
import java.lang.instrument.Instrumentation;
-import org.apache.wicket.util.lang.WicketObjects;
-import org.apache.wicket.util.lang.WicketObjects.IObjectSizeOfStrategy;
+import org.apache.wicket.core.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects.IObjectSizeOfStrategy;
/**
* Instrumentation agent for calculating object sizes using Java's instrumentation API. To use it,
@@ -27,7 +27,7 @@ import org.apache.wicket.util.lang.WicketObjects.IObjectSizeOfStrategy;
* enough) and startup your application with a -javaagent argument like e.g:
* '-javaagent:/mydir/wicket-objectsizeof-agent-1.3-SNAPSHOT.jar'. When the application starts up,
* this agent will register an {@link IObjectSizeOfStrategy} at
- * {@link Objects#setObjectSizeOfStrategy(IObjectSizeOfStrategy)}. Note that this is a static
+ * {@link WicketObjects#setObjectSizeOfStrategy(IObjectSizeOfStrategy)}. Note that this is a static
* registration.
*
* @author eelcohillenius
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
index 8cc2310..497e1fe 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.IStringIterator;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ddc37320/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java b/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
index 2564eb7..2c84d30 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
@@ -18,7 +18,6 @@ package org.apache.wicket.request.parameter;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;