You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/05/09 14:16:42 UTC
svn commit: r536500 - in /tiles/framework/trunk:
tiles-api/src/main/java/org/apache/tiles/mgmt/
tiles-core/src/test/java/org/apache/tiles/definition/
tiles-core/src/test/java/org/apache/tiles/definition/digester/
Author: apetrelli
Date: Wed May 9 05:16:41 2007
New Revision: 536500
URL: http://svn.apache.org/viewvc?view=rev&rev=536500
Log:
TILES-172
The TileDefinition.getAttribute now returns an Attribute.
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java?view=diff&rev=536500&r1=536499&r2=536500
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java Wed May 9 05:16:41 2007
@@ -131,19 +131,14 @@
}
/**
- * Returns the value of the named attribute as an Object, or null if no
- * attribute of the given name exists.
+ * Returns the attribute for the given name, or null if no attribute of the
+ * given name exists.
*
* @param key name of the attribute
* @return requested attribute or null if not found
*/
- public Object getAttribute(String key) {
- Attribute attribute = attributes.get(key);
- if (attribute != null) {
- return attribute.getValue();
- } else {
- return null;
- }
+ public Attribute getAttribute(String key) {
+ return attributes.get(key);
}
/**
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java?view=diff&rev=536500&r1=536499&r2=536500
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java Wed May 9 05:16:41 2007
@@ -21,6 +21,7 @@
package org.apache.tiles.definition;
+import org.apache.tiles.Attribute;
import org.apache.tiles.Attribute.AttributeType;
import junit.framework.Test;
@@ -70,11 +71,13 @@
Definition def = new Definition();
def.setName("test1");
def.setTemplate("/page1.jsp");
- def.put("attr1", new Definition(), AttributeType.DEFINITION, null);
+ def.put("attr1", "test.definition.name", AttributeType.DEFINITION,
+ null);
- Object attr1 = def.getAttribute("attr1");
+ Attribute attr1 = def.getAttribute("attr1");
assertNotNull("Null attribute.", attr1);
- assertTrue("Wrong attribute type", attr1 instanceof Definition);
+ assertTrue("Wrong attribute type",
+ attr1.getType() == AttributeType.DEFINITION);
}
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java?view=diff&rev=536500&r1=536499&r2=536500
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java Wed May 9 05:16:41 2007
@@ -117,7 +117,7 @@
assertEquals("Incorrect template value.", "/test1.jsp", def
.getTemplate());
assertEquals("Incorrect attr1 value", "value1", def
- .getAttribute("attr1"));
+ .getAttribute("attr1").getValue());
attr = def.getAttributes().get("attr1");
assertNotNull("Dependent attribute not found.", attr);
@@ -134,8 +134,8 @@
definitions.getDefinition("child.def1"));
assertEquals("Incorrect template value." , "/test1.jsp",
definitions.getDefinition("child.def1").getTemplate());
- assertEquals("Incorrect attr1 value", "New value",
- definitions.getDefinition("child.def1").getAttribute("attr1"));
+ assertEquals("Incorrect attr1 value", "New value", definitions
+ .getDefinition("child.def1").getAttribute("attr1").getValue());
attr = def.getAttributes().get("attr1");
assertNotNull("Dependent attribute not found.", attr);
@@ -192,29 +192,31 @@
definitions.getDefinition("parent.def1"));
assertEquals("Incorrect template value." , "/test1.jsp",
definitions.getDefinition("parent.def1").getTemplate());
- assertEquals("Incorrect attr1 value", "value1",
- definitions.getDefinition("parent.def1").getAttribute("attr1"));
+ assertEquals("Incorrect attr1 value", "value1", definitions
+ .getDefinition("parent.def1").getAttribute("attr1").getValue());
assertNotNull("Couldn't get child.",
definitions.getDefinition("child.def1"));
assertEquals("Incorrect template value." , "/test1.jsp",
definitions.getDefinition("child.def1").getTemplate());
- assertEquals("Incorrect attr1 value", "New value",
- definitions.getDefinition("child.def1").getAttribute("attr1"));
+ assertEquals("Incorrect attr1 value", "New value", definitions
+ .getDefinition("child.def1").getAttribute("attr1").getValue());
assertNotNull("Couldn't get parent.",
definitions.getDefinition("parent.def1", Locale.US));
assertEquals("Incorrect template value." , "/test1.jsp",
definitions.getDefinition("parent.def1", Locale.US).getTemplate());
- assertEquals("Incorrect attr1 value", "value1",
- definitions.getDefinition("parent.def1", Locale.US).getAttribute("attr1"));
+ assertEquals("Incorrect attr1 value", "value1", definitions
+ .getDefinition("parent.def1", Locale.US).getAttribute("attr1")
+ .getValue());
assertNotNull("Couldn't get child.",
definitions.getDefinition("child.def1", Locale.US));
assertEquals("Incorrect template value." , "/test1.jsp",
definitions.getDefinition("child.def1", Locale.US).getTemplate());
- assertEquals("Incorrect attr1 value", "US Value",
- definitions.getDefinition("child.def1", Locale.US).getAttribute("attr1"));
+ assertEquals("Incorrect attr1 value", "US Value", definitions
+ .getDefinition("child.def1", Locale.US).getAttribute("attr1")
+ .getValue());
}
/**
@@ -319,13 +321,13 @@
Definition newDef = definitions.getDefinition("parent.def1");
assertNotNull("Parent definition not found.", newDef);
- Object newAttr = newDef.getAttribute("attr1");
+ Object newAttr = newDef.getAttribute("attr1").getValue();
assertNotNull("Dependent attribute not found.", newAttr);
newDef = definitions.getDefinition("parent.notype.def1");
assertNotNull("Parent definition not found.", newDef);
- newAttr = newDef.getAttribute("attr1");
+ newAttr = newDef.getAttribute("attr1").getValue();
assertNotNull("Dependent attribute not found.", newAttr);
assertEquals("Incorrect dependent attribute name.", "tiles.def2",
@@ -335,14 +337,14 @@
newDef = definitions.getDefinition("parent.def1", Locale.ITALIAN);
assertNotNull("Parent definition not found.", newDef);
- newAttr = newDef.getAttribute("attr1");
+ newAttr = newDef.getAttribute("attr1").getValue();
assertNotNull("Dependent attribute not found.", newAttr);
newDef = definitions.getDefinition("parent.notype.def1",
Locale.ITALIAN);
assertNotNull("Parent definition not found.", newDef);
- newAttr = newDef.getAttribute("attr1");
+ newAttr = newDef.getAttribute("attr1").getValue();
assertNotNull("Dependent attribute not found.", newAttr);
assertEquals("Incorrect dependent attribute name.", "tiles.def2",
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java?view=diff&rev=536500&r1=536499&r2=536500
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java Wed May 9 05:16:41 2007
@@ -174,22 +174,31 @@
"test.def.overridden definition in FRENCH locale not found.",
factory.getDefinition("test.def.overridden", frenchContext));
- assertEquals("Incorrect default country value", "default",
- factory.getDefinition("test.def1", emptyContext).getAttribute("country"));
- assertEquals("Incorrect US country value", "US",
- factory.getDefinition("test.def1", usContext).getAttribute("country"));
- assertEquals("Incorrect France country value", "France",
- factory.getDefinition("test.def1", frenchContext).getAttribute("country"));
- assertEquals("Incorrect Chinese country value (should be default)", "default",
- factory.getDefinition("test.def1", chinaContext).getAttribute("country"));
- assertEquals("Incorrect default country value", "default",
- factory.getDefinition("test.def.overridden", emptyContext).getAttribute("country"));
- assertEquals("Incorrect default title value", "Definition to be overridden",
- factory.getDefinition("test.def.overridden", emptyContext).getAttribute("title"));
- assertEquals("Incorrect France country value", "France",
- factory.getDefinition("test.def.overridden", frenchContext).getAttribute("country"));
- assertEquals("Incorrect France title value", "Definition to be extended",
- factory.getDefinition("test.def.overridden", frenchContext).getAttribute("title"));
+ assertEquals("Incorrect default country value", "default", factory
+ .getDefinition("test.def1", emptyContext).getAttribute(
+ "country").getValue());
+ assertEquals("Incorrect US country value", "US", factory.getDefinition(
+ "test.def1", usContext).getAttribute("country").getValue());
+ assertEquals("Incorrect France country value", "France", factory
+ .getDefinition("test.def1", frenchContext).getAttribute(
+ "country").getValue());
+ assertEquals("Incorrect Chinese country value (should be default)",
+ "default", factory.getDefinition("test.def1", chinaContext)
+ .getAttribute("country").getValue());
+ assertEquals("Incorrect default country value", "default", factory
+ .getDefinition("test.def.overridden", emptyContext)
+ .getAttribute("country").getValue());
+ assertEquals("Incorrect default title value",
+ "Definition to be overridden", factory.getDefinition(
+ "test.def.overridden", emptyContext).getAttribute(
+ "title").getValue());
+ assertEquals("Incorrect France country value", "France", factory
+ .getDefinition("test.def.overridden", frenchContext)
+ .getAttribute("country").getValue());
+ assertEquals("Incorrect France title value",
+ "Definition to be extended", factory.getDefinition(
+ "test.def.overridden", frenchContext).getAttribute(
+ "title").getValue());
}
/**
@@ -252,14 +261,17 @@
assertNotNull("test.def1 France definition not found.", definitions.getDefinition("test.def1", Locale.FRENCH));
assertNotNull("test.def1 China should return default.", definitions.getDefinition("test.def1", Locale.CHINA));
- assertEquals("Incorrect default country value", "default",
- definitions.getDefinition("test.def1").getAttribute("country"));
- assertEquals("Incorrect US country value", "US",
- definitions.getDefinition("test.def1", Locale.US).getAttribute("country"));
- assertEquals("Incorrect France country value", "France",
- definitions.getDefinition("test.def1", Locale.FRENCH).getAttribute("country"));
- assertEquals("Incorrect Chinese country value (should default)", "default",
- definitions.getDefinition("test.def1", Locale.CHINA).getAttribute("country"));
+ assertEquals("Incorrect default country value", "default", definitions
+ .getDefinition("test.def1").getAttribute("country").getValue());
+ assertEquals("Incorrect US country value", "US", definitions
+ .getDefinition("test.def1", Locale.US).getAttribute("country")
+ .getValue());
+ assertEquals("Incorrect France country value", "France", definitions
+ .getDefinition("test.def1", Locale.FRENCH).getAttribute(
+ "country").getValue());
+ assertEquals("Incorrect Chinese country value (should default)",
+ "default", definitions.getDefinition("test.def1", Locale.CHINA)
+ .getAttribute("country").getValue());
}
/**
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?view=diff&rev=536500&r1=536499&r2=536500
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java Wed May 9 05:16:41 2007
@@ -94,10 +94,10 @@
assertNotNull("Couldn't find doc.mainLayout tile.",
definitions.get("doc.mainLayout"));
assertNotNull("Couldn't Find title attribute.", definitions.get(
- "doc.mainLayout").getAttribute("title"));
+ "doc.mainLayout").getAttribute("title").getValue());
assertEquals("Incorrect Find title attribute.",
"Tiles Library Documentation", definitions.get(
- "doc.mainLayout").getAttribute("title"));
+ "doc.mainLayout").getAttribute("title").getValue());
} catch (Exception e) {
fail("Exception reading configuration." + e);