myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r511491 - in /myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/util: DebugUtils.java ViewIterator.java
Date Sun, 25 Feb 2007 12:46:02 GMT
Author: mbr
Date: Sun Feb 25 04:46:01 2007
New Revision: 511491

URL: http://svn.apache.org/viewvc?view=rev&rev=511491
Log:
generic types

Modified:
    myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
    myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/util/ViewIterator.java

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java?view=diff&rev=511491&r1=511490&r2=511491
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
(original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
Sun Feb 25 04:46:01 2007
@@ -295,7 +295,7 @@
         if (withChildrenAndFacets)
         {
             int childCount = comp.getChildCount();
-            Map facetsMap = comp.getFacets();
+            Map<String, UIComponent> facetsMap = comp.getFacets();
             if (childCount > 0 || !facetsMap.isEmpty())
             {
                 nestedObjects = true;

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/util/ViewIterator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/util/ViewIterator.java?view=diff&rev=511491&r1=511490&r2=511491
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/util/ViewIterator.java
(original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/util/ViewIterator.java
Sun Feb 25 04:46:01 2007
@@ -34,7 +34,7 @@
     private UIComponent _next = null;
     private boolean _mayHaveNext = true;
     private UIComponent _current = null;
-    private Stack _stack = new Stack();
+    private Stack<Iterator> _stack = new Stack<Iterator>();
 
     /**
      * @param root the root of the view structure to iterate over
@@ -89,7 +89,7 @@
                         break;
                     }
 
-                    Iterator currentSiblings = (Iterator)_stack.peek();
+                    Iterator currentSiblings = _stack.peek();
                     if (currentSiblings.hasNext())
                     {
                         _next = (UIComponent)currentSiblings.next();



Mime
View raw message