Author: jdonnerstag
Date: Fri Dec 3 20:10:34 2010
New Revision: 1041973
URL: http://svn.apache.org/viewvc?rev=1041973&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/resource/AbstractResourceStream.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MergedMarkup.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/BaseMarkupFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RootMarkupFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStreamWriter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/PackageResourceStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
Fri Dec 3 20:10:34 2010
@@ -35,73 +35,46 @@ public abstract class AbstractResourceSt
private String style;
private String variation;
- /**
- * @see org.apache.wicket.util.resource.IResourceStream#getLocale()
- */
public Locale getLocale()
{
return locale;
}
- /**
- * @see
org.apache.wicket.util.resource.IResourceStream#setLocale(java.util.Locale)
- */
public void setLocale(Locale locale)
{
this.locale = locale;
}
- /**
- * @see org.apache.wicket.util.resource.IResourceStream#getStyle()
- */
public String getStyle()
{
return style;
}
- /**
- * @see org.apache.wicket.util.resource.IResourceStream#getVariation()
- */
public String getVariation()
{
return variation;
}
- /**
- * @see
org.apache.wicket.util.resource.IResourceStream#setStyle(java.lang.String)
- */
public void setStyle(String style)
{
this.style = style;
}
- /**
- * @see
org.apache.wicket.util.resource.IResourceStream#setVariation(java.lang.String)
- */
public void setVariation(String variation)
{
this.variation = variation;
}
- /**
- * @see org.apache.wicket.util.resource.IResourceStream#length()
- */
public Bytes length()
{
return null;
}
- /**
- * @see org.apache.wicket.util.resource.IResourceStream#getContentType()
- */
public String getContentType()
{
return null;
}
- /**
- * @see org.apache.wicket.util.watch.IModifiable#lastModifiedTime()
- */
public Time lastModifiedTime()
{
return null;
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java
Fri Dec 3 20:10:34 2010
@@ -81,9 +81,6 @@ public class FileResourceStream extends
}
}
- /**
- * @see IResourceStream#getContentType()
- */
@Override
public String getContentType()
{
@@ -137,9 +134,6 @@ public class FileResourceStream extends
return null;
}
- /**
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
@@ -150,9 +144,6 @@ public class FileResourceStream extends
return "";
}
- /**
- * @see org.apache.wicket.util.resource.IResourceStream#length()
- */
@Override
public Bytes length()
{
@@ -163,9 +154,6 @@ public class FileResourceStream extends
return null;
}
- /**
- * @see
org.apache.wicket.util.resource.IFixedLocationResourceStream#locationAsString()
- */
public String locationAsString()
{
if (file != null)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java Fri
Dec 3 20:10:34 2010
@@ -18,10 +18,8 @@ package org.apache.wicket.markup;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
-import org.apache.wicket.util.resource.IFixedLocationResourceStream;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
@@ -76,25 +74,17 @@ public class Markup implements IMarkupFr
markupElements = new ArrayList<MarkupElement>();
}
- /**
- * @see org.apache.wicket.markup.IMarkupFragment#get(int)
- */
public final MarkupElement get(final int index)
{
return markupElements.get(index);
}
- /**
- * @see
org.apache.wicket.markup.IMarkupFragment#getMarkupResourceStream()
- */
public final MarkupResourceStream getMarkupResourceStream()
{
return markupResourceStream;
}
/**
- * @see MarkupResourceStream#locationAsString()
- * @see IFixedLocationResourceStream#locationAsString()
*
* @return The fixed location as a string, e.g. the file name or the
URL. Return null to avoid
* caching the markup.
@@ -104,9 +94,6 @@ public class Markup implements IMarkupFr
return markupResourceStream.locationAsString();
}
- /**
- * @see org.apache.wicket.markup.IMarkupFragment#size()
- */
public final int size()
{
return markupElements.size();
@@ -143,16 +130,13 @@ public class Markup implements IMarkupFr
if (markupElement instanceof ComponentTag)
{
// Make the tag immutable
- ((ComponentTag) markupElement).makeImmutable();
+ ((ComponentTag)markupElement).makeImmutable();
}
}
markupElements = Collections.unmodifiableList(markupElements);
}
- /**
- * @see org.apache.wicket.markup.IMarkupFragment#find(java.lang.String)
- */
public final IMarkupFragment find(final String id)
{
if (Strings.isEmpty(id))
@@ -188,9 +172,6 @@ public class Markup implements IMarkupFr
return null;
}
- /**
- * @see org.apache.wicket.markup.IMarkupFragment#toString()
- */
@Override
public final String toString()
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
Fri Dec 3 20:10:34 2010
@@ -98,28 +98,18 @@ public class MarkupCache implements IMar
}
}
- /**
- * @see org.apache.wicket.markup.IMarkupCache#clear()
- */
public void clear()
{
markupCache.clear();
markupKeyCache.clear();
}
- /**
- *
- * @see org.apache.wicket.markup.IMarkupCache#shutdown()
- */
public void shutdown()
{
markupCache.shutdown();
markupKeyCache.shutdown();
}
- /**
- * @see
org.apache.wicket.markup.IMarkupCache#removeMarkup(java.lang.String)
- */
public final IMarkupFragment removeMarkup(final String cacheKey)
{
Args.notNull(cacheKey, "cacheKey");
@@ -227,9 +217,6 @@ public class MarkupCache implements IMar
return false;
}
- /**
- * @see org.apache.wicket.markup.IMarkupCache#size()
- */
public final int size()
{
return markupCache.size();
@@ -533,7 +520,6 @@ public class MarkupCache implements IMar
*
* @param <K>
* @param <V>
- *
* @return new instance of cache implementation
*/
protected <K, V> ICache<K, V> newCacheImplementation()
@@ -549,8 +535,6 @@ public class MarkupCache implements IMar
* The key type
* @param <V>
* The value type
- *
- * @see MarkupCache
*/
public interface ICache<K, V>
{
@@ -616,7 +600,6 @@ public class MarkupCache implements IMar
/**
* @param <K>
* @param <V>
- *
*/
public class DefaultCacheImplementation<K, V> implements ICache<K, V>
{
@@ -629,17 +612,11 @@ public class MarkupCache implements IMar
{
}
- /**
- * @see org.apache.wicket.markup.MarkupCache.ICache#clear()
- */
public void clear()
{
cache.clear();
}
- /**
- * @see
org.apache.wicket.markup.MarkupCache.ICache#containsKey(java.lang.Object)
- */
public boolean containsKey(Object key)
{
if (key == null)
@@ -649,9 +626,6 @@ public class MarkupCache implements IMar
return cache.containsKey(key);
}
- /**
- * @see
org.apache.wicket.markup.MarkupCache.ICache#get(java.lang.Object)
- */
public V get(Object key)
{
if (key == null)
@@ -661,41 +635,26 @@ public class MarkupCache implements IMar
return cache.get(key);
}
- /**
- * @see org.apache.wicket.markup.MarkupCache.ICache#getKeys()
- */
public Collection<K> getKeys()
{
return cache.keySet();
}
- /**
- * @see
org.apache.wicket.markup.MarkupCache.ICache#put(java.lang.Object,
java.lang.Object)
- */
public void put(K key, V value)
{
cache.put(key, value);
}
- /**
- * @see
org.apache.wicket.markup.MarkupCache.ICache#remove(java.lang.Object)
- */
public boolean remove(K key)
{
return cache.remove(key) == null;
}
- /**
- * @see org.apache.wicket.markup.MarkupCache.ICache#size()
- */
public int size()
{
return cache.size();
}
- /**
- * @see org.apache.wicket.markup.MarkupCache.ICache#shutdown()
- */
public void shutdown()
{
clear();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java
Fri Dec 3 20:10:34 2010
@@ -127,9 +127,6 @@ public class MarkupFragment implements I
size = endIndex - startIndex + 1;
}
- /**
- * @see org.apache.wicket.markup.IMarkupFragment#get(int)
- */
public final MarkupElement get(final int index)
{
if ((index < 0) || (index > size))
@@ -142,9 +139,6 @@ public class MarkupFragment implements I
return markup.get(startIndex + index);
}
- /**
- * @see org.apache.wicket.markup.IMarkupFragment#find(java.lang.String)
- */
public final IMarkupFragment find(final String id)
{
if (Strings.isEmpty(id))
@@ -180,17 +174,11 @@ public class MarkupFragment implements I
return null;
}
- /**
- * @see
org.apache.wicket.markup.IMarkupFragment#getMarkupResourceStream()
- */
public final MarkupResourceStream getMarkupResourceStream()
{
return markup.getMarkupResourceStream();
}
- /**
- * @see org.apache.wicket.markup.IMarkupFragment#size()
- */
public final int size()
{
return size;
@@ -217,18 +205,12 @@ public class MarkupFragment implements I
return (Markup)markup;
}
- /**
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
return toString(false);
}
- /**
- * @see org.apache.wicket.markup.IMarkupFragment#toString(boolean)
- */
public String toString(boolean markupOnly)
{
final AppendingStringBuffer buf = new
AppendingStringBuffer(400);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
Fri Dec 3 20:10:34 2010
@@ -81,9 +81,6 @@ public class MarkupParser extends Abstra
super(xmlParser, resource);
}
- /**
- * @see org.apache.wicket.markup.MarkupParser#getMarkupFilters()
- */
@Override
public MarkupFilterList getMarkupFilters()
{
@@ -194,9 +191,6 @@ public class MarkupParser extends Abstra
{
private static final long serialVersionUID = 1L;
- /**
- * @see java.util.ArrayList#add(java.lang.Object)
- */
@Override
public boolean add(final IMarkupFilter filter)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
Fri Dec 3 20:10:34 2010
@@ -115,9 +115,6 @@ public class MarkupResourceStream implem
setWicketNamespace(ComponentTag.DEFAULT_WICKET_NAMESPACE);
}
- /**
- * @see
org.apache.wicket.util.resource.IFixedLocationResourceStream#locationAsString()
- */
public String locationAsString()
{
if (resourceStream instanceof IFixedLocationResourceStream)
@@ -127,64 +124,36 @@ public class MarkupResourceStream implem
return null;
}
- /**
- *
- * @see org.apache.wicket.util.resource.IResourceStream#close()
- */
public void close() throws IOException
{
resourceStream.close();
}
- /**
- *
- * @see org.apache.wicket.util.resource.IResourceStream#getContentType()
- */
public String getContentType()
{
return resourceStream.getContentType();
}
- /**
- *
- * @see org.apache.wicket.util.resource.IResourceStream#getInputStream()
- */
public InputStream getInputStream() throws
ResourceStreamNotFoundException
{
return resourceStream.getInputStream();
}
- /**
- *
- * @see org.apache.wicket.util.resource.IResourceStream#getLocale()
- */
public Locale getLocale()
{
return resourceStream.getLocale();
}
- /**
- *
- * @see org.apache.wicket.util.watch.IModifiable#lastModifiedTime()
- */
public Time lastModifiedTime()
{
return resourceStream.lastModifiedTime();
}
- /**
- *
- * @see org.apache.wicket.util.resource.IResourceStream#length()
- */
public Bytes length()
{
return resourceStream.length();
}
- /**
- *
- * @see
org.apache.wicket.util.resource.IResourceStream#setLocale(java.util.Locale)
- */
public void setLocale(Locale locale)
{
resourceStream.setLocale(locale);
@@ -355,42 +324,26 @@ public class MarkupResourceStream implem
return baseMarkup;
}
- /**
- * @see org.apache.wicket.util.resource.IResourceStream#getStyle()
- */
public String getStyle()
{
return resourceStream.getStyle();
}
- /**
- * @see org.apache.wicket.util.resource.IResourceStream#getVariation()
- */
public String getVariation()
{
return resourceStream.getVariation();
}
- /**
- * @see
org.apache.wicket.util.resource.IResourceStream#setStyle(java.lang.String)
- */
public void setStyle(String style)
{
resourceStream.setStyle(style);
}
- /**
- * @see
org.apache.wicket.util.resource.IResourceStream#setVariation(java.lang.String)
- */
public void setVariation(String variation)
{
resourceStream.setVariation(variation);
}
- /**
- *
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MergedMarkup.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MergedMarkup.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MergedMarkup.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MergedMarkup.java
Fri Dec 3 20:10:34 2010
@@ -90,9 +90,6 @@ public class MergedMarkup extends Markup
}
}
- /**
- * @see org.apache.wicket.markup.Markup#locationAsString()
- */
@Override
public String locationAsString()
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java
Fri Dec 3 20:10:34 2010
@@ -42,10 +42,6 @@ public class DefaultMarkupLoader impleme
* Uses {...@link SimpleMarkupLoader} to load the resource(s), read it
and check if markup
* inheritance applies. If yes, load the required other markup and
merge them using
* {...@link InheritedMarkupMarkupLoader}.
- *
- * @see
org.apache.wicket.markup.loader.IMarkupLoader#loadMarkup(org.apache.wicket.MarkupContainer,
- * org.apache.wicket.markup.MarkupResourceStream,
- * org.apache.wicket.markup.loader.IMarkupLoader, boolean)
*/
public final Markup loadMarkup(final MarkupContainer container,
final MarkupResourceStream markupResourceStream, final
IMarkupLoader baseLoader,
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
Fri Dec 3 20:10:34 2010
@@ -46,10 +46,6 @@ public class InheritedMarkupMarkupLoader
/**
* Load the markup from the resource stream with the base MarkupLoader
provided, than check if
* markup inheritance must be applied. If yes, than load the base
markup and merge them.
- *
- * @see
org.apache.wicket.markup.loader.IMarkupLoader#loadMarkup(org.apache.wicket.MarkupContainer,
- * org.apache.wicket.markup.MarkupResourceStream,
- * org.apache.wicket.markup.loader.IMarkupLoader, boolean)
*/
public final Markup loadMarkup(final MarkupContainer container,
final MarkupResourceStream markupResourceStream, final
IMarkupLoader baseLoader,
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java
Fri Dec 3 20:10:34 2010
@@ -42,10 +42,6 @@ public class SimpleMarkupLoader implemen
/**
* Uses {...@link MarkupFactory#newMarkupParser(MarkupResourceStream)}
and
* {...@link MarkupParser#parse()} to load the Markup.
- *
- * @see
org.apache.wicket.markup.loader.IMarkupLoader#loadMarkup(org.apache.wicket.MarkupContainer,
- * org.apache.wicket.markup.MarkupResourceStream,
- * org.apache.wicket.markup.loader.IMarkupLoader, boolean)
*/
public final Markup loadMarkup(final MarkupContainer container,
final MarkupResourceStream markupResourceStream, final
IMarkupLoader baseLoader,
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java
Fri Dec 3 20:10:34 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.markup.parser;
-import java.util.Iterator;
import java.util.Map;
+import org.apache.wicket.util.value.IValueMap;
import org.apache.wicket.util.value.ValueMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
public class TagAttributes extends ValueMap
{
/** Log. */
- static final Logger log = LoggerFactory.getLogger(TagAttributes.class);
+ private static final Logger log =
LoggerFactory.getLogger(TagAttributes.class);
private static final long serialVersionUID = 1L;
@@ -47,15 +47,12 @@ public class TagAttributes extends Value
* @param map
* the <code>ValueMap</code> to copy
*/
- public TagAttributes(final Map map)
+ public TagAttributes(final IValueMap map)
{
super();
putAll(map);
}
- /**
- * @see org.apache.wicket.util.value.ValueMap#put(java.lang.String,
java.lang.Object)
- */
@Override
public final Object put(String key, Object value)
{
@@ -87,11 +84,8 @@ public class TagAttributes extends Value
return super.put(key, value);
}
- /**
- * @see org.apache.wicket.util.value.ValueMap#putAll(java.util.Map)
- */
@Override
- public final void putAll(Map map)
+ public final void putAll(Map<? extends String, ? extends Object> map)
{
for (Object o : map.keySet())
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
Fri Dec 3 20:10:34 2010
@@ -73,46 +73,26 @@ public final class XmlPullParser impleme
{
}
- /**
- *
- * @see org.apache.wicket.markup.parser.IXmlPullParser#getEncoding()
- */
public final String getEncoding()
{
return xmlReader.getEncoding();
}
- /**
- *
- * @see
org.apache.wicket.markup.parser.IXmlPullParser#getXmlDeclaration()
- */
public final CharSequence getXmlDeclaration()
{
return xmlReader.getXmlDeclaration();
}
- /**
- *
- * @see org.apache.wicket.markup.parser.IXmlPullParser#getDoctype()
- */
public final CharSequence getDoctype()
{
return doctype;
}
- /**
- *
- * @see
org.apache.wicket.markup.parser.IXmlPullParser#getInputFromPositionMarker(int)
- */
public final CharSequence getInputFromPositionMarker(final int toPos)
{
return input.getSubstring(toPos);
}
- /**
- *
- * @see org.apache.wicket.markup.parser.IXmlPullParser#getInput(int,
int)
- */
public final CharSequence getInput(final int fromPos, final int toPos)
{
return input.getSubstring(fromPos, toPos);
@@ -573,28 +553,16 @@ public final class XmlPullParser impleme
}
}
- /**
- *
- * @see
org.apache.wicket.markup.parser.IXmlPullParser#setPositionMarker()
- */
public final void setPositionMarker()
{
input.setPositionMarker(input.getPosition());
}
- /**
- *
- * @see
org.apache.wicket.markup.parser.IXmlPullParser#setPositionMarker(int)
- */
public final void setPositionMarker(final int pos)
{
input.setPositionMarker(pos);
}
- /**
- *
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
Fri Dec 3 20:10:34 2010
@@ -126,13 +126,9 @@ public class XmlTag extends MarkupElemen
*/
public final boolean closes(final XmlTag open)
{
-// return (closes == open) || (closes == open.copyOf);
return (closes == open) || ((closes == open.copyOf) && (this !=
open));
}
- /**
- * @see
org.apache.wicket.markup.MarkupElement#equalTo(org.apache.wicket.markup.MarkupElement)
- */
@Override
public final boolean equalTo(final MarkupElement element)
{
@@ -593,9 +589,6 @@ public class XmlTag extends MarkupElemen
return toCharSequence().toString();
}
- /**
- * @see org.apache.wicket.markup.MarkupElement#toCharSequence()
- */
@Override
public CharSequence toCharSequence()
{
@@ -676,7 +669,6 @@ public class XmlTag extends MarkupElemen
}
buffer.append('>');
-
return buffer;
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/BaseMarkupFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/BaseMarkupFilter.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/BaseMarkupFilter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/BaseMarkupFilter.java
Fri Dec 3 20:10:34 2010
@@ -52,9 +52,6 @@ public abstract class BaseMarkupFilter e
super(parent);
}
- /**
- * @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
- */
public final MarkupElement nextTag() throws ParseException
{
// Get the next tag from the next MarkupFilter in the chain.
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
Fri Dec 3 20:10:34 2010
@@ -74,9 +74,6 @@ public final class EnclosureHandler exte
{
}
- /**
- * @see
org.apache.wicket.markup.parser.filter.BaseMarkupFilter#nextTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected final MarkupElement nextTag(ComponentTag tag) throws
ParseException
{
@@ -152,11 +149,6 @@ public final class EnclosureHandler exte
return tag;
}
- /**
- *
- * @see
org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
- * org.apache.wicket.markup.MarkupStream,
org.apache.wicket.markup.ComponentTag)
- */
public Component resolve(final MarkupContainer container, final
MarkupStream markupStream,
final ComponentTag tag)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
Fri Dec 3 20:10:34 2010
@@ -70,9 +70,6 @@ public class HeadForceTagIdHandler exten
headElementIdPrefix = buffer.toString();
}
- /**
- * @see
org.apache.wicket.markup.parser.filter.BaseMarkupFilter#nextTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected final MarkupElement nextTag(ComponentTag tag) throws
ParseException
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
Fri Dec 3 20:10:34 2010
@@ -65,9 +65,6 @@ public final class HtmlHandler extends A
{
}
- /**
- * @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
- */
public MarkupElement nextTag() throws ParseException
{
// Get the next tag. If null, no more tags are available
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
Fri Dec 3 20:10:34 2010
@@ -62,9 +62,6 @@ public final class HtmlHeaderSectionHand
this.markup = markup;
}
- /**
- * @see
org.apache.wicket.markup.parser.filter.BaseMarkupFilter#nextTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected final MarkupElement nextTag(ComponentTag tag) throws
ParseException
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
Fri Dec 3 20:10:34 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.markup.parser.filter;
import java.text.ParseException;
-import java.util.Iterator;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
@@ -79,9 +78,6 @@ public final class HtmlProblemFinder ext
this.problemEscalation = problemEscalation;
}
- /**
- * @see
org.apache.wicket.markup.parser.filter.BaseMarkupFilter#nextTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected final MarkupElement nextTag(ComponentTag tag) throws
ParseException
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
Fri Dec 3 20:10:34 2010
@@ -37,11 +37,10 @@ import org.apache.wicket.markup.parser.X
*/
public class OpenCloseTagExpander extends AbstractMarkupFilter
{
- private static final List<String> replaceForTags = Arrays.asList("a",
"q",
- "sub", "sup", "abbr", "acronym", "cite", "code", "del", "dfn",
"em", "ins", "kbd",
- "samp", "var", "label", "textarea", "tr", "td", "th",
"caption", "thead", "tbody",
- "tfoot", "dl", "dt", "dd", "li", "ol", "ul", "h1", "h2", "h3",
"h4", "h5", "h6", "pre",
- "title", "div"
+ private static final List<String> replaceForTags = Arrays.asList("a",
"q", "sub", "sup",
+ "abbr", "acronym", "cite", "code", "del", "dfn", "em", "ins",
"kbd", "samp", "var",
+ "label", "textarea", "tr", "td", "th", "caption", "thead",
"tbody", "tfoot", "dl", "dt",
+ "dd", "li", "ol", "ul", "h1", "h2", "h3", "h4", "h5", "h6",
"pre", "title", "div"
// tags from pre 1.5 days, shouldnt really be here but make
this release more backwards
// compatible
@@ -49,10 +48,6 @@ public class OpenCloseTagExpander extend
private ComponentTag next = null;
- /**
- *
- * @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
- */
public MarkupElement nextTag() throws ParseException
{
if (next != null)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
Fri Dec 3 20:10:34 2010
@@ -92,9 +92,6 @@ public final class RelativePathPrefixHan
}
};
- /**
- * @see
org.apache.wicket.markup.parser.filter.BaseMarkupFilter#nextTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected final MarkupElement nextTag(ComponentTag tag) throws
ParseException
{
@@ -132,11 +129,6 @@ public final class RelativePathPrefixHan
return tag;
}
- /**
- *
- * @see
org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
- * org.apache.wicket.markup.MarkupStream,
org.apache.wicket.markup.ComponentTag)
- */
public Component resolve(final MarkupContainer container, final
MarkupStream markupStream,
final ComponentTag tag)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RootMarkupFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RootMarkupFilter.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RootMarkupFilter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RootMarkupFilter.java
Fri Dec 3 20:10:34 2010
@@ -43,9 +43,6 @@ public final class RootMarkupFilter impl
this.parser = parser;
}
- /**
- * @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
- */
public final MarkupElement nextTag() throws ParseException
{
ELEMENT_TYPE type;
@@ -60,17 +57,11 @@ public final class RootMarkupFilter impl
return parser.getElement();
}
- /**
- * @see org.apache.wicket.markup.parser.IMarkupFilter#getNextFilter()
- */
public IMarkupFilter getNextFilter()
{
return null;
}
- /**
- * @see
org.apache.wicket.markup.parser.IMarkupFilter#setNextFilter(org.apache.wicket.markup.parser.IMarkupFilter)
- */
public void setNextFilter(final IMarkupFilter parent)
{
throw new IllegalArgumentException("You can not set the parent
with RootMarkupFilter.");
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
Fri Dec 3 20:10:34 2010
@@ -89,9 +89,6 @@ public class WicketLinkTagHandler extend
autolinking = enable;
}
- /**
- * @see
org.apache.wicket.markup.parser.filter.BaseMarkupFilter#nextTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected final MarkupElement nextTag(ComponentTag tag) throws
ParseException
{
@@ -201,10 +198,6 @@ public class WicketLinkTagHandler extend
return (ref != null) && (!ref.contains(":"));
}
- /**
- * @see
org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
- * org.apache.wicket.markup.MarkupStream,
org.apache.wicket.markup.ComponentTag)
- */
public Component resolve(final MarkupContainer container, final
MarkupStream markupStream,
final ComponentTag tag)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
Fri Dec 3 20:10:34 2010
@@ -65,9 +65,6 @@ public final class WicketMessageTagHandl
{
}
- /**
- * @see
org.apache.wicket.markup.parser.filter.BaseMarkupFilter#nextTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected final MarkupElement nextTag(ComponentTag tag) throws
ParseException
{
@@ -107,10 +104,6 @@ public final class WicketMessageTagHandl
{
private static final long serialVersionUID = 1L;
- /**
- * @see
org.apache.wicket.behavior.AbstractBehavior#onComponentTag(org.apache.wicket.Component,
- * org.apache.wicket.markup.ComponentTag)
- */
@Override
public void onComponentTag(final Component component, final
ComponentTag tag)
{
@@ -152,11 +145,6 @@ public final class WicketMessageTagHandl
}
}
- /**
- *
- * @see
org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
- * org.apache.wicket.markup.MarkupStream,
org.apache.wicket.markup.ComponentTag)
- */
public Component resolve(MarkupContainer container, MarkupStream
markupStream, ComponentTag tag)
{
// localize any raw markup that has wicket:message attrs
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
Fri Dec 3 20:10:34 2010
@@ -58,9 +58,6 @@ public final class WicketNamespaceHandle
this.markup = markup;
}
- /**
- * @see
org.apache.wicket.markup.parser.filter.BaseMarkupFilter#nextTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected final MarkupElement nextTag(ComponentTag tag) throws
ParseException
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java
Fri Dec 3 20:10:34 2010
@@ -49,9 +49,6 @@ public final class WicketRemoveTagHandle
{
}
- /**
- * @see
org.apache.wicket.markup.parser.filter.BaseMarkupFilter#nextTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected final MarkupElement nextTag(ComponentTag tag) throws
ParseException
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStreamWriter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStreamWriter.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStreamWriter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStreamWriter.java
Fri Dec 3 20:10:34 2010
@@ -38,25 +38,17 @@ public abstract class AbstractResourceSt
/**
* Default implementation to return -1. Do override this if you know
the length up front.
- *
- * @see org.apache.wicket.util.resource.IResourceStream#length()
*/
public Bytes length()
{
return null;
}
- /**
- * @see org.apache.wicket.util.resource.IResourceStream#getLocale()
- */
public Locale getLocale()
{
return locale;
}
- /**
- * @see
org.apache.wicket.util.resource.IResourceStream#setLocale(java.util.Locale)
- */
public void setLocale(final Locale locale)
{
this.locale = locale;
@@ -64,8 +56,6 @@ public abstract class AbstractResourceSt
/**
* Just returns now.
- *
- * @see org.apache.wicket.util.watch.IModifiable#lastModifiedTime()
*/
public Time lastModifiedTime()
{
@@ -74,9 +64,6 @@ public abstract class AbstractResourceSt
/**
* this method should not be used as it is not required for resource
writers
- *
- * @return input stream
- * @throws ResourceStreamNotFoundException
*/
public final InputStream getInputStream() throws
ResourceStreamNotFoundException
{
@@ -85,11 +72,9 @@ public abstract class AbstractResourceSt
/**
* this method should not be used as it is not required for resource
writers
- * <p/>
+ * <p>
* resource write generate content directly, not using an input stream,
so there's nothing to
* close later.
- *
- * @throws IOException
*/
public final void close() throws IOException
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/PackageResourceStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/PackageResourceStream.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/PackageResourceStream.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/PackageResourceStream.java
Fri Dec 3 20:10:34 2010
@@ -36,11 +36,10 @@ import org.apache.wicket.util.time.Time;
*/
public class PackageResourceStream extends AbstractResourceStream
{
- /**
- *
- */
+ /** */
private static final long serialVersionUID = 1L;
- IResourceStream resourceStream;
+
+ private IResourceStream resourceStream;
/**
* Obtains an {...@link IResourceStream} from the application's
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
Fri Dec 3 20:10:34 2010
@@ -277,18 +277,12 @@ public class UrlResourceStream extends A
Connections.close(connection);
}
- /**
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
return url.toString();
}
- /**
- * @see org.apache.wicket.util.resource.IResourceStream#length()
- */
@Override
public Bytes length()
{
@@ -296,9 +290,6 @@ public class UrlResourceStream extends A
return Bytes.bytes(contentLength);
}
- /**
- * @see
org.apache.wicket.util.resource.IFixedLocationResourceStream#locationAsString()
- */
public String locationAsString()
{
return url.toExternalForm();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java?rev=1041973&r1=1041972&r2=1041973&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java
Fri Dec 3 20:10:34 2010
@@ -57,9 +57,6 @@ public class WebExternalResourceStream e
this.url = url;
}
- /**
- * @see org.apache.wicket.util.resource.IResourceStream#length()
- */
@Override
public Bytes length()
{
