svn commit: r833153 - in /tiles/sandbox/trunk/tiles3: tiles-api/src/main/java/org/apache/tiles/access/ tiles-core/src/main/java/org/apache/tiles/definition/pattern/ tiles-core/src/test/java/org/apache/tiles/definition/digester/

[apetrelli]

Author: apetrelli
Date: Thu Nov  5 20:13:37 2009
New Revision: 833153

URL: http://svn.apache.org/viewvc?rev=833153&view=rev
Log:
TILESSB-10
Fixed code to reflect changes in ListAttribute.

Removed:
    
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccessException.java
Modified:
    
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
    
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java
    
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java

Modified: 
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java?rev=833153&r1=833152&r2=833153&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
 Thu Nov  5 20:13:37 2009
@@ -51,8 +51,6 @@
      *
      * @param context The Tiles application context object to use.
      * @param container The container object to set.
-     * @throws TilesAccessException If something goes wrong during 
manipulation of the
-     * context.
      * @since 2.1.2
      */
     public static void setContainer(TilesApplicationContext context,
@@ -66,8 +64,6 @@
      * @param context The Tiles application context object to use.
      * @param container The container object to set.
      * @param key The key under which the container will be stored.
-     * @throws TilesAccessException If something goes wrong during 
manipulation of the
-     * context.
      * @since 2.1.2
      */
     public static void setContainer(TilesApplicationContext context,

Modified: 
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java?rev=833153&r1=833152&r2=833153&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java
 Thu Nov  5 20:13:37 2009
@@ -177,22 +177,16 @@
      * @return A new instance of an attribute, whose properties have been
      * replaced with variables' values.
      */
-    @SuppressWarnings("unchecked")
     private static Attribute replaceVarsInListAttribute(ListAttribute listAttr,
             Object... vars) {
         Attribute nuattr;
         ListAttribute nuListAttr = new ListAttribute();
         nuListAttr.setInherit(listAttr.isInherit());
-        List<Object> nuItems = (List<Object>) nuListAttr.getValue();
-        for (Object item : (List<Object>) listAttr.getValue()) {
-            if (item instanceof Attribute) {
-                Attribute child = (Attribute) item;
-                child = replaceVarsInAttribute(child, vars);
-                nuItems.add(child);
-            } else {
-                // Seems improbable, but APIs permit it.
-                nuItems.add(item);
-            }
+        List<Attribute> nuItems = nuListAttr.getValue();
+        for (Object item : listAttr.getValue()) {
+            Attribute child = (Attribute) item;
+            child = replaceVarsInAttribute(child, vars);
+            nuItems.add(child);
         }
         nuattr = nuListAttr;
         return nuattr;

Modified: 
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?rev=833153&r1=833152&r2=833153&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
 Thu Nov  5 20:13:37 2009
@@ -305,7 +305,6 @@
      *
      * @throws IOException If something goes wrong.
      */
-    @SuppressWarnings("unchecked")
     public void testRegressionTiles352() throws IOException {
         URL configFile = this.getClass().getClassLoader().getResource(
                 "org/apache/tiles/config/defs_regression_TILES-352.xml");
@@ -318,7 +317,7 @@
         Attribute attribute = root.getAttribute("body");
         Definition child = name2defs.get((String) attribute.getValue());
         ListAttribute listAttribute = (ListAttribute) 
child.getAttribute("list");
-        List<Object> list = (List<Object>) listAttribute.getValue();
+        List<Attribute> list = listAttribute.getValue();
         assertEquals(((Attribute) list.get(0)).getValue(), "This is a value");
     }
 }