dgraham 2003/07/01 19:16:39
Modified: src/share/org/apache/struts/tiles DirectStringAttribute.java
PathAttribute.java DefinitionNameAttribute.java
DefinitionAttribute.java
src/share/org/apache/struts/taglib/tiles DefinitionTag.java
PutListTag.java
src/share/org/apache/struts/tiles/xmlDefinition
XmlAttribute.java
Added: src/share/org/apache/struts/tiles UntypedAttribute.java
Log:
Changed UntyppedAttribute class name to UntypedAttribute for PR# 17514.
Revision Changes Path
1.4 +4 -4
jakarta-struts/src/share/org/apache/struts/tiles/DirectStringAttribute.java
Index: DirectStringAttribute.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DirectStringAttribute.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirectStringAttribute.java 2 Jul 2003 02:13:53 -0000 1.3
+++ DirectStringAttribute.java 2 Jul 2003 02:16:39 -0000 1.4
@@ -65,7 +65,7 @@
* Component attribute.
* Such attribute value represent a path used to include a JSP.
*/
-public class DirectStringAttribute extends UntyppedAttribute {
+public class DirectStringAttribute extends UntypedAttribute {
public DirectStringAttribute(String value) {
super(value);
1.5 +4 -4
jakarta-struts/src/share/org/apache/struts/tiles/PathAttribute.java
Index: PathAttribute.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/PathAttribute.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PathAttribute.java 2 Jul 2003 02:13:53 -0000 1.4
+++ PathAttribute.java 2 Jul 2003 02:16:39 -0000 1.5
@@ -65,7 +65,7 @@
* Component attribute.
* Attribute value represents a path used to include a JSP.
*/
-public class PathAttribute extends UntyppedAttribute {
+public class PathAttribute extends UntypedAttribute {
public PathAttribute(String value) {
super(value);
1.4 +4 -4
jakarta-struts/src/share/org/apache/struts/tiles/DefinitionNameAttribute.java
Index: DefinitionNameAttribute.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefinitionNameAttribute.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefinitionNameAttribute.java 2 Jul 2003 02:13:53 -0000 1.3
+++ DefinitionNameAttribute.java 2 Jul 2003 02:16:39 -0000 1.4
@@ -65,7 +65,7 @@
* Component attribute.
* Such attribute value represent an instance name.
*/
-public class DefinitionNameAttribute extends UntyppedAttribute {
+public class DefinitionNameAttribute extends UntypedAttribute {
/**
* Constructor.
1.4 +4 -4
jakarta-struts/src/share/org/apache/struts/tiles/DefinitionAttribute.java
Index: DefinitionAttribute.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefinitionAttribute.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefinitionAttribute.java 2 Jul 2003 02:13:53 -0000 1.3
+++ DefinitionAttribute.java 2 Jul 2003 02:16:39 -0000 1.4
@@ -65,7 +65,7 @@
* Attribute representing a Component Definition.
* This attribute definition contains a Component definition.
*/
-public class DefinitionAttribute extends UntyppedAttribute {
+public class DefinitionAttribute extends UntypedAttribute {
public DefinitionAttribute(String value) {
super(value);
1.1
jakarta-struts/src/share/org/apache/struts/tiles/UntypedAttribute.java
Index: UntypedAttribute.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/UntyppedAttribute.java,v
1.2 2003/02/27 19:20:50 cedric Exp $
* $Revision: 1.2 $
* $Date: 2003/02/27 19:20:50 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Struts", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.struts.tiles;
/**
* Common implementation of attribute definition.
*/
public class UntypedAttribute implements AttributeDefinition {
/**
* Role associated to this attribute.
*/
protected String role = null;
protected Object value=null;
/**
* Constructor.
* @param value Object to store.
*/
public UntypedAttribute(Object value) {
this.value = value;
}
/**
* Constructor.
* @param value Object to store.
* @param role Asociated role.
*/
public UntypedAttribute(Object value, String role) {
this.value = value;
this.role = role;
}
/**
* Get role.
*/
public String getRole() {
return role;
}
/**
* Set role.
* @param role Associated role.
*/
public void setRole(String role) {
this.role = role;
}
/**
* Get value.
*/
public Object getValue() {
return value;
}
/**
* Set value.
* @param value New value.
*/
public void setValue(Object value) {
this.value = value;
}
/**
* Get String representation of this object.
*/
public String toString() {
return value.toString();
}
}
1.8 +7 -7
jakarta-struts/src/share/org/apache/struts/taglib/tiles/DefinitionTag.java
Index: DefinitionTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/DefinitionTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefinitionTag.java 2 Jul 2003 02:13:53 -0000 1.7
+++ DefinitionTag.java 2 Jul 2003 02:16:39 -0000 1.8
@@ -66,7 +66,7 @@
import org.apache.struts.taglib.tiles.util.TagUtils;
import org.apache.struts.tiles.AttributeDefinition;
import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.UntyppedAttribute;
+import org.apache.struts.tiles.UntypedAttribute;
/**
* This is the tag handler for <tiles:definition>, which defines
@@ -149,7 +149,7 @@
try {
def = ((AttributeDefinition) attributeValue);
} catch (ClassCastException ex) {
- def = new UntyppedAttribute(attributeValue);
+ def = new UntypedAttribute(attributeValue);
}
def.setRole(nestedTag.getRole());
attributeValue = def;
@@ -173,7 +173,7 @@
Object attributeValue = nestedTag.getList();
if (nestedTag.getRole() != null) {
- AttributeDefinition def = new UntyppedAttribute(attributeValue);
+ AttributeDefinition def = new UntypedAttribute(attributeValue);
def.setRole(nestedTag.getRole());
attributeValue = def;
}
1.6 +6 -6
jakarta-struts/src/share/org/apache/struts/taglib/tiles/PutListTag.java
Index: PutListTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/PutListTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PutListTag.java 2 Jul 2003 02:13:53 -0000 1.5
+++ PutListTag.java 2 Jul 2003 02:16:39 -0000 1.6
@@ -68,7 +68,7 @@
import javax.servlet.jsp.tagext.TagSupport;
import org.apache.struts.tiles.AttributeDefinition;
-import org.apache.struts.tiles.UntyppedAttribute;
+import org.apache.struts.tiles.UntypedAttribute;
/**
* PutList tag implementation.
@@ -176,7 +176,7 @@
Object attributeValue = nestedTag.getList();
if (nestedTag.getRole() != null) {
- AttributeDefinition def = new UntyppedAttribute(attributeValue);
+ AttributeDefinition def = new UntypedAttribute(attributeValue);
def.setRole(nestedTag.getRole());
attributeValue = def;
}
@@ -203,7 +203,7 @@
try {
def = ((AttributeDefinition) attributeValue);
} catch (ClassCastException ex) {
- def = new UntyppedAttribute(attributeValue);
+ def = new UntypedAttribute(attributeValue);
}
def.setRole(nestedTag.getRole());
attributeValue = def;
1.4 +6 -6
jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlAttribute.java
Index: XmlAttribute.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlAttribute.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XmlAttribute.java 2 Jul 2003 02:13:53 -0000 1.3
+++ XmlAttribute.java 2 Jul 2003 02:16:39 -0000 1.4
@@ -64,7 +64,7 @@
import org.apache.struts.tiles.DefinitionNameAttribute;
import org.apache.struts.tiles.DirectStringAttribute;
import org.apache.struts.tiles.PathAttribute;
-import org.apache.struts.tiles.UntyppedAttribute;
+import org.apache.struts.tiles.UntypedAttribute;
/**
* A property key-value pair. This class is used to read configuration files.
@@ -269,13 +269,13 @@
// Set realValue's role value if needed
if (role != null) {
- ((UntyppedAttribute) realValue).setRole(role);
+ ((UntypedAttribute) realValue).setRole(role);
}
}
// Create attribute wrapper to hold role if role is set and no type
specified
if (role != null && value != null && valueType == null) {
- realValue = new UntyppedAttribute(value.toString(), role);
+ realValue = new UntypedAttribute(value.toString(), role);
}
return realValue;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
