Author: ivaynberg
Date: Wed Oct 25 17:38:39 2006
New Revision: 467821
URL: http://svn.apache.org/viewvc?view=rev&rev=467821
Log:
moving simple attribute modifier to extensions
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/SimpleAttributeModifier.java
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel1.java
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel2.java
incubator/wicket/trunk/wicket/src/test/java/wicket/util/lang/ObjectsTest.java
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/SimpleAttributeModifier.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/SimpleAttributeModifier.java?view=diff&rev=467821&r1=467820&r2=467821
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/SimpleAttributeModifier.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/SimpleAttributeModifier.java
Wed Oct 25 17:38:39 2006
@@ -1,5 +1,20 @@
/*
- * Copyright Teachscape
+ * $Id: AbstractAjaxBehavior.java 5791 2006-05-20 00:32:57 +0000 (Sat, 20 May
+ * 2006) joco01 $ $Revision$ $Date: 2006-05-20 00:32:57 +0000 (Sat, 20
+ * May 2006) $
+ *
+ *
==============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
*/
package wicket.behavior;
@@ -12,7 +27,9 @@
* pull-based model.
*
* @author Igor Vaynberg (ivaynberg)
+ * @deprecated moved to wicket-extensions
*/
[EMAIL PROTECTED]
public class SimpleAttributeModifier extends AbstractBehavior
{
private static final long serialVersionUID = 1L;
Modified:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java?view=diff&rev=467821&r1=467820&r2=467821
==============================================================================
(empty)
Modified:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel1.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel1.java?view=diff&rev=467821&r1=467820&r2=467821
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel1.java
(original)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel1.java
Wed Oct 25 17:38:39 2006
@@ -17,10 +17,11 @@
*/
package wicket.markup.html.header.testing4;
+import wicket.AttributeModifier;
import wicket.MarkupContainer;
-import wicket.behavior.SimpleAttributeModifier;
import wicket.markup.html.WebMarkupContainer;
import wicket.markup.html.panel.Panel;
+import wicket.model.Model;
/**
* Test panel.
@@ -40,6 +41,7 @@
public Panel1(MarkupContainer parent, final String id)
{
super(parent, id);
- new WebMarkupContainer(this, "testid").add(new
SimpleAttributeModifier("src", "test1.js"));
+ new WebMarkupContainer(this, "testid").add(new
AttributeModifier("src", true,
+ new Model<String>("test1.js")));
}
}
Modified:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel2.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel2.java?view=diff&rev=467821&r1=467820&r2=467821
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel2.java
(original)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel2.java
Wed Oct 25 17:38:39 2006
@@ -17,10 +17,11 @@
*/
package wicket.markup.html.header.testing4;
+import wicket.AttributeModifier;
import wicket.MarkupContainer;
-import wicket.behavior.SimpleAttributeModifier;
import wicket.markup.html.WebMarkupContainer;
import wicket.markup.html.panel.Panel;
+import wicket.model.Model;
/**
* Test panel.
@@ -40,6 +41,7 @@
public Panel2(MarkupContainer parent, final String id)
{
super(parent, id);
- new WebMarkupContainer(this, "testid").add(new
SimpleAttributeModifier("src", "test2.js"));
+ new WebMarkupContainer(this, "testid").add(new
AttributeModifier("src", true,
+ new Model<String>("test2.js")));
}
}
Modified:
incubator/wicket/trunk/wicket/src/test/java/wicket/util/lang/ObjectsTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/util/lang/ObjectsTest.java?view=diff&rev=467821&r1=467820&r2=467821
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/util/lang/ObjectsTest.java
(original)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/util/lang/ObjectsTest.java
Wed Oct 25 17:38:39 2006
@@ -3,9 +3,9 @@
import java.io.Serializable;
import java.lang.reflect.Field;
+import wicket.AttributeModifier;
import wicket.MockPageWithOneComponent;
import wicket.WicketTestCase;
-import wicket.behavior.SimpleAttributeModifier;
import wicket.markup.html.basic.SimplePage;
import wicket.markup.html.form.TextField;
import wicket.model.CompoundPropertyModel;
@@ -95,8 +95,8 @@
*/
public void testComponentClone()
{
- PropertyModel pm = new PropertyModel(new TextField<String>(new
MockPageWithOneComponent(), "component",
- new Model<String>("test")), "modelObject");
+ PropertyModel pm = new PropertyModel(new TextField<String>(new
MockPageWithOneComponent(),
+ "component", new Model<String>("test")),
"modelObject");
PropertyModel pm2 = Objects.cloneModel(pm);
assertTrue(pm.getObject() == pm2.getObject());
}
@@ -119,17 +119,17 @@
*/
public void testCloneModelByMapping()
{
- PropertyModel<Integer> model = new PropertyModel<Integer>(new
CloneObject(),"nr");
+ PropertyModel<Integer> model = new PropertyModel<Integer>(new
CloneObject(), "nr");
model.setObject(1);
assertEquals(1, (int)model.getObject());
MiniMap<Field, Object> clonemap = Objects.mapObject(model);
model.setObject(10);
assertEquals(10, (int)model.getObject());
-
- Objects.restoreObject(model,clonemap);
-
+
+ Objects.restoreObject(model, clonemap);
+
assertEquals(1, (int)model.getObject());
-
+
}
/**
@@ -137,35 +137,36 @@
*/
public void testCloneModelByMappingWithFinal()
{
- PropertyModel<Integer> model = new PropertyModel<Integer>(new
CloneObject(),"test.nr");
+ PropertyModel<Integer> model = new PropertyModel<Integer>(new
CloneObject(), "test.nr");
model.setObject(1);
assertEquals(1, (int)model.getObject());
MiniMap<Field, Object> clonemap = Objects.mapObject(model);
model.setObject(10);
assertEquals(10, (int)model.getObject());
-
- Objects.restoreObject(model,clonemap);
-
+
+ Objects.restoreObject(model, clonemap);
+
assertEquals(1, (int)model.getObject());
-
+
}
-
+
/**
*
*/
public void testCloneModelByMappingWithCompound()
{
- PropertyModel<Integer> model = new PropertyModel<Integer>(new
CompoundPropertyModel<CloneObject>(new CloneObject()),"nr");
+ PropertyModel<Integer> model = new PropertyModel<Integer>(
+ new CompoundPropertyModel<CloneObject>(new
CloneObject()), "nr");
model.setObject(1);
assertEquals(1, (int)model.getObject());
MiniMap<Field, Object> clonemap = Objects.mapObject(model);
model.setObject(10);
assertEquals(10, (int)model.getObject());
-
- Objects.restoreObject(model,clonemap);
-
+
+ Objects.restoreObject(model, clonemap);
+
assertEquals(1, (int)model.getObject());
-
+
}
/**
@@ -173,19 +174,20 @@
*/
public void testCloneModelByMappingWithCompoundAndReplace()
{
- CompoundPropertyModel<CloneObject> compound = new
CompoundPropertyModel<CloneObject>(new CloneObject());
- PropertyModel<Integer> model = new
PropertyModel<Integer>(compound,"nr");
+ CompoundPropertyModel<CloneObject> compound = new
CompoundPropertyModel<CloneObject>(
+ new CloneObject());
+ PropertyModel<Integer> model = new
PropertyModel<Integer>(compound, "nr");
model.setObject(1);
assertEquals(1, (int)model.getObject());
MiniMap<Field, Object> clonemap = Objects.mapObject(model);
compound.setObject(new CloneObject());
model.setObject(10);
assertEquals(10, (int)model.getObject());
-
- Objects.restoreObject(model,clonemap);
-
+
+ Objects.restoreObject(model, clonemap);
+
assertEquals(1, (int)model.getObject());
-
+
}
/**
@@ -193,21 +195,22 @@
*/
public void testCloneModelByMappingWithSharedModel()
{
- CompoundPropertyModel<CloneObject> sharedModel = new
CompoundPropertyModel<CloneObject>(new CloneObject());
- PropertyModel<Integer> model = new
PropertyModel<Integer>(sharedModel,"nr");
- PropertyModel<Integer> model2 = new
PropertyModel<Integer>(sharedModel,"nr");
+ CompoundPropertyModel<CloneObject> sharedModel = new
CompoundPropertyModel<CloneObject>(
+ new CloneObject());
+ PropertyModel<Integer> model = new
PropertyModel<Integer>(sharedModel, "nr");
+ PropertyModel<Integer> model2 = new
PropertyModel<Integer>(sharedModel, "nr");
model.setObject(1);
assertEquals(1, (int)model2.getObject());
MiniMap<Field, Object> clonemap = Objects.mapObject(model);
model.setObject(10);
assertEquals(10, (int)model2.getObject());
-
- Objects.restoreObject(model,clonemap);
-
+
+ Objects.restoreObject(model, clonemap);
+
assertEquals(1, (int)model2.getObject());
-
+
}
-
+
/**
*
*/
@@ -215,30 +218,30 @@
{
SimplePage page = new SimplePage();
MiniMap<Field, Object> clonemap = Objects.mapObject(page);
-
+
assertEquals(true, page.get("myLabel").isVisible());
page.get("myLabel").setVisible(false);
assertEquals(false, page.get("myLabel").isVisible());
- Objects.restoreObject(page,clonemap);
+ Objects.restoreObject(page, clonemap);
assertEquals(true, page.get("myLabel").isVisible());
-
+
page.remove("myLabel");
-
+
assertNull(page.get("myLabel"));
-
- Objects.restoreObject(page,clonemap);
-
+
+ Objects.restoreObject(page, clonemap);
+
assertNotNull(page.get("myLabel"));
-
- page.get("myLabel").add(new
SimpleAttributeModifier("test","test"));
-
+
+ page.get("myLabel").add(new AttributeModifier("test", true, new
Model<String>("test")));
+
assertEquals(1, page.get("myLabel").getBehaviors().size());
-
- Objects.restoreObject(page,clonemap);
-
+
+ Objects.restoreObject(page, clonemap);
+
assertEquals(0, page.get("myLabel").getBehaviors().size());
- }
-
+ }
+
/**
* Used for testing the clone function.
*/
@@ -250,7 +253,7 @@
* int for testing equality.
*/
private int nr;
-
+
private final CloneObject2 test = new CloneObject2();
/**
@@ -259,15 +262,15 @@
@Override
public boolean equals(Object o)
{
- if(o instanceof CloneObject)
+ if (o instanceof CloneObject)
{
CloneObject other = (CloneObject)o;
return other.nr == nr;
- }
+ }
return false;
}
}
-
+
/**
* Used for testing the clone function.
*/
@@ -279,20 +282,20 @@
* int for testing equality.
*/
private int nr;
-
+
/**
* @see Object#equals(java.lang.Object)
*/
@Override
public boolean equals(Object o)
{
- if(o instanceof CloneObject2)
+ if (o instanceof CloneObject2)
{
CloneObject2 other = (CloneObject2)o;
return other.nr == nr;
}
return false;
}
- }
-
+ }
+
}
