struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r471756 [17/31] - in /struts/struts2/trunk: apps/blank/ apps/blank/src/main/java/example/ apps/blank/src/test/java/example/ apps/mailreader/src/main/java/mailreader2/ apps/portlet/src/main/java/org/apache/struts2/portlet/example/ apps/portl...
Date Mon, 06 Nov 2006 15:02:22 GMT
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -29,10 +32,10 @@
  * @see ElseIf
  */
 public class ElseIfTag extends ComponentTagSupport {
-	
-	private static final long serialVersionUID = -3872016920741400345L;
-	
-	protected String test;
+
+    private static final long serialVersionUID = -3872016920741400345L;
+
+    protected String test;
 
     public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new ElseIf(stack);

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -30,10 +33,10 @@
  * @see Else
  */
 public class ElseTag extends ComponentTagSupport {
-	
-	private static final long serialVersionUID = 8166807953193406785L;
 
-	public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+    private static final long serialVersionUID = 8166807953193406785L;
+
+    public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new Else(stack);
     }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -30,10 +33,10 @@
  * @see I18n
  */
 public class I18nTag extends ComponentTagSupport {
-	
-	private static final long serialVersionUID = -7914587341936116887L;
-	
-	protected String name;
+
+    private static final long serialVersionUID = -7914587341936116887L;
+
+    protected String name;
 
     public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new I18n(stack);

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -30,10 +33,10 @@
  * @see If
  */
 public class IfTag extends ComponentTagSupport {
-	
-	private static final long serialVersionUID = 4448870162549923833L;
-	
-	String test;
+
+    private static final long serialVersionUID = 4448870162549923833L;
+
+    String test;
 
     public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new If(stack);

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -30,10 +33,10 @@
  * @see Include
  */
 public class IncludeTag extends ComponentTagSupport {
-	
-	private static final long serialVersionUID = -1585165567043278243L;
-	
-	protected String value;
+
+    private static final long serialVersionUID = -1585165567043278243L;
+
+    protected String value;
 
     public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new Include(stack, req, res);

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -31,9 +34,9 @@
  */
 public class IteratorTag extends ComponentTagSupport {
 
-	private static final long serialVersionUID = -1827978135193581901L;
-	
-	protected String statusAttr;
+    private static final long serialVersionUID = -1827978135193581901L;
+
+    protected String statusAttr;
     protected String value;
 
     public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
@@ -41,8 +44,8 @@
     }
 
     protected void populateParams() {
-    	super.populateParams();
-    	
+        super.populateParams();
+
         IteratorComponent tag = (IteratorComponent) getComponent();
         tag.setStatus(statusAttr);
         tag.setValue(value);

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -29,10 +32,10 @@
  * @see Param
  */
 public class ParamTag extends ComponentTagSupport {
-	
-	private static final long serialVersionUID = -968332732207156408L;
-	
-	protected String name;
+
+    private static final long serialVersionUID = -968332732207156408L;
+
+    protected String name;
     protected String value;
 
     public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -30,10 +33,10 @@
  * @see Property
  */
 public class PropertyTag extends ComponentTagSupport {
-	
-	private static final long serialVersionUID = 435308349113743852L;
-	
-	private String defaultValue;
+
+    private static final long serialVersionUID = 435308349113743852L;
+
+    private String defaultValue;
     private String value;
     private boolean escape = true;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -30,10 +33,10 @@
  * @see Push
  */
 public class PushTag extends ComponentTagSupport {
-	
-	private static final long serialVersionUID = -1357895305148907931L;
-	
-	protected String value;
+
+    private static final long serialVersionUID = -1357895305148907931L;
+
+    protected String value;
 
     public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new Push(stack);

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -30,10 +33,10 @@
  * @see Set
  */
 public class SetTag extends ComponentTagSupport {
-	
-	private static final long serialVersionUID = -5074213926790716974L;
-	
-	protected String name;
+
+    private static final long serialVersionUID = -5074213926790716974L;
+
+    protected String name;
     protected String scope;
     protected String value;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -29,7 +32,7 @@
 
 /**
  * Contains common functonalities for Struts JSP Tags.
- * 
+ *
  */
 public class StrutsBodyTagSupport extends BodyTagSupport {
 
@@ -42,7 +45,7 @@
     public void setId(String string) {
         super.setId(string);
     }
-    
+
     protected boolean altSyntax() {
         return ContextUtil.isUseAltSyntax(getStack().getContext());
     }
@@ -97,7 +100,7 @@
             return bodyContent.getString().trim();
         }
     }
-    
+
     public static String translateVariables(String expression, ValueStack stack) {
         while (true) {
             int x = expression.indexOf("%{");

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -30,10 +33,10 @@
  * @see Text
  */
 public class TextTag extends ComponentTagSupport {
-	
-	private static final long serialVersionUID = -3075088084198264581L;
-	
-	protected String name;
+
+    private static final long serialVersionUID = -3075088084198264581L;
+
+    protected String name;
 
     public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new Text(stack);

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp;
 
@@ -30,10 +33,10 @@
  * @see URL
  */
 public class URLTag extends ComponentTagSupport {
-	
-	private static final long serialVersionUID = 1722460444125206226L;
 
-	protected String includeParams;
+    private static final long serialVersionUID = 1722460444125206226L;
+
+    protected String includeParams;
     protected String scheme;
     protected String value;
     protected String action;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp.iterator;
 
@@ -35,10 +38,10 @@
  */
 public class AppendIteratorTag extends ComponentTagSupport {
 
-	private static final long serialVersionUID = -6017337859763283691L;
+    private static final long serialVersionUID = -6017337859763283691L;
+
+    public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+        return new AppendIterator(stack);
+    }
 
-	public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
-		return new AppendIterator(stack);
-	}
-	
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.jsp.iterator;
 
@@ -29,20 +32,20 @@
 /**
  * <!-- START SNIPPET: javadoc -->
  * <b>NOTE: JSP-TAG</b>
- * 
+ *
  * <p>Generate an iterator based on the val attribute supplied.</P>
- * 
+ *
  * <b>NOTE:</b> The generated iterator will <b>ALWAYS</b> be pushed into the top of the stack, and poped
  * at the end of the tag.
  * <!-- END SNIPPET: javadoc -->
  *
  * <!-- START SNIPPET: params -->
  * <ul>
- * 		<li>val* (Object) - the source to be parsed into an iterator </li>
- * 		<li>count (Object) - the max number (Integer, Float, Double, Long, String) entries to be in the iterator</li>
- * 		<li>separator (String) - the separator to be used in separating the <i>val</i> into entries of the iterator</li>
- *  	<li>id (String) - the id to store the resultant iterator into page context, if such id is supplied</li>
- *  	<li>converter (Object) - the converter (must extends off IteratorGenerator.Converter interface) to convert the String entry parsed from <i>val</i> into an object</li>
+ *      <li>val* (Object) - the source to be parsed into an iterator </li>
+ *      <li>count (Object) - the max number (Integer, Float, Double, Long, String) entries to be in the iterator</li>
+ *      <li>separator (String) - the separator to be used in separating the <i>val</i> into entries of the iterator</li>
+ *      <li>id (String) - the id to store the resultant iterator into page context, if such id is supplied</li>
+ *      <li>converter (Object) - the converter (must extends off IteratorGenerator.Converter interface) to convert the String entry parsed from <i>val</i> into an object</li>
  * </ul>
  * <!-- END SNIPPET: params -->
  *
@@ -52,9 +55,9 @@
  * <pre>
  * Generate a simple iterator
  * &lt;s:generator val="%{'aaa,bbb,ccc,ddd,eee'}"&gt;
- *	&lt;s:iterator&gt;
- *		&lt;s:property /&gt;&lt;br/&gt;
- *	&lt;/s:iterator&gt;
+ *  &lt;s:iterator&gt;
+ *      &lt;s:property /&gt;&lt;br/&gt;
+ *  &lt;/s:iterator&gt;
  * &lt;/s:generator&gt;
  * </pre>
  * This generates an iterator and print it out using the iterator tag.
@@ -63,9 +66,9 @@
  * <pre>
  * Generate an iterator with count attribute
  * &lt;s:generator val="%{'aaa,bbb,ccc,ddd,eee'}" count="3"&gt;
- *	&lt;s:iterator&gt;
- *		&lt;s:property /&gt;&lt;br/&gt;
- *	&lt;/s:iterator&gt;
+ *  &lt;s:iterator&gt;
+ *      &lt;s:property /&gt;&lt;br/&gt;
+ *  &lt;/s:iterator&gt;
  * &lt;/s:generator&gt;
  * </pre>
  * This generates an iterator, but only 3 entries will be available in the iterator
@@ -76,11 +79,11 @@
  * Generate an iterator with id attribute
  * &lt;s:generator val="%{'aaa,bbb,ccc,ddd,eee'}" count="4" separator="," id="myAtt" /&gt;
  * &lt;%
- * 	Iterator i = (Iterator) pageContext.getAttribute("myAtt");
- * 	while(i.hasNext()) {
- * 		String s = (String) i.next(); %>
- * 		&lt;%=s%&gt; &lt;br/&gt;
- * &lt;% 	}
+ *  Iterator i = (Iterator) pageContext.getAttribute("myAtt");
+ *  while(i.hasNext()) {
+ *      String s = (String) i.next(); %>
+ *      &lt;%=s%&gt; &lt;br/&gt;
+ * &lt;%    }
  * %&gt;
  * </pre>
  * This generates an iterator and put it in the PageContext under the key as specified
@@ -91,9 +94,9 @@
  * <pre>
  * Generate an iterator with comparator attribute
  * &lt;s:generator val="%{'aaa,bbb,ccc,ddd,eee'}" converter="%{myConverter}"&gt;
- *	&lt;s:iterator&gt;
- * 		&lt;s:property /&gt;&lt;br/&gt;
- * 	&lt;/s:iterator&gt;
+ *  &lt;s:iterator&gt;
+ *      &lt;s:property /&gt;&lt;br/&gt;
+ *  &lt;/s:iterator&gt;
  * &lt;/s:generator&gt;
  *
  *
@@ -101,13 +104,13 @@
  *
  *   ....
  *
- *	 public Converter getMyConverter() {
- *		return new Converter() {
- *			public Object convert(String value) throws Exception {
- *				return "converter-"+value;
- *			}
- *		};
- *	 }
+ *   public Converter getMyConverter() {
+ *      return new Converter() {
+ *          public Object convert(String value) throws Exception {
+ *              return "converter-"+value;
+ *          }
+ *      };
+ *   }
  *
  *   ...
  *
@@ -124,11 +127,11 @@
  */
 public class IteratorGeneratorTag extends StrutsBodyTagSupport {
 
-	private static final long serialVersionUID = 2968037295463973936L;
+    private static final long serialVersionUID = 2968037295463973936L;
 
-	public static final String DEFAULT_SEPARATOR = ",";
+    public static final String DEFAULT_SEPARATOR = ",";
 
-	private static final Log _log = LogFactory.getLog(IteratorGeneratorTag.class);
+    private static final Log _log = LogFactory.getLog(IteratorGeneratorTag.class);
 
     String countAttr;
     String separatorAttr;
@@ -166,7 +169,7 @@
      * description="the converter to convert the String entry parsed from <i>val</i> into an object"
      */
     public void setConverter(String aConverter) {
-    	converterAttr = aConverter;
+        converterAttr = aConverter;
     }
 
     /**
@@ -179,75 +182,75 @@
 
     public int doStartTag() throws JspException {
 
-    	// value
-    	Object value = findValue(valueAttr);
+        // value
+        Object value = findValue(valueAttr);
 
-    	// separator
-    	String separator = DEFAULT_SEPARATOR;
-    	if (separatorAttr != null && separatorAttr.length() > 0) {
-    		separator = findString(separatorAttr);
-    	}
-
-    	// TODO: maybe this could be put into an Util class, or there is already one?
-    	// count
-    	int count = 0;
-    	if (countAttr != null && countAttr.length() > 0) {
-    		Object countObj = findValue(countAttr);
-    		if (countObj instanceof Integer) {
-    			count = ((Integer)countObj).intValue();
-    		}
-    		else if (countObj instanceof Float) {
-    			count = ((Float)countObj).intValue();
-    		}
-    		else if (countObj instanceof Long) {
-    			count = ((Long)countObj).intValue();
-    		}
-    		else if (countObj instanceof Double) {
-    			count = ((Long)countObj).intValue();
-    		}
-    		else if (countObj instanceof String) {
-    			try {
-    				count = Integer.parseInt((String)countObj);
-    			}
-    			catch(NumberFormatException e) {
-    				_log.warn("unable to convert count attribute ["+countObj+"] to number, ignore count attribute", e);
-    			}
-    		}
-    	}
-
-    	// converter
-    	Converter converter = null;
-    	if (converterAttr != null && converterAttr.length() > 0) {
-    		converter = (Converter) findValue(converterAttr);
-    	}
-
-
-    	iteratorGenerator = new IteratorGenerator();
-    	iteratorGenerator.setValues(value);
-    	iteratorGenerator.setCount(count);
-    	iteratorGenerator.setSeparator(separator);
-    	iteratorGenerator.setConverter(converter);
-
-    	iteratorGenerator.execute();
+        // separator
+        String separator = DEFAULT_SEPARATOR;
+        if (separatorAttr != null && separatorAttr.length() > 0) {
+            separator = findString(separatorAttr);
+        }
+
+        // TODO: maybe this could be put into an Util class, or there is already one?
+        // count
+        int count = 0;
+        if (countAttr != null && countAttr.length() > 0) {
+            Object countObj = findValue(countAttr);
+            if (countObj instanceof Integer) {
+                count = ((Integer)countObj).intValue();
+            }
+            else if (countObj instanceof Float) {
+                count = ((Float)countObj).intValue();
+            }
+            else if (countObj instanceof Long) {
+                count = ((Long)countObj).intValue();
+            }
+            else if (countObj instanceof Double) {
+                count = ((Long)countObj).intValue();
+            }
+            else if (countObj instanceof String) {
+                try {
+                    count = Integer.parseInt((String)countObj);
+                }
+                catch(NumberFormatException e) {
+                    _log.warn("unable to convert count attribute ["+countObj+"] to number, ignore count attribute", e);
+                }
+            }
+        }
+
+        // converter
+        Converter converter = null;
+        if (converterAttr != null && converterAttr.length() > 0) {
+            converter = (Converter) findValue(converterAttr);
+        }
+
+
+        iteratorGenerator = new IteratorGenerator();
+        iteratorGenerator.setValues(value);
+        iteratorGenerator.setCount(count);
+        iteratorGenerator.setSeparator(separator);
+        iteratorGenerator.setConverter(converter);
+
+        iteratorGenerator.execute();
 
 
 
-    	// push resulting iterator into stack
-    	getStack().push(iteratorGenerator);
-    	if (getId() != null && getId().length() > 0) {
-    		// if an id is specified, we have the resulting iterator set into
-    		// the pageContext attribute as well
-    		pageContext.setAttribute(getId(), iteratorGenerator);
-    	}
+        // push resulting iterator into stack
+        getStack().push(iteratorGenerator);
+        if (getId() != null && getId().length() > 0) {
+            // if an id is specified, we have the resulting iterator set into
+            // the pageContext attribute as well
+            pageContext.setAttribute(getId(), iteratorGenerator);
+        }
 
         return EVAL_BODY_INCLUDE;
     }
 
     public int doEndTag() throws JspException {
-    	// pop resulting iterator from stack at end tag
-    	getStack().pop();
-    	iteratorGenerator = null; // clean up
+        // pop resulting iterator from stack at end tag
+        getStack().pop();
+        iteratorGenerator = null; // clean up
 
-    	return EVAL_PAGE;
+        return EVAL_PAGE;
     }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp.iterator;
 
@@ -36,10 +39,10 @@
  */
 public class MergeIteratorTag extends ComponentTagSupport {
 
-	private static final long serialVersionUID = 4999729472466011218L;
+    private static final long serialVersionUID = 4999729472466011218L;
 
-	public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
-		return new MergeIterator(stack);
-	}
+    public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+        return new MergeIterator(stack);
+    }
 
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.jsp.iterator;
 
@@ -30,7 +33,7 @@
  * <!-- START SNIPPET: javadoc -->
  *
  * <b>NOTE: JSP-TAG</b>
- * 
+ *
  * <p>A Tag that sorts a List using a Comparator both passed in as the tag attribute.
  * If 'id' attribute is specified, the sorted list will be placed into the PageContext
  * attribute using the key specified by 'id'. The sorted list will ALWAYS be
@@ -42,9 +45,9 @@
  * <!-- START SNIPPET: params -->
  *
  * <ul>
- * 		<li>id (String) - if specified, the sorted iterator will be place with this id under page context</li>
- * 		<li>source (Object) - the source for the sort to take place (should be iteratable) else JspException will be thrown</li>
- * 		<li>comparator* (Object) - the comparator used to do sorting (should be a type of Comparator or its decendent) else JspException will be thrown</li>
+ *      <li>id (String) - if specified, the sorted iterator will be place with this id under page context</li>
+ *      <li>source (Object) - the source for the sort to take place (should be iteratable) else JspException will be thrown</li>
+ *      <li>comparator* (Object) - the comparator used to do sorting (should be a type of Comparator or its decendent) else JspException will be thrown</li>
  * </ul>
  *
  * <!-- END SNIPPET: params -->
@@ -57,8 +60,8 @@
  * USAGE 1:
  * &lt;s:sort comparator="myComparator" source="myList"&gt;
  *      &lt;s:iterator&gt;
- * 		&lt;!-- do something with each sorted elements --&gt;
- * 		&lt;s:property value="..." /&gt;
+ *      &lt;!-- do something with each sorted elements --&gt;
+ *      &lt;s:property value="..." /&gt;
  *      &lt;/s:iterator&gt;
  * &lt;/s:sort&gt;
  *
@@ -68,7 +71,7 @@
  * &lt;%
  *    Iterator sortedIterator = (Iterator) pageContext.getAttribute("mySortedList");
  *    for (Iterator i = sortedIterator; i.hasNext(); ) {
- *    	// do something with each of the sorted elements
+ *      // do something with each of the sorted elements
  *    }
  * %&gt;
  *
@@ -83,9 +86,9 @@
  */
 public class SortIteratorTag extends StrutsBodyTagSupport {
 
-	private static final long serialVersionUID = -7835719609764092235L;
+    private static final long serialVersionUID = -7835719609764092235L;
 
-	String comparatorAttr;
+    String comparatorAttr;
     String sourceAttr;
 
     SortIteratorFilter sortIteratorFilter = null;
@@ -107,7 +110,7 @@
     }
 
     public int doStartTag() throws JspException {
-    	// Source
+        // Source
         Object srcToSort;
         if (sourceAttr == null) {
             srcToSort = findValue("top");
@@ -115,13 +118,13 @@
             srcToSort = findValue(sourceAttr);
         }
         if (! MakeIterator.isIterable(srcToSort)) { // see if source is Iteratable
-        	throw new JspException("source ["+srcToSort+"] is not iteratable");
+            throw new JspException("source ["+srcToSort+"] is not iteratable");
         }
 
         // Comparator
         Object comparatorObj = findValue(comparatorAttr);
         if (! (comparatorObj instanceof Comparator)) {
-        	throw new JspException("comparator ["+comparatorObj+"] does not implements Comparator interface");
+            throw new JspException("comparator ["+comparatorObj+"] does not implements Comparator interface");
         }
         Comparator c = (Comparator) findValue(comparatorAttr);
 
@@ -132,21 +135,21 @@
         sortIteratorFilter.execute();
 
         // push sorted iterator into stack, so nexted tag have access to it
-    	getStack().push(sortIteratorFilter);
+        getStack().push(sortIteratorFilter);
         if (getId() != null && getId().length() > 0) {
-        	pageContext.setAttribute(getId(), sortIteratorFilter);
+            pageContext.setAttribute(getId(), sortIteratorFilter);
         }
 
         return EVAL_BODY_INCLUDE;
     }
 
     public int doEndTag() throws JspException {
-    	int returnVal =  super.doEndTag();
+        int returnVal =  super.doEndTag();
 
-   		// pop sorted list from stack at the end of tag
-   		getStack().pop();
-   		sortIteratorFilter = null;
+        // pop sorted list from stack at the end of tag
+        getStack().pop();
+        sortIteratorFilter = null;
 
-    	return returnVal;
+        return returnVal;
     }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.jsp.iterator;
 
@@ -29,7 +32,7 @@
 /**
  * <!-- START SNIPPET: javadoc -->
  * <b>NOTE: JSP-TAG</b>
- * 
+ *
  * <p>A tag that takes an iterator and outputs a subset of it. It delegates to
  * {@link org.apache.struts2.util.SubsetIteratorFilter} internally to
  * perform the subset functionality.</p>
@@ -37,11 +40,11 @@
  *
  * <!-- START SNIPPET: params -->
  * <ul>
- * 		<li>count (Object) - Indicate the number of entries to be in the resulting subset iterator</li>
- * 		<li>source* (Object) - Indicate the source of which the resulting subset iterator is to be derived base on</li>
- * 		<li>start (Object) - Indicate the starting index (eg. first entry is 0) of entries in the source to be available as the first entry in the resulting subset iterator</li>
- * 		<li>decider (Object) - Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator</li>
- * 		<li>id (String) - Indicate the pageContext attribute id to store the resultant subset iterator in</li>
+ *      <li>count (Object) - Indicate the number of entries to be in the resulting subset iterator</li>
+ *      <li>source* (Object) - Indicate the source of which the resulting subset iterator is to be derived base on</li>
+ *      <li>start (Object) - Indicate the starting index (eg. first entry is 0) of entries in the source to be available as the first entry in the resulting subset iterator</li>
+ *      <li>decider (Object) - Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator</li>
+ *      <li>id (String) - Indicate the pageContext attribute id to store the resultant subset iterator in</li>
  * </ul>
  * <!-- END SNIPPET: params -->
  *
@@ -50,33 +53,33 @@
  * <!-- START SNIPPET: action -->
  * public class MySubsetTagAction extends ActionSupport {
  *      public String execute() throws Exception {
- *		   l = new ArrayList();
- *		   l.add(new Integer(1));
- *		   l.add(new Integer(2));
- *		   l.add(new Integer(3));
- *		   l.add(new Integer(4));
- *		   l.add(new Integer(5));
- *		   return "done";
- *	    }
- *
- *
- *	    public Integer[] getMyArray() {
- *		   return a;
- *	    }
- *
- *	    public List getMyList() {
- *		   return l;
- *	     }
+ *         l = new ArrayList();
+ *         l.add(new Integer(1));
+ *         l.add(new Integer(2));
+ *         l.add(new Integer(3));
+ *         l.add(new Integer(4));
+ *         l.add(new Integer(5));
+ *         return "done";
+ *      }
+ *
+ *
+ *      public Integer[] getMyArray() {
+ *         return a;
+ *      }
+ *
+ *      public List getMyList() {
+ *         return l;
+ *       }
  *
  *      public Decider getMyDecider() {
- *		return new Decider() {
- *			public boolean decide(Object element) throws Exception {
- *				int i = ((Integer)element).intValue();
- *				return (((i % 2) == 0)?true:false);
- *			}
- *		};
- *		}
- *	}
+ *      return new Decider() {
+ *          public boolean decide(Object element) throws Exception {
+ *              int i = ((Integer)element).intValue();
+ *              return (((i % 2) == 0)?true:false);
+ *          }
+ *      };
+ *      }
+ *  }
  * <!-- END SNIPPET: action -->
  * </pre>
  *
@@ -85,9 +88,9 @@
  * <!-- START SNIPPET: example1 -->
  * &lt;!-- s: List basic --&gt;
  *    &lt;s:subset source="myList"&gt;
- *	     &lt;s:iterator&gt;
- *		    &lt;s:property /&gt;
- *	     &lt;/s:iterator&gt;
+ *       &lt;s:iterator&gt;
+ *          &lt;s:property /&gt;
+ *       &lt;/s:iterator&gt;
  *    &lt;/s:subset&gt;
  * <!-- END SNIPPET: example1 -->
  * </pre>
@@ -96,9 +99,9 @@
  * <!-- START SNIPPET: example2 -->
  * &lt;!-- B: List with count --&gt;
  *    &lt;s:subset source="myList" count="3"&gt;
- * 	     &lt;s:iterator&gt;
- * 		     &lt;s:property /&gt;
- * 	     &lt;/s:iterator&gt;
+ *       &lt;s:iterator&gt;
+ *           &lt;s:property /&gt;
+ *       &lt;/s:iterator&gt;
  *     &lt;/s:subset&gt;
  * <!-- END SNIPPET: example2 -->
  * </pre>
@@ -107,9 +110,9 @@
  * <!-- START SNIPPET: example3 -->
  * &lt;!--  C: List with start -->
  *      &lt;s:subset source="myList" count="13" start="3"&gt;
- * 	       &lt;s:iterator&gt;
- * 		     &lt;s:property /&gt;
- * 	       &lt;/s:iterator&gt;
+ *         &lt;s:iterator&gt;
+ *           &lt;s:property /&gt;
+ *         &lt;/s:iterator&gt;
  *      &lt;/s:subset&gt;
  * <!-- END SNIPPET: example3 -->
  * </pre>
@@ -119,7 +122,7 @@
  * &lt;!--  D: List with id --&gt;
  *      &lt;s:subset id="mySubset" source="myList" count="13" start="3" /&gt;
  *      &lt;%
- * 	        Iterator i = (Iterator) pageContext.getAttribute("mySubset");
+ *          Iterator i = (Iterator) pageContext.getAttribute("mySubset");
  *          while(i.hasNext()) {
  *      %&gt;
  *      &lt;%=i.next() %&gt;
@@ -131,9 +134,9 @@
  * <!-- START SNIPPET: example5 -->
  *  &lt;!--  D: List with Decider --&gt;
  *      &lt;s:subset source="myList" decider="myDecider"&gt;
- * 	           &lt;s:iterator&gt;
- *		            &lt;s:property /&gt;
- *	           &lt;/s:iterator&gt;
+ *             &lt;s:iterator&gt;
+ *                  &lt;s:property /&gt;
+ *             &lt;/s:iterator&gt;
  *      &lt;/s:subset&gt;
  * <!-- END SNIPPET: example5 -->
  * </pre>
@@ -144,9 +147,9 @@
  */
 public class SubsetIteratorTag extends StrutsBodyTagSupport {
 
-	private static final long serialVersionUID = -6252696081713080102L;
+    private static final long serialVersionUID = -6252696081713080102L;
 
-	private static final Log _log = LogFactory.getLog(SubsetIteratorTag.class);
+    private static final Log _log = LogFactory.getLog(SubsetIteratorTag.class);
 
     String countAttr;
     String sourceAttr;
@@ -185,7 +188,7 @@
      * description="Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator"
      */
     public void setDecider(String decider) {
-    	deciderAttr = decider;
+        deciderAttr = decider;
     }
 
 
@@ -194,71 +197,71 @@
         // source
         Object source = null;
         if (sourceAttr == null && sourceAttr.length() <= 0) {
-        	source = findValue("top");
+            source = findValue("top");
         } else {
             source = findValue(sourceAttr);
         }
 
         // count
         int count = -1;
-    	if (countAttr != null && countAttr.length() > 0) {
-    		Object countObj = findValue(countAttr);
-    		if (countObj instanceof Integer) {
-    			count = ((Integer)countObj).intValue();
-    		}
-    		else if (countObj instanceof Float) {
-    			count = ((Float)countObj).intValue();
-    		}
-    		else if (countObj instanceof Long) {
-    			count = ((Long)countObj).intValue();
-    		}
-    		else if (countObj instanceof Double) {
-    			count = ((Long)countObj).intValue();
-    		}
-    		else if (countObj instanceof String) {
-    			try {
-    				count = Integer.parseInt((String)countObj);
-    			}
-    			catch(NumberFormatException e) {
-    				_log.warn("unable to convert count attribute ["+countObj+"] to number, ignore count attribute", e);
-    			}
-    		}
-    	}
+        if (countAttr != null && countAttr.length() > 0) {
+            Object countObj = findValue(countAttr);
+            if (countObj instanceof Integer) {
+                count = ((Integer)countObj).intValue();
+            }
+            else if (countObj instanceof Float) {
+                count = ((Float)countObj).intValue();
+            }
+            else if (countObj instanceof Long) {
+                count = ((Long)countObj).intValue();
+            }
+            else if (countObj instanceof Double) {
+                count = ((Long)countObj).intValue();
+            }
+            else if (countObj instanceof String) {
+                try {
+                    count = Integer.parseInt((String)countObj);
+                }
+                catch(NumberFormatException e) {
+                    _log.warn("unable to convert count attribute ["+countObj+"] to number, ignore count attribute", e);
+                }
+            }
+        }
 
         // start
-    	int start = 0;
+        int start = 0;
         if (startAttr != null && startAttr.length() > 0) {
             Object startObj = findValue(startAttr);
             if (startObj instanceof Integer) {
-    			start = ((Integer)startObj).intValue();
-    		}
-    		else if (startObj instanceof Float) {
-    			start = ((Float)startObj).intValue();
-    		}
-    		else if (startObj instanceof Long) {
-    			start = ((Long)startObj).intValue();
-    		}
-    		else if (startObj instanceof Double) {
-    			start = ((Long)startObj).intValue();
-    		}
-    		else if (startObj instanceof String) {
-    			try {
-    				start = Integer.parseInt((String)startObj);
-    			}
-    			catch(NumberFormatException e) {
-    				_log.warn("unable to convert count attribute ["+startObj+"] to number, ignore count attribute", e);
-    			}
-    		}
+                start = ((Integer)startObj).intValue();
+            }
+            else if (startObj instanceof Float) {
+                start = ((Float)startObj).intValue();
+            }
+            else if (startObj instanceof Long) {
+                start = ((Long)startObj).intValue();
+            }
+            else if (startObj instanceof Double) {
+                start = ((Long)startObj).intValue();
+            }
+            else if (startObj instanceof String) {
+                try {
+                    start = Integer.parseInt((String)startObj);
+                }
+                catch(NumberFormatException e) {
+                    _log.warn("unable to convert count attribute ["+startObj+"] to number, ignore count attribute", e);
+                }
+            }
         }
 
         // decider
         Decider decider = null;
         if (deciderAttr != null && deciderAttr.length() > 0) {
-        	Object deciderObj = findValue(deciderAttr);
-        	if (! (deciderObj instanceof Decider)) {
-        		throw new JspException("decider found from stack ["+deciderObj+"] does not implement "+Decider.class);
-        	}
-        	decider = (Decider) deciderObj;
+            Object deciderObj = findValue(deciderAttr);
+            if (! (deciderObj instanceof Decider)) {
+                throw new JspException("decider found from stack ["+deciderObj+"] does not implement "+Decider.class);
+            }
+            decider = (Decider) deciderObj;
         }
 
 
@@ -271,7 +274,7 @@
 
         getStack().push(subsetIteratorFilter);
         if (getId() != null) {
-        	pageContext.setAttribute(getId(), subsetIteratorFilter);
+            pageContext.setAttribute(getId(), subsetIteratorFilter);
         }
 
         return EVAL_BODY_INCLUDE;
@@ -279,10 +282,10 @@
 
     public int doEndTag() throws JspException {
 
-    	getStack().pop();
+        getStack().pop();
 
-    	subsetIteratorFilter = null;
+        subsetIteratorFilter = null;
 
-    	return EVAL_PAGE;
+        return EVAL_PAGE;
     }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractClosingTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractClosingTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractClosingTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractClosingTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp.ui;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ * 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.jsp.ui;
 
@@ -23,20 +26,20 @@
 /**
  */
 public abstract class AbstractDoubleListTag extends AbstractRequiredListTag {
-	
+
     protected String doubleList;
     protected String doubleListKey;
     protected String doubleListValue;
     protected String doubleName;
     protected String doubleValue;
     protected String formName;
-    
+
     protected String emptyOption;
     protected String headerKey;
     protected String headerValue;
     protected String multiple;
     protected String size;
-    
+
     protected String doubleId;
     protected String doubleDisabled;
     protected String doubleMultiple;
@@ -44,10 +47,10 @@
     protected String doubleHeaderKey;
     protected String doubleHeaderValue;
     protected String doubleEmptyOption;
-    
+
     protected String doubleCssClass;
     protected String doubleCssStyle;
-    
+
     protected String doubleOnclick;
     protected String doubleOndblclick;
     protected String doubleOnmousedown;
@@ -62,7 +65,7 @@
     protected String doubleOnkeyup;
     protected String doubleOnselect;
     protected String doubleOnchange;
-    
+
     protected String doubleAccesskey;
 
     protected void populateParams() {
@@ -75,7 +78,7 @@
         bean.setDoubleName(doubleName);
         bean.setDoubleValue(doubleValue);
         bean.setFormName(formName);
-        
+
         bean.setDoubleId(doubleId);
         bean.setDoubleDisabled(doubleDisabled);
         bean.setDoubleMultiple(doubleMultiple);
@@ -83,10 +86,10 @@
         bean.setDoubleHeaderKey(doubleHeaderKey);
         bean.setDoubleHeaderValue(doubleHeaderValue);
         bean.setDoubleEmptyOption(doubleEmptyOption);
-        
+
         bean.setDoubleCssClass(doubleCssClass);
         bean.setDoubleCssStyle(doubleCssStyle);
-        
+
         bean.setDoubleOnclick(doubleOnclick);
         bean.setDoubleOndblclick(doubleOndblclick);
         bean.setDoubleOnmousedown(doubleOnmousedown);
@@ -101,9 +104,9 @@
         bean.setDoubleOnkeyup(doubleOnkeyup);
         bean.setDoubleOnselect(doubleOnselect);
         bean.setDoubleOnchange(doubleOnchange);
-        
+
         bean.setDoubleAccesskey(doubleAccesskey);
-        
+
         bean.setEmptyOption(emptyOption);
         bean.setHeaderKey(headerKey);
         bean.setHeaderValue(headerValue);
@@ -135,215 +138,215 @@
         this.formName = formName;
     }
 
-	public String getDoubleCssClass() {
-		return doubleCssClass;
-	}
-
-	public void setDoubleCssClass(String doubleCssClass) {
-		this.doubleCssClass = doubleCssClass;
-	}
-
-	public String getDoubleCssStyle() {
-		return doubleCssStyle;
-	}
-
-	public void setDoubleCssStyle(String doubleCssStyle) {
-		this.doubleCssStyle = doubleCssStyle;
-	}
-
-	public String getDoubleDisabled() {
-		return doubleDisabled;
-	}
-
-	public void setDoubleDisabled(String doubleDisabled) {
-		this.doubleDisabled = doubleDisabled;
-	}
-
-	public String getDoubleEmptyOption() {
-		return doubleEmptyOption;
-	}
-
-	public void setDoubleEmptyOption(String doubleEmptyOption) {
-		this.doubleEmptyOption = doubleEmptyOption;
-	}
-
-	public String getDoubleHeaderKey() {
-		return doubleHeaderKey;
-	}
-
-	public void setDoubleHeaderKey(String doubleHeaderKey) {
-		this.doubleHeaderKey = doubleHeaderKey;
-	}
-
-	public String getDoubleHeaderValue() {
-		return doubleHeaderValue;
-	}
-
-	public void setDoubleHeaderValue(String doubleHeaderValue) {
-		this.doubleHeaderValue = doubleHeaderValue;
-	}
-
-	public String getDoubleId() {
-		return doubleId;
-	}
-
-	public void setDoubleId(String doubleId) {
-		this.doubleId = doubleId;
-	}
-
-	public String getDoubleMultiple() {
-		return doubleMultiple;
-	}
-
-	public void setDoubleMultiple(String doubleMultiple) {
-		this.doubleMultiple = doubleMultiple;
-	}
-
-	public String getDoubleOnblur() {
-		return doubleOnblur;
-	}
-
-	public void setDoubleOnblur(String doubleOnblur) {
-		this.doubleOnblur = doubleOnblur;
-	}
-
-	public String getDoubleOnchange() {
-		return doubleOnchange;
-	}
-
-	public void setDoubleOnchange(String doubleOnchange) {
-		this.doubleOnchange = doubleOnchange;
-	}
-
-	public String getDoubleOnclick() {
-		return doubleOnclick;
-	}
-
-	public void setDoubleOnclick(String doubleOnclick) {
-		this.doubleOnclick = doubleOnclick;
-	}
-
-	public String getDoubleOndblclick() {
-		return doubleOndblclick;
-	}
-
-	public void setDoubleOndblclick(String doubleOndblclick) {
-		this.doubleOndblclick = doubleOndblclick;
-	}
-
-	public String getDoubleOnfocus() {
-		return doubleOnfocus;
-	}
-
-	public void setDoubleOnfocus(String doubleOnfocus) {
-		this.doubleOnfocus = doubleOnfocus;
-	}
-
-	public String getDoubleOnkeydown() {
-		return doubleOnkeydown;
-	}
-
-	public void setDoubleOnkeydown(String doubleOnkeydown) {
-		this.doubleOnkeydown = doubleOnkeydown;
-	}
-
-	public String getDoubleOnkeypress() {
-		return doubleOnkeypress;
-	}
-
-	public void setDoubleOnkeypress(String doubleOnkeypress) {
-		this.doubleOnkeypress = doubleOnkeypress;
-	}
-
-	public String getDoubleOnkeyup() {
-		return doubleOnkeyup;
-	}
-
-	public void setDoubleOnkeyup(String doubleOnkeyup) {
-		this.doubleOnkeyup = doubleOnkeyup;
-	}
-
-	public String getDoubleOnmousedown() {
-		return doubleOnmousedown;
-	}
-
-	public void setDoubleOnmousedown(String doubleOnmousedown) {
-		this.doubleOnmousedown = doubleOnmousedown;
-	}
-
-	public String getDoubleOnmousemove() {
-		return doubleOnmousemove;
-	}
-
-	public void setDoubleOnmousemove(String doubleOnmousemove) {
-		this.doubleOnmousemove = doubleOnmousemove;
-	}
-
-	public String getDoubleOnmouseout() {
-		return doubleOnmouseout;
-	}
-
-	public void setDoubleOnmouseout(String doubleOnmouseout) {
-		this.doubleOnmouseout = doubleOnmouseout;
-	}
-
-	public String getDoubleOnmouseover() {
-		return doubleOnmouseover;
-	}
-
-	public void setDoubleOnmouseover(String doubleOnmouseover) {
-		this.doubleOnmouseover = doubleOnmouseover;
-	}
-
-	public String getDoubleOnmouseup() {
-		return doubleOnmouseup;
-	}
-
-	public void setDoubleOnmouseup(String doubleOnmouseup) {
-		this.doubleOnmouseup = doubleOnmouseup;
-	}
-
-	public String getDoubleOnselect() {
-		return doubleOnselect;
-	}
-
-	public void setDoubleOnselect(String doubleOnselect) {
-		this.doubleOnselect = doubleOnselect;
-	}
-
-	public String getDoubleSize() {
-		return doubleSize;
-	}
-
-	public void setDoubleSize(String doubleSize) {
-		this.doubleSize = doubleSize;
-	}
-
-	public String getDoubleList() {
-		return doubleList;
-	}
-
-	public String getDoubleListKey() {
-		return doubleListKey;
-	}
-
-	public String getDoubleListValue() {
-		return doubleListValue;
-	}
-
-	public String getDoubleName() {
-		return doubleName;
-	}
-
-	public String getDoubleValue() {
-		return doubleValue;
-	}
-
-	public String getFormName() {
-		return formName;
-	}
-	
-	public void setEmptyOption(String emptyOption) {
+    public String getDoubleCssClass() {
+        return doubleCssClass;
+    }
+
+    public void setDoubleCssClass(String doubleCssClass) {
+        this.doubleCssClass = doubleCssClass;
+    }
+
+    public String getDoubleCssStyle() {
+        return doubleCssStyle;
+    }
+
+    public void setDoubleCssStyle(String doubleCssStyle) {
+        this.doubleCssStyle = doubleCssStyle;
+    }
+
+    public String getDoubleDisabled() {
+        return doubleDisabled;
+    }
+
+    public void setDoubleDisabled(String doubleDisabled) {
+        this.doubleDisabled = doubleDisabled;
+    }
+
+    public String getDoubleEmptyOption() {
+        return doubleEmptyOption;
+    }
+
+    public void setDoubleEmptyOption(String doubleEmptyOption) {
+        this.doubleEmptyOption = doubleEmptyOption;
+    }
+
+    public String getDoubleHeaderKey() {
+        return doubleHeaderKey;
+    }
+
+    public void setDoubleHeaderKey(String doubleHeaderKey) {
+        this.doubleHeaderKey = doubleHeaderKey;
+    }
+
+    public String getDoubleHeaderValue() {
+        return doubleHeaderValue;
+    }
+
+    public void setDoubleHeaderValue(String doubleHeaderValue) {
+        this.doubleHeaderValue = doubleHeaderValue;
+    }
+
+    public String getDoubleId() {
+        return doubleId;
+    }
+
+    public void setDoubleId(String doubleId) {
+        this.doubleId = doubleId;
+    }
+
+    public String getDoubleMultiple() {
+        return doubleMultiple;
+    }
+
+    public void setDoubleMultiple(String doubleMultiple) {
+        this.doubleMultiple = doubleMultiple;
+    }
+
+    public String getDoubleOnblur() {
+        return doubleOnblur;
+    }
+
+    public void setDoubleOnblur(String doubleOnblur) {
+        this.doubleOnblur = doubleOnblur;
+    }
+
+    public String getDoubleOnchange() {
+        return doubleOnchange;
+    }
+
+    public void setDoubleOnchange(String doubleOnchange) {
+        this.doubleOnchange = doubleOnchange;
+    }
+
+    public String getDoubleOnclick() {
+        return doubleOnclick;
+    }
+
+    public void setDoubleOnclick(String doubleOnclick) {
+        this.doubleOnclick = doubleOnclick;
+    }
+
+    public String getDoubleOndblclick() {
+        return doubleOndblclick;
+    }
+
+    public void setDoubleOndblclick(String doubleOndblclick) {
+        this.doubleOndblclick = doubleOndblclick;
+    }
+
+    public String getDoubleOnfocus() {
+        return doubleOnfocus;
+    }
+
+    public void setDoubleOnfocus(String doubleOnfocus) {
+        this.doubleOnfocus = doubleOnfocus;
+    }
+
+    public String getDoubleOnkeydown() {
+        return doubleOnkeydown;
+    }
+
+    public void setDoubleOnkeydown(String doubleOnkeydown) {
+        this.doubleOnkeydown = doubleOnkeydown;
+    }
+
+    public String getDoubleOnkeypress() {
+        return doubleOnkeypress;
+    }
+
+    public void setDoubleOnkeypress(String doubleOnkeypress) {
+        this.doubleOnkeypress = doubleOnkeypress;
+    }
+
+    public String getDoubleOnkeyup() {
+        return doubleOnkeyup;
+    }
+
+    public void setDoubleOnkeyup(String doubleOnkeyup) {
+        this.doubleOnkeyup = doubleOnkeyup;
+    }
+
+    public String getDoubleOnmousedown() {
+        return doubleOnmousedown;
+    }
+
+    public void setDoubleOnmousedown(String doubleOnmousedown) {
+        this.doubleOnmousedown = doubleOnmousedown;
+    }
+
+    public String getDoubleOnmousemove() {
+        return doubleOnmousemove;
+    }
+
+    public void setDoubleOnmousemove(String doubleOnmousemove) {
+        this.doubleOnmousemove = doubleOnmousemove;
+    }
+
+    public String getDoubleOnmouseout() {
+        return doubleOnmouseout;
+    }
+
+    public void setDoubleOnmouseout(String doubleOnmouseout) {
+        this.doubleOnmouseout = doubleOnmouseout;
+    }
+
+    public String getDoubleOnmouseover() {
+        return doubleOnmouseover;
+    }
+
+    public void setDoubleOnmouseover(String doubleOnmouseover) {
+        this.doubleOnmouseover = doubleOnmouseover;
+    }
+
+    public String getDoubleOnmouseup() {
+        return doubleOnmouseup;
+    }
+
+    public void setDoubleOnmouseup(String doubleOnmouseup) {
+        this.doubleOnmouseup = doubleOnmouseup;
+    }
+
+    public String getDoubleOnselect() {
+        return doubleOnselect;
+    }
+
+    public void setDoubleOnselect(String doubleOnselect) {
+        this.doubleOnselect = doubleOnselect;
+    }
+
+    public String getDoubleSize() {
+        return doubleSize;
+    }
+
+    public void setDoubleSize(String doubleSize) {
+        this.doubleSize = doubleSize;
+    }
+
+    public String getDoubleList() {
+        return doubleList;
+    }
+
+    public String getDoubleListKey() {
+        return doubleListKey;
+    }
+
+    public String getDoubleListValue() {
+        return doubleListValue;
+    }
+
+    public String getDoubleName() {
+        return doubleName;
+    }
+
+    public String getDoubleValue() {
+        return doubleValue;
+    }
+
+    public String getFormName() {
+        return formName;
+    }
+
+    public void setEmptyOption(String emptyOption) {
         this.emptyOption = emptyOption;
     }
 
@@ -362,8 +365,8 @@
     public void setSize(String size) {
         this.size = size;
     }
-    
+
     public void setDoubleAccesskey(String doubleAccesskey) {
-    	this.doubleAccesskey = doubleAccesskey;
+        this.doubleAccesskey = doubleAccesskey;
     }
 }



Mime
View raw message