You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2010/12/03 21:17:32 UTC
svn commit: r1041975 - in /wicket/trunk:
wicket-util/src/main/java/org/apache/wicket/util/diff/
wicket-util/src/main/java/org/apache/wicket/util/lang/
wicket-util/src/main/java/org/apache/wicket/util/time/
wicket/src/main/java/org/apache/wicket/ wicket...
Author: jdonnerstag
Date: Fri Dec 3 20:17:31 2010
New Revision: 1041975
URL: http://svn.apache.org/viewvc?rev=1041975&view=rev
Log:
don't use @see upperClass when javadoc inheritance is sufficient
Issue: WICKET-3221
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/RemoveTestPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java Fri Dec 3 20:17:31 2010
@@ -59,7 +59,6 @@ package org.apache.wicket.util.diff;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java Fri Dec 3 20:17:31 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.util.lang;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java Fri Dec 3 20:17:31 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.util.time;
import java.io.Serializable;
-import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Fri Dec 3 20:17:31 2010
@@ -3510,7 +3510,6 @@ public abstract class Component
* @param <M>
* A class derived from IBehavior
*/
- @SuppressWarnings("unchecked")
public <M extends Behavior> List<M> getBehaviors(Class<M> type)
{
return new Behaviors(this).getBehaviors(type);
@@ -3593,7 +3592,6 @@ public abstract class Component
*
* @return The model
*/
- @SuppressWarnings("unchecked")
protected IModel<?> initModel()
{
IModel<?> foundModel = null;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java Fri Dec 3 20:17:31 2010
@@ -399,7 +399,6 @@ public final class LocalizedImageResourc
* @throws WicketRuntimeException
* Thrown if the image cannot be located
*/
- @SuppressWarnings("unchecked")
private void loadStaticImage(final String path)
{
MarkupContainer parent = component.findParentWithAssociatedMarkup();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java Fri Dec 3 20:17:31 2010
@@ -295,7 +295,6 @@ public class Enclosure extends WebMarkup
/**
* @see org.apache.wicket.application.IComponentOnBeforeRenderListener#onBeforeRender(org.apache.wicket.Component)
*/
- @SuppressWarnings("unchecked")
public void onAfterRender(final Component component)
{
if (log.isWarnEnabled())
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java Fri Dec 3 20:17:31 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.markup.renderStrategy;
-import java.util.Iterator;
import java.util.List;
import org.apache.wicket.Application;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java Fri Dec 3 20:17:31 2010
@@ -20,7 +20,6 @@ import java.util.Iterator;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.html.WebMarkupContainer;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java Fri Dec 3 20:17:31 2010
@@ -33,7 +33,6 @@ public class EmptyDataProvider<T> implem
{
private static final long serialVersionUID = 1L;
- @SuppressWarnings("unchecked")
private static EmptyDataProvider<?> INSTANCE = new EmptyDataProvider();
/**
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=1041975&r1=1041974&r2=1041975&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:17:31 2010
@@ -20,7 +20,6 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java Fri Dec 3 20:17:31 2010
@@ -23,7 +23,6 @@ import java.io.RandomAccessFile;
import java.nio.channels.FileChannel;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
import java.util.Set;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java Fri Dec 3 20:17:31 2010
@@ -21,7 +21,6 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.java Fri Dec 3 20:17:31 2010
@@ -70,7 +70,6 @@ public class ValidatorStringResourceLoad
* java.lang.String, java.util.Locale, java.lang.String, java.lang.String)
*/
@Override
- @SuppressWarnings("unchecked")
public String loadStringResource(final Component component, final String key,
final Locale locale, final String style, final String variation)
{
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=1041975&r1=1041974&r2=1041975&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:17:31 2010
@@ -28,7 +28,6 @@ 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;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java Fri Dec 3 20:17:31 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.util.tester;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/RemoveTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/RemoveTestPage.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/RemoveTestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/RemoveTestPage.java Fri Dec 3 20:17:31 2010
@@ -38,7 +38,6 @@ public class RemoveTestPage extends WebP
/**
* Construct.
*/
- @SuppressWarnings("unchecked")
public RemoveTestPage()
{
_1 = new MarkupContainer(COMPONENT)
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java Fri Dec 3 20:17:31 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.markup.html.panel;
-import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.html.WebPage;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java Fri Dec 3 20:17:31 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.markup.parser.filter;
-import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.WebPage;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePage.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePage.java Fri Dec 3 20:17:31 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.protocol.http;
-import org.apache.wicket.Component;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.http.WebResponse;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java?rev=1041975&r1=1041974&r2=1041975&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java Fri Dec 3 20:17:31 2010
@@ -44,8 +44,8 @@ public class BasicResourceReferenceMappe
{
}
- private final BasicResourceReferenceMapper encoder =
- new BasicResourceReferenceMapper(new PageParametersEncoder(), TIMESTAMPS_OFF)
+ private final BasicResourceReferenceMapper encoder = new BasicResourceReferenceMapper(
+ new PageParametersEncoder(), TIMESTAMPS_OFF)
{
@Override
protected IMapperContext getContext()
@@ -54,8 +54,8 @@ public class BasicResourceReferenceMappe
}
};
- private final BasicResourceReferenceMapper encoderWithTimestamps =
- new BasicResourceReferenceMapper(new PageParametersEncoder(), TIMESTAMPS_ON)
+ private final BasicResourceReferenceMapper encoderWithTimestamps = new BasicResourceReferenceMapper(
+ new PageParametersEncoder(), TIMESTAMPS_ON)
{
@Override
protected IMapperContext getContext()
@@ -425,22 +425,25 @@ public class BasicResourceReferenceMappe
public void testLastModifiedTimestampIsPartOfUrl()
{
long millis = 12345678L;
- final ResourceReferenceWithTimestamp reference = new ResourceReferenceWithTimestamp(Time.milliseconds(millis));
+ final ResourceReferenceWithTimestamp reference = new ResourceReferenceWithTimestamp(
+ Time.milliseconds(millis));
final IRequestHandler handler = new ResourceReferenceRequestHandler(reference, null);
// request url with timestamp
Url url = encoderWithTimestamps.mapHandler(handler);
// check that url contains timestamp
- String timestampPart = BasicResourceReferenceMapper.TIMESTAMP_PREFIX + Long.toString(millis) + "?";
+ String timestampPart = BasicResourceReferenceMapper.TIMESTAMP_PREFIX +
+ Long.toString(millis) + "?";
assertTrue(url.toString().contains(timestampPart));
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ })
public void testLastModifiedTimestampCache()
{
long millis = 87654321L;
- final ResourceReferenceWithTimestamp reference = new ResourceReferenceWithTimestamp(Time.milliseconds(millis));
+ final ResourceReferenceWithTimestamp reference = new ResourceReferenceWithTimestamp(
+ Time.milliseconds(millis));
final IRequestHandler handler = new ResourceReferenceRequestHandler(reference, null);
// setup mock request cycle
@@ -458,7 +461,7 @@ public class BasicResourceReferenceMappe
Url url3 = encoderWithTimestamps.mapHandler(handler);
assertNotNull(url3);
-
+
assertEquals(1, reference.lastModifiedInvocationCount);
// urls should be equal