jvanzyl 00/10/11 07:47:03
Modified: src/java/org/apache/velocity/runtime Runtime.java
src/java/org/apache/velocity/runtime/directive Foreach.java
Log:
- updates for new parser, some fixes.
Revision Changes Path
1.11 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java
Index: Runtime.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Runtime.java 2000/10/09 21:43:42 1.10
+++ Runtime.java 2000/10/11 14:47:02 1.11
@@ -145,7 +145,7 @@
public static void initializeLogger() throws
MalformedURLException
{
- if (!getString(TEMPLATE_PATH).equals("system"))
+ if (!getString(RUNTIME_LOG).equals("system"))
{
// Initialize the logger.
logger = LogKit.createLogger("velocity",
1.5 +0 -7
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Foreach.java
Index: Foreach.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Foreach.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Foreach.java 2000/10/09 15:08:21 1.4
+++ Foreach.java 2000/10/11 14:47:03 1.5
@@ -43,12 +43,6 @@
// element is so that we don't have to do it
// everytime the node is traversed.
- if (listObject == null)
- {
- System.out.println("dude you're fucked!");
- System.out.println(node.jjtGetChild(2).getFirstToken().image);
- }
-
if (listObject instanceof Object[])
{
node.setInfo(ARRAY);
@@ -89,7 +83,6 @@
node.jjtGetChild(3).render(context, writer);
}
context.remove(elementKey);
-
break;
case ITERATOR:
