Author: ivaynberg
Date: Thu Nov 17 17:48:18 2011
New Revision: 1203300
URL: http://svn.apache.org/viewvc?rev=1203300&view=rev
Log:
removed some deprecations and minor cleanup
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=1203300&r1=1203299&r2=1203300&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
Thu Nov 17 17:48:18 2011
@@ -234,19 +234,6 @@ public abstract class AbstractDefaultAja
}
/**
- * @return the name and the type of the channel to use when processing
Ajax calls at the client
- * side
- * @deprecated Use {@link #getChannel()} instead
- */
- // TODO Wicket.next - Remove this method
- @Deprecated
- protected String getChannelName()
- {
- AjaxChannel channel = getChannel();
- return channel != null ? channel.getChannelName() : null;
- }
-
- /**
* Provides an AjaxChannel for this Behavior.
*
* @return an AjaxChannel - Defaults to null.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java?rev=1203300&r1=1203299&r2=1203300&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
Thu Nov 17 17:48:18 2011
@@ -239,9 +239,10 @@ public class Check<T> extends LabeledWeb
* @param labelModel
* @return this for chaining
*/
+ @Override
public Check<T> setLabel(IModel<String> labelModel)
{
- setLabelInternal(labelModel);
+ super.setLabel(labelModel);
return this;
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=1203300&r1=1203299&r2=1203300&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Thu Nov 17 17:48:18 2011
@@ -995,9 +995,10 @@ public abstract class FormComponent<T> e
* @param labelModel
* @return this for chaining
*/
+ @Override
public FormComponent<T> setLabel(IModel<String> labelModel)
{
- setLabelInternal(labelModel);
+ super.setLabel(labelModel);
return this;
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java?rev=1203300&r1=1203299&r2=1203300&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java
Thu Nov 17 17:48:18 2011
@@ -87,9 +87,11 @@ public abstract class LabeledWebMarkupCo
* ILabelProvider and still make chaining in FormComponent work
properly.
*
* @param labelModel
+ * @return {@code this}
*/
- protected void setLabelInternal(IModel<String> labelModel)
+ protected LabeledWebMarkupContainer setLabel(IModel<String> labelModel)
{
this.labelModel = wrap(labelModel);
+ return this;
}
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java?rev=1203300&r1=1203299&r2=1203300&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
Thu Nov 17 17:48:18 2011
@@ -225,9 +225,10 @@ public class Radio<T> extends LabeledWeb
* @param labelModel
* @return this for chaining
*/
+ @Override
public Radio<T> setLabel(IModel<String> labelModel)
{
- setLabelInternal(labelModel);
+ super.setLabel(labelModel);
return this;
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java?rev=1203300&r1=1203299&r2=1203300&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
Thu Nov 17 17:48:18 2011
@@ -232,7 +232,7 @@ public class DefaultButtonImageResource
* @see RenderedDynamicImageResource#render(Graphics2D)
*/
@Override
- protected boolean render(final Graphics2D graphics)
+ protected boolean render(Graphics2D graphics, Attributes attributes)
{
// Get width and height
final int width = getWidth();
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java?rev=1203300&r1=1203299&r2=1203300&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java
Thu Nov 17 17:48:18 2011
@@ -201,23 +201,6 @@ public abstract class RenderedDynamicIma
}
/**
- * Override this method to provide your rendering code
- *
- * @param graphics
- * The graphics context to render on
- * @return True if the image was rendered. False if the image size was
changed by the rendering
- * implementation and the image should be re-rendered at the
new size.
- * @deprecated Use
- * {@link RenderedDynamicImageResource#render(Graphics2D,
org.apache.wicket.request.resource.IResource.Attributes)
- * instead}
- */
- @Deprecated
- protected boolean render(Graphics2D graphics)
- {
- return true;
- }
-
- /**
* Override this method to provide your rendering code.
*
* @param graphics
@@ -227,9 +210,5 @@ public abstract class RenderedDynamicIma
* @return {@code true} if the image was rendered. {@code false} if the
image size was changed
* by the rendering implementation and the image should be
re-rendered at the new size.
*/
- // TODO Wicket.next: make this method abstract
- protected boolean render(Graphics2D graphics, final Attributes
attributes)
- {
- return render(graphics);
- }
+ protected abstract boolean render(Graphics2D graphics, final Attributes
attributes);
}
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java?rev=1203300&r1=1203299&r2=1203300&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
Thu Nov 17 17:48:18 2011
@@ -53,7 +53,7 @@ public final class Home extends WicketEx
}
@Override
- protected boolean render(Graphics2D graphics)
+ protected boolean render(Graphics2D graphics, Attributes
attributes)
{
drawCircle(graphics);
return true;
