geirm 01/04/08 18:03:28
Modified: whiteboard/geir/listener ASTReference.java
ASTSetDirective.java EventCartridge.java
Log:
updated
Revision Changes Path
1.2 +5 -6 jakarta-velocity/whiteboard/geir/listener/ASTReference.java
Index: ASTReference.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/whiteboard/geir/listener/ASTReference.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ASTReference.java 2001/04/09 00:04:49 1.1
+++ ASTReference.java 2001/04/09 01:03:26 1.2
@@ -82,7 +82,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Christoph Reck</a>
- * @version $Id: ASTReference.java,v 1.1 2001/04/09 00:04:49 geirm Exp $
+ * @version $Id: ASTReference.java,v 1.2 2001/04/09 01:03:26 geirm Exp $
*/
public class ASTReference extends SimpleNode
{
@@ -238,14 +238,13 @@
if (ec != null)
{
- Object[] rieh = ec.getNullReferenceHandlerArray();
+ NullReferenceEventHandler[] rieh =
ec.getNullReferenceHandlerArray();
for(int i = 0; i < rieh.length; i++)
{
- localNullstring = ( (NullReferenceEventHandler)
rieh[i]).nullReferenceRender( localNullstring );
+ localNullstring = rieh[i].nullReferenceRender( localNullstring
);
}
}
-
/*
* write prefix twice, because it's shmoo, so the \ don't escape each
other...
@@ -263,11 +262,11 @@
if (ec != null)
{
- Object[] rieh = ec.getReferenceInsertionHandlerArray();
-
+ ReferenceInsertionEventHandler[] rieh =
ec.getReferenceInsertionHandlerArray();
+
for(int i = 0; i < rieh.length; i++)
{
- val = ( (ReferenceInsertionEventHandler)
rieh[i]).referenceInsert( nullString, val );
+ val = rieh[i].referenceInsert( nullString, val );
}
}
1.2 +19 -11 jakarta-velocity/whiteboard/geir/listener/ASTSetDirective.java
Index: ASTSetDirective.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/whiteboard/geir/listener/ASTSetDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ASTSetDirective.java 2001/04/09 00:04:49 1.1
+++ ASTSetDirective.java 2001/04/09 01:03:27 1.2
@@ -75,7 +75,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ASTSetDirective.java,v 1.1 2001/04/09 00:04:49 geirm Exp $
+ * @version $Id: ASTSetDirective.java,v 1.2 2001/04/09 01:03:27 geirm Exp $
*/
public class ASTSetDirective extends SimpleNode
{
@@ -140,22 +140,30 @@
{
EventCartridge ec = context.getEventCartridge();
+ boolean doit = true;
+
+ /*
+ * if we have an EventCartridge...
+ */
+
if (ec != null)
{
- Object[] rieh = ec.getNullSetEventHandlerArray();
-
- boolean doit = true;
-
- for(int i = 0; i < rieh.length; i++)
+ NullSetEventHandler[] nseh = ec.getNullSetEventHandlerArray();
+
+ for(int i = 0; i < nseh.length; i++)
{
- if( !( (NullSetEventHandler) rieh[i]).nullSetLogMessage(
left.literal() ))
+ if( ! nseh[i].nullSetLogMessage( left.literal() ))
+ {
doit = false;
+ }
}
-
- if (doit)
- Runtime.error("RHS of #set statement is null. Context will
not be modified. "
- + context.getCurrentTemplateName() + " [line
" + getLine()
- + ", column " + getColumn() + "]");
+ }
+
+ if (doit)
+ {
+ Runtime.error("RHS of #set statement is null. Context will not
be modified. "
+ + context.getCurrentTemplateName() + " [line " +
getLine()
+ + ", column " + getColumn() + "]");
}
}
1.2 +30 -9 jakarta-velocity/whiteboard/geir/listener/EventCartridge.java
Index: EventCartridge.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/whiteboard/geir/listener/EventCartridge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EventCartridge.java 2001/04/06 11:25:52 1.1
+++ EventCartridge.java 2001/04/09 01:03:27 1.2
@@ -63,18 +63,18 @@
* 'Package' of event handlers...
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: EventCartridge.java,v 1.1 2001/04/06 11:25:52 geirm Exp $
+ * @version $Id: EventCartridge.java,v 1.2 2001/04/09 01:03:27 geirm Exp $
*/
public class EventCartridge
{
private ArrayList riehList = null;
- private Object[] riehArr = null;
+ private ReferenceInsertionEventHandler[] riehArr = null;
private ArrayList nsehList = null;
- private Object[] nsehArr = null;
+ private NullSetEventHandler[] nsehArr = null;
private ArrayList nrehList = null;
- private Object[] nrehArr = null;
+ private NullReferenceEventHandler[] nrehArr = null;
/**
* called by client to add an event handler. For multiple
@@ -107,7 +107,14 @@
*/
riehList.add( ev );
- riehArr = riehList.toArray();
+
+ /*
+ * gen the static typed array
+ */
+
+ Object[] oarr = riehList.toArray();
+ riehArr = new ReferenceInsertionEventHandler[ oarr.length ];
+ System.arraycopy( oarr, 0, riehArr, 0, oarr.length);
found = true;
}
@@ -128,7 +135,14 @@
*/
nrehList.add( ev );
- nrehArr = nrehList.toArray();
+
+ /*
+ * gen the static typed array
+ */
+
+ Object[] oarr = nrehList.toArray();
+ nrehArr = new NullReferenceEventHandler[ oarr.length ];
+ System.arraycopy( oarr, 0, nrehArr, 0, oarr.length);
found = true;
}
@@ -150,7 +164,14 @@
*/
nsehList.add( ev );
- nsehArr = nsehList.toArray();
+
+ /*
+ * gen the static typed array
+ */
+
+ Object[] oarr = nsehList.toArray();
+ nsehArr = new NullSetEventHandler[ oarr.length ];
+ System.arraycopy( oarr, 0, nsehArr, 0, oarr.length);
found = true;
}
@@ -167,18 +188,18 @@
return true;
}
- public Object[] getReferenceInsertionHandlerArray()
+ public ReferenceInsertionEventHandler[] getReferenceInsertionHandlerArray()
{
return riehArr;
}
- public Object[] getNullReferenceHandlerArray()
+ public NullReferenceEventHandler[] getNullReferenceHandlerArray()
{
return nrehArr;
}
- public Object[] getNullSetEventHandlerArray()
+ public NullSetEventHandler[] getNullSetEventHandlerArray()
{
return nsehArr;
}
