Author: jdonnerstag
Date: Sat Mar 19 21:14:46 2011
New Revision: 1083291
URL: http://svn.apache.org/viewvc?rev=1083291&view=rev
Log:
removed superfluous variable from XmlTag
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java?rev=1083291&r1=1083290&r2=1083291&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java Sat
Mar 19 21:14:46 2011
@@ -1725,6 +1725,7 @@ public abstract class Component
* Model object to convert to string
* @return The string
*/
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public final String getDefaultModelObjectAsString(final Object
modelObject)
{
if (modelObject != null)
@@ -3354,6 +3355,7 @@ public abstract class Component
* Traverses all parent components of the given class in this
container, calling the visitor's
* visit method at each one.
*
+ * @param <R>
* @param c
* Class
* @param visitor
@@ -4169,21 +4171,9 @@ public abstract class Component
if (markupStream.atCloseTag() &&
markupStream.getTag().closes(openTag))
{
// Render the close tag
- if (renderBodyOnly == false)
+ if ((renderBodyOnly == false) &&
needToRenderTag(openTag))
{
- // Get the close tag from the stream
- ComponentTag closeTag =
markupStream.getTag();
-
- // If the open tag had its id changed
- if (openTag.getNameChanged())
- {
- // change the id of the close
tag
- closeTag = closeTag.mutable();
-
closeTag.setName(openTag.getName());
-
closeTag.setNamespace(openTag.getNamespace());
- }
-
- renderComponentTag(closeTag);
+
getResponse().write(openTag.syntheticCloseTagString());
}
}
else if (openTag.requiresCloseTag())
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java?rev=1083291&r1=1083290&r2=1083291&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
Sat Mar 19 21:14:46 2011
@@ -298,7 +298,6 @@ public class ComponentTag extends Markup
}
/**
- * @see org.apache.wicket.markup.parser.XmlTag#getName()
* @return The tag's name
*/
public final String getName()
@@ -307,16 +306,6 @@ public class ComponentTag extends Markup
}
/**
- * @see org.apache.wicket.markup.parser.XmlTag#getNameChanged()
- * @return Returns true if the name of this component tag was changed
- */
- public final boolean getNameChanged()
- {
- return xmlTag.getNameChanged();
- }
-
- /**
- * @see org.apache.wicket.markup.parser.XmlTag#getNamespace()
* @return The tag's namespace
*/
public final String getNamespace()
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java?rev=1083291&r1=1083290&r2=1083291&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
Sat Mar 19 21:14:46 2011
@@ -95,9 +95,6 @@ public class XmlTag extends MarkupElemen
/** True if this tag is mutable, false otherwise. */
private boolean isMutable = true;
- /** True if the name of this tag was changed. */
- private boolean nameChanged = false;
-
/**
* Construct.
*/
@@ -207,16 +204,6 @@ public class XmlTag extends MarkupElemen
}
/**
- * Get whether the name of this component tag was changed.
- *
- * @return Returns true if the name of this component tag was changed
- */
- public boolean getNameChanged()
- {
- return nameChanged;
- }
-
- /**
* Namespace of the tag, if available. For example, <wicket:link>.
*
* @return The tag's namespace
@@ -376,7 +363,7 @@ public class XmlTag extends MarkupElemen
* @param dest
* tag whose properties will be set
*/
- void copyPropertiesTo(XmlTag dest)
+ void copyPropertiesTo(final XmlTag dest)
{
dest.namespace = namespace;
dest.name = name;
@@ -493,7 +480,6 @@ public class XmlTag extends MarkupElemen
if (isMutable)
{
this.name = name;
- nameChanged = true;
}
else
{
@@ -512,7 +498,6 @@ public class XmlTag extends MarkupElemen
if (isMutable)
{
this.namespace = namespace;
- nameChanged = true;
}
else
{
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.html?rev=1083291&r1=1083290&r2=1083291&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.html
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.html
Sat Mar 19 21:14:46 2011
@@ -4,7 +4,7 @@
<!-- In addition test that chars are not converted from upper to lower
and vice versa -->
<FORM wicket:id="form">
<span wicket:id="group">
- <Input type="checkbox" wicket:id="check1">check1</input>
+ <input type="checkbox" wicket:id="check1">check1</input>
<span wicket:id="container">
<input type="checkbox"
wicket:id="check2">check2</input>
</span>
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html?rev=1083291&r1=1083290&r2=1083291&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
Sat Mar 19 21:14:46 2011
@@ -4,7 +4,7 @@
<!-- In addition test that chars are not converted from upper to lower
and vice versa -->
<FORM wicket:id="form" id="form1" method="post"
action="../page?0-1.IFormSubmitListener-form"><div
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<span wicket:id="group">
- <Input type="checkbox" wicket:id="check1" id="check12"
name="group" value="check1" checked="checked" disabled="disabled"
class="wicket-group3">check1</input>
+ <input type="checkbox" wicket:id="check1" id="check12"
name="group" value="check1" checked="checked" disabled="disabled"
class="wicket-group3">check1</input>
<span wicket:id="container">
<input type="checkbox" wicket:id="check2"
id="check24" name="group" value="check2" checked="checked" disabled="disabled"
class="wicket-group3">check2</input>
</span>
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java?rev=1083291&r1=1083290&r2=1083291&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
Sat Mar 19 21:14:46 2011
@@ -159,15 +159,17 @@ public class CheckGroupTest extends Wick
assertTrue("running with nothing selected - model must be
empty", modelObject.getProp1()
.size() == 0);
-
tester.getRequest().getPostParameters().setParameterValue(group.getInputName(),
- String.valueOf(choice1.getValue()));
+ tester.getRequest()
+ .getPostParameters()
+ .setParameterValue(group.getInputName(),
String.valueOf(choice1.getValue()));
tester.applyRequest();
form.onFormSubmitted();
assertTrue("running with choice1 selected - model must only
contain value of check1",
modelObject.getProp1().size() == 1 &&
modelObject.getProp1().contains(check1));
-
tester.getRequest().getPostParameters().setParameterValue(group.getInputName(),
- String.valueOf(choice2.getValue()));
+ tester.getRequest()
+ .getPostParameters()
+ .setParameterValue(group.getInputName(),
String.valueOf(choice2.getValue()));
tester.applyRequest();
form.onFormSubmitted();
assertTrue("running with choice2 selected - model must only
contain value of check2",
@@ -176,10 +178,12 @@ public class CheckGroupTest extends Wick
// throw in some nulls into the request param to make sure they
are
// ignored
tester.getRequest().getPostParameters().addParameterValue(group.getInputName(),
null);
-
tester.getRequest().getPostParameters().addParameterValue(group.getInputName(),
- String.valueOf(choice1.getValue()));
-
tester.getRequest().getPostParameters().addParameterValue(group.getInputName(),
- String.valueOf(choice2.getValue()));
+ tester.getRequest()
+ .getPostParameters()
+ .addParameterValue(group.getInputName(),
String.valueOf(choice1.getValue()));
+ tester.getRequest()
+ .getPostParameters()
+ .addParameterValue(group.getInputName(),
String.valueOf(choice2.getValue()));
tester.applyRequest();
form.onFormSubmitted();
@@ -188,8 +192,9 @@ public class CheckGroupTest extends Wick
modelObject.getProp1().size() == 2 &&
modelObject.getProp1().contains(check2) &&
modelObject.getProp1().contains(check1));
-
tester.getRequest().getPostParameters().setParameterValue(group.getInputName(),
- "some weird choice uuid to test error");
+ tester.getRequest()
+ .getPostParameters()
+ .setParameterValue(group.getInputName(), "some weird
choice uuid to test error");
tester.applyRequest();
try
{
@@ -222,7 +227,8 @@ public class CheckGroupTest extends Wick
}
catch (WicketRuntimeException e)
{
- if (!e.getMessage().contains("Check component
[4:form:check2] cannot find its parent CheckGroup"))
+ if (!e.getMessage().contains(
+ "Check component [4:form:check2] cannot find
its parent CheckGroup"))
{
fail("failed with wrong exception");
}
@@ -237,6 +243,4 @@ public class CheckGroupTest extends Wick
{
executeTest(CheckGroupDisabledTestPage.class,
"CheckGroupDisabledTestPage_expected.html");
}
-
-
}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1.html?rev=1083291&r1=1083290&r2=1083291&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1.html
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1.html
Sat Mar 19 21:14:46 2011
@@ -4,7 +4,7 @@
<!-- In addition test that chars are not converted from upper to lower
and vice versa -->
<FORM wicket:id="form">
<span wicket:id="group">
- <Input type="checkbox" wicket:id="check1">check1</input>
+ <input type="checkbox" wicket:id="check1">check1</input>
<span wicket:id="container">
<input type="checkbox"
wicket:id="check2">check2</input>
</span>
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html?rev=1083291&r1=1083290&r2=1083291&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
Sat Mar 19 21:14:46 2011
@@ -4,7 +4,7 @@
<!-- In addition test that chars are not converted from upper to lower
and vice versa -->
<FORM wicket:id="form" id="form1" method="post"
action="../page?0-1.IFormSubmitListener-form"><div
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
- <Input type="checkbox" wicket:id="check1" id="check12"
name="group" value="check1" class="wicket-group3">check1</input>
+ <input type="checkbox" wicket:id="check1" id="check12"
name="group" value="check1" class="wicket-group3">check1</input>
<span wicket:id="container">
<input type="checkbox" wicket:id="check2"
id="check24" name="group" value="check2" class="wicket-group3">check2</input>
</span>
