Author: musachy
Date: Mon Dec 15 13:27:01 2008
New Revision: 726807
URL: http://svn.apache.org/viewvc?rev=726807&view=rev
Log:
Add head and file handlers
Added:
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/HeadHandler.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/HeadTest.java
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Attributes.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTheme.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandler.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Theme.java
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/CommonAttributesHandler.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/CheckboxTest.java
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FieldErrorTest.java
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Attributes.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Attributes.java?rev=726807&r1=726806&r2=726807&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Attributes.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Attributes.java
Mon Dec 15 13:27:01 2008
@@ -24,21 +24,21 @@
import java.util.LinkedHashMap;
-public class Attributes extends LinkedHashMap<String,String> {
+public class Attributes extends LinkedHashMap<String, String> {
public Attributes add(String key, String value) {
return add(key, value, true);
}
-
+
public Attributes add(String key, String value, boolean encode) {
put(key, (encode ? TextUtils.htmlEncode(value) : value));
return this;
}
-
+
public Attributes addIfExists(String attrName, Object paramValue) {
return addIfExists(attrName, paramValue, true);
}
-
+
public Attributes addIfExists(String attrName, Object paramValue, boolean
encode) {
if (paramValue != null) {
String val = paramValue.toString();
@@ -47,21 +47,21 @@
}
return this;
}
-
+
public Attributes addIfTrue(String attrName, Object paramValue) {
if (paramValue != null) {
- if ((paramValue instanceof Boolean &&
((Boolean)paramValue).booleanValue()) ||
- (Boolean.valueOf(paramValue.toString()).booleanValue())) {
+ if ((paramValue instanceof Boolean && ((Boolean)
paramValue).booleanValue()) ||
+ (Boolean.valueOf(paramValue.toString()).booleanValue())) {
put(attrName, attrName);
}
}
return this;
}
-
+
public Attributes addDefaultToEmpty(String attrName, Object paramValue) {
return addDefaultToEmpty(attrName, paramValue, true);
}
-
+
public Attributes addDefaultToEmpty(String attrName, Object paramValue,
boolean encode) {
if (paramValue != null) {
String val = paramValue.toString();
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java?rev=726807&r1=726806&r2=726807&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java
Mon Dec 15 13:27:01 2008
@@ -23,11 +23,11 @@
public class DefaultTagHandlerFactory implements TagHandlerFactory {
private Class tagHandlerClass;
-
+
public DefaultTagHandlerFactory(Class tagHandlerClass) {
this.tagHandlerClass = tagHandlerClass;
}
-
+
public TagHandler create(TagHandler next) {
try {
TagHandler th = (TagHandler) tagHandlerClass.newInstance();
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTheme.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTheme.java?rev=726807&r1=726806&r2=726807&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTheme.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTheme.java
Mon Dec 15 13:27:01 2008
@@ -31,16 +31,16 @@
public class DefaultTheme implements Theme {
private String name;
- private Map<String,List<TagHandlerFactory>> handlerFactories;
-
+ private Map<String, List<TagHandlerFactory>> handlerFactories;
+
protected void setName(String name) {
this.name = name;
}
-
- protected void setHandlerFactories(Map<String,List<TagHandlerFactory>>
handlers) {
+
+ protected void setHandlerFactories(Map<String, List<TagHandlerFactory>>
handlers) {
this.handlerFactories = handlers;
}
-
+
public String getName() {
return name;
}
@@ -49,27 +49,27 @@
if (tagName.endsWith(".java")) {
tagName = tagName.substring(0, tagName.length() -
".java".length());
}
-
+
List<TagHandler> handlers = new ArrayList<TagHandler>();
List<TagHandlerFactory> factories = handlerFactories.get(tagName);
if (factories == null) {
- throw new StrutsException("Unable to find handlers for tag
"+tagName);
+ throw new StrutsException("Unable to find handlers for tag " +
tagName);
}
-
- TagHandler prev = null;
+
+ TagHandler prev = null;
for (int x = factories.size() - 1; x >= 0; x--) {
prev = factories.get(x).create(prev);
prev.setup(context);
handlers.add(0, prev);
}
-
+
TagSerializer ser = (TagSerializer) handlers.get(handlers.size() - 1);
-
+
TagGenerator gen = (TagGenerator) handlers.get(0);
try {
gen.generate();
} catch (IOException ex) {
- throw new StrutsException("Unable to write tag: "+tagName);
+ throw new StrutsException("Unable to write tag: " + tagName);
}
}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java?rev=726807&r1=726806&r2=726807&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java
Mon Dec 15 13:27:01 2008
@@ -33,7 +33,7 @@
private Themes themes = new Themes() {{
add(new SimpleTheme());
}};
-
+
@Override
protected String getSuffix() {
return "java";
@@ -44,18 +44,18 @@
Template t = templateContext.getTemplate();
Theme theme = themes.get(t.getTheme());
if (theme == null) {
- throw new StrutsException("Cannot render tag "+t.getName()+"
because theme "+t.getTheme()+" is not found.");
+ throw new StrutsException("Cannot render tag " + t.getName() + "
because theme " + t.getTheme() + " is not found.");
}
theme.renderTag(t.getName(), templateContext);
}
-
+
private class Themes {
- private HashMap<String,Theme> themes = new HashMap<String,Theme>();
-
+ private HashMap<String, Theme> themes = new HashMap<String, Theme>();
+
public void add(Theme theme) {
themes.put(theme.getName(), theme);
}
-
+
public Theme get(String name) {
return themes.get(name);
}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandler.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandler.java?rev=726807&r1=726806&r2=726807&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandler.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandler.java
Mon Dec 15 13:27:01 2008
@@ -25,12 +25,16 @@
import java.io.IOException;
public interface TagHandler {
-
+
void setNext(TagHandler next);
+
void setup(TemplateRenderingContext context);
-
+
void start(String name, Attributes a) throws IOException;
+
void end(String name) throws IOException;
+
void characters(String text) throws IOException;
+
void characters(String text, boolean encode) throws IOException;
}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Theme.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Theme.java?rev=726807&r1=726806&r2=726807&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Theme.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Theme.java
Mon Dec 15 13:27:01 2008
@@ -24,5 +24,6 @@
public interface Theme {
public String getName();
+
public void renderTag(String name, TemplateRenderingContext context);
}
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=726807&r1=726806&r2=726807&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
Mon Dec 15 13:27:01 2008
@@ -63,11 +63,11 @@
/*
* Expression used to get list from stack
*/
- protected abstract String getListExpression();
+ protected abstract String getListExpression();
/*
- * default class for span element
- */
+ * default class for span element
+ */
protected abstract String getItemClass();
}
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=726807&r1=726806&r2=726807&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
Mon Dec 15 13:27:01 2008
@@ -27,6 +27,6 @@
@Override
protected String getItemClass() {
- return "errorMessage";
+ 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=726807&r1=726806&r2=726807&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
Mon Dec 15 13:27:01 2008
@@ -1,7 +1,7 @@
package org.apache.struts2.views.java.simple;
public class ActionMessageHandler extends AbstractMessageListHandler {
- protected String getListExpression() {
+ protected String getListExpression() {
return "actionMessages";
}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/CommonAttributesHandler.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/CommonAttributesHandler.java?rev=726807&r1=726806&r2=726807&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/CommonAttributesHandler.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/CommonAttributesHandler.java
Mon Dec 15 13:27:01 2008
@@ -34,5 +34,5 @@
a.addIfExists("accesskey", context.getParameters().get("accesskey"));
super.start(name, a);
}
-
+
}
Added:
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=726807&view=auto
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java
(added)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java
Mon Dec 15 13:27:01 2008
@@ -0,0 +1,48 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.struts2.views.java.simple;
+
+import org.apache.struts2.views.java.Attributes;
+import org.apache.struts2.views.java.TagGenerator;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class FileHandler extends AbstractTagHandler implements TagGenerator {
+
+ public void generate() throws IOException {
+ Map<String, Object> params = context.getParameters();
+ Attributes a = new Attributes();
+
+ a.addDefaultToEmpty("name", params.get("name"))
+ .addIfExists("size", params.get("size"))
+ .addIfExists("value", params.get("nameValue"), false)
+ .addIfTrue("disabled", params.get("disabled"))
+ .addIfExists("accept", params.get("accept"))
+ .addIfExists("tabindex", params.get("tabindex"))
+ .addIfExists("id", params.get("id"))
+ .addIfExists("class", params.get("cssClass"))
+ .addIfExists("style", params.get("cssStyle"))
+ .addIfExists("title", params.get("title"));
+ super.start("input", a);
+ super.end("input");
+ }
+}
Added:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java?rev=726807&view=auto
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java
(added)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java
Mon Dec 15 13:27:01 2008
@@ -0,0 +1,43 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.struts2.views.java.simple;
+
+import org.apache.struts2.views.java.Attributes;
+import org.apache.struts2.views.java.TagGenerator;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class HeadHandler extends AbstractTagHandler implements TagGenerator {
+
+ public void generate() throws IOException {
+ Map<String, Object> params = context.getParameters();
+ Attributes attrs = new Attributes();
+ attrs.put("type", "text/javascript");
+
+ StringBuilder sb = new StringBuilder((String) findValue("base"));
+ sb.append("/struts/utils.js");
+ attrs.put("src", sb.toString());
+
+ super.start("script", attrs);
+ super.end("script");
+ }
+}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java?rev=726807&r1=726806&r2=726807&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
Mon Dec 15 13:27:01 2008
@@ -32,22 +32,24 @@
public class SimpleTheme extends DefaultTheme {
public SimpleTheme() {
- setHandlerFactories(new HashMap<String,List<TagHandlerFactory>>() {{
+ setHandlerFactories(new HashMap<String, List<TagHandlerFactory>>() {{
put("text", new FactoryList(TextFieldHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class));
put("textfield", new FactoryList(TextFieldHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class));
put("select", new FactoryList(SelectHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class));
put("form", new FactoryList(FormHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class));
put("a", new FactoryList(AnchorHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class));
put("checkbox", new FactoryList(CheckboxHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class));
+ put("file", new FactoryList(FileHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class));
put("actionerror", new FactoryList(ActionErrorHandler.class));
put("actionmessage", new FactoryList(ActionMessageHandler.class));
+ put("head", new FactoryList(HeadHandler.class));
put("fielderror", new FactoryList(FieldErrorHandler.class));
put("div", new FactoryList(DivHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class));
put("empty", new FactoryList(EmptyHandler.class));
}});
setName("simple");
}
-
+
private class FactoryList extends ArrayList<TagHandlerFactory> {
public FactoryList(Class... classes) {
super();
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java?rev=726807&r1=726806&r2=726807&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
Mon Dec 15 13:27:01 2008
@@ -20,42 +20,31 @@
*/
package org.apache.struts2.views.java.simple;
-import org.apache.struts2.components.Property;
import org.apache.struts2.views.java.Attributes;
import org.apache.struts2.views.java.TagGenerator;
import java.io.IOException;
-import java.io.StringWriter;
import java.util.Map;
public class TextFieldHandler extends AbstractTagHandler implements
TagGenerator {
public void generate() throws IOException {
- Map<String,Object> params = context.getParameters();
+ Map<String, Object> params = context.getParameters();
Attributes a = new Attributes();
a.put("type", "text");
-
+
a.addDefaultToEmpty("name", params.get("name"))
- .addIfExists("size", params.get("size"))
- .addIfExists("maxlength", params.get("maxlength"))
- .addIfExists("value", params.get("nameValue"), false)
- .addIfTrue("disabled", params.get("disabled"))
- .addIfTrue("readonly", params.get("readonly"))
- .addIfExists("tabindex", params.get("tabindex"))
- .addIfExists("id", params.get("id"))
- .addIfExists("class", params.get("cssClass"))
- .addIfExists("style", params.get("cssStyle"))
- .addIfExists("title", params.get("title"));
+ .addIfExists("size", params.get("size"))
+ .addIfExists("maxlength", params.get("maxlength"))
+ .addIfExists("value", params.get("nameValue"), false)
+ .addIfTrue("disabled", params.get("disabled"))
+ .addIfTrue("readonly", params.get("readonly"))
+ .addIfExists("tabindex", params.get("tabindex"))
+ .addIfExists("id", params.get("id"))
+ .addIfExists("class", params.get("cssClass"))
+ .addIfExists("style", params.get("cssStyle"))
+ .addIfExists("title", params.get("title"));
super.start("input", a);
super.end("input");
}
-
- private String evalProperty(Object rawValue) {
- Property prop = new Property(context.getStack());
- prop.setValue(rawValue.toString());
- StringWriter writer = new StringWriter();
- prop.start(writer);
- return writer.toString();
- }
-
}
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/CheckboxTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/CheckboxTest.java?rev=726807&r1=726806&r2=726807&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/CheckboxTest.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/CheckboxTest.java
Mon Dec 15 13:27:01 2008
@@ -26,7 +26,7 @@
public class CheckboxTest extends AbstractCommonAttributesTest {
private Checkbox tag;
- public void testRenderCheckbox() {
+ public void testRenderCheckbox() {
tag.setName("name_");
tag.setDisabled("true");
tag.setTabindex("1");
@@ -69,7 +69,7 @@
super.setUp();
tag = new Checkbox(stack, request, response);
}
-
+
@Override
protected UIBean getUIBean() {
return tag;
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FieldErrorTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FieldErrorTest.java?rev=726807&r1=726806&r2=726807&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FieldErrorTest.java
(original)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FieldErrorTest.java
Mon Dec 15 13:27:01 2008
@@ -68,7 +68,7 @@
assertEquals(expected, output);
}
- public void testRenderFieldErrorWithoutOneFieldName() {
+ public void testRenderFieldErrorWithoutOneFieldName() {
this.fieldNames.remove(1);
tag.evaluateParams();
@@ -92,7 +92,7 @@
@Override
protected void setUp() throws Exception {
- this.errors = new HashMap<String, List<String>>(){
+ this.errors = new HashMap<String, List<String>>() {
{
put("field1", Arrays.asList("not good", "bad"));
put("field2", Arrays.asList("bad to the bone"));
Added:
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=726807&view=auto
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FileTest.java
(added)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FileTest.java
Mon Dec 15 13:27:01 2008
@@ -0,0 +1,66 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.struts2.views.java.simple;
+
+import org.apache.struts2.components.File;
+import org.apache.struts2.components.UIBean;
+
+public class FileTest extends AbstractCommonAttributesTest {
+ private File tag;
+
+ public void testRenderTextField() {
+ tag.setName("name");
+ tag.setValue("val1");
+ tag.setSize("10");
+ tag.setDisabled("true");
+ tag.setAccept("accept_");
+ tag.setTabindex("1");
+ tag.setId("id1");
+ tag.setCssClass("class1");
+ tag.setCssStyle("style1");
+ tag.setTitle("title");
+
+
+ tag.evaluateParams();
+ 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>");
+ assertEquals(expected, output);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ this.tag = new File(stack, request, response);
+ }
+
+ @Override
+ protected UIBean getUIBean() {
+ return tag;
+ }
+
+ @Override
+ protected String getTagName() {
+ return "file";
+ }
+}
+
Added:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/HeadTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/HeadTest.java?rev=726807&view=auto
==============================================================================
---
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/HeadTest.java
(added)
+++
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/HeadTest.java
Mon Dec 15 13:27:01 2008
@@ -0,0 +1,61 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.struts2.views.java.simple;
+
+import org.apache.struts2.components.Head;
+import org.apache.struts2.components.UIBean;
+
+public class HeadTest extends AbstractTest {
+ private Head tag;
+
+ public void testRenderTextField() {
+ tag.evaluateParams();
+ map.putAll(tag.getParameters());
+ theme.renderTag(getTagName(), context);
+ String output = writer.getBuffer().toString();
+ String expected = s("<script type='text/javascript'
src='/la-base/struts/utils.js'></script>");
+ assertEquals(expected, output);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ this.tag = new Head(stack, request, response);
+ }
+
+ @Override
+ protected void setUpStack() {
+ super.setUpStack();
+ expectFind("base", "/la-base");
+ }
+
+ @Override
+ protected UIBean getUIBean() {
+ return tag;
+ }
+
+ @Override
+ protected String getTagName() {
+ return "head";
+ }
+}
+
+
