You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/06/09 17:34:51 UTC
svn commit: r1133940 - in /wicket/trunk:
wicket-core/src/main/java/org/apache/wicket/
wicket-core/src/test/java/org/apache/wicket/
wicket-examples/src/main/java/org/apache/wicket/examples/library/
Author: ivaynberg
Date: Thu Jun 9 15:34:51 2011
New Revision: 1133940
URL: http://svn.apache.org/viewvc?rev=1133940&view=rev
Log:
remove setEnabled() from attribute modifier
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/AttributeModifier.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/AttributeModifierTest.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/AttributeModifier.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/AttributeModifier.java?rev=1133940&r1=1133939&r2=1133940&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/AttributeModifier.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/AttributeModifier.java Thu Jun 9 15:34:51 2011
@@ -74,9 +74,6 @@ public class AttributeModifier extends B
private static final long serialVersionUID = 1L;
- /** Flag for en/disabling the modifier. */
- private boolean enabled = true;
-
/** Attribute specification. */
private final String attribute;
@@ -160,12 +157,6 @@ public class AttributeModifier extends B
}
@Override
- public boolean isEnabled(Component component)
- {
- return enabled;
- }
-
- @Override
public final void onComponentTag(Component component, ComponentTag tag)
{
if (tag.getType() != TagType.CLOSE)
@@ -210,26 +201,12 @@ public class AttributeModifier extends B
}
/**
- * Sets whether this attribute modifier is enabled or not.
- *
- * @param enabled
- * Whether enabled or not
- * @return this
- */
- public final AttributeModifier setEnabled(final boolean enabled)
- {
- this.enabled = enabled;
- return this;
- }
-
- /**
* @see java.lang.Object#toString()
*/
@Override
public String toString()
{
- return "[AttributeModifier attribute=" + attribute + ", enabled=" + enabled +
- ", replaceModel=" + replaceModel + "]";
+ return "[AttributeModifier attribute=" + attribute + ", replaceModel=" + replaceModel + "]";
}
/**
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/AttributeModifierTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/AttributeModifierTest.java?rev=1133940&r1=1133939&r2=1133940&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/AttributeModifierTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/AttributeModifierTest.java Thu Jun 9 15:34:51 2011
@@ -141,8 +141,15 @@ public class AttributeModifierTest
@Test
public void testNoNewValueWhenNotEnabled()
{
- AttributeModifier modifier = new AttributeModifier("test", Model.of("Ellioth Smith Rocks"));
- modifier.setEnabled(false);
+ AttributeModifier modifier = new AttributeModifier("test", Model.of("Ellioth Smith Rocks"))
+ {
+ @Override
+ public boolean isEnabled(Component component)
+ {
+ return false;
+ }
+ };
+
XmlTag xmlTag = new XmlTag();
ComponentTag tag = new ComponentTag(xmlTag);
tag.setId("test");
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java?rev=1133940&r1=1133939&r2=1133940&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java Thu Jun 9 15:34:51 2011
@@ -18,6 +18,7 @@ package org.apache.wicket.examples.libra
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
import org.apache.wicket.examples.library.Book.WritingStyle;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -57,10 +58,10 @@ public final class BookDetails extends A
add(new Label("title", book.getTitle()));
add(new Label("author", book.getAuthor()));
add(new Label("fiction", Boolean.toString(book.getFiction())));
- add(BookDetails.link("companion", book.getCompanionBook(), getLocalizer().getString(
- "noBookTitle", this)));
- add(BookDetails.link("related", book.getRelatedBook(), getLocalizer().getString(
- "noBookTitle", this)));
+ add(BookDetails.link("companion", book.getCompanionBook(),
+ getLocalizer().getString("noBookTitle", this)));
+ add(BookDetails.link("related", book.getRelatedBook(),
+ getLocalizer().getString("noBookTitle", this)));
String writingStyles;
final boolean hasStyles = (book.getWritingStyles() != null) &&
@@ -84,8 +85,14 @@ public final class BookDetails extends A
Label writingStylesLabel = new Label("writingStyles", writingStyles);
- final AttributeModifier italic = new AttributeModifier("class", new Model<String>("italic"));
- italic.setEnabled(!hasStyles);
+ final AttributeModifier italic = new AttributeModifier("class", new Model<String>("italic"))
+ {
+ @Override
+ public boolean isEnabled(Component component)
+ {
+ return !hasStyles;
+ }
+ };
add(writingStylesLabel.add(italic));
add(EditBook.link("edit", book.getId()));