webmacro-cvs — receive cvs commit messages

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

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

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

Modified Files:
	WMParser_implTokenManager.java 
Log Message:
Regenerated with CVS version of JavaCC, unused elements removed by hand

Index: WMParser_implTokenManager.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_implTokenManager.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** WMParser_implTokenManager.java	17 Mar 2008 23:49:48 -0000	1.32
--- WMParser_implTokenManager.java	18 Mar 2008 11:50:04 -0000	1.33
***************
*** 34,45 ****
     return pos + 1;
  }
- private int jjStartNfaWithStates_4(int pos, int kind, int state)
- {
-    jjmatchedKind = kind;
-    jjmatchedPos = pos;
-    try { curChar = input_stream.readChar(); }
-    catch(java.io.IOException e) { return pos + 1; }
-    return jjMoveNfa_4(state, pos + 1);
- }
  private int jjMoveStringLiteralDfa0_4()
  {
--- 34,37 ----
***************
*** 163,166 ****
--- 155,166 ----
     return jjStartNfa_4(4, active0);
  }
+ private int jjStartNfaWithStates_4(int pos, int kind, int state)
+ {
+    jjmatchedKind = kind;
+    jjmatchedPos = pos;
+    try { curChar = input_stream.readChar(); }
+    catch(java.io.IOException e) { return pos + 1; }
+    return jjMoveNfa_4(state, pos + 1);
+ }
  static final long[] jjbitVec0 = {
     0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
***************
*** 171,180 ****
  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 (;;)
--- 171,178 ----
***************
*** 290,313 ****
     }
  }
- private final int jjStopStringLiteralDfa_1(int pos, long active0)
- {
-    switch (pos)
-    {
-       default :
-          return -1;
-    }
- }
- private final int jjStartNfa_1(int pos, long active0)
- {
-    return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
- }
- private int jjStartNfaWithStates_1(int pos, int kind, int state)
- {
-    jjmatchedKind = kind;
-    jjmatchedPos = pos;
-    try { curChar = input_stream.readChar(); }
-    catch(java.io.IOException e) { return pos + 1; }
-    return jjMoveNfa_1(state, pos + 1);
- }
  private int jjMoveStringLiteralDfa0_1()
  {
--- 288,291 ----
***************
*** 324,335 ****
     }
  }
  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 (;;)
--- 302,319 ----
     }
  }
+ private int jjStartNfaWithStates_1(int pos, int kind, int state)
+ {
+    jjmatchedKind = kind;
+    jjmatchedPos = pos;
+    try { curChar = input_stream.readChar(); }
+    catch(java.io.IOException e) { return pos + 1; }
+    return jjMoveNfa_1(state, pos + 1);
+ }
  private int jjMoveNfa_1(int startState, int curPos)
  {
     int startsAt = 0;
     jjnewStateCnt = 5;
     int i = 1;
     jjstateSet[0] = startState;
     int kind = 0x7fffffff;
     for (;;)
***************
*** 451,460 ****
  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 (;;)
--- 435,442 ----
***************
*** 481,485 ****
        else if (curChar < 128)
        {
!          long l = 1L << (curChar & 077);
           do
           {
--- 463,467 ----
        else if (curChar < 128)
        {
!          //long l = 1L << (curChar & 077);
           do
           {
***************
*** 614,625 ****
     return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
  }
- private int jjStartNfaWithStates_3(int pos, int kind, int state)
- {
-    jjmatchedKind = kind;
-    jjmatchedPos = pos;
-    try { curChar = input_stream.readChar(); }
-    catch(java.io.IOException e) { return pos + 1; }
-    return jjMoveNfa_3(state, pos + 1);
- }
  private int jjMoveStringLiteralDfa0_3()
  {
--- 596,599 ----
***************
*** 870,881 ****
     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 (;;)
--- 844,861 ----
     return jjStartNfa_3(7, active0);
  }
+ private int jjStartNfaWithStates_3(int pos, int kind, int state)
+ {
+    jjmatchedKind = kind;
+    jjmatchedPos = pos;
+    try { curChar = input_stream.readChar(); }
+    catch(java.io.IOException e) { return pos + 1; }
+    return jjMoveNfa_3(state, pos + 1);
+ }
  private int jjMoveNfa_3(int startState, int curPos)
  {
     int startsAt = 0;
     jjnewStateCnt = 31;
     int i = 1;
     jjstateSet[0] = startState;
     int kind = 0x7fffffff;
     for (;;)
***************
*** 1155,1178 ****
     }
  }
- private final int jjStopStringLiteralDfa_0(int pos, long active0)
- {
-    switch (pos)
-    {
-       default :
-          return -1;
-    }
- }
- private final int jjStartNfa_0(int pos, long active0)
- {
-    return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
- }
- private int jjStartNfaWithStates_0(int pos, int kind, int state)
- {
-    jjmatchedKind = kind;
-    jjmatchedPos = pos;
-    try { curChar = input_stream.readChar(); }
-    catch(java.io.IOException e) { return pos + 1; }
-    return jjMoveNfa_0(state, pos + 1);
- }
  private int jjMoveStringLiteralDfa0_0()
  {
--- 1135,1138 ----
***************
*** 1189,1200 ****
     }
  }
  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 (;;)
--- 1149,1166 ----
     }
  }
+ private int jjStartNfaWithStates_0(int pos, int kind, int state)
+ {
+    jjmatchedKind = kind;
+    jjmatchedPos = pos;
+    try { curChar = input_stream.readChar(); }
+    catch(java.io.IOException e) { return pos + 1; }
+    return jjMoveNfa_0(state, pos + 1);
+ }
  private int jjMoveNfa_0(int startState, int curPos)
  {
     int startsAt = 0;
     jjnewStateCnt = 5;
     int i = 1;
     jjstateSet[0] = startState;
     int kind = 0x7fffffff;
     for (;;)
***************
*** 1362,1368 ****
  private final int[] jjrounds = new int[31];
  private final int[] jjstateSet = new int[62];
! StringBuffer image;
! int jjimageLen;
! int lengthOfMatch;
  protected char curChar;
  /** Constructor. */
--- 1328,1333 ----
  private final int[] jjrounds = new int[31];
  private final int[] jjstateSet = new int[62];
! private final StringBuffer jjimage = new StringBuffer();
! private StringBuffer image = jjimage;
  protected char curChar;
  /** Constructor. */
***************
*** 1435,1440 ****
        endColumn = input_stream.getEndColumn();
     }
!    t = Token.newToken(jjmatchedKind);
!    t.image = tokenImage;
     t.beginLine = beginLine;
     t.endLine = endLine;
--- 1400,1405 ----
        endColumn = input_stream.getEndColumn();
     }
!    t = Token.newToken(jjmatchedKind, tokenImage);
! 
     t.beginLine = beginLine;
     t.endLine = endLine;
***************
*** 1455,1459 ****
  public Token getNextToken() 
  {
-   //int kind;
    Token specialToken = null;
    Token matchedToken;
--- 1420,1423 ----
***************
*** 1474,1479 ****
        return matchedToken;
     }
!    image = null;
!    jjimageLen = 0;
  
     switch(curLexState)
--- 1438,1443 ----
        return matchedToken;
     }
!    image = jjimage;
!    image.setLength(0);
  
     switch(curLexState)
***************
*** 1591,1606 ****
     } 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);
- }
  
  }
--- 1555,1558 ----

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

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

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

Modified Files:
	WMParser_impl.java 
Log Message:
Regenerated with CVS version of JavaCC, removed unused variable in grammar

Index: WMParser_impl.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** WMParser_impl.java	17 Mar 2008 23:46:35 -0000	1.57
--- WMParser_impl.java	18 Mar 2008 11:44:33 -0000	1.58
***************
*** 1801,1805 ****
    Token t;
    Object o;
-   Subdirective s;
      jj_consume_token(POUND);
      SetState(WM);
--- 1801,1804 ----
***************
*** 2519,2527 ****
    }
  
-   private boolean jj_3_18() {
-     if (jj_scan_token(DOLLAR)) return true;
-     return false;
-   }
- 
    private boolean jj_3_11() {
      Token xsp;
--- 2518,2521 ----
***************
*** 2539,2542 ****
--- 2533,2541 ----
    }
  
+   private boolean jj_3_18() {
+     if (jj_scan_token(DOLLAR)) return true;
+     return false;
+   }
+ 
    private boolean jj_3R_53() {
      if (jj_scan_token(STUFF)) return true;
***************
*** 2544,2547 ****
--- 2543,2557 ----
    }
  
+   private boolean jj_3_15() {
+     Token xsp;
+     xsp = jj_scanpos;
+     if (jj_scan_token(30)) jj_scanpos = xsp;
+     if (jj_scan_token(OP_OR)) return true;
+     xsp = jj_scanpos;
+     if (jj_scan_token(30)) jj_scanpos = xsp;
+     if (jj_3R_30()) return true;
+     return false;
+   }
+ 
    private boolean jj_3R_47() {
      Token xsp;
***************
*** 2563,2577 ****
    }
  
-   private boolean jj_3_15() {
-     Token xsp;
-     xsp = jj_scanpos;
-     if (jj_scan_token(30)) jj_scanpos = xsp;
-     if (jj_scan_token(OP_OR)) return true;
-     xsp = jj_scanpos;
-     if (jj_scan_token(30)) jj_scanpos = xsp;
-     if (jj_3R_30()) return true;
-     return false;
-   }
- 
    private boolean jj_3R_26() {
      if (jj_3R_25()) return true;
--- 2573,2576 ----
***************
*** 2640,2648 ****
    }
  
-   private boolean jj_3_22() {
-     if (jj_scan_token(POUND)) return true;
-     return false;
-   }
- 
    private boolean jj_3R_39() {
      if (jj_3R_52()) return true;
--- 2639,2642 ----
***************
*** 2660,2663 ****
--- 2654,2667 ----
    }
  
+   private boolean jj_3_22() {
+     if (jj_scan_token(POUND)) return true;
+     return false;
+   }
+ 
+   private boolean jj_3R_38() {
+     if (jj_3R_51()) return true;
+     return false;
+   }
+ 
    private boolean jj_3_17() {
      if (jj_scan_token(DOLLAR)) return true;
***************
*** 2671,2679 ****
    }
  
-   private boolean jj_3R_38() {
-     if (jj_3R_51()) return true;
-     return false;
-   }
- 
    private boolean jj_3R_37() {
      if (jj_3R_50()) return true;
--- 2675,2678 ----
***************
*** 2694,2704 ****
    }
  
!   private boolean jj_3R_63() {
!     if (jj_scan_token(DOLLAR)) return true;
      return false;
    }
  
!   private boolean jj_3R_35() {
!     if (jj_3R_49()) return true;
      return false;
    }
--- 2693,2703 ----
    }
  
!   private boolean jj_3R_35() {
!     if (jj_3R_49()) return true;
      return false;
    }
  
!   private boolean jj_3R_63() {
!     if (jj_scan_token(DOLLAR)) return true;
      return false;
    }
***************
*** 2793,2799 ****
      if (jj_3R_33()) {
      jj_scanpos = xsp;
!     lookingAhead = true;
      jj_semLA = lookahead_not_breaking_subd();
!     lookingAhead = false;
      if (!jj_semLA || jj_3R_34()) return true;
      }
--- 2792,2798 ----
      if (jj_3R_33()) {
      jj_scanpos = xsp;
!     jj_lookingAhead = true;
      jj_semLA = lookahead_not_breaking_subd();
!     jj_lookingAhead = false;
      if (!jj_semLA || jj_3R_34()) return true;
      }
***************
*** 2808,2818 ****
    }
  
!   private boolean jj_3_23() {
!     if (jj_scan_token(LBRACE)) return true;
      return false;
    }
  
!   private boolean jj_3R_58() {
!     if (jj_scan_token(QUOTE)) return true;
      return false;
    }
--- 2807,2817 ----
    }
  
!   private boolean jj_3R_58() {
!     if (jj_scan_token(QUOTE)) return true;
      return false;
    }
  
!   private boolean jj_3_23() {
!     if (jj_scan_token(LBRACE)) return true;
      return false;
    }
***************
*** 2884,2894 ****
    }
  
!   private boolean jj_3R_48() {
!     if (jj_scan_token(POUND)) return true;
      return false;
    }
  
!   private boolean jj_3R_51() {
!     if (jj_scan_token(LBRACKET)) return true;
      return false;
    }
--- 2883,2893 ----
    }
  
!   private boolean jj_3R_51() {
!     if (jj_scan_token(LBRACKET)) return true;
      return false;
    }
  
!   private boolean jj_3R_48() {
!     if (jj_scan_token(POUND)) return true;
      return false;
    }
***************
*** 2936,2940 ****
    private int jj_la;
    /** Whether we are looking ahead. */
!   public boolean lookingAhead = false;
    private boolean jj_semLA;
    private int jj_gen;
--- 2935,2939 ----
    private int jj_la;
    /** Whether we are looking ahead. */
!   private boolean jj_lookingAhead = false;
    private boolean jj_semLA;
    private int jj_gen;
***************
*** 2971,2974 ****
--- 2970,2974 ----
      token = new Token();
      jj_ntk = -1;
+     jj_lookingAhead = false;
      jj_gen = 0;
      for (int i = 0; i < 120; i++) jj_la1[i] = -1;
***************
*** 3020,3024 ****
    }
  
!   static private final class LookaheadSuccess extends java.lang.Error { }
    final private LookaheadSuccess jj_ls = new LookaheadSuccess();
    private boolean jj_scan_token(int kind) {
--- 3020,3027 ----
    }
  
!   static private final class LookaheadSuccess extends java.lang.Error {
!       // The things I will do to apease IDEs
!       private static final long serialVersionUID = 1L; 
!   }
    final private LookaheadSuccess jj_ls = new LookaheadSuccess();
    private boolean jj_scan_token(int kind) {
***************
*** 3055,3059 ****
  /** Get the specific Token. */
    final public Token getToken(int index) {
!     Token t = lookingAhead ? jj_scanpos : token;
      for (int i = 0; i < index; i++) {
        if (t.next != null) t = t.next;
--- 3058,3062 ----
  /** Get the specific Token. */
    final public Token getToken(int index) {
!     Token t = jj_lookingAhead ? jj_scanpos : token;
      for (int i = 0; i < index; i++) {
        if (t.next != null) t = t.next;
***************
*** 3070,3074 ****
    }
  
!   private java.util.Vector jj_expentries = new java.util.Vector();
    private int[] jj_expentry;
    private int jj_kind = -1;
--- 3073,3077 ----
    }
  
!   private java.util.List jj_expentries = new java.util.ArrayList();
    private int[] jj_expentry;
    private int jj_kind = -1;
***************
*** 3085,3103 ****
          jj_expentry[i] = jj_lasttokens[i];
        }
!       boolean exists = false;
!       for (java.util.Enumeration e = jj_expentries.elements(); e.hasMoreElements();) {
!         int[] oldentry = (int[])(e.nextElement());
          if (oldentry.length == jj_expentry.length) {
-           exists = true;
            for (int i = 0; i < jj_expentry.length; i++) {
              if (oldentry[i] != jj_expentry[i]) {
!               exists = false;
!               break;
              }
            }
!           if (exists) break;
          }
        }
-       if (!exists) jj_expentries.addElement(jj_expentry);
        if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
      }
--- 3088,3103 ----
          jj_expentry[i] = jj_lasttokens[i];
        }
!       jj_entries_loop: for (java.util.Iterator it = jj_expentries.iterator(); it.hasNext();) {
!         int[] oldentry = (int[])(it.next());
          if (oldentry.length == jj_expentry.length) {
            for (int i = 0; i < jj_expentry.length; i++) {
              if (oldentry[i] != jj_expentry[i]) {
!               continue jj_entries_loop;
              }
            }
!           jj_expentries.add(jj_expentry);
!           break jj_entries_loop;
          }
        }
        if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
      }
***************
*** 3106,3110 ****
    /** Generate ParseException. */
    public ParseException generateParseException() {
!     jj_expentries.removeAllElements();
      boolean[] la1tokens = new boolean[59];
      if (jj_kind >= 0) {
--- 3106,3110 ----
    /** Generate ParseException. */
    public ParseException generateParseException() {
!     jj_expentries.clear();
      boolean[] la1tokens = new boolean[59];
      if (jj_kind >= 0) {
***************
*** 3128,3132 ****
          jj_expentry = new int[1];
          jj_expentry[0] = i;
!         jj_expentries.addElement(jj_expentry);
        }
      }
--- 3128,3132 ----
          jj_expentry = new int[1];
          jj_expentry[0] = i;
!         jj_expentries.add(jj_expentry);
        }
      }
***************
*** 3136,3140 ****
      int[][] exptokseq = new int[jj_expentries.size()][];
      for (int i = 0; i < jj_expentries.size(); i++) {
!       exptokseq[i] = (int[])jj_expentries.elementAt(i);
      }
      return new ParseException(token, exptokseq, tokenImage);
--- 3136,3140 ----
      int[][] exptokseq = new int[jj_expentries.size()][];
      for (int i = 0; i < jj_expentries.size(); i++) {
!       exptokseq[i] = (int[])jj_expentries.get(i);
      }
      return new ParseException(token, exptokseq, tokenImage);

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

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

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

Modified Files:
	Token.java 
Log Message:
Regenerated with CVS version of JavaCC, more comments, less warnings, unnecessary finals removed

Index: Token.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/Token.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Token.java	17 Mar 2008 23:43:44 -0000	1.6
--- Token.java	18 Mar 2008 11:42:30 -0000	1.7
***************
*** 1,3 ****
--- 1,4 ----
  /* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */
+ /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null */
  package org.webmacro.parser;
  
***************
*** 54,58 ****
  
    /**
!    * No-argument contructor
     */
    public Token() {}
--- 55,71 ----
  
    /**
!    * An optional attribute value of the Token.
!    * Tokens which are not used as syntactic sugar will often contain
!    * meaningful values that will be used later on by the compiler or
!    * interpreter. This attribute value is often different from the image.
!    * Any subclass of Token that actually wants to return a non-null value can
!    * override this method as appropriate.
!    */
!   public Object getValue() {
!     return null;
!   }
! 
!   /**
!    * No-argument constructor
     */
    public Token() {}
***************
*** 93,99 ****
     *
     * 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)
--- 106,112 ----
     *
     * to the following switch statement. Then you can cast matchedToken
!    * variable to the appropriate type and use sit in your lexical actions.
     */
!   public static Token newToken(int ofKind, String image)
    {
       switch(ofKind)
***************
*** 103,107 ****
    }
  
!   public static final Token newToken(int ofKind)
    {
       return newToken(ofKind, null);
--- 116,120 ----
    }
  
!   public static Token newToken(int ofKind)
    {
       return newToken(ofKind, null);
***************
*** 109,110 ****
--- 122,124 ----
  
  }
+ /* JavaCC - OriginalChecksum=4c0a5442e139dec7d7b83a0c3aaebda2 (do not edit this line) */

[WebMacro-cvs] webmacro/src/org/webmacro/parser CharStream.java, 1.6, 1.7

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

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

Modified Files:
	CharStream.java 
Log Message:
Regenerated with CVS version of JavaCC, more comments, less warnings

Index: CharStream.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/CharStream.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CharStream.java	27 May 2005 19:44:58 -0000	1.6
--- CharStream.java	18 Mar 2008 11:40:08 -0000	1.7
***************
*** 1,3 ****
! /* Generated By:JavaCC: Do not edit this line. CharStream.java Version 3.0 */
  package org.webmacro.parser;
  
--- 1,4 ----
! /* Generated By:JavaCC: Do not edit this line. CharStream.java Version 4.1 */
! /* JavaCCOptions:STATIC=false */
  package org.webmacro.parser;
  
***************
*** 109,110 ****
--- 110,112 ----
  
  }
+ /* JavaCC - OriginalChecksum=995d31c169f1d3d55e372131438a66de (do not edit this line) */

[WebMacro-cvs] webmacro/src/org/webmacro/parser TokenMgrError.java, 1.6, 1.7

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

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

Modified Files:
	TokenMgrError.java 
Log Message:
Regenerated with CVS version of JavaCC, more comments, less warnings

Index: TokenMgrError.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/TokenMgrError.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TokenMgrError.java	30 Jul 2005 04:00:34 -0000	1.6
--- TokenMgrError.java	18 Mar 2008 11:39:28 -0000	1.7
***************
*** 1,7 ****
! /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */
  package org.webmacro.parser;
  
  public class TokenMgrError extends Error
  {
     /*
      * Ordinals for various reasons why an Error of this type can be thrown.
--- 1,11 ----
! /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 4.1 */
! /* JavaCCOptions: */
  package org.webmacro.parser;
  
+ /** Token Manager Error. */
  public class TokenMgrError extends Error
  {
+     private static final long serialVersionUID = 419637845218887887L;
+ 
     /*
      * Ordinals for various reasons why an Error of this type can be thrown.
***************
*** 9,23 ****
  
     /**
! 	 * 
! 	 */
! 	private static final long serialVersionUID = 1L;
! 
! /**
!     * Lexical error occured.
      */
     static final int LEXICAL_ERROR = 0;
  
     /**
!     * An attempt wass made to create a second instance of a static token manager.
      */
     static final int STATIC_LEXER_ERROR = 1;
--- 13,22 ----
  
     /**
!     * Lexical error occurred.
      */
     static final int LEXICAL_ERROR = 0;
  
     /**
!     * An attempt was made to create a second instance of a static token manager.
      */
     static final int STATIC_LEXER_ERROR = 1;
***************
*** 40,44 ****
  
     /**
!     * Replaces unprintable characters by their espaced (or unicode escaped)
      * equivalents in the given string
      */
--- 39,43 ----
  
     /**
!     * Replaces unprintable characters by their escaped (or unicode escaped)
      * equivalents in the given string
      */
***************
*** 92,100 ****
      * token manager to indicate a lexical error.
      * Parameters : 
!     *    EOFSeen     : indicates if EOF caused the lexicl error
!     *    curLexState : lexical state in which this error occured
!     *    errorLine   : line number when the error occured
!     *    errorColumn : column number when the error occured
!     *    errorAfter  : prefix that was seen before this error occured
      *    curchar     : the offending character
      * Note: You can customize the lexical error message by modifying this method.
--- 91,99 ----
      * token manager to indicate a lexical error.
      * Parameters : 
!     *    EOFSeen     : indicates if EOF caused the lexical error
!     *    curLexState : lexical state in which this error occurred
!     *    errorLine   : line number when the error occurred
!     *    errorColumn : column number when the error occurred
!     *    errorAfter  : prefix that was seen before this error occurred
      *    curchar     : the offending character
      * Note: You can customize the lexical error message by modifying this method.
***************
*** 125,131 ****
--- 124,132 ----
      */
  
+    /** No arg constructor. */
     public TokenMgrError() {
     }
  
+    /** Constructor with message and reason. */
     public TokenMgrError(String message, int reason) {
        super(message);
***************
*** 133,138 ****
--- 134,141 ----
     }
  
+    /** Full Constructor. */
     public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
        this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
     }
  }
+ /* JavaCC - OriginalChecksum=704347df73e865ae0e52f827bf72326f (do not edit this line) */

[WebMacro-cvs] webmacro/src/org/webmacro/util WMEval.java, 1.20, 1.21

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

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

Modified Files:
	WMEval.java 
Log Message:
Organise imports

Index: WMEval.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/WMEval.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** WMEval.java	31 Oct 2005 02:46:41 -0000	1.20
--- WMEval.java	18 Mar 2008 11:20:35 -0000	1.21
***************
*** 23,30 ****
  package org.webmacro.util;
  
! import org.webmacro.*;
! import org.webmacro.servlet.*;
! import org.webmacro.engine.*;
! 
  
  import javax.servlet.Servlet;
--- 23,30 ----
  package org.webmacro.util;
  
! import java.io.FileOutputStream;
! import java.io.InputStream;
! import java.io.InputStreamReader;
! import java.io.OutputStream;
  
  import javax.servlet.Servlet;
***************
*** 32,39 ****
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
! import java.io.FileOutputStream;
! import java.io.InputStream;
! import java.io.InputStreamReader;
! import java.io.OutputStream;
  
  
--- 32,44 ----
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
! 
! import org.webmacro.Context;
! import org.webmacro.Log;
! import org.webmacro.Template;
! import org.webmacro.WM;
! import org.webmacro.WMConstants;
! import org.webmacro.WebMacro;
! import org.webmacro.engine.StreamTemplate;
! import org.webmacro.servlet.WebContext;
  
  
***************
*** 41,45 ****
   * WMEval encapsulates an instance of WebMacro for reuse in any java application.
   * <p>
!  * Its main benefit are a number of convenience methods for evaluating a template
   * and directing output either to a supplied output stream or to a file.
   * <p>
--- 46,50 ----
   * WMEval encapsulates an instance of WebMacro for reuse in any java application.
   * <p>
!  * It's main benefits are a number of convenience methods for evaluating a template
   * and directing output either to a supplied output stream or to a file.
   * <p>
***************
*** 57,60 ****
--- 62,66 ----
   * This helper class is useful for evaluating WebMacro templates for which
   * flexibility in managing the evaluation options is key.
+  * 
   * @author Lane Sharman
   * @version 3.0

[WebMacro-cvs] webmacro/src/org/webmacro/parser WMParser_impl.jj, 1.52, 1.53

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

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

Modified Files:
	WMParser_impl.jj 
Log Message:
Remove unused variable SubDirective

Index: WMParser_impl.jj
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.jj,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** WMParser_impl.jj	14 Mar 2008 00:19:23 -0000	1.52
--- WMParser_impl.jj	18 Mar 2008 11:14:13 -0000	1.53
***************
*** 1050,1054 ****
    Token t;
    Object o;
-   Subdirective s;
  }
  {
--- 1050,1053 ----

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template TestPerformanceAreas.java, 1.4, 1.5

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

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

Modified Files:
	TestPerformanceAreas.java 
Log Message:
Comment out unused variables

Index: TestPerformanceAreas.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestPerformanceAreas.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestPerformanceAreas.java	12 Jun 2003 00:47:50 -0000	1.4
--- TestPerformanceAreas.java	18 Mar 2008 11:12:11 -0000	1.5
***************
*** 25,29 ****
      protected int iterationCount;
  
!     private static final String fileName = "org/webmacro/template/PerformanceOperations.wm";
      private static final String reportName = "org/webmacro/template/PerformanceReport.wm";
      private Context context = null;
--- 25,29 ----
      protected int iterationCount;
  
!     //private static final String fileName = "org/webmacro/template/PerformanceOperations.wm";
      private static final String reportName = "org/webmacro/template/PerformanceReport.wm";
      private Context context = null;
***************
*** 81,86 ****
      public void testPublicVersusAccessor () throws Exception
      {
!         long tet, singleTet, start, end;
! 
          PublicValue pub = new PublicValue();
          PrivateValue priv = new PrivateValue();
--- 81,86 ----
      public void testPublicVersusAccessor () throws Exception
      {
!         //long tet, singleTet, end;
!         long start;
          PublicValue pub = new PublicValue();
          PrivateValue priv = new PrivateValue();

[WebMacro-cvs] webmacro/src/org/webmacro/util Encoder.java, 1.6, 1.7

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

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

Modified Files:
	Encoder.java 
Log Message:
Remove unused variable

Index: Encoder.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/Encoder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Encoder.java	30 Jul 2003 02:28:15 -0000	1.6
--- Encoder.java	18 Mar 2008 11:07:56 -0000	1.7
***************
*** 88,95 ****
          }
  
!         // check to be sure that this encoding is supported. this will
          // throw an UnsupportedEncodingException if the JVM doesn't
          // support the requested encoding
!         byte[] test = "some test string".getBytes(encoding);
  
          // keep track of this for later
--- 88,95 ----
          }
  
!         // Check to be sure that this encoding is supported. this will
          // throw an UnsupportedEncodingException if the JVM doesn't
          // support the requested encoding
!         "some test string".getBytes(encoding);
  
          // keep track of this for later

[WebMacro-cvs] webmacro/src/org/webmacro/util EncodingCache.java, 1.14, 1.15

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

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

Modified Files:
	EncodingCache.java 
Log Message:
Remove unused variable

Index: EncodingCache.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/EncodingCache.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** EncodingCache.java	31 Oct 2005 02:46:41 -0000	1.14
--- EncodingCache.java	18 Mar 2008 11:05:04 -0000	1.15
***************
*** 109,113 ****
          }
          _encoding = encoding;
!         byte[] test = "some test string".getBytes(encoding); // throw except.
      }
  
--- 109,113 ----
          }
          _encoding = encoding;
!         "some test string".getBytes(encoding); // throw exception is encoding is invalid
      }
  
***************
*** 159,163 ****
              catch (UnsupportedEncodingException e)
              {
!                 e.printStackTrace(); // never happen: we check in ctor
                  return null;
              }
--- 159,163 ----
              catch (UnsupportedEncodingException e)
              {
!                 e.printStackTrace(); // never happen: we check in constructor
                  return null;
              }

[WebMacro-cvs] webmacro/test/unit/org/webmacro TestMultipleInstances.java, 1.8, 1.9

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

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

Modified Files:
	TestMultipleInstances.java 
Log Message:
Remove unused variable

Index: TestMultipleInstances.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/TestMultipleInstances.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestMultipleInstances.java	16 Jul 2003 06:45:00 -0000	1.8
--- TestMultipleInstances.java	18 Mar 2008 10:58:26 -0000	1.9
***************
*** 53,57 ****
          String template = " #foo ";
          String output = null;
-         Context context = null;
  
          // against the default configured WM isntance, this *should* throw
--- 53,56 ----

[WebMacro-cvs] webmacro/src/org/webmacro/engine TemplateDumper.java, 1.5, 1.6

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

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

Modified Files:
	TemplateDumper.java 
Log Message:
Remove unused variable

Index: TemplateDumper.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/TemplateDumper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TemplateDumper.java	12 Jun 2003 00:47:45 -0000	1.5
--- TemplateDumper.java	18 Mar 2008 10:57:41 -0000	1.6
***************
*** 23,27 ****
  package org.webmacro.engine;
  
- import org.webmacro.Context;
  import org.webmacro.Macro;
  import org.webmacro.TemplateVisitor;
--- 23,26 ----
***************
*** 127,131 ****
      {
          WM wm = new WM();
-         Context context = wm.getContext();
          WMTemplate t = new StreamTemplate(wm.getBroker(),
                  new InputStreamReader(System.in));
--- 126,129 ----

[WebMacro-cvs] webmacro/src/org/webmacro/resource URLTemplateProvider.java, 1.18, 1.19

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

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

Modified Files:
	URLTemplateProvider.java 
Log Message:
Comment out unused private static variable

Index: URLTemplateProvider.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/URLTemplateProvider.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** URLTemplateProvider.java	12 Jun 2003 00:47:47 -0000	1.18
--- URLTemplateProvider.java	18 Mar 2008 10:51:03 -0000	1.19
***************
*** 126,131 ****
      private static final int CLASSPATH_PREFIX_LENGTH
              = CLASSPATH_PREFIX.length();
!     private static final int CONTEXT_PREFIX_LENGTH
!             = CONTEXT_PREFIX.length();
  
  
--- 126,131 ----
      private static final int CLASSPATH_PREFIX_LENGTH
              = CLASSPATH_PREFIX.length();
!     //private static final int CONTEXT_PREFIX_LENGTH
!     //        = CONTEXT_PREFIX.length();
  
  

[WebMacro-cvs] webmacro/src/org/webmacro/directive TempletDirective.java, 1.2, 1.3

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

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

Modified Files:
	TempletDirective.java 
Log Message:
Comment out unused private static variable

Index: TempletDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/TempletDirective.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TempletDirective.java	1 Dec 2004 20:23:16 -0000	1.2
--- TempletDirective.java	18 Mar 2008 10:50:00 -0000	1.3
***************
*** 27,36 ****
  package org.webmacro.directive;
  
! import org.webmacro.*;
  import org.webmacro.engine.BuildContext;
  import org.webmacro.engine.BuildException;
  import org.webmacro.engine.Variable;
  
! /** This directive allows a block within a template to be reused
   * as a "templet" that can be invoked using the #eval directive.
   * @author Keats Kirsch
--- 27,40 ----
  package org.webmacro.directive;
  
! import java.io.IOException;
! 
! import org.webmacro.PropertyException;
! import org.webmacro.TemplateVisitor;
  import org.webmacro.engine.BuildContext;
  import org.webmacro.engine.BuildException;
  import org.webmacro.engine.Variable;
  
! /** 
!  * This directive allows a block within a template to be reused
   * as a "templet" that can be invoked using the #eval directive.
   * @author Keats Kirsch
***************
*** 47,51 ****
      private Variable _target;
      private org.webmacro.engine.Block _result;
!     static private org.webmacro.servlet.TemplateTool _templateTool;
      
      private static final ArgDescriptor[]
--- 51,55 ----
      private Variable _target;
      private org.webmacro.engine.Block _result;
!     //static private org.webmacro.servlet.TemplateTool _templateTool;
      
      private static final ArgDescriptor[]
***************
*** 59,63 ****
      myDescr = new DirectiveDescriptor("templet", null, myArgs, null);
      
!     /** Returns the descriptor for this directive
       * @return the directive descriptor
       */
--- 63,68 ----
      myDescr = new DirectiveDescriptor("templet", null, myArgs, null);
      
!     /** 
!      * Returns the descriptor for this directive.
       * @return the directive descriptor
       */
***************
*** 67,71 ****
      }
      
!     /** Creates a new instance of TempletDirective */
      public TempletDirective()
      {
--- 72,76 ----
      }
      
!     /** Creates a new instance of TempletDirective. */
      public TempletDirective()
      {
***************
*** 125,129 ****
      }
      
!     /** Used by template visitors
       * @param v a template vistor
       */
--- 130,134 ----
      }
      
!     /** Used by template visitors.
       * @param v a template vistor
       */

[WebMacro-cvs] webmacro/src/org/webmacro/servlet TemplateTool.java, 1.9, 1.10

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

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

Modified Files:
	TemplateTool.java 
Log Message:
Comment out unused private variable

Index: TemplateTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TemplateTool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TemplateTool.java	30 Jul 2003 04:51:17 -0000	1.9
--- TemplateTool.java	18 Mar 2008 10:48:19 -0000	1.10
***************
*** 17,21 ****
  //import java.util.Map;
  
! /** This is an experimental context tool that allows templates
   * to be used as macros.  The tool places a
   * MacroTemplateFactory instance into the context that can
--- 17,22 ----
  //import java.util.Map;
  
! /** 
!  * This is an experimental context tool that allows templates
   * to be used as macros.  The tool places a
   * MacroTemplateFactory instance into the context that can
***************
*** 32,41 ****
      private Context _context = null;
      /**
!      * flag set when destroy is first called, to prevent subsequent calls from
       * invoking the destroy() method on the factory object.
       */
!     private boolean _destroyed = false;
  
!     /** Creates new TemplateTool */
      public TemplateTool ()
      {
--- 33,42 ----
      private Context _context = null;
      /**
!      * Flag set when destroy is first called, to prevent subsequent calls from
       * invoking the destroy() method on the factory object.
       */
!     //private boolean _destroyed = false;
  
!     /** Creates new TemplateTool. */
      public TemplateTool ()
      {
***************
*** 99,103 ****
      }
  
!     /** Encapsulates a template and a context, allowing a template
       * to be used like a function or "macro".
       */
--- 100,105 ----
      }
  
!     /** 
!      * Encapsulates a template and a context, allowing a template
       * to be used like a function or "macro".
       */
***************
*** 108,112 ****
          private Context _context, _origContext;
  
!         /** Constructor
           * @param c the current request context
           * @param t the template to be used as a macro
--- 110,115 ----
          private Context _context, _origContext;
  
!         /** 
!          * Constructor.
           * @param c the current request context
           * @param t the template to be used as a macro
***************
*** 120,124 ****
          }
  
!         /** Construct a MacroTemplate with a StringTemplate
           * @param c The context of the current request
           * @param src the string for the StringTemplate
--- 123,128 ----
          }
  
!         /** 
!          * Construct a MacroTemplate with a StringTemplate.
           * @param c The context of the current request
           * @param src the string for the StringTemplate
***************
*** 129,133 ****
          }
  
!         /** Exposes the context of the current MacroTemplate.  This allows
           * "arguments" to be set from a template.  E.g.,
           * <CODE>#set $myMacro.Args.Name = $User.Name</CODE>
--- 133,138 ----
          }
  
!         /** 
!          * Exposes the context of the current MacroTemplate.  This allows
           * "arguments" to be set from a template.  E.g.,
           * <CODE>#set $myMacro.Args.Name = $User.Name</CODE>
***************
*** 139,143 ****
          }
  
!         /** Evaluates the macro's template against its context and returns the
           * resulting string.
           * @throws PropertyException runtime errors in evaluating the macro's template
--- 144,149 ----
          }
  
!         /** 
!          * Evaluates the macro's template against its context and returns the
           * resulting string.
           * @throws PropertyException runtime errors in evaluating the macro's template
***************
*** 184,188 ****
          }
  
!         /** Copies all variables from the current request context into the context
           * of the macro.
           */
--- 190,195 ----
          }
  
!         /** 
!          * Copies all variables from the current request context into the context
           * of the macro.
           */

[WebMacro-cvs] webmacro/src/org/webmacro/engine MacroBuilder.java, 1.6, 1.7

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

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

Modified Files:
	MacroBuilder.java 
Log Message:
Comment out unused private variable

Index: MacroBuilder.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/MacroBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MacroBuilder.java	12 Jun 2003 00:47:45 -0000	1.6
--- MacroBuilder.java	18 Mar 2008 10:45:27 -0000	1.7
***************
*** 31,34 ****
--- 31,35 ----
   * during the building of a template.  Not to be confused with Macro
   * as used by WebMacro, which is something else.
+  * 
   * @author Brian Goetz
   */
***************
*** 40,44 ****
      private ListBuilder argsBuilder;
      private int lineNo, colNo;
!     private String[] nullArgs = new String[0];
  
      public MacroBuilder (String name,
--- 41,45 ----
      private ListBuilder argsBuilder;
      private int lineNo, colNo;
!     //private String[] nullArgs = new String[0];
  
      public MacroBuilder (String name,

[WebMacro-cvs] webmacro/src/org/webmacro/directive DefaultDirective.java, 1.6, 1.7

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

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

Modified Files:
	DefaultDirective.java 
Log Message:
Comment out unused private constant

Index: DefaultDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/DefaultDirective.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DefaultDirective.java	1 Nov 2005 04:08:04 -0000	1.6
--- DefaultDirective.java	18 Mar 2008 10:42:58 -0000	1.7
***************
*** 23,32 ****
  package org.webmacro.directive;
  
! import org.webmacro.*;
  import org.webmacro.engine.BuildContext;
  import org.webmacro.engine.BuildException;
  import org.webmacro.engine.Variable;
  
- import java.io.IOException;
  /**
   * Implements the directive that allows
--- 23,37 ----
  package org.webmacro.directive;
  
! import java.io.IOException;
! 
! import org.webmacro.Context;
! import org.webmacro.FastWriter;
! import org.webmacro.Macro;
! import org.webmacro.PropertyException;
! import org.webmacro.TemplateVisitor;
  import org.webmacro.engine.BuildContext;
  import org.webmacro.engine.BuildException;
  import org.webmacro.engine.Variable;
  
  /**
   * Implements the directive that allows
***************
*** 38,42 ****
  
      private static final int DEFAULT_TARGET = 1;
!     private static final int DEFAULT_TO = 2;
      private static final int DEFAULT_RESULT = 3;
  
--- 43,47 ----
  
      private static final int DEFAULT_TARGET = 1;
!     //private static final int DEFAULT_TO = 2;
      private static final int DEFAULT_RESULT = 3;
  

[WebMacro-cvs] webmacro/src/org/webmacro/servlet TextTool.java, 1.14, 1.15

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

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

Modified Files:
	TextTool.java 
Log Message:
Unused instance, called methods are static

Index: TextTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TextTool.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** TextTool.java	2 Dec 2004 08:49:53 -0000	1.14
--- TextTool.java	18 Mar 2008 10:11:56 -0000	1.15
***************
*** 50,54 ****
  
      /**
!      * @return the static instance of the MathTool
       */
      public static TextTool getInstance ()
--- 50,54 ----
  
      /**
!      * @return the static instance of the TextTool
       */
      public static TextTool getInstance ()
***************
*** 113,120 ****
  
      /**
!      * replace all occurrences of <code>from</code> to <code>to</code>
!      * in <code>src</code>.<P>
!      *
!      * If any paramer is <code>null</code>, <code>replace()</code> returns
       * the value of <code>src</code>.<p>
       *
--- 113,120 ----
  
      /**
!      * Replace all occurrences of <code>from</code> to <code>to</code>
!      * in <code>src</code>.
!      * <P>
!      * If any parameter is <code>null</code>, <code>replace()</code> returns
       * the value of <code>src</code>.<p>
       *
***************
*** 406,410 ****
      public static void main (String[] args) throws Exception
      {
-         TextTool tt = TextTool.getInstance();
          String input1 = "This is a test";
          String input2 = "This is a test";
--- 406,409 ----

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template TestSyntheticTemplate.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-serv23700/test/unit/org/webmacro/template

Modified Files:
	TestSyntheticTemplate.java 
Log Message:
Comment out unused variables

Index: TestSyntheticTemplate.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestSyntheticTemplate.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestSyntheticTemplate.java	27 Sep 2005 05:45:17 -0000	1.9
--- TestSyntheticTemplate.java	18 Mar 2008 10:08:17 -0000	1.10
***************
*** 10,14 ****
  import java.io.PrintWriter;
  
! /** a simple test case to load and execute a file
   * via the path relative to the classpath.
   */
--- 10,15 ----
  import java.io.PrintWriter;
  
! /** 
!  * A simple test case to load and execute a file
   * via the path relative to the classpath.
   */
***************
*** 114,118 ****
          {
              singleTet = System.currentTimeMillis();
!             String value = executeFileTemplate(release2TestFileName);
              singleTet = System.currentTimeMillis() - singleTet;
              if (singleTet < min) min = singleTet;
--- 115,120 ----
          {
              singleTet = System.currentTimeMillis();
!             //String value = 
!             executeFileTemplate(release2TestFileName);
              singleTet = System.currentTimeMillis() - singleTet;
              if (singleTet < min) min = singleTet;
***************
*** 285,289 ****
                      try
                      {
!                         String value = executeFileTemplate(fileName);
                          // Thread.yield(); // allow other threads time to run as well;
                      }
--- 287,292 ----
                      try
                      {
!                         //String value = 
!                         executeFileTemplate(fileName);
                          // Thread.yield(); // allow other threads time to run as well;
                      }

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

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

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

Modified Files:
	EncodingTestCase.java 
Log Message:
Working on Windows

Index: EncodingTestCase.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/EncodingTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EncodingTestCase.java	18 Mar 2008 00:36:26 -0000	1.7
--- EncodingTestCase.java	18 Mar 2008 10:00:36 -0000	1.8
***************
*** 1,8 ****
  package org.webmacro.template;
  
  import junit.framework.TestCase;
- import org.webmacro.*;
  
! import java.io.*;
  
  /**
--- 1,19 ----
  package org.webmacro.template;
  
+ import java.io.ByteArrayOutputStream;
+ import java.io.File;
+ import java.io.FileOutputStream;
+ import java.io.FileWriter;
+ import java.io.IOException;
+ import java.io.OutputStreamWriter;
+ import java.io.PrintWriter;
+ import java.io.Writer;
+ 
  import junit.framework.TestCase;
  
! import org.webmacro.Context;
! import org.webmacro.Template;
! import org.webmacro.WM;
! import org.webmacro.WebMacro;
  
  /**
***************
*** 11,17 ****
   * and implement the four abstract methods. Be sure to run native2ascii
   * on your source code to have it encoding neutral before checking it into
!  * CVS.<br>
   * This class will then create a file of your source template, written in the
!  * encoding you specified. Then three tests are run on this file:<br>
   * 1) Parse template and evaluate it into a string.
   * 2) Parse template and output it in the encoding you specified
--- 22,30 ----
   * and implement the four abstract methods. Be sure to run native2ascii
   * on your source code to have it encoding neutral before checking it into
!  * CVS.
!  * <br>
   * This class will then create a file of your source template, written in the
!  * encoding you specified. Then three tests are run on this file:
!  * <br>
   * 1) Parse template and evaluate it into a string.
   * 2) Parse template and output it in the encoding you specified
***************
*** 19,22 ****
--- 32,36 ----
   * <br>
   * In all cases, the output is compared to the expected results.
+  * 
   * @author Sebastian Kanthak
   */
***************
*** 175,181 ****
  
      /**
!      * FIXME Works in Eclipse but not Maven
       */
!     public void brokenTestUTF8InputEncoding () throws Exception
      {
          assertEquals("InputEncoding is not UFT8",
--- 189,196 ----
  
      /**
!      * FIXME Works in Eclipse but not Maven on Linux
!      * Works in Eclipse and Maven on Windows
       */
!     public void testUTF8InputEncoding () throws Exception
      {
          assertEquals("InputEncoding is not UFT8",

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template TestWindows1251Encoding.java, 1.2, 1.3

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

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

Modified Files:
	TestWindows1251Encoding.java 
Log Message:
Typo

Index: TestWindows1251Encoding.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestWindows1251Encoding.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestWindows1251Encoding.java	12 Jun 2003 00:47:50 -0000	1.2
--- TestWindows1251Encoding.java	18 Mar 2008 09:58:43 -0000	1.3
***************
*** 4,11 ****
  
  /**
!  * This test uses russian characters encoded
!  * in windows-1251 encoding.
!  * As I do not understand russion, I've no idea,
!  * what the text acutally means. :)
   * @author Sebastian Kanthak
   */
--- 4,10 ----
  
  /**
!  * This test uses Russian characters encoded in windows-1251 encoding.
!  * As I do not understand Russian, I've no idea what the text actually means. :)
!  * 
   * @author Sebastian Kanthak
   */

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template AbstractVariableTestCase.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-serv15211/test/unit/org/webmacro/template

Modified Files:
	AbstractVariableTestCase.java 
Log Message:
Typo

Index: AbstractVariableTestCase.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/AbstractVariableTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AbstractVariableTestCase.java	12 Jun 2003 00:47:49 -0000	1.6
--- AbstractVariableTestCase.java	18 Mar 2008 09:48:59 -0000	1.7
***************
*** 3,10 ****
  
  
! /** abstract variable test case for ROGUE variables/properties
!  and how they're handled by each EvaluationExceptionHandler.
!  It is expected that atleast 3 subclasses will exist:  TestDefaultEEH,
!  TestCrankyEEH, TestComplacentEEH
   */
  public abstract class AbstractVariableTestCase extends TemplateTestCase
--- 3,12 ----
  
  
! /** 
!  * Abstract variable test case for ROGUE variables/properties
!  *  and how they're handled by each EvaluationExceptionHandler.
!  *  
!  *   It is expected that at least 3 subclasses will exist:  TestDefaultEEH,
!  *   TestCrankyEEH, TestComplacentEEH.
   */
  public abstract class AbstractVariableTestCase extends TemplateTestCase
***************
*** 80,84 ****
  
  
!     /** A variable in the context who's .toString() method returns null */
      public void testNullVariable () throws Exception
      {
--- 82,86 ----
  
  
!     /** A variable in the context who's .toString() method returns null. */
      public void testNullVariable () throws Exception
      {

[WebMacro-cvs] webmacro/src/org/webmacro/resource CacheReloadContext.java, 1.4, 1.5

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

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

Modified Files:
	CacheReloadContext.java 
Log Message:
Typo

Index: CacheReloadContext.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/CacheReloadContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CacheReloadContext.java	12 Jun 2003 00:47:47 -0000	1.4
--- CacheReloadContext.java	18 Mar 2008 09:36:02 -0000	1.5
***************
*** 30,33 ****
--- 30,34 ----
   * resource has changed.  The reload context allows the cache manager to ask
   * the provider if the resource should be reloaded.
+  * 
   * @since 0.96
   */
***************
*** 37,43 ****
  
      /**
!      * The CacheManager calls shouldReload to ask the reference whether
!      * it has changed since we loaded it.  Subclasses should define an
!      * implementation if this if it makes sense to.  Otherwise, the default
       * returns false, which means the item is replaced when it expires from
       * the cache.
--- 38,44 ----
  
      /**
!      * The CacheManager calls <code>shouldReload()</code> to ask the reference 
!      * whether it has changed since we loaded it.  Subclasses should define an
!      * implementation of this if it makes sense to.  Otherwise, the default
       * returns false, which means the item is replaced when it expires from
       * the cache.

[WebMacro-cvs] webmacro/src/org/webmacro/resource ReloadDelayDecorator.java, 1.5, 1.6

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

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

Modified Files:
	ReloadDelayDecorator.java 
Log Message:
Typo

Index: ReloadDelayDecorator.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/ReloadDelayDecorator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ReloadDelayDecorator.java	12 Jun 2003 00:47:47 -0000	1.5
--- ReloadDelayDecorator.java	18 Mar 2008 09:33:38 -0000	1.6
***************
*** 88,92 ****
       * a suitable TimedReloadContext or passes back the original
       * reload context if delay <= 0
!      * @param protocol protocl to look up delay for
       * @param reloadContext reloadContext to decorate
       * @return eventually decorated reload context
--- 88,92 ----
       * a suitable TimedReloadContext or passes back the original
       * reload context if delay <= 0
!      * @param protocol protocol to look up delay for
       * @param reloadContext reloadContext to decorate
       * @return eventually decorated reload context

[WebMacro-cvs] webmacro/src/org/webmacro/resource DelegatingTemplateProvider.java, 1.8, 1.9

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

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

Modified Files:
	DelegatingTemplateProvider.java 
Log Message:
Eclipse warning, organise imports, Maven compatible NOTE

Index: DelegatingTemplateProvider.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/DelegatingTemplateProvider.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DelegatingTemplateProvider.java	12 Jun 2003 00:47:47 -0000	1.8
--- DelegatingTemplateProvider.java	18 Mar 2008 09:29:05 -0000	1.9
***************
*** 24,30 ****
  package org.webmacro.resource;
  
- import org.webmacro.*;
- import org.webmacro.util.Settings;
- 
  import java.util.ArrayList;
  import java.util.Arrays;
--- 24,27 ----
***************
*** 32,35 ****
--- 29,40 ----
  import java.util.List;
  
+ import org.webmacro.Broker;
+ import org.webmacro.InitException;
+ import org.webmacro.Log;
+ import org.webmacro.NotFoundException;
+ import org.webmacro.ResourceException;
+ import org.webmacro.Template;
+ import org.webmacro.util.Settings;
+ 
  /**
   * Alternative implementation of a TemplateProvider that uses TemplateLoaders to do the actual work.
***************
*** 61,65 ****
   * <li>The directory WEB-INF/templates/ in the web-app directory ("webapp:/WEB-INF/templates/")
   * </ol>
!  * Note, that this setup only makes sense in a web-app environment, because the webapp template loader
   * won't work otherwise.
   * @author Sebastian Kanthak (seb...@mu...)
--- 66,70 ----
   * <li>The directory WEB-INF/templates/ in the web-app directory ("webapp:/WEB-INF/templates/")
   * </ol>
!  * NOTE This setup only makes sense in a web-app environment, because the webapp template loader
   * won't work otherwise.
   * @author Sebastian Kanthak (seb...@mu...)
***************
*** 68,72 ****
  {
  
-     private Broker broker;
      private Log log;
      private TemplateLoaderFactory factory;
--- 73,76 ----
***************
*** 76,80 ****
      {
          super.init(broker, config);
-         this.broker = broker;
          log = broker.getLog("resource", "DelegatingTemplateProvider");
  
--- 80,83 ----