Author: musachy
Date: Sat Dec 20 10:17:33 2008
New Revision: 728328
URL: http://svn.apache.org/viewvc?rev=728328&view=rev
Log:
fix bugs and tests
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/ActionErrorTest.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/ActionMessageTest.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FileTest.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/LabelTest.java
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java?rev=728328&r1=728327&r2=728328&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java
Sat Dec 20 10:17:33 2008
@@ -29,7 +29,7 @@
import java.util.Map;
/**
- * Base class for ActionError and ActionMessage
+ * Base class for ActionError and ActionMessage
*/
public abstract class AbstractMessageListHandler extends AbstractTagHandler
implements TagGenerator {
@Override
@@ -40,7 +40,10 @@
if (errorsObj != null) {
Iterator itt = MakeIterator.convert(errorsObj);
if (itt.hasNext()) {
- start("ul", null);
+ Attributes attrs = new Attributes();
+ attrs.addIfExists("style", params.get("cssStyle"))
+ .add("class", params.containsKey("cssClass") ?
(String) params.get("cssClass") : getDefaultClass());
+ start("ul", attrs);
while (itt.hasNext()) {
String error = (String) itt.next();
@@ -48,11 +51,7 @@
start("li", null);
//span for error
- Attributes attrs = new Attributes();
- attrs.addIfExists("style", params.get("cssStyle"))
- .add("class", params.containsKey("cssClass") ?
(String) params.get("cssClass") : getItemClass());
-
- start("span", attrs);
+ start("span", null);
characters(error);
end("span");
end("li");
@@ -69,8 +68,8 @@
protected abstract String getListExpression();
/*
- * default class for span element
+ * default class for UL element
*/
- protected abstract String getItemClass();
+ protected abstract String getDefaultClass();
}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java?rev=728328&r1=728327&r2=728328&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java
Sat Dec 20 10:17:33 2008
@@ -26,7 +26,7 @@
}
@Override
- protected String getItemClass() {
+ protected String getDefaultClass() {
return "errorMessage";
}
}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java?rev=728328&r1=728327&r2=728328&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java
Sat Dec 20 10:17:33 2008
@@ -6,7 +6,7 @@
}
@Override
- protected String getItemClass() {
+ protected String getDefaultClass() {
return "actionMessage";
}
}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java?rev=728328&r1=728327&r2=728328&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java
Sat Dec 20 10:17:33 2008
@@ -28,7 +28,6 @@
import java.util.Map;
public class FieldErrorHandler extends AbstractTagHandler implements
TagGenerator {
- @Override
public void generate() throws IOException {
Map<String, Object> params = context.getParameters();
Map<String, List<String>> errors = (Map<String, List<String>>)
findValue("fieldErrors");
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java?rev=728328&r1=728327&r2=728328&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java
Sat Dec 20 10:17:33 2008
@@ -33,6 +33,7 @@
Attributes a = new Attributes();
a.addDefaultToEmpty("name", params.get("name"))
+ .add("type", "file")
.addIfExists("size", params.get("size"))
.addIfExists("value", params.get("nameValue"), false)
.addIfTrue("disabled", params.get("disabled"))
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java?rev=728328&r1=728327&r2=728328&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java
Sat Dec 20 10:17:33 2008
@@ -35,7 +35,7 @@
Attributes a = new Attributes();
a.addDefaultToEmpty("name", params.get("name"))
- .addIfExists("for", "for")
+ .addIfExists("for", params.get("for"))
.addIfExists("id", params.get("id"))
.addIfExists("class", params.get("cssClass"))
.addIfExists("style", params.get("cssStyle"))
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/ActionErrorTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/ActionErrorTest.java?rev=728328&r1=728327&r2=728328&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/ActionErrorTest.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/ActionErrorTest.java
Sat Dec 20 10:17:33 2008
@@ -39,7 +39,7 @@
map.putAll(tag.getParameters());
theme.renderTag(getTagName(), context);
String output = writer.getBuffer().toString();
- String expected = s("<ul><li><span style='style' class='class'>this
clas is bad</span></li><li><span style='style'
class='class'>baaaaad</span></li></ul>");
+ String expected = s("<ul style='style' class='class'><li><span>this
clas is bad</span></li><li><span>baaaaad</span></li></ul>");
assertEquals(expected, output);
}
@@ -50,7 +50,7 @@
map.putAll(tag.getParameters());
theme.renderTag(getTagName(), context);
String output = writer.getBuffer().toString();
- String expected = s("<ul><li><span style='style'
class='errorMessage'>this clas is bad</span></li><li><span style='style'
class='errorMessage'>baaaaad</span></li></ul>");
+ String expected = s("<ul style='style'
class='errorMessage'><li><span>this clas is
bad</span></li><li><span>baaaaad</span></li></ul>");
assertEquals(expected, output);
}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/ActionMessageTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/ActionMessageTest.java?rev=728328&r1=728327&r2=728328&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/ActionMessageTest.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/ActionMessageTest.java
Sat Dec 20 10:17:33 2008
@@ -18,7 +18,7 @@
map.putAll(tag.getParameters());
theme.renderTag(getTagName(), context);
String output = writer.getBuffer().toString();
- String expected = s("<ul><li><span style='style' class='class'>this
clas is bad</span></li><li><span style='style'
class='class'>baaaaad</span></li></ul>");
+ String expected = s("<ul style='style' class='class'><li><span>this
clas is bad</span></li><li><span>baaaaad</span></li></ul>");
assertEquals(expected, output);
}
@@ -29,7 +29,7 @@
map.putAll(tag.getParameters());
theme.renderTag(getTagName(), context);
String output = writer.getBuffer().toString();
- String expected = s("<ul><li><span style='style'
class='actionMessage'>this clas is bad</span></li><li><span style='style'
class='actionMessage'>baaaaad</span></li></ul>");
+ String expected = s("<ul style='style'
class='actionMessage'><li><span>this clas is
bad</span></li><li><span>baaaaad</span></li></ul>");
assertEquals(expected, output);
}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FileTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FileTest.java?rev=728328&r1=728327&r2=728328&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FileTest.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FileTest.java
Sat Dec 20 10:17:33 2008
@@ -43,7 +43,7 @@
map.putAll(tag.getParameters());
theme.renderTag(getTagName(), context);
String output = writer.getBuffer().toString();
- String expected = s("<input name='name' size='10' value='val1'
accept='accept_' tabindex='1' id='id1' class='class1' style='style1'
title='title'></input>");
+ String expected = s("<input name='name' type='file' size='10'
value='val1' accept='accept_' tabindex='1' id='id1' class='class1'
style='style1' title='title'></input>");
assertEquals(expected, output);
}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/LabelTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/LabelTest.java?rev=728328&r1=728327&r2=728328&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/LabelTest.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/LabelTest.java
Sat Dec 20 10:17:33 2008
@@ -41,7 +41,7 @@
map.putAll(tag.getParameters());
theme.renderTag(getTagName(), context);
String output = writer.getBuffer().toString();
- String expected = s("<label name='name' for='for' id='id1'
class='class1' style='style1' title='title'>val1</label>");
+ String expected = s("<label name='name' for='for_' id='id1'
class='class1' style='style1' title='title'>val1</label>");
assertEquals(expected, output);
}
