Author: jdonnerstag
Date: Fri Dec 3 20:53:01 2010
New Revision: 1041989
URL: http://svn.apache.org/viewvc?rev=1041989&view=rev
Log:
don't use @see upperClass when javadoc inheritance is sufficient
Issue: WICKET-3221
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IScopedComponent.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/ScopedComponentResolverTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/ScopedLabel.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/ScopedLink.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPageExpectedResult.html
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/SharedResources.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ThreadContext.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentInitializationListenerCollection.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentInstantiationListenerCollection.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentOnAfterRenderListenerCollection.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentOnBeforeRenderListenerCollection.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/AbstractRequestCycleListener.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleListenerCollection.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ByteArrayResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/ComponentStrings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java
(original)
+++
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java
Fri Dec 3 20:53:01 2010
@@ -623,6 +623,8 @@ public final class Url implements Serial
*/
public final static class QueryParameter implements Serializable
{
+ private static final long serialVersionUID = 1L;
+
private final String name;
private final String value;
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
(original)
+++
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
Fri Dec 3 20:53:01 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.request.mapper;
-
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
@@ -26,6 +25,9 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
+/**
+ *
+ */
public abstract class AbstractMapper implements IRequestMapper
{
@@ -47,6 +49,9 @@ public abstract class AbstractMapper imp
}
}
+ /**
+ * Construct.
+ */
public AbstractMapper()
{
super();
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java
(original)
+++
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java
Fri Dec 3 20:53:01 2010
@@ -54,7 +54,7 @@ public class Mount
/**
*
- * @return
+ * @return mount parameters
*/
public MountParameters getMountParameters()
{
@@ -63,7 +63,7 @@ public class Mount
/**
*
- * @return
+ * @return Url
*/
public Url getUrl()
{
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
Fri Dec 3 20:53:01 2010
@@ -31,6 +31,11 @@ import java.util.Map;
public class MultiMap<K, V> extends HashMap<K, List<V>>
{
/**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* Constructor
*
* @see HashMap#HashMap()
@@ -46,7 +51,7 @@ public class MultiMap<K, V> extends Hash
* @param initialCapacity
* @param loadFactor
*
- * @see HashMap#HashMap(int, float))
+ * @see HashMap#HashMap(int, float)
*/
public MultiMap(int initialCapacity, float loadFactor)
{
@@ -134,7 +139,7 @@ public class MultiMap<K, V> extends Hash
* Gets the first value in the value list
*
* @param key
- * @return
+ * @return first value
*/
public V getFirstValue(K key)
{
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
Fri Dec 3 20:53:01 2010
@@ -26,14 +26,15 @@ package org.apache.wicket.util.listener;
*/
public final class ChangeListenerSet extends
ListenerCollection<IChangeListener>
{
- /**
- * @see
org.apache.wicket.util.listener.ListenerCollection#notifyListener(org.apache.wicket.util.listener.IListener)
- */
+ private static final long serialVersionUID = 1L;
+
protected void notifyListener(IChangeListener listener)
{
-
}
+ /**
+ *
+ */
public void notifyListeners()
{
notify(new INotifier<IChangeListener>()
@@ -43,7 +44,6 @@ public final class ChangeListenerSet ext
{
object.onChange();
}
-
});
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java Fri Dec
3 20:53:01 2010
@@ -33,6 +33,7 @@ import org.apache.wicket.util.lang.Args;
*/
final class Behaviors implements IDetachable
{
+ private static final long serialVersionUID = 1L;
private final Component component;
public Behaviors(Component component)
@@ -221,13 +222,14 @@ final class Behaviors implements IDetach
private static class BehaviorIdList extends ArrayList<Behavior>
{
+ private static final long serialVersionUID = 1L;
+
public BehaviorIdList()
{
super(1);
}
}
- /** {...@inheritdoc} */
public final int getBehaviorId(Behavior behavior)
{
Args.notNull(behavior, "behavior");
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/SharedResources.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/SharedResources.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/SharedResources.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/SharedResources.java
Fri Dec 3 20:53:01 2010
@@ -112,7 +112,7 @@ public class SharedResources
* @param style
* @param variation
* @param strict
- * @return
+ * @return resource reference
*/
public ResourceReference get(Class<?> scope, String name, Locale
locale, String style,
String variation, boolean strict)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ThreadContext.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ThreadContext.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ThreadContext.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ThreadContext.java Fri
Dec 3 20:53:01 2010
@@ -37,7 +37,7 @@ public class ThreadContext
* INTERNAL METHOD
*
* @param createIfDoesNotExist
- * @return
+ * @return ThreadContext
*/
public static ThreadContext get(boolean createIfDoesNotExist)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentInitializationListenerCollection.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentInitializationListenerCollection.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentInitializationListenerCollection.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentInitializationListenerCollection.java
Fri Dec 3 20:53:01 2010
@@ -19,11 +19,16 @@ package org.apache.wicket.application;
import org.apache.wicket.Component;
import org.apache.wicket.util.listener.ListenerCollection;
+/**
+ *
+ */
public class ComponentInitializationListenerCollection extends
ListenerCollection<IComponentInitializationListener>
implements
IComponentInitializationListener
{
+ private static final long serialVersionUID = 1L;
+
public void onInitialize(final Component component)
{
notify(new INotifier<IComponentInitializationListener>()
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentInstantiationListenerCollection.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentInstantiationListenerCollection.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentInstantiationListenerCollection.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentInstantiationListenerCollection.java
Fri Dec 3 20:53:01 2010
@@ -19,9 +19,14 @@ package org.apache.wicket.application;
import org.apache.wicket.Component;
import org.apache.wicket.util.listener.ListenerCollection;
+/**
+ *
+ */
public class ComponentInstantiationListenerCollection extends
ListenerCollection<IComponentInstantiationListener> implements
IComponentInstantiationListener
{
+ private static final long serialVersionUID = 1L;
+
public void onInstantiation(final Component component)
{
notify(new INotifier<IComponentInstantiationListener>()
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentOnAfterRenderListenerCollection.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentOnAfterRenderListenerCollection.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentOnAfterRenderListenerCollection.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentOnAfterRenderListenerCollection.java
Fri Dec 3 20:53:01 2010
@@ -19,9 +19,14 @@ package org.apache.wicket.application;
import org.apache.wicket.Component;
import org.apache.wicket.util.listener.ListenerCollection;
+/**
+ *
+ */
public class ComponentOnAfterRenderListenerCollection extends
ListenerCollection<IComponentOnAfterRenderListener> implements
IComponentOnAfterRenderListener
{
+ private static final long serialVersionUID = 1L;
+
public void onAfterRender(final Component component)
{
notify(new INotifier<IComponentOnAfterRenderListener>()
@@ -32,5 +37,4 @@ public class ComponentOnAfterRenderListe
}
});
}
-
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentOnBeforeRenderListenerCollection.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentOnBeforeRenderListenerCollection.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentOnBeforeRenderListenerCollection.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ComponentOnBeforeRenderListenerCollection.java
Fri Dec 3 20:53:01 2010
@@ -19,11 +19,16 @@ package org.apache.wicket.application;
import org.apache.wicket.Component;
import org.apache.wicket.util.listener.ListenerCollection;
+/**
+ *
+ */
public class ComponentOnBeforeRenderListenerCollection extends
ListenerCollection<IComponentOnBeforeRenderListener>
implements
IComponentOnBeforeRenderListener
{
+ private static final long serialVersionUID = 1L;
+
public void onBeforeRender(final Component component)
{
notify(new INotifier<IComponentOnBeforeRenderListener>()
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
Fri Dec 3 20:53:01 2010
@@ -195,6 +195,8 @@ public class BrowserInfoPage extends Web
throw new IllegalArgumentException("continueTo url : "
+ continueTo +
" must be relative to the current server.")
{
+ private static final long serialVersionUID = 1L;
+
/**
* No stack trace. We won't tell the hackers
about the internals of wicket in case
* stack traces are enabled
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java
Fri Dec 3 20:53:01 2010
@@ -79,10 +79,10 @@ public class Item<T> extends ListItem<T>
* Comparator that compares Items by their index property
*
* @author Igor Vaynberg (ivaynberg)
- *
*/
public static class IndexComparator implements Comparator<Item<?>>,
Serializable
{
+ private static final long serialVersionUID = 1L;
private static final Comparator<Item<?>> instance = new
IndexComparator();
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
Fri Dec 3 20:53:01 2010
@@ -52,6 +52,7 @@ public final class AutoComponentResolver
{
private static final long serialVersionUID = 1L;
+ /** */
public static final String COMPONENT = "component";
static
@@ -167,8 +168,9 @@ public final class AutoComponentResolver
// the name might be a Groovy file.
// Note: Spring based components are not supported this
way. May be we
// should provide a ComponentFactory like we provide a
PageFactory.
- final Class<?> componentClass =
container.getSession().getClassResolver().resolveClass(
- classname);
+ final Class<?> componentClass = container.getSession()
+ .getClassResolver()
+ .resolveClass(classname);
final Constructor<?> constructor =
componentClass.getConstructor(new Class[] { String.class });
component =
(Component)constructor.newInstance(componentId);
@@ -277,8 +279,9 @@ public final class AutoComponentResolver
final Class<?> paramClass = parameterClasses[0];
try
{
- final IConverter converter =
Application.get().getConverterLocator().getConverter(
- paramClass);
+ final IConverter converter = Application.get()
+ .getConverterLocator()
+ .getConverter(paramClass);
final Object param = converter.convertToObject(value,
locale);
if (param == null)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
Fri Dec 3 20:53:01 2010
@@ -792,7 +792,7 @@ public class MockHttpServletResponse imp
/**
* @deprecated use {...@link #getDocument()}
- * @return
+ * @return response as String
*/
@Deprecated
public String getTextResponse()
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/AbstractRequestCycleListener.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/AbstractRequestCycleListener.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/AbstractRequestCycleListener.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/AbstractRequestCycleListener.java
Fri Dec 3 20:53:01 2010
@@ -18,6 +18,9 @@ package org.apache.wicket.request.cycle;
import org.apache.wicket.request.IRequestHandler;
+/**
+ *
+ */
public abstract class AbstractRequestCycleListener implements
IRequestCycleListener
{
public void onBeginRequest(final RequestCycle cycle)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleListenerCollection.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleListenerCollection.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleListenerCollection.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleListenerCollection.java
Fri Dec 3 20:53:01 2010
@@ -25,11 +25,15 @@ import org.apache.wicket.util.listener.L
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ *
+ */
public class RequestCycleListenerCollection extends
ListenerCollection<IRequestCycleListener>
implements
IRequestCycleListener
{
private static final Logger logger =
LoggerFactory.getLogger(RequestCycleListenerCollection.class);
+ private static final long serialVersionUID = 1L;
public void onBeginRequest(final RequestCycle cycle)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java
Fri Dec 3 20:53:01 2010
@@ -29,6 +29,11 @@ public class ComponentRenderingRequestHa
{
private final Component component;
+ /**
+ * Construct.
+ *
+ * @param component
+ */
public ComponentRenderingRequestHandler(Component component)
{
this.component = component;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
Fri Dec 3 20:53:01 2010
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.request.mapper;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.request.IRequestHandler;
@@ -31,32 +36,29 @@ import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.time.Time;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
/**
* Generic {...@link ResourceReference} encoder that encodes and decodes
non-mounted
* {...@link ResourceReference}s.
* <p>
* Decodes and encodes the following URLs:
- *
+ *
* <pre>
* /wicket/resource/org.apache.wicket.ResourceScope/name
* /wicket/resource/org.apache.wicket.ResourceScope/name?en
* /wicket/resource/org.apache.wicket.ResourceScope/name?-style
*
/wicket/resource/org.apache.wicket.ResourceScope/resource/name.xyz?en_EN-style
* </pre>
- *
+ *
* @author Matej Knopp
* @author igor.vaynberg
*/
class BasicResourceReferenceMapper extends AbstractResourceReferenceMapper
{
// timestamp cache stored in request cycle meta data
- protected static final MetaDataKey<Map<ResourceReference, Time>>
TIMESTAMP_KEY =
- new MetaDataKey<Map<ResourceReference, Time>>() {};
+ protected static final MetaDataKey<Map<ResourceReference, Time>>
TIMESTAMP_KEY = new MetaDataKey<Map<ResourceReference, Time>>()
+ {
+ private static final long serialVersionUID = 1L;
+ };
protected static final String TIMESTAMP_PREFIX = "-ts";
@@ -67,11 +69,12 @@ class BasicResourceReferenceMapper exten
/**
* Construct.
- *
+ *
* @param pageParametersEncoder
* @param timestamps
*/
- public BasicResourceReferenceMapper(IPageParametersEncoder
pageParametersEncoder, IProvider<Boolean> timestamps)
+ public BasicResourceReferenceMapper(IPageParametersEncoder
pageParametersEncoder,
+ IProvider<Boolean> timestamps)
{
this.pageParametersEncoder = pageParametersEncoder;
this.timestamps = timestamps;
@@ -85,7 +88,7 @@ class BasicResourceReferenceMapper exten
Url url = request.getUrl();
if (url.getSegments().size() >= 4 &&
- urlStartsWith(url, getContext().getNamespace(),
getContext().getResourceIdentifier()))
+ urlStartsWith(url, getContext().getNamespace(),
getContext().getResourceIdentifier()))
{
String className = url.getSegments().get(2);
StringBuilder name = new StringBuilder();
@@ -140,7 +143,7 @@ class BasicResourceReferenceMapper exten
/**
* strip timestamp information from resource name
- *
+ *
* @param resourceName
* @return
*/
@@ -210,7 +213,7 @@ class BasicResourceReferenceMapper exten
{
String token = tokens.nextToken();
- // on the last component of the resource path
add the timestamp
+ // on the last component of the resource path
add the timestamp
if (isTimestampsEnabled() &&
tokens.hasMoreTokens() == false)
{
// get last modification of resource
(cached during the current request cycle)
@@ -224,7 +227,8 @@ class BasicResourceReferenceMapper exten
// create timestamped version
of filename:
//
- // filename :=
[basename][timestamp-prefix][last-modified-milliseconds](.extension)
+ // filename :=
+// [basename][timestamp-prefix][last-modified-milliseconds](.extension)
//
StringBuilder filename = new
StringBuilder();
filename.append(extensionAt ==
-1 ? token : token.substring(0, extensionAt));
@@ -258,13 +262,12 @@ class BasicResourceReferenceMapper exten
/**
* That method gets the last modification timestamp from the specified
resource reference.
* <p/>
- * The timestamp is cached in the meta data of the current request
cycle to
- * eliminate repeated lookups of the same resource reference
- * which will harm performance.
- *
+ * The timestamp is cached in the meta data of the current request
cycle to eliminate repeated
+ * lookups of the same resource reference which will harm performance.
+ *
* @param resourceReference
- * resource reference
- *
+ * resource reference
+ *
* @return last modification timestamp or <code>null</code> if no
timestamp provided
*/
protected Time getLastModifiedTimestampUsingCache(ResourceReference
resourceReference)
@@ -272,7 +275,8 @@ class BasicResourceReferenceMapper exten
// try to lookup current request cycle
RequestCycle requestCycle = ThreadContext.getRequestCycle();
- // no request cycle: this should not happen unless we e.g. run
a plain test case without WicketTester
+ // no request cycle: this should not happen unless we e.g. run
a plain test case without
+// WicketTester
if (requestCycle == null)
return resourceReference.getLastModified();
@@ -316,7 +320,7 @@ class BasicResourceReferenceMapper exten
// lookup current request cycle
RequestCycle cycle = RequestCycle.get();
- if(cycle != null)
+ if (cycle != null)
{
// retrieve cache
Map<ResourceReference, Time> cache =
cycle.getMetaData(TIMESTAMP_KEY);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
Fri Dec 3 20:53:01 2010
@@ -227,9 +227,6 @@ public class ComponentStringResourceLoad
// walk it downwards starting with Page down to the Component
List<Class<?>> searchStack = getComponentStack(component);
- // TODO Should be changed to false in 1.5
- final boolean old = true;
-
// Walk the component hierarchy down from page to the component
for (int i = searchStack.size() - 1; (i >= 0) && (string ==
null); i--)
{
@@ -249,7 +246,7 @@ public class ComponentStringResourceLoad
// If not found, than check if a property with the
'key' provided by
// the user can be found.
- if ((string == null) && old)
+ if (string == null)
{
string = loadStringResource(clazz, key, locale,
style, variation);
}
@@ -257,7 +254,7 @@ public class ComponentStringResourceLoad
// If not found, than check if a property with the 'key'
provided by
// the user can be found.
- if ((string == null) && !old)
+ if (string == null)
{
// Walk the component hierarchy down from page to the
component
for (int i = searchStack.size() - 1; (i >= 0) &&
(string == null); i--)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ByteArrayResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ByteArrayResponse.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ByteArrayResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ByteArrayResponse.java
Fri Dec 3 20:53:01 2010
@@ -53,6 +53,9 @@ public class ByteArrayResponse extends R
this(null);
}
+ /**
+ * @return bytes
+ */
public byte[] getBytes()
{
return bytes.toByteArray();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
Fri Dec 3 20:53:01 2010
@@ -28,6 +28,7 @@ import org.apache.wicket.Application;
import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.convert.ConversionException;
+import org.apache.wicket.util.lang.PropertyResolver.IClassCache;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,13 +63,14 @@ import org.slf4j.LoggerFactory;
*/
public final class PropertyResolver
{
+ /** Log. */
+ private static final Logger log =
LoggerFactory.getLogger(PropertyResolver.class);
+
private final static int RETURN_NULL = 0;
private final static int CREATE_NEW_VALUE = 1;
private final static int RESOLVE_CLASS = 2;
private final static Map<Object, IClassCache>
applicationToClassesToGetAndSetters = Generics.newConcurrentHashMap(2);
- /** Log. */
- private static final Logger log =
LoggerFactory.getLogger(PropertyResolver.class);
/**
* Looks up the value from the object with the given expression. If the
expression, the object
@@ -1131,7 +1133,7 @@ public final class PropertyResolver
public final void setValue(final Object object, final Object
value,
PropertyResolverConverter converter)
{
- Class type = null;
+ Class<?> type = null;
if (setMethod != null)
{
// getMethod is always there and if the value
will be set through a setMethod then
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/ComponentStrings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/ComponentStrings.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/ComponentStrings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/ComponentStrings.java
Fri Dec 3 20:53:01 2010
@@ -18,12 +18,16 @@ package org.apache.wicket.util.string;
import org.apache.wicket.Component;
+/**
+ *
+ */
public class ComponentStrings
{
-
+ /**
+ * Construct.
+ */
private ComponentStrings()
{
-
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Fri Dec 3 20:53:01 2010
@@ -625,6 +625,10 @@ public class BaseWicketTester
return lastResponse;
}
+ /**
+ *
+ * @return last response as String
+ */
public String getLastResponseAsString()
{
return lastResponse.getDocument();
@@ -680,6 +684,10 @@ public class BaseWicketTester
return url;
}
+ /**
+ * @param link
+ * @return url for Link
+ */
public String urlFor(Link link)
{
return link.urlFor(ILinkListener.INTERFACE).toString();
@@ -1320,7 +1328,7 @@ public class BaseWicketTester
*
* @param form
*/
- public void submitForm(Form form)
+ public void submitForm(Form<?> form)
{
submitForm(form.getPageRelativePath());
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java?rev=1041989&r1=1041988&r2=1041989&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
Fri Dec 3 20:53:01 2010
@@ -64,9 +64,6 @@ public class BookmarkablePageLinkTest ex
*/
public void testBookmarkableRequestWithInterceptWithParams() throws
Exception
{
- if (true)
- return;
-
PageParameters pp = new PageParameters();
pp.set("test", "test");
@@ -76,7 +73,5 @@ public class BookmarkablePageLinkTest ex
tester.startPage(BookmarkableContinueToPage.class);
assertEquals(tester.getLastRenderedPage().getClass(),
BookmarkableThrowsInterceptPage.class);
-
}
-
}
