webmacro-cvs — receive cvs commit messages

[WebMacro-cvs] webmacro LICENSE.txt,1.1,1.2

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11138

Modified Files:
	LICENSE.txt 
Log Message:
Tabs appeared from nowhere

Index: LICENSE.txt
===================================================================
RCS file: /cvsroot/webmacro/webmacro/LICENSE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LICENSE.txt	17 Mar 2008 23:37:16 -0000	1.1
--- LICENSE.txt	18 Mar 2008 00:39:11 -0000	1.2
***************
*** 4,17 ****
  * modification, are permitted provided that the following conditions are met:
  *
! *     * Redistributions of source code must retain the above copyright
! *       notice, this list of conditions and the following disclaimer.
  *
! *     * Redistributions in binary form must reproduce the above copyright
! *       notice, this list of conditions and the following disclaimer in the
! *       documentation and/or other materials provided with the distribution.
  *
! *     * Neither the name WebMacro, nor the name Semiotek Inc., nor the names
! *       of any of the contributors may be used to endorse or promote products 
! *       derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY SEMIOTEK INC., WEBMACRO.ORG, THE WEBMACRO 
--- 4,17 ----
  * modification, are permitted provided that the following conditions are met:
  *
! * * Redistributions of source code must retain the above copyright
! *   notice, this list of conditions and the following disclaimer.
  *
! * * Redistributions in binary form must reproduce the above copyright
! *   notice, this list of conditions and the following disclaimer in the
! *   documentation and/or other materials provided with the distribution.
  *
! * * Neither the name WebMacro, nor the name Semiotek Inc., nor the names
! *   of any of the contributors may be used to endorse or promote products 
! *   derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY SEMIOTEK INC., WEBMACRO.ORG, THE WEBMACRO 

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template EncodingTestCase.java, 1.6, 1.7

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9994/test/unit/org/webmacro/template

Modified Files:
	EncodingTestCase.java 
Log Message:
Add fixme, broken test excluded

Index: EncodingTestCase.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/EncodingTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EncodingTestCase.java	16 Jul 2003 06:45:00 -0000	1.6
--- EncodingTestCase.java	18 Mar 2008 00:36:26 -0000	1.7
***************
*** 174,178 ****
  
  
!     public void testUTF8InputEncoding () throws Exception
      {
          assertEquals("InputEncoding is not UFT8",
--- 174,181 ----
  
  
!     /**
!      * FIXME Works in Eclipse but not Maven
!      */
!     public void brokenTestUTF8InputEncoding () throws Exception
      {
          assertEquals("InputEncoding is not UFT8",

[WebMacro-cvs] webmacro pom.xml,1.3,1.4

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32384

Modified Files:
	pom.xml 
Log Message:
Specify license, enable all reports

Index: pom.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pom.xml	14 Mar 2008 17:32:39 -0000	1.3
--- pom.xml	18 Mar 2008 00:10:26 -0000	1.4
***************
*** 4,8 ****
    <artifactId>webmacro</artifactId>
    <name>WebMacro</name>
!   <version>2.1.1</version>
    <description>WebMacro template engine</description>
    <url>http://webmacro.sourceforge.net/</url>
--- 4,8 ----
    <artifactId>webmacro</artifactId>
    <name>WebMacro</name>
!   <version>2.1-RC1-SNAPSHOT</version>
    <description>WebMacro template engine</description>
    <url>http://webmacro.sourceforge.net/</url>
***************
*** 152,161 ****
    <licenses>
      <license>
!       <name>Gnu Public License</name>
!       <url>http://www.gnu.org/copyleft/gpl.html</url>
!     </license>
!     <license>
!       <name>The Apache Software License, Version 2.0</name>
!       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
      </license>
    </licenses>
--- 152,157 ----
    <licenses>
      <license>
!       <name>BSD Licence</name>
!       <url>http://webmacro.cvs.sourceforge.net/*checkout*/webmacro/webmacro/LICENSE.txt</url>
      </license>
    </licenses>
***************
*** 327,336 ****
    <reporting>
      <plugins>
!       <!--plugin>
          <artifactId>maven-checkstyle-plugin</artifactId>
          <configuration>
            <configLocation>checkstyle.xml</configLocation>
          </configuration>
!       </plugin-->
        <plugin>
          <artifactId>maven-site-plugin</artifactId>
--- 323,332 ----
    <reporting>
      <plugins>
!       <plugin>
          <artifactId>maven-checkstyle-plugin</artifactId>
          <configuration>
            <configLocation>checkstyle.xml</configLocation>
          </configuration>
!       </plugin>
        <plugin>
          <artifactId>maven-site-plugin</artifactId>
***************
*** 347,354 ****
          <artifactId>cobertura-maven-plugin</artifactId>
        </plugin>
!       <!--plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-changelog-plugin</artifactId>
!       </plugin -->
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
--- 343,350 ----
          <artifactId>cobertura-maven-plugin</artifactId>
        </plugin>
!       <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-changelog-plugin</artifactId>
!       </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
***************
*** 392,396 ****
        <id>default</id>
        <name>Default Repository</name>
!       <url>file:///dist/webmacro/target/distributions/</url>
      </repository>
      <site>
--- 388,392 ----
        <id>default</id>
        <name>Default Repository</name>
!       <url>scp://shell.sourceforge.net/home/groups/w/we/webmacro/htdocs/maven2/</url>
      </repository>
      <site>

[WebMacro-cvs] webmacro/src/org/webmacro/parser WMParser_implTokenManager.java, 1.31, 1.32

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23551/src/org/webmacro/parser

Modified Files:
	WMParser_implTokenManager.java 
Log Message:
Generated with 4.1, not 3.0, comments in grammar maintained in generated code, unused code no longer generated

Index: WMParser_implTokenManager.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_implTokenManager.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** WMParser_implTokenManager.java	29 Jan 2008 10:08:57 -0000	1.31
--- WMParser_implTokenManager.java	17 Mar 2008 23:49:48 -0000	1.32
***************
*** 2,10 ****
--- 2,14 ----
  package org.webmacro.parser;
  
+ /** Token Manager. */
  public class WMParser_implTokenManager implements WMParser_implConstants
  {
    // Required by SetState
    void backup(int n) { input_stream.backup(n); }
+ 
+   /** Debug output. */
    public  java.io.PrintStream debugStream = System.out;
+   /** Set debug output. */
    public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
  private final int jjStopStringLiteralDfa_4(int pos, long active0)
***************
*** 24,28 ****
     return jjMoveNfa_4(jjStopStringLiteralDfa_4(pos, active0), pos + 1);
  }
! private final int jjStopAtPos(int pos, int kind)
  {
     jjmatchedKind = kind;
--- 28,32 ----
     return jjMoveNfa_4(jjStopStringLiteralDfa_4(pos, active0), pos + 1);
  }
! private int jjStopAtPos(int pos, int kind)
  {
     jjmatchedKind = kind;
***************
*** 30,34 ****
     return pos + 1;
  }
! private final int jjStartNfaWithStates_4(int pos, int kind, int state)
  {
     jjmatchedKind = kind;
--- 34,38 ----
     return pos + 1;
  }
! private int jjStartNfaWithStates_4(int pos, int kind, int state)
  {
     jjmatchedKind = kind;
***************
*** 38,42 ****
     return jjMoveNfa_4(state, pos + 1);
  }
! private final int jjMoveStringLiteralDfa0_4()
  {
     switch(curChar)
--- 42,46 ----
     return jjMoveNfa_4(state, pos + 1);
  }
! private int jjMoveStringLiteralDfa0_4()
  {
     switch(curChar)
***************
*** 57,61 ****
     }
  }
! private final int jjMoveStringLiteralDfa1_4(long active0)
  {
     try { curChar = input_stream.readChar(); }
--- 61,65 ----
     }
  }
! private int jjMoveStringLiteralDfa1_4(long active0)
  {
     try { curChar = input_stream.readChar(); }
***************
*** 79,83 ****
     return jjStartNfa_4(0, active0);
  }
! private final int jjMoveStringLiteralDfa2_4(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
--- 83,87 ----
     return jjStartNfa_4(0, active0);
  }
! private int jjMoveStringLiteralDfa2_4(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
***************
*** 99,103 ****
     return jjStartNfa_4(1, active0);
  }
! private final int jjMoveStringLiteralDfa3_4(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
--- 103,107 ----
     return jjStartNfa_4(1, active0);
  }
! private int jjMoveStringLiteralDfa3_4(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
***************
*** 121,125 ****
     return jjStartNfa_4(2, active0);
  }
! private final int jjMoveStringLiteralDfa4_4(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
--- 125,129 ----
     return jjStartNfa_4(2, active0);
  }
! private int jjMoveStringLiteralDfa4_4(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
***************
*** 139,143 ****
     return jjStartNfa_4(3, active0);
  }
! private final int jjMoveStringLiteralDfa5_4(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
--- 143,147 ----
     return jjStartNfa_4(3, active0);
  }
! private int jjMoveStringLiteralDfa5_4(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
***************
*** 159,192 ****
     return jjStartNfa_4(4, active0);
  }
- private final void jjCheckNAdd(int state)
- {
-    if (jjrounds[state] != jjround)
-    {
-       jjstateSet[jjnewStateCnt++] = state;
-       jjrounds[state] = jjround;
-    }
- }
- private final void jjAddStates(int start, int end)
- {
-    do {
-       jjstateSet[jjnewStateCnt++] = jjnextStates[start];
-    } while (start++ != end);
- }
- private final void jjCheckNAddTwoStates(int state1, int state2)
- {
-    jjCheckNAdd(state1);
-    jjCheckNAdd(state2);
- }
- private final void jjCheckNAddStates(int start, int end)
- {
-    do {
-       jjCheckNAdd(jjnextStates[start]);
-    } while (start++ != end);
- }
- private final void jjCheckNAddStates(int start)
- {
-    jjCheckNAdd(jjnextStates[start]);
-    jjCheckNAdd(jjnextStates[start + 1]);
- }
  static final long[] jjbitVec0 = {
     0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
--- 163,166 ----
***************
*** 195,206 ****
     0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
  };
! private final int jjMoveNfa_4(int startState, int curPos)
  {
!    int[] nextStates;
     int startsAt = 0;
     jjnewStateCnt = 5;
     int i = 1;
     jjstateSet[0] = startState;
!    int j, kind = 0x7fffffff;
     for (;;)
     {
--- 169,181 ----
     0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
  };
! private int jjMoveNfa_4(int startState, int curPos)
  {
!    //int[] nextStates; // not used
     int startsAt = 0;
     jjnewStateCnt = 5;
     int i = 1;
     jjstateSet[0] = startState;
!    //int j; // not used
!    int kind = 0x7fffffff;
     for (;;)
     {
***************
*** 327,331 ****
     return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
  }
! private final int jjStartNfaWithStates_1(int pos, int kind, int state)
  {
     jjmatchedKind = kind;
--- 302,306 ----
     return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
  }
! private int jjStartNfaWithStates_1(int pos, int kind, int state)
  {
     jjmatchedKind = kind;
***************
*** 335,339 ****
     return jjMoveNfa_1(state, pos + 1);
  }
! private final int jjMoveStringLiteralDfa0_1()
  {
     switch(curChar)
--- 310,314 ----
     return jjMoveNfa_1(state, pos + 1);
  }
! private int jjMoveStringLiteralDfa0_1()
  {
     switch(curChar)
***************
*** 349,360 ****
     }
  }
! private final int jjMoveNfa_1(int startState, int curPos)
  {
!    int[] nextStates;
     int startsAt = 0;
     jjnewStateCnt = 5;
     int i = 1;
     jjstateSet[0] = startState;
!    int j, kind = 0x7fffffff;
     for (;;)
     {
--- 324,336 ----
     }
  }
! private int jjMoveNfa_1(int startState, int curPos)
  {
!    //int[] nextStates; // not used
     int startsAt = 0;
     jjnewStateCnt = 5;
     int i = 1;
     jjstateSet[0] = startState;
!    //int j; // not used
!    int kind = 0x7fffffff;
     for (;;)
     {
***************
*** 469,484 ****
     }
  }
! private final int jjMoveStringLiteralDfa0_2()
  {
     return jjMoveNfa_2(0, 0);
  }
! private final int jjMoveNfa_2(int startState, int curPos)
  {
!    int[] nextStates;
     int startsAt = 0;
     jjnewStateCnt = 1;
     int i = 1;
     jjstateSet[0] = startState;
!    int j, kind = 0x7fffffff;
     for (;;)
     {
--- 445,461 ----
     }
  }
! private int jjMoveStringLiteralDfa0_2()
  {
     return jjMoveNfa_2(0, 0);
  }
! private int jjMoveNfa_2(int startState, int curPos)
  {
!    //int[] nextStates; // not used
     int startsAt = 0;
     jjnewStateCnt = 1;
     int i = 1;
     jjstateSet[0] = startState;
!    //int j; // not used
!    int kind = 0x7fffffff;
     for (;;)
     {
***************
*** 637,641 ****
     return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
  }
! private final int jjStartNfaWithStates_3(int pos, int kind, int state)
  {
     jjmatchedKind = kind;
--- 614,618 ----
     return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
  }
! private int jjStartNfaWithStates_3(int pos, int kind, int state)
  {
     jjmatchedKind = kind;
***************
*** 645,649 ****
     return jjMoveNfa_3(state, pos + 1);
  }
! private final int jjMoveStringLiteralDfa0_3()
  {
     switch(curChar)
--- 622,626 ----
     return jjMoveNfa_3(state, pos + 1);
  }
! private int jjMoveStringLiteralDfa0_3()
  {
     switch(curChar)
***************
*** 707,711 ****
     }
  }
! private final int jjMoveStringLiteralDfa1_3(long active0)
  {
     try { curChar = input_stream.readChar(); }
--- 684,688 ----
     }
  }
! private int jjMoveStringLiteralDfa1_3(long active0)
  {
     try { curChar = input_stream.readChar(); }
***************
*** 739,743 ****
     return jjStartNfa_3(0, active0);
  }
! private final int jjMoveStringLiteralDfa2_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
--- 716,720 ----
     return jjStartNfa_3(0, active0);
  }
! private int jjMoveStringLiteralDfa2_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
***************
*** 763,767 ****
     return jjStartNfa_3(1, active0);
  }
! private final int jjMoveStringLiteralDfa3_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
--- 740,744 ----
     return jjStartNfa_3(1, active0);
  }
! private int jjMoveStringLiteralDfa3_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
***************
*** 791,795 ****
     return jjStartNfa_3(2, active0);
  }
! private final int jjMoveStringLiteralDfa4_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
--- 768,772 ----
     return jjStartNfa_3(2, active0);
  }
! private int jjMoveStringLiteralDfa4_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
***************
*** 815,819 ****
     return jjStartNfa_3(3, active0);
  }
! private final int jjMoveStringLiteralDfa5_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
--- 792,796 ----
     return jjStartNfa_3(3, active0);
  }
! private int jjMoveStringLiteralDfa5_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
***************
*** 837,841 ****
     return jjStartNfa_3(4, active0);
  }
! private final int jjMoveStringLiteralDfa6_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
--- 814,818 ----
     return jjStartNfa_3(4, active0);
  }
! private int jjMoveStringLiteralDfa6_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
***************
*** 855,859 ****
     return jjStartNfa_3(5, active0);
  }
! private final int jjMoveStringLiteralDfa7_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
--- 832,836 ----
     return jjStartNfa_3(5, active0);
  }
! private int jjMoveStringLiteralDfa7_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
***************
*** 873,877 ****
     return jjStartNfa_3(6, active0);
  }
! private final int jjMoveStringLiteralDfa8_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
--- 850,854 ----
     return jjStartNfa_3(6, active0);
  }
! private int jjMoveStringLiteralDfa8_3(long old0, long active0)
  {
     if (((active0 &= old0)) == 0L)
***************
*** 893,904 ****
     return jjStartNfa_3(7, active0);
  }
! private final int jjMoveNfa_3(int startState, int curPos)
  {
!    int[] nextStates;
     int startsAt = 0;
     jjnewStateCnt = 31;
     int i = 1;
     jjstateSet[0] = startState;
!    int j, kind = 0x7fffffff;
     for (;;)
     {
--- 870,882 ----
     return jjStartNfa_3(7, active0);
  }
! private int jjMoveNfa_3(int startState, int curPos)
  {
!    //int[] nextStates; // not used
     int startsAt = 0;
     jjnewStateCnt = 31;
     int i = 1;
     jjstateSet[0] = startState;
!    //int j; // not used
!    int kind = 0x7fffffff;
     for (;;)
     {
***************
*** 1189,1193 ****
     return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
  }
! private final int jjStartNfaWithStates_0(int pos, int kind, int state)
  {
     jjmatchedKind = kind;
--- 1167,1171 ----
     return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
  }
! private int jjStartNfaWithStates_0(int pos, int kind, int state)
  {
     jjmatchedKind = kind;
***************
*** 1197,1201 ****
     return jjMoveNfa_0(state, pos + 1);
  }
! private final int jjMoveStringLiteralDfa0_0()
  {
     switch(curChar)
--- 1175,1179 ----
     return jjMoveNfa_0(state, pos + 1);
  }
! private int jjMoveStringLiteralDfa0_0()
  {
     switch(curChar)
***************
*** 1211,1222 ****
     }
  }
! private final int jjMoveNfa_0(int startState, int curPos)
  {
!    int[] nextStates;
     int startsAt = 0;
     jjnewStateCnt = 5;
     int i = 1;
     jjstateSet[0] = startState;
!    int j, kind = 0x7fffffff;
     for (;;)
     {
--- 1189,1201 ----
     }
  }
! private int jjMoveNfa_0(int startState, int curPos)
  {
!    //int[] nextStates; // not used
     int startsAt = 0;
     jjnewStateCnt = 5;
     int i = 1;
     jjstateSet[0] = startState;
!    //int j; // not used
!    int kind = 0x7fffffff;
     for (;;)
     {
***************
*** 1346,1349 ****
--- 1325,1330 ----
     }
  }
+ 
+ /** Token literal values. */
  public static final String[] jjstrLiteralImages = {
  "", null, null, null, null, null, null, null, null, null, null, null, "\175", 
***************
*** 1353,1356 ****
--- 1334,1339 ----
  "\135", "\72", "\56", "\74", "\74\75", "\76", "\76\75", "\75\75", "\75", null, "\53", 
  "\55", "\52", "\57", null, null, null, "\54", "\73", null, null, null, null, null, };
+ 
+ /** Lexer state names. */
  public static final String[] lexStateNames = {
     "SQS", 
***************
*** 1360,1363 ****
--- 1343,1348 ----
     "DEFAULT", 
  };
+ 
+ /** Lex State array. */
  public static final int[] jjnewLexState = {
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
***************
*** 1381,1393 ****
  int lengthOfMatch;
  protected char curChar;
! public WMParser_implTokenManager(CharStream stream)
! {
     input_stream = stream;
  }
! public WMParser_implTokenManager(CharStream stream, int lexState)
! {
     this(stream);
     SwitchTo(lexState);
  }
  public void ReInit(CharStream stream)
  {
--- 1366,1381 ----
  int lengthOfMatch;
  protected char curChar;
! /** Constructor. */
! public WMParser_implTokenManager(CharStream stream){
     input_stream = stream;
  }
! 
! /** Constructor. */
! public WMParser_implTokenManager(CharStream stream, int lexState){
     this(stream);
     SwitchTo(lexState);
  }
+ 
+ /** Reinitialise parser. */
  public void ReInit(CharStream stream)
  {
***************
*** 1397,1401 ****
     ReInitRounds();
  }
! private final void ReInitRounds()
  {
     int i;
--- 1385,1389 ----
     ReInitRounds();
  }
! private void ReInitRounds()
  {
     int i;
***************
*** 1404,1407 ****
--- 1392,1397 ----
        jjrounds[i] = 0x80000000;
  }
+ 
+ /** Reinitialise parser. */
  public void ReInit(CharStream stream, int lexState)
  {
***************
*** 1409,1412 ****
--- 1399,1404 ----
     SwitchTo(lexState);
  }
+ 
+ /** Switch to specified lex state. */
  public void SwitchTo(int lexState)
  {
***************
*** 1419,1442 ****
  protected Token jjFillToken()
  {
!    Token t = Token.newToken(jjmatchedKind);
!    t.kind = jjmatchedKind;
     if (jjmatchedPos < 0)
     {
        if (image == null)
!          t.image = "";
        else
!          t.image = image.toString();
!       t.beginLine = t.endLine = input_stream.getBeginLine();
!       t.beginColumn = t.endColumn = input_stream.getBeginColumn();
     }
     else
     {
        String im = jjstrLiteralImages[jjmatchedKind];
!       t.image = (im == null) ? input_stream.GetImage() : im;
!       t.beginLine = input_stream.getBeginLine();
!       t.beginColumn = input_stream.getBeginColumn();
!       t.endLine = input_stream.getEndLine();
!       t.endColumn = input_stream.getEndColumn();
     }
     return t;
  }
--- 1411,1445 ----
  protected Token jjFillToken()
  {
!    final Token t;
!    final String tokenImage;
!    final int beginLine;
!    final int endLine;
!    final int beginColumn;
!    final int endColumn;
     if (jjmatchedPos < 0)
     {
        if (image == null)
!          tokenImage = "";
        else
!          tokenImage = image.toString();
!       beginLine = endLine = input_stream.getBeginLine();
!       beginColumn = endColumn = input_stream.getBeginColumn();
     }
     else
     {
        String im = jjstrLiteralImages[jjmatchedKind];
!       tokenImage = (im == null) ? input_stream.GetImage() : im;
!       beginLine = input_stream.getBeginLine();
!       beginColumn = input_stream.getBeginColumn();
!       endLine = input_stream.getEndLine();
!       endColumn = input_stream.getEndColumn();
     }
+    t = Token.newToken(jjmatchedKind);
+    t.image = tokenImage;
+    t.beginLine = beginLine;
+    t.endLine = endLine;
+    t.beginColumn = beginColumn;
+    t.endColumn = endColumn;
+ 
     return t;
  }
***************
*** 1449,1455 ****
  int jjmatchedKind;
  
  public Token getNextToken() 
  {
!   int kind;
    Token specialToken = null;
    Token matchedToken;
--- 1452,1459 ----
  int jjmatchedKind;
  
+ /** Get the next Token. */
  public Token getNextToken() 
  {
!   //int kind;
    Token specialToken = null;
    Token matchedToken;
***************
*** 1573,1575 ****
--- 1577,1606 ----
     }
  }
+ private void jjCheckNAdd(int state)
+ {
+    if (jjrounds[state] != jjround)
+    {
+       jjstateSet[jjnewStateCnt++] = state;
+       jjrounds[state] = jjround;
+    }
+ }
+ private void jjAddStates(int start, int end)
+ {
+    do {
+       jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+    } while (start++ != end);
+ }
+ private void jjCheckNAddTwoStates(int state1, int state2)
+ {
+    jjCheckNAdd(state1);
+    jjCheckNAdd(state2);
+ }
+ 
+ private void jjCheckNAddStates(int start, int end)
+ {
+    do {
+       jjCheckNAdd(jjnextStates[start]);
+    } while (start++ != end);
+ }
+ 
  }

[WebMacro-cvs] webmacro/src/org/webmacro/parser WMParser_implConstants.java, 1.14, 1.15

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22759/src/org/webmacro/parser

Modified Files:
	WMParser_implConstants.java 
Log Message:
Generated with 4.1, not 3.0, comments in grammar maintained in generated code

Index: WMParser_implConstants.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_implConstants.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** WMParser_implConstants.java	30 Jul 2003 02:28:14 -0000	1.14
--- WMParser_implConstants.java	17 Mar 2008 23:47:46 -0000	1.15
***************
*** 2,72 ****
--- 2,141 ----
  package org.webmacro.parser;
  
+ 
+ /** 
+  * Token literal values and constants.
+  * Generated by org.javacc.parser.OtherFilesGen#start()
+  */
  public interface WMParser_implConstants {
  
+   /** End of File. */
    int EOF = 0;
+   /** RegularExpression Id. */
    int _ALPHA_CHAR = 1;
+   /** RegularExpression Id. */
    int _NUM_CHAR = 2;
+   /** RegularExpression Id. */
    int _ALPHANUM_CHAR = 3;
+   /** RegularExpression Id. */
    int _IDENTIFIER_CHAR = 4;
+   /** RegularExpression Id. */
    int _IDENTIFIER = 5;
+   /** RegularExpression Id. */
    int _NEWLINE = 6;
+   /** RegularExpression Id. */
    int _WHITESPACE = 7;
+   /** RegularExpression Id. */
    int _QCHAR = 8;
+   /** RegularExpression Id. */
    int _RESTOFLINE = 9;
+   /** RegularExpression Id. */
    int _COMMENT = 10;
+   /** RegularExpression Id. */
    int STUFF = 11;
+   /** RegularExpression Id. */
    int RBRACE = 12;
+   /** RegularExpression Id. */
    int END = 13;
+   /** RegularExpression Id. */
    int BEGIN = 14;
+   /** RegularExpression Id. */
    int LBRACE = 15;
+   /** RegularExpression Id. */
    int POUNDPOUND = 17;
+   /** RegularExpression Id. */
    int RESTOFLINE = 18;
+   /** RegularExpression Id. */
    int COMMENT_ELSE = 19;
+   /** RegularExpression Id. */
    int DOLLAR = 20;
+   /** RegularExpression Id. */
    int QCHAR = 21;
+   /** RegularExpression Id. */
    int SLASH = 22;
+   /** RegularExpression Id. */
    int POUND = 23;
+   /** RegularExpression Id. */
    int QUOTE = 24;
+   /** RegularExpression Id. */
    int SQUOTE = 25;
+   /** RegularExpression Id. */
    int NULL = 26;
+   /** RegularExpression Id. */
    int TRUE = 27;
+   /** RegularExpression Id. */
    int FALSE = 28;
+   /** RegularExpression Id. */
    int UNDEFINED = 29;
+   /** RegularExpression Id. */
    int WS = 30;
+   /** RegularExpression Id. */
    int NEWLINE = 31;
+   /** RegularExpression Id. */
    int LPAREN = 32;
+   /** RegularExpression Id. */
    int RPAREN = 33;
+   /** RegularExpression Id. */
    int LBRACKET = 34;
+   /** RegularExpression Id. */
    int RBRACKET = 35;
+   /** RegularExpression Id. */
    int COLON = 36;
+   /** RegularExpression Id. */
    int DOT = 37;
+   /** RegularExpression Id. */
    int OP_LT = 38;
+   /** RegularExpression Id. */
    int OP_LE = 39;
+   /** RegularExpression Id. */
    int OP_GT = 40;
+   /** RegularExpression Id. */
    int OP_GE = 41;
+   /** RegularExpression Id. */
    int OP_EQ = 42;
+   /** RegularExpression Id. */
    int OP_SET = 43;
+   /** RegularExpression Id. */
    int OP_NE = 44;
+   /** RegularExpression Id. */
    int OP_PLUS = 45;
+   /** RegularExpression Id. */
    int OP_MINUS = 46;
+   /** RegularExpression Id. */
    int OP_MULT = 47;
+   /** RegularExpression Id. */
    int OP_DIV = 48;
+   /** RegularExpression Id. */
    int OP_AND = 49;
+   /** RegularExpression Id. */
    int OP_OR = 50;
+   /** RegularExpression Id. */
    int OP_NOT = 51;
+   /** RegularExpression Id. */
    int COMMA = 52;
+   /** RegularExpression Id. */
    int SEMI = 53;
+   /** RegularExpression Id. */
    int WORD = 54;
+   /** RegularExpression Id. */
    int NUMBER = 55;
+   /** RegularExpression Id. */
    int OTHER = 56;
+   /** RegularExpression Id. */
    int QS_TEXT = 57;
+   /** RegularExpression Id. */
    int SQS_TEXT = 58;
  
+   /** Lexical state. */
    int SQS = 0;
+   /** Lexical state. */
    int QS = 1;
+   /** Lexical state. */
    int COMMENT = 2;
+   /** Lexical state. */
    int WM = 3;
+   /** Lexical state. */
    int DEFAULT = 4;
  
+   /** Literal token values. */
    String[] tokenImage = {
      "<EOF>",

[WebMacro-cvs] webmacro/src/org/webmacro/parser WMParser_impl.java, 1.56, 1.57

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22361/src/org/webmacro/parser

Modified Files:
	WMParser_impl.java 
Log Message:
Generated with 4.1, not 3.0, final private methods now just private

Index: WMParser_impl.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** WMParser_impl.java	16 Oct 2005 17:39:41 -0000	1.56
--- WMParser_impl.java	17 Mar 2008 23:46:35 -0000	1.57
***************
*** 126,130 ****
  
    private boolean lookahead_not_breaking_subd() {
-     int entryState = token_source.curLexState;
      boolean retVal = true;
      Object o = blockStack.peek();
--- 126,129 ----
***************
*** 578,582 ****
  
    final public void Punct_EQ() throws ParseException {
[...1232 lines suppressed...]
          p = p.next;
        } while (p != null);
      }
      jj_rescan = false;
    }
  
!   final private void jj_save(int index, int xla) {
      JJCalls p = jj_2_rtns[index];
      while (p.gen > jj_gen) {
--- 3185,3194 ----
          p = p.next;
        } while (p != null);
+       } catch(LookaheadSuccess ls) { }
      }
      jj_rescan = false;
    }
  
!   private void jj_save(int index, int xla) {
      JJCalls p = jj_2_rtns[index];
      while (p.gen > jj_gen) {

[WebMacro-cvs] webmacro/src/org/webmacro/parser Token.java, 1.5, 1.6

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21172/src/org/webmacro/parser

Modified Files:
	Token.java 
Log Message:
Generated with 4.1, not 3.0, only a change in comment

Index: Token.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/Token.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Token.java	27 May 2005 19:44:58 -0000	1.5
--- Token.java	17 Mar 2008 23:43:44 -0000	1.6
***************
*** 1,3 ****
! /* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */
  package org.webmacro.parser;
  
--- 1,3 ----
! /* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */
  package org.webmacro.parser;
  
***************
*** 15,24 ****
    public int kind;
  
!   /**
!    * beginLine and beginColumn describe the position of the first character
!    * of this token; endLine and endColumn describe the position of the
!    * last character of this token.
!    */
!   public int beginLine, beginColumn, endLine, endColumn;
  
    /**
--- 15,26 ----
    public int kind;
  
!   /** The line number of the first character of this Token. */
!   public int beginLine;
!   /** The column number of the first character of this Token. */
!   public int beginColumn;
!   /** The line number of the last character of this Token. */
!   public int endLine;
!   /** The column number of the last character of this Token. */
!   public int endColumn;
  
    /**
***************
*** 52,55 ****
--- 54,79 ----
  
    /**
+    * No-argument contructor
+    */
+   public Token() {}
+ 
+   /**
+    * Constructs a new token for the specified Image.
+    */
+   public Token(int kind)
+   {
+      this(kind, null);
+   }
+ 
+   /**
+    * Constructs a new token for the specified Image and Kind.
+    */
+   public Token(int kind, String image)
+   {
+      this.kind = kind;
+      this.image = image;
+   }
+ 
+   /**
     * Returns the image.
     */
***************
*** 64,81 ****
     * Simply add the cases to the switch for all those special cases.
     * For example, if you have a subclass of Token called IDToken that
!    * you want to create if ofKind is ID, simlpy add something like :
     *
!    *    case MyParserConstants.ID : return new IDToken();
     *
     * to the following switch statement. Then you can cast matchedToken
     * variable to the appropriate type and use it in your lexical actions.
     */
!   public static final Token newToken(int ofKind)
    {
       switch(ofKind)
       {
!        default : return new Token();
       }
    }
  
  }
--- 88,110 ----
     * Simply add the cases to the switch for all those special cases.
     * For example, if you have a subclass of Token called IDToken that
!    * you want to create if ofKind is ID, simply add something like :
     *
!    *    case MyParserConstants.ID : return new IDToken(ofKind, image);
     *
     * to the following switch statement. Then you can cast matchedToken
     * variable to the appropriate type and use it in your lexical actions.
     */
!   public static final Token newToken(int ofKind, String image)
    {
       switch(ofKind)
       {
!        default : return new Token(ofKind, image);
       }
    }
  
+   public static final Token newToken(int ofKind)
+   {
+      return newToken(ofKind, null);
+   }
+ 
  }

[WebMacro-cvs] webmacro NOTICE.txt,NONE,1.1

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19169

Added Files:
	NOTICE.txt 
Log Message:
Initial version, included in jar

--- NEW FILE: NOTICE.txt ---
This product includes software developed by
http://www.webmacro.org/ using http://www.sourceforge.net/

[WebMacro-cvs] webmacro checkstyleSuppressions.xml, NONE, 1.1 checkstyle.xml, NONE, 1.1

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18784

Added Files:
	checkstyleSuppressions.xml checkstyle.xml 
Log Message:
Initial versions

--- NEW FILE: checkstyleSuppressions.xml ---
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC
    "-//Puppy Crawl//DTD Suppressions 1.0//EN"
    "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">

<suppressions>
    <suppress checks="MagicNumber"
              files=".java" />
    <suppress checks="MagicNumber"
              files="Test*.java" />
    <suppress checks="Javadoc"
              files="Test*.java" />
    <suppress checks="EmptyBlock"
              files="Test*.java" />

</suppressions>

--- NEW FILE: checkstyle.xml ---
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
    "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
    "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">

<!--

  Checkstyle configuration that checks the style fits with what 
  the PanEris collective use.
 
  Some checks have been disabled because they appear to require  
  a reduction in the human readable semantics of the code.
  Others have been disabled because it is too much work to retro fit!

-->

<module name="Checker">

    <module name="SuppressionFilter">
      <property name="file" value="checkstyleSuppressions.xml" />
    </module>

    <!-- Checks that a package.html file exists for each package.     -->
    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
    <module name="PackageHtml"/>

    <!-- Checks whether files end with a new line.                        -->
    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
    <module name="NewlineAtEndOfFile"/>

    <!-- Checks that property files contain the same keys.         -->
    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
    <module name="Translation"/>

    <module name="TreeWalker">

        <property name="cacheFile" value="${checkstyle.cache.file}"/>

        <property name="tabWidth" value="2"/>
        <!-- module name="LeftCurly">
          <property name="option" value="eol"/>
          <property name="tokens"
          value="CLASS_DEF,CTOR_DEF,INTERFACE_DEF,LITERAL_CATCH,LITERAL_DO,LITERAL_FINALLY,LITERAL_FOR,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,METHOD_DEF" />
        </module -->
        <!-- module name="RightCurly">
          <property name="option" value="alone"/>
        </module -->
        <module name="LineLength">
          <property name="max" value="120"/>
          <property name="ignorePattern" value="$Source:"/>
        </module>

        <!-- Checks for Javadoc comments.                     -->
        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
        <module name="JavadocMethod">
          <property name="scope" value="nothing"/>
        </module>
        <module name="JavadocType">
          <property name="scope" value="public"/>
        </module>
        <module name="JavadocVariable">
          <property name="scope" value="nothing"/>
        </module>



        <!-- Checks for Naming Conventions.                  -->
        <!-- See http://checkstyle.sf.net/config_naming.html -->
        <module name="MemberName">
          <property name="format" value="^[a-zA-Z0-9\_]*$"/>
        </module>
        <module name="ConstantName">
          <property name="format" value="^[a-zA-Z0-9\_]*$"/>
        </module>
        <module name="LocalFinalVariableName">
         <property name="format" value="^[\_]?[a-zA-Z0-9\_]*$"/>
        </module>
        <module name="LocalVariableName">
         <property name="format" value="^[\_]?[a-zA-Z0-9\_]*$"/>
        </module>
        <module name="MethodName">
         <property name="format" value="^[\_]?[a-zA-Z0-9\_]*$"/>
        </module>
        <module name="PackageName"/>
        <module name="ParameterName">
         <property name="format" value="^[\_]?[a-zA-Z0-9\_]*$"/>
        </module>
        <module name="StaticVariableName">
         <property name="format" value="^[\_]?[a-zA-Z0-9\_]*$"/>
        </module>
        <module name="TypeName"/>


        <!-- Checks for Headers                              -->
        <!-- See http://checkstyle.sf.net/config_header.html -->
        <!--module name="Header">
            <property name="headerFile" value="./LICENSE.txt"/>
            <property name="ignoreLines" value="1,2,3,4,5,6,7,8,9"/>
        </module -->

        <!-- Following interprets the header file as regular expressions. -->
        <!-- <module name="RegexpHeader"/>                                -->


        <!-- Checks for imports                              -->
        <!-- See http://checkstyle.sf.net/config_import.html -->
        <module name="AvoidStarImport"/>
        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
        <module name="RedundantImport"/>
        <module name="UnusedImports"/>


        <!-- Checks for Size Violations.                    -->
        <!-- See http://checkstyle.sf.net/config_sizes.html -->
        <module name="FileLength"/>
        <module name="MethodLength">
          <property name="max" value="165"/>
        </module>
        <module name="ParameterNumber"/>


        <!-- Checks for whitespace                               -->
        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
        <module name="EmptyForIteratorPad"/>
        <module name="NoWhitespaceAfter">
         <property name="tokens" value="TYPECAST"/>
        </module>
        <module name="NoWhitespaceBefore"/>
        <!-- Bad check - sometimes the operator should be on a new
        line sometimes not -->
        <!-- module name="OperatorWrap"/ -->
        <!-- No padding -->
        <module name="TypecastParenPad"/>
        <!-- No padding -->
        <module name="ParenPad"/>
        <!-- None allowed -->
        <!-- module name="TabCharacter"/ -->
        <module name="WhitespaceAfter">
         <property name="tokens" value="SEMI"/>
         <!-- Not TYPECAST or COMMA -->
        </module>
        <!-- module name="WhitespaceAround"/ -->


        <!-- Modifier Checks                                    -->
        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
        <!-- module name="ModifierOrder"/ -->
        <!-- module name="RedundantModifier"/ -->


        <!-- Checks for blocks. You know, those {}'s         -->
        <!-- See http://checkstyle.sf.net/config_blocks.html -->
        <module name="AvoidNestedBlocks"/>
        <module name="EmptyBlock"/>
        
        <module name="NeedBraces">
         <property name="tokens" 
                   value="LITERAL_DO" />
         <!-- No braces LITERAL_IF,LITERAL_FOR, LITERAL_WHILE, LITERAL_ELSE -->
        </module>


        <!-- Checks for common coding problems               -->
        <!-- See http://checkstyle.sf.net/config_coding.html -->
        <!-- module name="AvoidInlineConditionals"/ -->
        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
        <!-- Ignoring exceptions already dealt with -->
        <!-- module name="EmptyStatement"/-->
        <module name="EqualsHashCode"/>
        <!-- done quite a bit -->
        <module name="HiddenField">
          <property name="tokens" value="VARIABLE_DEF"/>
          <!-- ie ignore for params -->
        </module>
        <module name="IllegalInstantiation"/>
        <!-- Suppressed in  poem generated code  -->
        <module name="InnerAssignment"/>
        <!-- Suppressed in  poem generated code  -->
        <!-- But we have another xx occurrances -->
        <module name="MagicNumber"/>
        <module name="MissingSwitchDefault"/>
        <!-- We have loads of unchecked exceptions -->
        <!-- also subclasses of PoemException in generated-->
        <!-- bad check in my view -->
        <!-- module name="RedundantThrows"/ -->
        <module name="SimplifyBooleanExpression"/>
        <module name="SimplifyBooleanReturn"/>

        <!-- Checks for class design                         -->
        <!-- See http://checkstyle.sf.net/config_design.html -->
        <!-- module name="DesignForExtension"/ -->
        <module name="FinalClass"/>
        <module name="HideUtilityClassConstructor"/>
        <module name="InterfaceIsType"/>
        <!-- We do use public fields responsibly sometimes -->
        <!-- module name="VisibilityModifier">
         <property name="protectedAllowed" value="true"/>
         <property name="packageAllowed" value="true"/>
        </module -->


        <!-- Miscellaneous other checks.                   -->
        <!-- See http://checkstyle.sf.net/config_misc.html -->
        <!-- module name="ArrayTypeStyle"/ -->
        <!-- We don't do this at all -->
        <!-- module name="FinalParameters"/ -->
        <!-- Bad check, it picks up on javadoc with terminal spaces -->
        <!-- module name="GenericIllegalRegexp">
            <property name="format" value="\s+$"/>
            <property name="message" value="Line has trailing spaces."/>
        </module -->
        <module name="TodoComment"/>
        <module name="UpperEll"/>

    </module>

</module>

[WebMacro-cvs] webmacro LICENSE.txt,NONE,1.1

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18761

Added Files:
	LICENSE.txt 
Log Message:
As per Justin Well's email dated 2006-04-19 21:47

--- NEW FILE: LICENSE.txt ---
* Copyright (c) 1996, 2006, Semiotek Inc.
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*     * Redistributions of source code must retain the above copyright
*       notice, this list of conditions and the following disclaimer.
*
*     * Redistributions in binary form must reproduce the above copyright
*       notice, this list of conditions and the following disclaimer in the
*       documentation and/or other materials provided with the distribution.
*
*     * Neither the name WebMacro, nor the name Semiotek Inc., nor the names
*       of any of the contributors may be used to endorse or promote products 
*       derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY SEMIOTEK INC., WEBMACRO.ORG, THE WEBMACRO 
* DEVELOPMENT TEAM, AND OTHER CONTRIBUTORS AND COPYRIGHT OWNERS ``AS IS'' 
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
* ARE DISCLAIMED. IN NO EVENT SHALL SEMIOTEK INC., WEBMACRO.ORG, THE WEBMACRO
* DEVELOPMENT TEAM, OR ANY OTHER CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE FOR 
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

[WebMacro-cvs] webmacro/src/org/webmacro/engine MacroBuildContext.java, 1.3, 1.4

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9519/src/org/webmacro/engine

Modified Files:
	MacroBuildContext.java 
Log Message:
Eclipse warning: arguments overshadowing members

Index: MacroBuildContext.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/MacroBuildContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MacroBuildContext.java	12 Jun 2003 00:47:45 -0000	1.3
--- MacroBuildContext.java	17 Mar 2008 14:05:05 -0000	1.4
***************
*** 43,54 ****
      private Map macroArgs = new HashMap();
  
!     public MacroBuildContext (MacroDefinition macro,
!                               Object[] args,
                                BuildContext bc)
      {
          super(bc.getBroker());
          this.chainedContext = bc;
!         this.args = args;
!         this.macro = macro;
          String[] argNames = macro.getArgNames();
          for (int i = 0; i < argNames.length; i++)
--- 43,54 ----
      private Map macroArgs = new HashMap();
  
!     public MacroBuildContext (MacroDefinition macroP,
!                               Object[] argsP,
                                BuildContext bc)
      {
          super(bc.getBroker());
          this.chainedContext = bc;
!         this.args = argsP;
!         this.macro = macroP;
          String[] argNames = macro.getArgNames();
          for (int i = 0; i < argNames.length; i++)

[WebMacro-cvs] webmacro/src/org/webmacro/resource BrokerTemplateProviderHelper.java, 1.12, 1.13

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8241/src/org/webmacro/resource

Modified Files:
	BrokerTemplateProviderHelper.java 
Log Message:
Comment out unused _cachDuration

Index: BrokerTemplateProviderHelper.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/BrokerTemplateProviderHelper.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** BrokerTemplateProviderHelper.java	28 Jan 2008 15:58:39 -0000	1.12
--- BrokerTemplateProviderHelper.java	17 Mar 2008 14:02:04 -0000	1.13
***************
*** 51,55 ****
  
      private Broker _broker;
!     private int _cacheDuration;
      private Log _log;
      private boolean _cacheSupportsReload = true;
--- 51,55 ----
  
      private Broker _broker;
!     //private int _cacheDuration;
      private Log _log;
      private boolean _cacheSupportsReload = true;
***************
*** 76,80 ****
      /**
       * Create a new TemplateProvider that uses the specified directory
!      * as the source for Template objects that it will return
       * @exception InitException provider failed to initialize
       */
--- 76,81 ----
      /**
       * Create a new TemplateProvider that uses the specified directory
!      * as the source for Template objects that it will return.
!      * 
       * @exception InitException provider failed to initialize
       */
***************
*** 83,87 ****
          _broker = b;
          _log = b.getLog("resource", "Object loading and caching");
!         _cacheDuration = config.getIntegerSetting("TemplateExpireTime", 0);
          reloadDelay = new ReloadDelayDecorator();
          reloadDelay.init(b, config);
--- 84,88 ----
          _broker = b;
          _log = b.getLog("resource", "Object loading and caching");
!         //_cacheDuration = config.getIntegerSetting("TemplateExpireTime", 0);
          reloadDelay = new ReloadDelayDecorator();
          reloadDelay.init(b, config);

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template TestAbuse.java, 1.10, 1.11

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6271/test/unit/org/webmacro/template

Modified Files:
	TestAbuse.java 
Log Message:
Javadoc, add FIXMEs

Index: TestAbuse.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestAbuse.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TestAbuse.java	17 Mar 2008 13:54:10 -0000	1.10
--- TestAbuse.java	17 Mar 2008 13:59:51 -0000	1.11
***************
*** 6,12 ****
  
  /**
!  * the abuse test.  Tries to do really mean things to
!  * the parser, and even expects the parser to do them 
!  * correctly.
   */
  public class TestAbuse extends TemplateTestCase
--- 6,12 ----
  
  /**
!  * The abuse test.  
!  * Tries to do really mean things to the parser, 
!  * and even expects the parser to do them correctly.
   */
  public class TestAbuse extends TemplateTestCase
***************
*** 27,31 ****
  
  
!     /** We'll start easy */
      public void testEOLComment () throws Exception
      {
--- 27,31 ----
  
  
!     /** We'll start easy. */
      public void testEOLComment () throws Exception
      {
***************
*** 34,38 ****
  
  
!     /** this is easy too */
      public void testBlockComment () throws Exception
      {
--- 34,38 ----
  
  
!     /** This is easy too. */
      public void testBlockComment () throws Exception
      {
***************
*** 41,45 ****
  
  
!     /** test a variable reference like: Welcome to the site, $User. */
      public void testTrailingDot () throws Exception
      {
--- 41,45 ----
  
  
!     /** Test a variable reference like: Welcome to the site, $User. */
      public void testTrailingDot () throws Exception
      {
***************
*** 70,75 ****
  
  
!     /** split an #if across multiple lines.
!      currently produces a big parse error
       */
      public void testMultiLineIf () throws Exception
--- 70,75 ----
  
  
!     /** Split an #if across multiple lines.
!      *  FIXME Currently produces a parse error.
       */
      public void testMultiLineIf () throws Exception
***************
*** 77,82 ****
          System.err.println("NEED TO REVISIT: TestAbuse.testMultiLineIf()");
          assertTrue(true);
! //      String tmpl = "#if (true\n&& true && true\n) {pass} #else {fail}";
! //      assertStringTemplateEquals (tmpl, "pass");
  
      }
--- 77,82 ----
          System.err.println("NEED TO REVISIT: TestAbuse.testMultiLineIf()");
          assertTrue(true);
!         // String tmpl = "#if (true\n&& true && true\n) {pass} #else {fail}";
!         // assertStringTemplateEquals (tmpl, "pass");
  
      }
***************
*** 114,120 ****
  
  
!     /** the infamous "but I want to put Javascript in an #if block!!"
  
!      Currently fails when using { and }, but passes with 
       #begin and #end.  Any reason why?
       */
--- 114,120 ----
  
  
!     /** The infamous "but I want to put Javascript in an #if block!!"
  
!      FIXME Currently fails when using { and }, but passes with 
       #begin and #end.  Any reason why?
       */
***************
*** 149,152 ****
--- 149,155 ----
  
  
+     /**
+      * Test that semi-colons are ignored.
+      */
      public void testSemi () throws Exception
      {
***************
*** 161,164 ****
--- 164,170 ----
  
  
+     /**
+      * Test that a BuildException is thrown.
+      */
      public void testNastyEndreTemplate () throws Exception
      {

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template TestAbuse.java, 1.9, 1.10

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3482/test/unit/org/webmacro/template

Modified Files:
	TestAbuse.java 
Log Message:
Use previously unused variable

Index: TestAbuse.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestAbuse.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestAbuse.java	12 Jun 2003 00:47:49 -0000	1.9
--- TestAbuse.java	17 Mar 2008 13:54:10 -0000	1.10
***************
*** 136,144 ****
                  + "</script>\n";
  
!         // check it with #begin and #end
          String tmpl = "#if (true) #begin"
                  + jscript
                  + "#end";
          assertStringTemplateEquals(tmpl, jscript);
      }
  
--- 136,149 ----
                  + "</script>\n";
  
!         // check no new line with #begin and #end
          String tmpl = "#if (true) #begin"
                  + jscript
                  + "#end";
          assertStringTemplateEquals(tmpl, jscript);
+         // check newline with #begin and #end
+         tmpl = "#if (true) #begin"
+                 + jscriptnl
+                 + "#end";
+         assertStringTemplateEquals(tmpl, jscriptnl);
      }
  

[WebMacro-cvs] webmacro/examples Standalone.java,1.9,1.10

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/examples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32403/examples

Modified Files:
	Standalone.java 
Log Message:
Eclipse warning:  organise imports, generate servialVersionID

Index: Standalone.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/examples/Standalone.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Standalone.java	4 Jul 2005 21:00:55 -0000	1.9
--- Standalone.java	17 Mar 2008 12:29:56 -0000	1.10
***************
*** 19,31 ****
  
  
- import org.webmacro.*;
- import org.webmacro.servlet.WebContext;
  import java.util.Date;
  
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
- import javax.servlet.http.HttpServlet;
  import javax.servlet.ServletConfig;
  import javax.servlet.ServletException;
  
  /**
--- 19,35 ----
  
  
  import java.util.Date;
  
  import javax.servlet.ServletConfig;
  import javax.servlet.ServletException;
+ import javax.servlet.http.HttpServlet;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+ 
+ import org.webmacro.InitException;
+ import org.webmacro.Template;
+ import org.webmacro.WM;
+ import org.webmacro.WebMacro;
+ import org.webmacro.servlet.WebContext;
  
  /**
***************
*** 53,57 ****
  public class Standalone extends HttpServlet
  {
! 
     /**
       * This is the core WebMacro interface which we use to create Contexts, 
--- 57,62 ----
  public class Standalone extends HttpServlet
  {
!     private static final long serialVersionUID = 8217641121301549921L;
!     
     /**
       * This is the core WebMacro interface which we use to create Contexts, 

[WebMacro-cvs] webmacro/examples SandBox.java,1.2,1.3

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/examples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31928/examples

Modified Files:
	SandBox.java 
Log Message:
Eclipse warning:  organise imports, generate servialVersionID

Index: SandBox.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/examples/SandBox.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SandBox.java	4 May 2001 00:39:27 -0000	1.2
--- SandBox.java	17 Mar 2008 12:28:08 -0000	1.3
***************
*** 1,12 ****
! import org.webmacro.*;
! import org.webmacro.servlet.*;
  
  /**
!   * SandBox - where to play
    */
  public class SandBox extends WMServlet
  {
  
!    public Template handle(WebContext context) throws HandlerException
     {
  
--- 1,17 ----
! import org.webmacro.ResourceException;
! import org.webmacro.Template;
! import org.webmacro.servlet.HandlerException;
! import org.webmacro.servlet.WMServlet;
! import org.webmacro.servlet.WebContext;
  
  /**
!   * SandBox - where to play.
    */
  public class SandBox extends WMServlet
  {
  
!   private static final long serialVersionUID = -4000736997081536863L;
! 
!   public Template handle(WebContext context) throws HandlerException
     {
  

[WebMacro-cvs] webmacro/src/org/webmacro/util CastUtil.java, 1.11, 1.12

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31203/src/org/webmacro/util

Modified Files:
	CastUtil.java 
Log Message:
Eclipse warning: Unused private method, unused variable

Index: CastUtil.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/CastUtil.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CastUtil.java	31 Oct 2005 02:46:41 -0000	1.11
--- CastUtil.java	17 Mar 2008 12:26:50 -0000	1.12
***************
*** 187,191 ****
      static public void main (String[] args)
      {
-         CastUtil cu = CastUtil.getInstance();
          println("77"
                  + test(BOOLEAN, "77")
--- 187,190 ----
***************
*** 208,216 ****
      }
  
-     static private void print (Object o)
-     {
-         System.out.print(o);
-     }
- 
      final static public int BOOLEAN = 1;
      final static public int CHAR = 2;
--- 207,210 ----

[WebMacro-cvs] webmacro/src/org/webmacro/adapter/jsp TemplateTag.java, 1.3, 1.4

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30007/src/org/webmacro/adapter/jsp

Modified Files:
	TemplateTag.java 
Log Message:
Eclipse warning:  generate servialVersionID

Index: TemplateTag.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp/TemplateTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TemplateTag.java	13 Mar 2008 23:53:10 -0000	1.3
--- TemplateTag.java	17 Mar 2008 12:23:44 -0000	1.4
***************
*** 57,60 ****
--- 57,62 ----
  public class TemplateTag extends BodyTagSupport
  {
+     private static final long serialVersionUID = -6790150900989142583L;
+ 
      private static final int DEFAULT_TEMPLATE_BUFFER_SIZE = 4000;
  

[WebMacro-cvs] webmacro/src-optional/org/opendoors/util Timer.java, 1.3, 1.4

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src-optional/org/opendoors/util
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29609/src-optional/org/opendoors/util

Modified Files:
	Timer.java 
Log Message:
Eclipse warning:  generate servialVersionID

Index: Timer.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src-optional/org/opendoors/util/Timer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Timer.java	14 Mar 2008 16:00:40 -0000	1.3
--- Timer.java	17 Mar 2008 12:22:32 -0000	1.4
***************
*** 32,35 ****
--- 32,36 ----
  public class Timer extends Observable implements Runnable, Serializable
  {
+     private static final long serialVersionUID = -7644577425188277667L;
  
      /** The timer thread. */

[WebMacro-cvs] webmacro/examples HelloWorld.java,1.6,1.7

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/examples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27623/examples

Modified Files:
	HelloWorld.java 
Log Message:
Eclipse warning:  organise imports, generate servialVersionID

Index: HelloWorld.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/examples/HelloWorld.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** HelloWorld.java	4 May 2001 00:39:27 -0000	1.6
--- HelloWorld.java	17 Mar 2008 12:17:43 -0000	1.7
***************
*** 1,8 ****
! 
! // import the WebMacro core interfaces
! import org.webmacro.*;
! 
! // import the WebMacro servlet classes
! import org.webmacro.servlet.*;
  
  
--- 1,7 ----
! import org.webmacro.ResourceException;
! import org.webmacro.Template;
! import org.webmacro.servlet.HandlerException;
! import org.webmacro.servlet.WMServlet;
! import org.webmacro.servlet.WebContext;
  
  
***************
*** 29,34 ****
  public class HelloWorld extends WMServlet
  {
  
!    /**
       * WebMacro creates a WebContext and passes it to your servlet. 
       * The WebContext contains all the information you'll need to 
--- 28,34 ----
  public class HelloWorld extends WMServlet
  {
+   private static final long serialVersionUID = 8929486027913401035L;
  
!   /**
       * WebMacro creates a WebContext and passes it to your servlet. 
       * The WebContext contains all the information you'll need to 

[WebMacro-cvs] webmacro/examples CheckConfig.java,1.3,1.4

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/examples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27231/examples

Modified Files:
	CheckConfig.java 
Log Message:
Eclipse warning: unused variable sess, organise imports, generate servialVersionID

Index: CheckConfig.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/examples/CheckConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CheckConfig.java	10 Jan 2002 23:40:24 -0000	1.3
--- CheckConfig.java	17 Mar 2008 12:16:29 -0000	1.4
***************
*** 1,9 ****
- import org.webmacro.servlet.*;
- import org.webmacro.*;
- import java.util.*;
- import java.io.StringWriter;
  import java.io.PrintWriter;
! import javax.servlet.http.*;
  import javax.servlet.ServletException;
  
  /**
--- 1,17 ----
  import java.io.PrintWriter;
! import java.io.StringWriter;
! import java.util.Enumeration;
! import java.util.Properties;
! import java.util.TreeMap;
! 
  import javax.servlet.ServletException;
+ import javax.servlet.http.HttpServletRequest;
+ 
+ import org.webmacro.Broker;
+ import org.webmacro.Log;
+ import org.webmacro.Template;
+ import org.webmacro.servlet.HandlerException;
+ import org.webmacro.servlet.WMServlet;
+ import org.webmacro.servlet.WebContext;
  
  /**
***************
*** 14,17 ****
--- 22,27 ----
   */
  public class CheckConfig extends WMServlet {
+     private static final long serialVersionUID = -1844295645621234018L;
+     
      final static public boolean DEBUG = true;
      final static public String DEFAULT_TEMPLATE = "default.wm";
***************
*** 19,23 ****
      
      public Template handle(WebContext context) throws HandlerException {
-         HttpSession sess = null;
          try {
              //TODO: 
--- 29,32 ----
***************
*** 112,116 ****
      }
  
!     /** debugging utility - dumps list of request headers from a WebContext */
      static public void printRequestHeaders(WebContext context){
          HttpServletRequest req = context.getRequest();
--- 121,125 ----
      }
  
!     /** Debugging utility - dumps list of request headers from a WebContext. */
      static public void printRequestHeaders(WebContext context){
          HttpServletRequest req = context.getRequest();
***************
*** 125,129 ****
      }
      
!     /** write the stack trace from an exception into a string */
      static public String getStackTrace(Throwable e){
          if (e == null) return null;
--- 134,138 ----
      }
      
!     /** Write the stack trace from an exception into a string. */
      static public String getStackTrace(Throwable e){
          if (e == null) return null;
***************
*** 149,151 ****
          
      }
! } // class CheckConfig
--- 158,160 ----
          
      }
! }

[WebMacro-cvs] webmacro/src/org/webmacro/engine QuotedStringBuilder.java, 1.16, 1.17

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26074/src/org/webmacro/engine

Modified Files:
	QuotedStringBuilder.java 
Log Message:
Eclipse warning: unused variable debug, organise imports, generate servialVersionID

Index: QuotedStringBuilder.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/QuotedStringBuilder.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** QuotedStringBuilder.java	30 Jul 2005 04:00:34 -0000	1.16
--- QuotedStringBuilder.java	17 Mar 2008 12:13:53 -0000	1.17
***************
*** 24,43 ****
  package org.webmacro.engine;
  
- import org.webmacro.*;
- 
  import java.io.IOException;
  import java.util.Enumeration;
  import java.util.Vector;
  
  
  public final class QuotedStringBuilder extends Vector implements Builder
  {
  
!     /**
! 	 * 
! 	 */
! 	private static final long serialVersionUID = 1L;
  
! 	final public Object build (BuildContext bc) throws BuildException
      {
          StringBuffer str = new StringBuffer(100);
--- 24,45 ----
  package org.webmacro.engine;
  
  import java.io.IOException;
  import java.util.Enumeration;
  import java.util.Vector;
  
+ import org.webmacro.Context;
+ import org.webmacro.FastWriter;
+ import org.webmacro.Macro;
+ import org.webmacro.PropertyException;
+ import org.webmacro.TemplateVisitor;
+ import org.webmacro.Visitable;
+ 
  
  public final class QuotedStringBuilder extends Vector implements Builder
  {
  
!   private static final long serialVersionUID = -7489766042268586054L;
  
!   final public Object build (BuildContext bc) throws BuildException
      {
          StringBuffer str = new StringBuffer(100);
***************
*** 111,123 ****
  final class QuotedString extends Vector implements Macro, Visitable
  {
! 
!     /**
! 	 * 
! 	 */
! 	private static final long serialVersionUID = 1L;
! 	/**
!      * conditionally include debugging statements in the compiled code
!      */
!     private static final boolean debug = false;
  
      /**
--- 113,117 ----
  final class QuotedString extends Vector implements Macro, Visitable
  {
!   private static final long serialVersionUID = 7578610597935217L;
  
      /**

[WebMacro-cvs] webmacro/src/org/webmacro/util ByteBufferOutputStream.java, 1.9, 1.10

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24482/src/org/webmacro/util

Modified Files:
	ByteBufferOutputStream.java 
Log Message:
Eclipse warning: unused variable initialSize

Index: ByteBufferOutputStream.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/ByteBufferOutputStream.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ByteBufferOutputStream.java	17 Mar 2006 19:03:29 -0000	1.9
--- ByteBufferOutputStream.java	17 Mar 2008 12:09:18 -0000	1.10
***************
*** 36,40 ****
      private byte[] _buf;
      private int _pos;
-     private final int _initialSize;
  
      /**
--- 36,39 ----
***************
*** 45,49 ****
          _buf = new byte[size];
          _pos = 0;
-         _initialSize = size;
      }
  
--- 44,47 ----

[WebMacro-cvs] webmacro/examples GuestBook.java,1.9,1.10

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/examples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23952/examples

Modified Files:
	GuestBook.java 
Log Message:
Eclipse warning: unused variable debug

Index: GuestBook.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/examples/GuestBook.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GuestBook.java	28 Jan 2008 16:08:06 -0000	1.9
--- GuestBook.java	17 Mar 2008 12:08:11 -0000	1.10
***************
*** 1,3 ****
- 
  /*
   * Copyright (c) 1998, 1999 Semiotek Inc. All Rights Reserved.
--- 1,2 ----
***************
*** 36,44 ****
    * http://...servletrunner.../servlet/GuestBook/
    *
!   * You guestbook should now work.
    */
  public class GuestBook extends WMServlet 
  {
!    ArrayList book = new ArrayList();
  
     String name;
--- 35,45 ----
    * http://...servletrunner.../servlet/GuestBook/
    *
!   * Your guestbook should now work.
    */
  public class GuestBook extends WMServlet 
  {
!   private static final long serialVersionUID = -7787198191764480269L;
! 
!   ArrayList book = new ArrayList();
  
     String name;
***************
*** 47,52 ****
     GuestEntry myGuestEntry;
  
-    final static private boolean debug = false;
-    
     public Template handle(WebContext context) 
        throws HandlerException
--- 48,51 ----

[WebMacro-cvs] webmacro/test/unit/org/webmacro TestContext.java, 1.3, 1.4

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15870/test/unit/org/webmacro

Modified Files:
	TestContext.java 
Log Message:
Eclipse warning: unused variable

Index: TestContext.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/TestContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestContext.java	12 Jun 2003 00:47:49 -0000	1.3
--- TestContext.java	16 Mar 2008 12:37:30 -0000	1.4
***************
*** 24,28 ****
          _context.put("Foo", null);
          Object o = _context.get("Foo");
!         assertTrue(_context.get("Foo") == null);
      }
  
--- 24,28 ----
          _context.put("Foo", null);
          Object o = _context.get("Foo");
!         assertTrue(o == null);
      }