Author: ivaynberg
Date: Sun Oct 11 00:50:54 2009
New Revision: 823993
URL: http://svn.apache.org/viewvc?rev=823993&view=rev
Log:
removed more ng util classes
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Classes.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Generics.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultPageFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultPageFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultPageFactory.java?rev=823993&r1=823992&r2=823993&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultPageFactory.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultPageFactory.java
Sun Oct 11 00:50:54 2009
@@ -23,7 +23,7 @@
import org.apache.wicket.ng.request.component.PageFactory;
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.component.RequestablePage;
-import org.apache.wicket.ng.util.lang.Generics;
+import org.apache.wicket.util.lang.Generics;
/**
@@ -146,7 +146,7 @@
if (argument != null)
return (Page)constructor.newInstance(new
Object[] { argument });
else
- return (Page)constructor.newInstance(new
Object[] {});
+ return (Page)constructor.newInstance(new
Object[] { });
}
catch (InstantiationException e)
{
@@ -160,12 +160,12 @@
{
// honor redirect exception contract defined in
IPageFactory
// TODO - Honor the exceptions
-// if (e.getTargetException() instanceof AbortException ||
-// e.getTargetException() instanceof
AuthorizationException ||
-// e.getTargetException() instanceof
MarkupException)
-// {
-// throw (RuntimeException)e.getTargetException();
-// }
+// if (e.getTargetException() instanceof AbortException ||
+// e.getTargetException() instanceof AuthorizationException ||
+// e.getTargetException() instanceof MarkupException)
+// {
+// throw (RuntimeException)e.getTargetException();
+// }
throw new
WicketRuntimeException(createDescription(constructor, argument), e);
}
}
@@ -173,17 +173,17 @@
private Page processPage(Page page, PageParameters pageParameters)
{
// the page might have not propagate page parameters from
constructor. if that's the case
- // we force the parameters
+ // we force the parameters
if (pageParameters != null && page.getPageParameters() !=
pageParameters)
{
page.getPageParameters().assign(pageParameters);
}
-
+
page.setWasCreatedBookmarkable(true);
-
+
return page;
- }
-
+ }
+
private String createDescription(Constructor<?> constructor, Object
argument)
{
if (argument != null)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java?rev=823993&r1=823992&r2=823993&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
Sun Oct 11 00:50:54 2009
@@ -26,8 +26,8 @@
import org.apache.wicket.ng.request.listener.RequestListenerInterface;
import org.apache.wicket.ng.request.mapper.info.PageComponentInfo;
import org.apache.wicket.ng.request.mapper.parameters.PageParametersEncoder;
-import org.apache.wicket.ng.util.lang.Classes;
import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.string.Strings;
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java?rev=823993&r1=823992&r2=823993&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java
Sun Oct 11 00:50:54 2009
@@ -26,7 +26,7 @@
import
org.apache.wicket.ng.request.mapper.parameters.SimplePageParametersEncoder;
import org.apache.wicket.ng.resource.Resource;
import org.apache.wicket.ng.resource.ResourceReference;
-import org.apache.wicket.ng.util.lang.Classes;
+import org.apache.wicket.util.lang.Classes;
/**
* Generic {...@link ResourceReference} encoder that encodes and decodes
non-mounted
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java?rev=823993&r1=823992&r2=823993&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
Sun Oct 11 00:50:54 2009
@@ -19,9 +19,9 @@
import java.io.Serializable;
import java.util.Locale;
-import org.apache.wicket.ng.util.lang.Classes;
import org.apache.wicket.ng.util.lang.Objects;
import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Classes;
/**
* Reference to a resource. Can be used to reference global resources.
