logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject cvs commit: logging-log4j/src/java/org/apache/log4j/lbel Parser.java
Date Thu, 27 Jan 2005 19:34:08 GMT
ceki        2005/01/27 11:34:08

  Modified:    src/java/org/apache/log4j/lbel Parser.java
  Log:
  Cosmetic changes
  
  Revision  Changes    Path
  1.4       +5 -6      logging-log4j/src/java/org/apache/log4j/lbel/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/lbel/Parser.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Parser.java	27 Jan 2005 19:31:38 -0000	1.3
  +++ Parser.java	27 Jan 2005 19:34:08 -0000	1.4
  @@ -4,10 +4,9 @@
   import java.util.Stack;
   
   import org.apache.log4j.Level;
  -import org.apache.log4j.lbel.comparator.Comparator;
   import org.apache.log4j.lbel.comparator.LevelComparator;
   import org.apache.log4j.lbel.comparator.LoggerComparator;
  -import org.apache.log4j.spi.LoggingEvent;
  +import org.apache.log4j.lbel.comparator.MessageComparator;
   
   /**
    * 
  @@ -166,7 +165,7 @@
         ts.next();
         operator = getOperator();
         ts.next();
  -      literal = getIdentifier();
  +      literal = getLiteral();
         return new Node(Node.COMPARATOR, new LoggerComparator(operator, literal));
       case Token.LEVEL:
         ts.next();
  @@ -208,17 +207,17 @@
       }
     }
   	
  -  String getIdentifier() throws ScanError {
  +  String getLiteral() throws ScanError {
       Token token = ts.getCurrent();
       if(token.getType() == Token.LITERAL) {
         return (String) token.getValue();
       } else {
  -      throw new ScanError("Expected identifier token but got "+token);
  +      throw new ScanError("Expected LITERAL but got "+token);
       }
     }
     
     int getLevelInt() throws ScanError {
  -    String levelStr = getIdentifier();
  +    String levelStr = getLiteral();
   
       if("DEBUG".equalsIgnoreCase(levelStr)) {
         return Level.DEBUG_INT;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Mime
View raw message