Updated Branches: refs/heads/master f4834654f -> 075cad0f1
Remove deprecated code. contributed-by: Jesse Long Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/075cad0f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/075cad0f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/075cad0f Branch: refs/heads/master Commit: 075cad0f127caa891ff13776ab73d522d4fff374 Parents: 3c57986 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue May 15 09:08:54 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue May 15 09:08:54 2012 +0200 ---------------------------------------------------------------------- .../resource/RenderedDynamicImageResource.java | 13 --- .../wicket/markup/html/link/ExternalLink.java | 10 -- .../org/apache/wicket/resource/ResourceUtil.java | 49 +--------- .../wicket/util/tester/MockFormFileUploadPage.java | 2 +- .../extensions/model/AbstractCheckBoxModel.java | 51 +---------- .../main/java/org/apache/wicket/request/Url.java | 54 +----------- .../org/apache/wicket/request/UrlRenderer.java | 14 --- .../request/mapper/parameter/PageParameters.java | 73 --------------- .../java/org/apache/wicket/util/time/Time.java | 15 --- .../util/upload/MultipartFormInputStream.java | 44 --------- 10 files changed, 7 insertions(+), 318 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/075cad0f/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java index 15390d2..5982a26 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java @@ -171,19 +171,6 @@ public abstract class RenderedDynamicImageResource extends DynamicImageResource /** * Renders this image * - * @return The image data - * @deprecated Use {@link #render(org.apache.wicket.request.resource.IResource.Attributes)} - * instead. - */ - @Deprecated - protected byte[] render() - { - return render((Attributes)null); - } - - /** - * Renders this image - * * @param attributes * the current request attributes * @return The image data http://git-wip-us.apache.org/repos/asf/wicket/blob/075cad0f/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java index 62952b8..2ebbef1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java @@ -228,14 +228,4 @@ public class ExternalLink extends AbstractLink this.contextRelative = contextRelative; return this; } - - /** - * @deprecated use {@link #getBody()} instead - * @return the model used for the link's body - */ - @Deprecated - public IModel<?> getLabel() - { - return getBody(); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/075cad0f/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java b/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java index 7052e54..3f03207 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java @@ -21,14 +21,9 @@ import java.io.InputStream; import java.nio.charset.Charset; import org.apache.wicket.WicketRuntimeException; -import org.apache.wicket.markup.head.CssHeaderItem; -import org.apache.wicket.markup.head.IHeaderResponse; -import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.ResourceStreamNotFoundException; -import org.apache.wicket.util.string.Strings; /** * Utilities for resources. @@ -44,48 +39,6 @@ public class ResourceUtil } /** - * Helper that calls the proper IHeaderResponse.render*Reference method based on the input. - * - * @param resp - * the response to call render*Reference methods on - * @param ref - * the reference to render - * @param css - * true if this is a css reference - * @param string - * the string argument to pass to those methods that accept it (js = id / css = - * media) - * @deprecated Will be removed in the next major release - */ - @Deprecated - public static void renderTo(IHeaderResponse resp, ResourceReference ref, boolean css, - String string) - { - if (css) - { - if (Strings.isEmpty(string)) - { - resp.render(CssHeaderItem.forReference(ref)); - } - else - { - resp.render(CssHeaderItem.forReference(ref, string)); - } - } - else - { - if (Strings.isEmpty(string)) - { - resp.render(JavaScriptHeaderItem.forReference(ref)); - } - else - { - resp.render(JavaScriptHeaderItem.forReference(ref, string)); - } - } - } - - /** * read string with platform default encoding from resource stream * * @param resourceStream @@ -118,7 +71,9 @@ public class ResourceUtil byte[] bytes = IOUtils.toByteArray(stream); if (charset == null) + { charset = Charset.defaultCharset(); + } return new String(bytes, charset.name()); } http://git-wip-us.apache.org/repos/asf/wicket/blob/075cad0f/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java index a5e42ad..ee2def7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java @@ -79,7 +79,7 @@ public class MockFormFileUploadPage extends WebPage @SuppressWarnings("deprecation") public MockFormFileUploadPage() { - this(new PageParameters("required=true")); + this(new PageParameters().set("required", "true")); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/075cad0f/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java index ab665d1..980bd25 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java @@ -16,7 +16,6 @@ */ package org.apache.wicket.extensions.model; -import org.apache.wicket.Component; import org.apache.wicket.model.IModel; /** @@ -32,6 +31,7 @@ public abstract class AbstractCheckBoxModel implements IModel<Boolean> /** * Detach model. */ + @Override public void detach() { } @@ -57,6 +57,7 @@ public abstract class AbstractCheckBoxModel implements IModel<Boolean> * * @see org.apache.wicket.model.IModel#getObject() */ + @Override public final Boolean getObject() { return isSelected(); @@ -65,6 +66,7 @@ public abstract class AbstractCheckBoxModel implements IModel<Boolean> /** * @see org.apache.wicket.model.IModel#setObject(Object) */ + @Override public final void setObject(final Boolean object) { if (Boolean.TRUE.equals(object)) @@ -76,51 +78,4 @@ public abstract class AbstractCheckBoxModel implements IModel<Boolean> unselect(); } } - - - // TODO Remove methods after deprecation release is done - - /** - * @param component - * @return throws UnsupportedOperationException - * @deprecated replaced by {@link #getObject()} - */ - @Deprecated - public final Object getObject(final Component component) - { - throw new UnsupportedOperationException(); - } - - /** - * @param component - * @return throws UnsupportedOperationException - * @deprecated replaced by {@link #isSelected()} - */ - @Deprecated - public final boolean isSelected(final Component component) - { - throw new UnsupportedOperationException(); - } - - /** - * @param component - * @param object - * @deprecated replaced by {@link #setObject(Object)} - */ - @Deprecated - public final void setObject(final Component component, final Object object) - { - throw new UnsupportedOperationException(); - } - - /** - * @param component - * @param sel - * @deprecated replaced by {@link #select()} - */ - @Deprecated - public final void setSelected(final Component component, final boolean sel) - { - throw new UnsupportedOperationException(); - } } http://git-wip-us.apache.org/repos/asf/wicket/blob/075cad0f/wicket-request/src/main/java/org/apache/wicket/request/Url.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/main/java/org/apache/wicket/request/Url.java b/wicket-request/src/main/java/org/apache/wicket/request/Url.java index f0cf6ec..8b4a1c4 100755 --- a/wicket-request/src/main/java/org/apache/wicket/request/Url.java +++ b/wicket-request/src/main/java/org/apache/wicket/request/Url.java @@ -615,59 +615,7 @@ public class Url implements Serializable return toString(getCharset()); } - /** - * render full representation of url (including protocol, host and port) into string - * representation - * - * @return absolute representation of the url - * @deprecated see {@link Url#toString(StringMode)} - */ - @Deprecated - public String toAbsoluteString() - { - return toAbsoluteString(getCharset()); - } - - /** - * render full representation of url (including protocol, host and port) into string - * representation - * - * @param charset - * - * @return see toStringRepresentation - * @deprecated see {@link Url#toString(StringMode, Charset)} - */ - @Deprecated - public String toAbsoluteString(final Charset charset) - { - StringBuilder result = new StringBuilder(); - - String protocol = this.protocol; - if (Strings.isEmpty(protocol)) - { - protocol = "http"; - } - - // output scheme://host:port if specified - if (Strings.isEmpty(host) == false) - { - result.append(protocol); - result.append("://"); - result.append(host); - - if (port != null && port.equals(getDefaultPortForProtocol(protocol)) == false) - { - result.append(':'); - result.append(port); - } - } - - // append relative part - return Strings.join("/", result.toString(), this.toString()); - } - - - /** + /** * Stringizes this url * * @param mode http://git-wip-us.apache.org/repos/asf/wicket/blob/075cad0f/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java index 8f44fda..ddef319 100644 --- a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java +++ b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java @@ -313,20 +313,6 @@ public class UrlRenderer return buffer.toString(); } - /** - * Renders the URL within context relative to current base URL. - * - * @param url - * @return relative URL - * @deprecated - * @see #renderContextRelativeUrl(String) - */ - @Deprecated - public String renderContextPathRelativeUrl(String url) - { - return renderContextRelativeUrl(url); - } - private static String choose(String value, final String fallback1, final String fallback2) { if (Strings.isEmpty(value)) http://git-wip-us.apache.org/repos/asf/wicket/blob/075cad0f/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java index 497e1fe..9c55d1c 100644 --- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java +++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java @@ -28,10 +28,7 @@ import org.apache.wicket.request.IRequestMapper; import org.apache.wicket.util.io.IClusterable; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.lang.Objects; -import org.apache.wicket.util.string.IStringIterator; -import org.apache.wicket.util.string.StringList; import org.apache.wicket.util.string.StringValue; -import org.apache.wicket.util.value.ValueMap; /** * Mutable class that holds parameters of a Page. Page parameters consist of indexed parameters and @@ -129,76 +126,6 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP } } - - /** - * Construct. - * - * @param keyValuePairs - * List of key value pairs separated by commas. For example, "param1=foo,param2=bar" - * @see ValueMap#ValueMap(String) - * @deprecated use various setter methods to set parameters - */ - @Deprecated - public PageParameters(final String keyValuePairs) - { - this(keyValuePairs, ","); - } - - /** - * Construct. - * - * @param keyValuePairs - * List of key value pairs separated by commas. For example, "param1=foo,param2=bar" - * @param delimiter - * Delimiter string used to separate key/value pairs - * @see ValueMap#ValueMap(String) - * - * @deprecated use various setter methods to set parameters - */ - @Deprecated - public PageParameters(final String keyValuePairs, final String delimiter) - { - super(); - - // We can not use ValueMaps constructor as it uses - // VariableAssignmentParser which is more suitable for markup - // attributes, rather than URL parameters. URL param keys for - // examples are allowed to start with a digit (e.g. 0=xxx) - // and quotes are not "quotes". - - // Get list of strings separated by the delimiter - final StringList pairs = StringList.tokenize(keyValuePairs, delimiter); - - // Go through each string in the list - for (IStringIterator iterator = pairs.iterator(); iterator.hasNext();) - { - // Get the next key value pair - final String pair = iterator.next(); - - final int pos = pair.indexOf('='); - if (pos == 0) - { - throw new IllegalArgumentException("URL parameter is missing the lvalue: " + pair); - } - else if (pos != -1) - { - final String key = pair.substring(0, pos).trim(); - final String value = pair.substring(pos + 1).trim(); - - add(key, value); - } - else - { - final String key = pair.trim(); - // null value is not allowed by #add - final String value = ""; - - add(key, value); - } - } - } - - /** * @return count of indexed parameters */ http://git-wip-us.apache.org/repos/asf/wicket/blob/075cad0f/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java b/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java index 7732390..cc5f630 100755 --- a/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java @@ -120,21 +120,6 @@ public final class Time extends AbstractTime return parseDate(localtime, string); } - - /** - * Retrieves a <code>Time</code> instance based on the given milliseconds. - * - * @param time - * the <code>Time</code> value in milliseconds since START_OF_UNIX_TIME - * @return a corresponding immutable <code>Time</code> object - * - * @deprecated use {@link Time#millis(long)} instead - */ - public static Time valueOf(final long time) - { - return millis(time); - } - /** * Retrieves a <code>Time</code> instance by parsing 'yyyy.MM.dd-h.mma' format. * http://git-wip-us.apache.org/repos/asf/wicket/blob/075cad0f/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java index bc19a0e..d98406d 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java @@ -291,50 +291,6 @@ public class MultipartFormInputStream // ----------------------------------------------------------- Constructors /** - * Creates a new instance. - * - * @deprecated Use - * {@link #MultipartStream(InputStream, byte[], org.apache.wicket.util.uploadMultipartStream.ProgressNotifier)} - * , or - * {@link #MultipartStream(InputStream, byte[], int, org.apache.wicket.util.uploadMultipartStream.ProgressNotifier)} - */ - @Deprecated - public MultipartFormInputStream() - { - // boundary can not be null - this(null, new byte[0], null); - } - - /** - * <p> - * Constructs a <code>MultipartStream</code> with a custom size buffer and no progress notifier. - * - * <p> - * Note that the buffer must be at least big enough to contain the boundary string, plus 4 - * characters for CR/LF and double dash, plus at least one byte of data. Too small a buffer size - * setting will degrade performance. - * - * @param input - * The <code>InputStream</code> to serve as a data source. - * @param boundary - * The token used for dividing the stream into <code>encapsulations</code>. - * @param bufSize - * The size of the buffer to be used, in bytes. - * - * @see #MultipartFormInputStream(InputStream, byte[], - * MultipartFormInputStream.ProgressNotifier) - * @deprecated Use - * {@link #MultipartStream(InputStream, byte[], int, org.apache.wicket.util.uploadMultipartStream.ProgressNotifier)} - * . - */ - @Deprecated - public MultipartFormInputStream(final InputStream input, final byte[] boundary, - final int bufSize) - { - this(input, boundary, bufSize, null); - } - - /** * <p> * Constructs a <code>MultipartStream</code> with a custom size buffer. *
