You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2008/12/14 03:45:05 UTC
svn commit: r726340 - in
/struts/sandbox/trunk/struts2-javatemplates-plugin/src:
main/java/org/apache/struts2/views/java/
main/java/org/apache/struts2/views/java/simple/
test/java/org/apache/struts2/views/java/simple/
Author: musachy
Date: Sat Dec 13 18:45:05 2008
New Revision: 726340
URL: http://svn.apache.org/viewvc?rev=726340&view=rev
Log:
Add form handler. Set svn:eol-style and svn:keyword on java files
Added:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/EmptyHandler.java (with props)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FormHandler.java (with props)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FormTest.java (with props)
Modified:
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Attributes.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTheme.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagGenerator.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandler.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandlerFactory.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagSerializer.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Theme.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/CommonAttributesHandler.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ScriptingEventsHandler.java (props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java (props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java (props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/AbstractTestCase.java (contents, props changed)
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/TextFieldTest.java (props changed)
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=726340&r1=726339&r2=726340&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 Sat Dec 13 18:45:05 2008
@@ -1,5 +1,5 @@
/*
- * $Id: BaseTemplateEngine.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Attributes.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Attributes.java
------------------------------------------------------------------------------
svn:keywords = Id
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=726340&r1=726339&r2=726340&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 Sat Dec 13 18:45:05 2008
@@ -1,5 +1,5 @@
/*
- * $Id: BaseTemplateEngine.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java
------------------------------------------------------------------------------
svn:keywords = Id
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=726340&r1=726339&r2=726340&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 Sat Dec 13 18:45:05 2008
@@ -1,5 +1,5 @@
/*
- * $Id: BaseTemplateEngine.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTheme.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/DefaultTheme.java
------------------------------------------------------------------------------
svn:keywords = Id
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=726340&r1=726339&r2=726340&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 Sat Dec 13 18:45:05 2008
@@ -1,5 +1,5 @@
/*
- * $Id: BaseTemplateEngine.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagGenerator.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagGenerator.java?rev=726340&r1=726339&r2=726340&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagGenerator.java (original)
+++ struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagGenerator.java Sat Dec 13 18:45:05 2008
@@ -1,5 +1,5 @@
/*
- * $Id: BaseTemplateEngine.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagGenerator.java
------------------------------------------------------------------------------
svn:keywords = Id
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=726340&r1=726339&r2=726340&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 Sat Dec 13 18:45:05 2008
@@ -1,5 +1,5 @@
/*
- * $Id: BaseTemplateEngine.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandler.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandlerFactory.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandlerFactory.java?rev=726340&r1=726339&r2=726340&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandlerFactory.java (original)
+++ struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandlerFactory.java Sat Dec 13 18:45:05 2008
@@ -1,5 +1,5 @@
/*
- * $Id: BaseTemplateEngine.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandlerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagHandlerFactory.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagSerializer.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagSerializer.java?rev=726340&r1=726339&r2=726340&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagSerializer.java (original)
+++ struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagSerializer.java Sat Dec 13 18:45:05 2008
@@ -1,5 +1,5 @@
/*
- * $Id: BaseTemplateEngine.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagSerializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/TagSerializer.java
------------------------------------------------------------------------------
svn:keywords = Id
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=726340&r1=726339&r2=726340&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 Sat Dec 13 18:45:05 2008
@@ -1,5 +1,5 @@
/*
- * $Id: BaseTemplateEngine.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Theme.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/Theme.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java?rev=726340&r1=726339&r2=726340&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java (original)
+++ struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java Sat Dec 13 18:45:05 2008
@@ -1,5 +1,5 @@
/*
- * $Id: BaseTemplateEngine.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java?rev=726340&r1=726339&r2=726340&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java (original)
+++ struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java Sat Dec 13 18:45:05 2008
@@ -33,7 +33,7 @@
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.ActionContext;
-public class AbstractTagHandler implements TagHandler {
+public abstract class AbstractTagHandler implements TagHandler {
protected TagHandler nextTagHandler;
protected TemplateRenderingContext context;
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java
------------------------------------------------------------------------------
svn:keywords = Id
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=726340&r1=726339&r2=726340&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 Sat Dec 13 18:45:05 2008
@@ -1,5 +1,5 @@
/*
- * $Id: BaseTemplateEngine.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/CommonAttributesHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/CommonAttributesHandler.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/EmptyHandler.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/EmptyHandler.java?rev=726340&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/EmptyHandler.java (added)
+++ struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/EmptyHandler.java Sat Dec 13 18:45:05 2008
@@ -0,0 +1,25 @@
+/*
+ * $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;
+
+//does nothing
+public class EmptyHandler extends AbstractTagHandler {
+}
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/EmptyHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/EmptyHandler.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FormHandler.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FormHandler.java?rev=726340&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FormHandler.java (added)
+++ struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FormHandler.java Sat Dec 13 18:45:05 2008
@@ -0,0 +1,49 @@
+/*
+ * $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 FormHandler extends AbstractTagHandler implements TagGenerator {
+ public void generate() throws IOException {
+ Map<String, Object> params = context.getParameters();
+ Attributes attrs = new Attributes();
+
+ attrs.addIfExists("name", params.get("name"))
+ .addIfExists("id", params.get("id"))
+ .addIfExists("onsubmit", params.get("onsubmit"))
+ .addIfExists("onreset", params.get("onreset"))
+ .addIfExists("action", params.get("action"))
+ .addIfExists("target", params.get("target"))
+ .addIfExists("enctype", params.get("enctype"))
+ .addIfExists("class", params.get("cssClass"))
+ .addIfExists("style", params.get("cssStyle"))
+ .addIfExists("title", params.get("title"))
+ .addIfExists("accept-charset", params.get("acceptcharset"));
+ attrs.add("method", params.containsKey("method") ? (String) params.get("method") : "post");
+ start("form", attrs);
+ end("form");
+ }
+}
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FormHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/FormHandler.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ScriptingEventsHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/ScriptingEventsHandler.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Dec 13 18:45:05 2008
@@ -1 +1 @@
-Id Author Date Rev
+Id
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=726340&r1=726339&r2=726340&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 Sat Dec 13 18:45:05 2008
@@ -36,6 +36,8 @@
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("empty", new FactoryList(EmptyHandler.class));
}});
setName("simple");
}
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/AbstractTestCase.java?rev=726340&r1=726339&r2=726340&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/AbstractTestCase.java (original)
+++ struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/AbstractTestCase.java Sat Dec 13 18:45:05 2008
@@ -1,155 +1,155 @@
-package org.apache.struts2.views.java.simple;
-
-import junit.framework.TestCase;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.UIBean;
-import org.apache.struts2.components.template.Template;
-import org.apache.struts2.components.template.TemplateRenderingContext;
-import org.apache.struts2.StrutsConstants;
-import org.easymock.EasyMock;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Stack;
-import java.io.StringWriter;
-
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.inject.Container;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public abstract class AbstractTestCase extends TestCase {
- private Map<String, String> scriptingAttrs = new HashMap<String, String>();
- private Map<String, String> commonAttrs = new HashMap<String, String>();
-
- protected SimpleTheme theme;
-
- protected StringWriter writer;
- protected Map map;
-
- protected Template template;
- protected Map stackContext;
- protected ValueStack stack;
- protected TemplateRenderingContext context;
- protected HttpServletRequest request;
- protected HttpServletResponse response;
-
-
- @Override
- protected void setUp() throws Exception {
- super.setUp(); //To change body of overridden methods use File | Settings | File Templates.
- scriptingAttrs.put("onclick", "onclick_");
- scriptingAttrs.put("ondblclick", "ondblclick_");
- scriptingAttrs.put("onmousedown", "onmousedown_");
- scriptingAttrs.put("onmouseup", "onmouseup_");
- scriptingAttrs.put("onmouseover", "onmouseover_");
- scriptingAttrs.put("onmousemove", "onmousemove_");
- scriptingAttrs.put("onmouseout", "onmouseout_");
- scriptingAttrs.put("onfocus", "onfocus_");
- scriptingAttrs.put("onblur", "onblur_");
- scriptingAttrs.put("onkeypress", "onkeypress_");
- scriptingAttrs.put("onkeydown", "onkeydown_");
- scriptingAttrs.put("onkeyup", "onkeyup_");
- scriptingAttrs.put("onselect", "onselect_");
- scriptingAttrs.put("onchange", "onchange_");
-
- commonAttrs.put("accesskey", "accesskey_");
-
- theme = new SimpleTheme();
- writer = new StringWriter();
- map = new HashMap();
-
- template = org.easymock.classextension.EasyMock.createMock(Template.class);
- stack = EasyMock.createNiceMock(ValueStack.class);
- setUpStack();
- stackContext = new HashMap();
-
- context = new TemplateRenderingContext(template, writer, stack, map, null);
- stackContext.put(Component.COMPONENT_STACK, new Stack());
-
- request = EasyMock.createMock(HttpServletRequest.class);
- response = EasyMock.createMock(HttpServletResponse.class);
-
- EasyMock.expect(stack.getContext()).andReturn(stackContext).anyTimes();
-
- Container container = EasyMock.createNiceMock(Container.class);
- XWorkConverter converter = new ConverterEx();
- EasyMock.expect(container.getInstance(String.class, StrutsConstants.STRUTS_TAG_ALTSYNTAX)).andReturn("true").anyTimes();
- EasyMock.expect(container.getInstance(XWorkConverter.class)).andReturn(converter).anyTimes();
- stackContext.put(ActionContext.CONTAINER, container);
-
-
-
- EasyMock.replay(stack);
- EasyMock.replay(container);
- }
-
- protected static String s(String input) {
- return input.replaceAll("'", "\"");
- }
-
- protected void expectFind(String expr, Class toClass, Object returnVal) {
- EasyMock.expect(stack.findValue(expr, toClass)).andReturn(returnVal);
- }
-
- protected void expectFind(String expr, Object returnVal) {
- EasyMock.expect(stack.findValue(expr)).andReturn(returnVal);
- }
-
- protected void setUpStack() {
- //TODO setup a config with stack and all..for real
- }
-
- protected void applyScriptingAttrs(UIBean bean) {
- bean.setOnclick(scriptingAttrs.get("onclick"));
- bean.setOndblclick(scriptingAttrs.get("ondblclick"));
- bean.setOnmousedown(scriptingAttrs.get("onmousedown"));
- bean.setOnmouseup(scriptingAttrs.get("onmouseup"));
- bean.setOnmouseover(scriptingAttrs.get("onmouseover"));
- bean.setOnmousemove(scriptingAttrs.get("onmousemove"));
- bean.setOnmouseout(scriptingAttrs.get("onmouseout"));
- bean.setOnfocus(scriptingAttrs.get("onfocus"));
- bean.setOnblur(scriptingAttrs.get("onblur"));
- bean.setOnkeypress(scriptingAttrs.get("onkeypress"));
- bean.setOnkeydown(scriptingAttrs.get("onkeydown"));
- bean.setOnkeyup(scriptingAttrs.get("onkeyup"));
- bean.setOnselect(scriptingAttrs.get("onselect"));
- bean.setOnchange(scriptingAttrs.get("onchange"));
- }
-
- protected void applyCommonAttrs(UIBean bean) {
- bean.setAccesskey("accesskey_");
- }
-
- protected void assertScriptingAttrs(String str) {
- for (Map.Entry<String, String> entry : scriptingAttrs.entrySet()) {
- String substr = entry.getKey() + "=\"" + entry.getValue() + "\"";
- assertTrue("String [" + substr + "] was not found in [" + str + "]", str.indexOf(substr) >= 0);
- }
- }
-
- protected void assertCommongAttrs(String str) {
- for (Map.Entry<String, String> entry : commonAttrs.entrySet()) {
- String substr = entry.getKey() + "=\"" + entry.getValue() + "\"";
- assertTrue("String [" + substr + "] was not found in [" + str + "]", str.indexOf(substr) >= 0);
- }
- }
-
- protected Object doFindValue(String expr, Class toType) {
- Object val = stack.findValue(expr);
-
- if (toType == String.class)
- return val == null ? expr : val;
- else
- return val == null ? null : val;
- }
-
- public class ConverterEx extends XWorkConverter {
- public ConverterEx() {
-
- }
- }
-}
+package org.apache.struts2.views.java.simple;
+
+import junit.framework.TestCase;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.UIBean;
+import org.apache.struts2.components.template.Template;
+import org.apache.struts2.components.template.TemplateRenderingContext;
+import org.apache.struts2.StrutsConstants;
+import org.easymock.EasyMock;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Stack;
+import java.io.StringWriter;
+
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public abstract class AbstractTestCase extends TestCase {
+ private Map<String, String> scriptingAttrs = new HashMap<String, String>();
+ private Map<String, String> commonAttrs = new HashMap<String, String>();
+
+ protected SimpleTheme theme;
+
+ protected StringWriter writer;
+ protected Map map;
+
+ protected Template template;
+ protected Map stackContext;
+ protected ValueStack stack;
+ protected TemplateRenderingContext context;
+ protected HttpServletRequest request;
+ protected HttpServletResponse response;
+
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp(); //To change body of overridden methods use File | Settings | File Templates.
+ scriptingAttrs.put("onclick", "onclick_");
+ scriptingAttrs.put("ondblclick", "ondblclick_");
+ scriptingAttrs.put("onmousedown", "onmousedown_");
+ scriptingAttrs.put("onmouseup", "onmouseup_");
+ scriptingAttrs.put("onmouseover", "onmouseover_");
+ scriptingAttrs.put("onmousemove", "onmousemove_");
+ scriptingAttrs.put("onmouseout", "onmouseout_");
+ scriptingAttrs.put("onfocus", "onfocus_");
+ scriptingAttrs.put("onblur", "onblur_");
+ scriptingAttrs.put("onkeypress", "onkeypress_");
+ scriptingAttrs.put("onkeydown", "onkeydown_");
+ scriptingAttrs.put("onkeyup", "onkeyup_");
+ scriptingAttrs.put("onselect", "onselect_");
+ scriptingAttrs.put("onchange", "onchange_");
+
+ commonAttrs.put("accesskey", "accesskey_");
+
+ theme = new SimpleTheme();
+ writer = new StringWriter();
+ map = new HashMap();
+
+ template = org.easymock.classextension.EasyMock.createMock(Template.class);
+ stack = EasyMock.createNiceMock(ValueStack.class);
+ setUpStack();
+ stackContext = new HashMap();
+
+ context = new TemplateRenderingContext(template, writer, stack, map, null);
+ stackContext.put(Component.COMPONENT_STACK, new Stack());
+
+ request = EasyMock.createMock(HttpServletRequest.class);
+ response = EasyMock.createMock(HttpServletResponse.class);
+
+ EasyMock.expect(stack.getContext()).andReturn(stackContext).anyTimes();
+
+ Container container = EasyMock.createNiceMock(Container.class);
+ XWorkConverter converter = new ConverterEx();
+ EasyMock.expect(container.getInstance(String.class, StrutsConstants.STRUTS_TAG_ALTSYNTAX)).andReturn("true").anyTimes();
+ EasyMock.expect(container.getInstance(XWorkConverter.class)).andReturn(converter).anyTimes();
+ stackContext.put(ActionContext.CONTAINER, container);
+
+
+
+ EasyMock.replay(stack);
+ EasyMock.replay(container);
+ }
+
+ protected static String s(String input) {
+ return input.replaceAll("'", "\"");
+ }
+
+ protected void expectFind(String expr, Class toClass, Object returnVal) {
+ EasyMock.expect(stack.findValue(expr, toClass)).andReturn(returnVal);
+ }
+
+ protected void expectFind(String expr, Object returnVal) {
+ EasyMock.expect(stack.findValue(expr)).andReturn(returnVal);
+ }
+
+ protected void setUpStack() {
+ //TODO setup a config with stack and all..for real
+ }
+
+ protected void applyScriptingAttrs(UIBean bean) {
+ bean.setOnclick(scriptingAttrs.get("onclick"));
+ bean.setOndblclick(scriptingAttrs.get("ondblclick"));
+ bean.setOnmousedown(scriptingAttrs.get("onmousedown"));
+ bean.setOnmouseup(scriptingAttrs.get("onmouseup"));
+ bean.setOnmouseover(scriptingAttrs.get("onmouseover"));
+ bean.setOnmousemove(scriptingAttrs.get("onmousemove"));
+ bean.setOnmouseout(scriptingAttrs.get("onmouseout"));
+ bean.setOnfocus(scriptingAttrs.get("onfocus"));
+ bean.setOnblur(scriptingAttrs.get("onblur"));
+ bean.setOnkeypress(scriptingAttrs.get("onkeypress"));
+ bean.setOnkeydown(scriptingAttrs.get("onkeydown"));
+ bean.setOnkeyup(scriptingAttrs.get("onkeyup"));
+ bean.setOnselect(scriptingAttrs.get("onselect"));
+ bean.setOnchange(scriptingAttrs.get("onchange"));
+ }
+
+ protected void applyCommonAttrs(UIBean bean) {
+ bean.setAccesskey("accesskey_");
+ }
+
+ protected void assertScriptingAttrs(String str) {
+ for (Map.Entry<String, String> entry : scriptingAttrs.entrySet()) {
+ String substr = entry.getKey() + "=\"" + entry.getValue() + "\"";
+ assertTrue("String [" + substr + "] was not found in [" + str + "]", str.indexOf(substr) >= 0);
+ }
+ }
+
+ protected void assertCommongAttrs(String str) {
+ for (Map.Entry<String, String> entry : commonAttrs.entrySet()) {
+ String substr = entry.getKey() + "=\"" + entry.getValue() + "\"";
+ assertTrue("String [" + substr + "] was not found in [" + str + "]", str.indexOf(substr) >= 0);
+ }
+ }
+
+ protected Object doFindValue(String expr, Class toType) {
+ Object val = stack.findValue(expr);
+
+ if (toType == String.class)
+ return val == null ? expr : val;
+ else
+ return val == null ? null : val;
+ }
+
+ public class ConverterEx extends XWorkConverter {
+ public ConverterEx() {
+
+ }
+ }
+}
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/AbstractTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/AbstractTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FormTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FormTest.java?rev=726340&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FormTest.java (added)
+++ struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FormTest.java Sat Dec 13 18:45:05 2008
@@ -0,0 +1,116 @@
+/*
+ * $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.Select;
+import org.apache.struts2.components.Form;
+import org.apache.struts2.components.UrlRenderer;
+import org.easymock.EasyMock;
+import com.opensymphony.xwork2.util.ValueStack;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class FormTest extends AbstractTestCase {
+ private FormEx tag;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ tag = new FormEx(stack, request, response);
+ UrlRenderer renderer = EasyMock.createNiceMock(UrlRenderer.class);
+ EasyMock.replay(renderer);
+ tag.setUrlRenderer(renderer);
+ }
+
+ public void testRenderForm() {
+ tag.setName("name_");
+ tag.setDisabled("true");
+ tag.setTabindex("1");
+ tag.setId("id_");
+ tag.setCssClass("class_");
+ tag.setCssStyle("style_");
+ tag.setTitle("title");
+ tag.setAcceptcharset("charset_");
+ tag.setAction("action_");
+ tag.setOnsubmit("submit");
+ tag.setOnreset("reset");
+ tag.setTarget("target_");
+ tag.setEnctype("enc");
+ tag.setMethod("post");
+
+ tag.processParams();
+ map.putAll(tag.getParameters());
+ theme.renderTag("form", context);
+ String output = writer.getBuffer().toString();
+ String expected = s("<form name='name_' id='id_' onsubmit='submit' onreset='reset' target='target_' enctype='enc' class='class_' style='style_' title='title' accept-charset='charset_' method='post'></form>");
+ assertEquals(expected, output);
+ }
+
+ public void testDefaultMethod() {
+ tag.processParams();
+ map.putAll(tag.getParameters());
+ theme.renderTag("form", context);
+ String output = writer.getBuffer().toString();
+ String expected = s("<form method='post'></form>");
+ assertEquals(expected, output);
+ }
+
+
+ public void testRenderScriptingAttrs() {
+
+ applyScriptingAttrs(tag);
+
+ tag.processParams();
+ map.putAll(tag.getParameters());
+ theme.renderTag("form", context);
+ String output = writer.getBuffer().toString();
+
+ assertScriptingAttrs(output);
+ }
+
+ public void testRenderCommonAttrs() {
+
+ applyCommonAttrs(tag);
+
+ tag.processParams();
+ map.putAll(tag.getParameters());
+ theme.renderTag("form", context);
+ String output = writer.getBuffer().toString();
+
+ assertCommongAttrs(output);
+ }
+
+ class FormEx extends Form {
+ public FormEx(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
+ super(stack, request, response);
+ }
+
+ public void processParams() {
+ //these methods are protected
+ evaluateParams();
+ }
+
+ public boolean altSyntax() {
+ return true;
+ }
+ }
+}
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FormTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/FormTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/TextFieldTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Dec 13 18:45:05 2008
@@ -1 +1 @@
-Id Author Date Rev
+Id