You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/04/11 17:22:48 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations DefaultBottomNavigation.java
henning 2003/04/11 08:22:46
Modified: src/java/org/apache/turbine/modules/navigations
DefaultBottomNavigation.java
Log:
Do not assume that getPermStorage() and getTempStorage() really return
Hashtables but maybe Maps.
Revision Changes Path
1.11 +10 -11 jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java
Index: DefaultBottomNavigation.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultBottomNavigation.java 11 Apr 2003 11:39:09 -0000 1.10
+++ DefaultBottomNavigation.java 11 Apr 2003 15:22:45 -0000 1.11
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Enumeration;
import java.util.Iterator;
import java.util.Map;
@@ -132,25 +131,25 @@
{
TD perm = new TD().setVAlign(AlignType.TOP);
TD temp = new TD().setVAlign(AlignType.TOP);
- java.util.Enumeration ePerm =
- data.getUser().getPermStorage().keys();
- java.util.Enumeration eTemp =
- data.getUser().getTempStorage().keys();
perm.addElement("Perm values:").addElement(new BR());
- temp.addElement("Temp values:").addElement(new BR());
- while (ePerm.hasMoreElements())
+ for (Iterator it = data.getUser().getPermStorage().keySet().iterator();
+ it.hasNext();)
{
- String key = (String) ePerm.nextElement();
+ String key = (String) it.next();
String value = data.getUser().getPerm(key).toString();
perm.addElement(key + "=" + value).addElement(new BR());
}
- while (eTemp.hasMoreElements())
+
+ temp.addElement("Temp values:").addElement(new BR());
+ for (Iterator it = data.getUser().getTempStorage().keySet().iterator();
+ it.hasNext();)
{
- String key = (String) eTemp.nextElement();
+ String key = (String) it.next();
String value = data.getUser().getTemp(key).toString();
temp.addElement(key + "=" + value).addElement(new BR());
}
+
body.addElement(new BR()).addElement(new BR()).addElement(
new Table().setBorder(2).setCellPadding(10).addElement(
new TR().addElement(perm).addElement(temp)));
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org