You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2004/11/26 19:13:04 UTC

cvs commit: logging-log4j/src/java/org/apache/log4j Level.java

ceki        2004/11/26 10:13:04

  Modified:    src/java/org/apache/log4j Level.java
  Log:
  Jalopy indentation
  
  Revision  Changes    Path
  1.14      +300 -308  logging-log4j/src/java/org/apache/log4j/Level.java
  
  Index: Level.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/Level.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Level.java	5 Aug 2004 17:45:45 -0000	1.13
  +++ Level.java	26 Nov 2004 18:13:04 -0000	1.14
  @@ -1,12 +1,12 @@
   /*
    * Copyright 1999,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -14,7 +14,6 @@
    * limitations under the License.
    */
   
  -
   // Contributors:  Kitching Simon <Si...@orange.ch>
   //                Nicholas Wolff
   package org.apache.log4j;
  @@ -33,312 +32,305 @@
      @author Yoav Shapira
    */
   public class Level {
  -    /**
  -     * OFF level integer value.
  -     */
  -    public static final int OFF_INT = Integer.MAX_VALUE;
  -   
  -    /**
  -     * FATAL level integer value.
  -     */
  -    public static final int FATAL_INT = 50000;
  -
  -    /**
  -     * ERROR level integer value.
  -     */
  -    public static final int ERROR_INT = 40000;
  -
  -    /**
  -     * WARN level integer value.
  -     */
  -    public static final int WARN_INT = 30000;
  -
  -    /**
  -     * INFO level integer value.
  -     */
  -    public static final int INFO_INT = 20000;
  -
  -    /**
  -     * DEBUG level integer value.
  -     */
  -    public static final int DEBUG_INT = 10000;
  -
  -    /**
  -     * TRACE level integer value.
  -     */
  -    public static final int TRACE_INT = 5000;
  -
  -    /**
  -     * ALL level integer value.
  -     */
  -    public static final int ALL_INT = Integer.MIN_VALUE;
  -  
  -    /**
  -     * The <code>OFF</code> has the highest possible rank and is
  -     * intended to turn off logging.  
  -     */
  -    public static final Level OFF = new Level(OFF_INT, "OFF", 0);
  -
  -    /**
  -     * The <code>FATAL</code> level designates very severe error
  -     * events that will presumably lead the application to abort.
  -     */
  -    public static final Level FATAL = new Level(FATAL_INT, "FATAL", 0);
  -
  -    /**
  -     * The <code>ERROR</code> level designates error events that
  -     * might still allow the application to continue running.  
  -     */
  -    public static final Level ERROR = new Level(ERROR_INT, "ERROR", 3);
  -
  -    /**
  -     * The <code>WARN</code> level designates potentially harmful situations.
  -     */
  -    public static final Level WARN = new Level(WARN_INT, "WARN", 4);
  -
  -    /**
  -     * The <code>INFO</code> level designates informational messages
  -     * that highlight the progress of the application at coarse-grained
  -     * level.
  -     */
  -    public static final Level INFO = new Level(INFO_INT, "INFO", 6);
  -
  -    /**
  -     * The <code>DEBUG</code> Level designates fine-grained
  -     * informational events that are most useful to debug an
  -     * application.
  -     */
  -    public static final Level DEBUG = new Level(DEBUG_INT, "DEBUG", 7);
  -
  -    /**
  -     * The <code>TRACE</code> Level designates finer-grained
  -     * informational events than the <code>DEBUG</code level.
  -     */
  -    public static final Level TRACE = new Level(TRACE_INT, "TRACE", 7);
  -
  -    /**
  -     * The <code>ALL</code> has the lowest possible rank and is intended to
  -     * turn on all logging.
  -     */
  -    public static final Level ALL = new Level(ALL_INT, "ALL", 7);
  -
  -    /**
  -     * The integer value of this Level instance.
  -     */
  -    int level;
  -
  -    /**
  -     * The label of this Level instance.
  -     */
  -    String levelStr;
  -
  -    /**
  -     * The UNIX SysLog equivalent value of this Level instance.
  -     */
  -    int syslogEquivalent;
  -
  -    /**
  -     * Instantiate a level object.
  -     *
  -     * @param level The integer level value
  -     * @param levelStr The level name
  -     * @param syslogEquivalent The UNIX SystLog level equivalent
  -     */ 
  -    protected Level(int level, String levelStr, int syslogEquivalent) {
  -	this.level = level;
  -	this.levelStr = levelStr;
  -	this.syslogEquivalent = syslogEquivalent;
  -    }
  -    
  -    /**
  -     * Convert the string passed as argument to a level. If the
  -     * conversion fails, then this method returns {@link #DEBUG}.
  -     *
  -     * @param sArg The level name
  -     * @return The matching Level object
  -     */
  -    public static Level toLevel(String sArg) {
  -	return toLevel(sArg, Level.DEBUG);
  -    }
  -
  -    /**
  -     * Convert an integer passed as argument to a level. If the
  -     * conversion fails, then this method returns {@link #DEBUG}.
  -     *
  -     * @param val The level integer value
  -     * @return The matching Level object
  -     */
  -    public static Level toLevel(int val) {
  -	return toLevel(val, Level.DEBUG);
  -    }
  -
  -    /**
  -     * Two Levels (formerly Priorities) are equal if their level
  -     * integer value fields are equal.  If the argument is not
  -     * a Level, this method returns False.
  -     *
  -     * @param o The other Level
  -     * @return boolean True if equals
  -     * @since 1.2
  -     */
  -    public boolean equals(Object o) {
  -	if (o instanceof Level) {
  -	    Level r = (Level) o;
  -	    
  -	    return (this.level == r.level);
  -	} else {
  -	    return false;
  -	}
  -    }
  -
  -    /**
  -     * The hashCode of a Level (i.e. Priority) is its level field.
  -     *
  -     * @return The integer level value
  -     */
  -    public int hashCode() {
  -	return level;
  -    }
  -
  -    /**
  -     * Return the syslog equivalent of this priority as an integer.
  -     *
  -     * @return The UNIX SysLog equivalent
  -     */
  -    public final int getSyslogEquivalent() {
  -	return syslogEquivalent;
  -    }
  -
  -    /**
  -     *  Returns <code>true</code> if this level has a higher or equal
  -     *  level than the level passed as argument, <code>false</code>
  -     *  otherwise.
  -     *
  -     *  <p>You should think twice before overriding the default
  -     *  implementation of <code>isGreaterOrEqual</code> method.</p>
  -     */
  -    public boolean isGreaterOrEqual(Level r) {
  -	return level >= r.level;
  -    }
  -
  -    /**
  -     * Return all possible priorities as an array of Level objects in
  -     * descending order.
  -     *
  -     * @return Level[] All the Levels 
  -     * @deprecated This method will be removed with no replacement.
  -     */
  -    public static Level[] getAllPossiblePriorities() {
  -	return new Level[] {
  -	    Level.FATAL, Level.ERROR, Level.WARN, Level.INFO, Level.DEBUG, Level.TRACE
  -	};
  -    }
  -
  -    /**
  -     * Returns the string representation of this Level.
  -     *
  -     * @return String The Level name
  -     */
  -    public final String toString() {
  -	return levelStr;
  -    }
  -
  -    /**
  -     * Returns the integer representation of this level.
  -     */
  -    public final int toInt() {
  -	return level;
  -    }
  -  
  -    /**
  -     * Convert an integer passed as argument to a level. If the
  -     * conversion fails, then this method returns the specified default.
  -     *
  -     * @param val The integer value
  -     * @param defaultLevel The Level to return if no match is found
  -     * @return The matching Level
  -     */
  -    public static Level toLevel(int val, Level defaultLevel) {
  -	switch (val) {
  -	case ALL_INT:
  -	    return ALL;
  -	    
  -	case TRACE_INT:
  -	    return TRACE;
  -	    
  -	case DEBUG_INT:
  -	    return DEBUG;
  -	    
  -	case INFO_INT:
  -	    return INFO;
  -	    
  -	case WARN_INT:
  -	    return WARN;
  -	    
  -	case ERROR_INT:
  -	    return ERROR;
  -	    
  -	case FATAL_INT:
  -	    return FATAL;
  -	    
  -	case OFF_INT:
  -	    return OFF;
  -	    
  -	default:
  -	    return defaultLevel;
  -	}
  -    }
  -
  -    /**
  -     * Convert the string passed as argument to a level. If the
  -     * conversion fails, then this method returns the
  -     * <code>defaultLevel</code>.
  -     *
  -     * @param sArg The Level name
  -     * @param defaultLevel Level to return if no match is found
  -     * @return The matching Level
  -     */
  -    public static Level toLevel(String sArg, Level defaultLevel) {
  -	if (sArg == null) {
  -	    return defaultLevel;
  -	}
  -	
  -	String s = sArg.toUpperCase();
  -	
  -	if (s.equals("ALL")) {
  -	    return ALL;
  -	}
  -
  -	if (s.equals("TRACE")) {
  -	    return TRACE;
  -	}
  -	
  -	if (s.equals("DEBUG")) {
  -	    return DEBUG;
  -	}
  -	
  -	if (s.equals("INFO")) {
  -	    return INFO;
  -	}
  -	
  -	if (s.equals("WARN")) {
  -	    return WARN;
  -	}
  -	
  -	if (s.equals("ERROR")) {
  -	    return ERROR;
  -	}
  -	
  -	if (s.equals("FATAL")) {
  -	    return FATAL;
  -	}
  -	
  -	if (s.equals("OFF")) {
  -	    return OFF;
  -	}
  +  /**
  +   * OFF level integer value.
  +   */
  +  public static final int OFF_INT = Integer.MAX_VALUE;
  +
  +  /**
  +   * FATAL level integer value.
  +   */
  +  public static final int FATAL_INT = 50000;
  +
  +  /**
  +   * ERROR level integer value.
  +   */
  +  public static final int ERROR_INT = 40000;
  +
  +  /**
  +   * WARN level integer value.
  +   */
  +  public static final int WARN_INT = 30000;
  +
  +  /**
  +   * INFO level integer value.
  +   */
  +  public static final int INFO_INT = 20000;
  +
  +  /**
  +   * DEBUG level integer value.
  +   */
  +  public static final int DEBUG_INT = 10000;
  +
  +  /**
  +   * TRACE level integer value.
  +   */
  +  public static final int TRACE_INT = 5000;
  +
  +  /**
  +   * ALL level integer value.
  +   */
  +  public static final int ALL_INT = Integer.MIN_VALUE;
  +
  +  /**
  +   * The <code>OFF</code> has the highest possible rank and is
  +   * intended to turn off logging.
  +   */
  +  public static final Level OFF = new Level(OFF_INT, "OFF", 0);
  +
  +  /**
  +   * The <code>FATAL</code> level designates very severe error
  +   * events that will presumably lead the application to abort.
  +   */
  +  public static final Level FATAL = new Level(FATAL_INT, "FATAL", 0);
  +
  +  /**
  +   * The <code>ERROR</code> level designates error events that
  +   * might still allow the application to continue running.
  +   */
  +  public static final Level ERROR = new Level(ERROR_INT, "ERROR", 3);
  +
  +  /**
  +   * The <code>WARN</code> level designates potentially harmful situations.
  +   */
  +  public static final Level WARN = new Level(WARN_INT, "WARN", 4);
  +
  +  /**
  +   * The <code>INFO</code> level designates informational messages
  +   * that highlight the progress of the application at coarse-grained
  +   * level.
  +   */
  +  public static final Level INFO = new Level(INFO_INT, "INFO", 6);
  +
  +  /**
  +   * The <code>DEBUG</code> Level designates fine-grained
  +   * informational events that are most useful to debug an
  +   * application.
  +   */
  +  public static final Level DEBUG = new Level(DEBUG_INT, "DEBUG", 7);
  +
  +  /**
  +   * The <code>TRACE</code> Level designates finer-grained
  +   * informational events than the <code>DEBUG</code level.
  +   */
  +  public static final Level TRACE = new Level(TRACE_INT, "TRACE", 7);
  +
  +  /**
  +   * The <code>ALL</code> has the lowest possible rank and is intended to
  +   * turn on all logging.
  +   */
  +  public static final Level ALL = new Level(ALL_INT, "ALL", 7);
  +
  +  /**
  +   * The integer value of this Level instance.
  +   */
  +  int level;
  +
  +  /**
  +   * The label of this Level instance.
  +   */
  +  String levelStr;
  +
  +  /**
  +   * The UNIX SysLog equivalent value of this Level instance.
  +   */
  +  int syslogEquivalent;
  +
  +  /**
  +   * Instantiate a level object.
  +   *
  +   * @param level The integer level value
  +   * @param levelStr The level name
  +   * @param syslogEquivalent The UNIX SystLog level equivalent
  +   */
  +  protected Level(int level, String levelStr, int syslogEquivalent) {
  +    this.level = level;
  +    this.levelStr = levelStr;
  +    this.syslogEquivalent = syslogEquivalent;
  +  }
  +
  +  /**
  +   * Convert the string passed as argument to a level. If the
  +   * conversion fails, then this method returns {@link #DEBUG}.
  +   *
  +   * @param sArg The level name
  +   * @return The matching Level object
  +   */
  +  public static Level toLevel(String sArg) {
  +    return toLevel(sArg, Level.DEBUG);
  +  }
  +
  +  /**
  +   * Convert an integer passed as argument to a level. If the
  +   * conversion fails, then this method returns {@link #DEBUG}.
  +   *
  +   * @param val The level integer value
  +   * @return The matching Level object
  +   */
  +  public static Level toLevel(int val) {
  +    return toLevel(val, Level.DEBUG);
  +  }
  +
  +  /**
  +   * Two Levels (formerly Priorities) are equal if their level
  +   * integer value fields are equal.  If the argument is not
  +   * a Level, this method returns False.
  +   *
  +   * @param o The other Level
  +   * @return boolean True if equals
  +   * @since 1.2
  +   */
  +  public boolean equals(Object o) {
  +    if (o instanceof Level) {
  +      Level r = (Level) o;
  +
  +      return (this.level == r.level);
  +    } else {
  +      return false;
  +    }
  +  }
  +
  +  /**
  +   * The hashCode of a Level (i.e. Priority) is its level field.
  +   *
  +   * @return The integer level value
  +   */
  +  public int hashCode() {
  +    return level;
  +  }
  +
  +  /**
  +   * Return the syslog equivalent of this priority as an integer.
  +   *
  +   * @return The UNIX SysLog equivalent
  +   */
  +  public final int getSyslogEquivalent() {
  +    return syslogEquivalent;
  +  }
  +
  +  /**
  +   *  Returns <code>true</code> if this level has a higher or equal
  +   *  level than the level passed as argument, <code>false</code>
  +   *  otherwise.
  +   *
  +   *  <p>You should think twice before overriding the default
  +   *  implementation of <code>isGreaterOrEqual</code> method.</p>
  +   */
  +  public boolean isGreaterOrEqual(Level r) {
  +    return level >= r.level;
  +  }
  +
  +  /**
  +   * Return all possible priorities as an array of Level objects in
  +   * descending order.
  +   *
  +   * @return Level[] All the Levels
  +   * @deprecated This method will be removed with no replacement.
  +   */
  +  public static Level[] getAllPossiblePriorities() {
  +    return new Level[] {
  +      Level.FATAL, Level.ERROR, Level.WARN, Level.INFO, Level.DEBUG,
  +      Level.TRACE
  +    };
  +  }
  +
  +  /**
  +   * Returns the string representation of this Level.
  +   *
  +   * @return String The Level name
  +   */
  +  public final String toString() {
  +    return levelStr;
  +  }
  +
  +  /**
  +   * Returns the integer representation of this level.
  +   */
  +  public final int toInt() {
  +    return level;
  +  }
  +
  +  /**
  +   * Convert an integer passed as argument to a level. If the
  +   * conversion fails, then this method returns the specified default.
  +   *
  +   * @param val The integer value
  +   * @param defaultLevel The Level to return if no match is found
  +   * @return The matching Level
  +   */
  +  public static Level toLevel(int val, Level defaultLevel) {
  +    switch (val) {
  +    case ALL_INT:
  +      return ALL;
  +    case TRACE_INT:
  +      return TRACE;
  +    case DEBUG_INT:
  +      return DEBUG;
  +    case INFO_INT:
  +      return INFO;
  +    case WARN_INT:
  +      return WARN;
  +    case ERROR_INT:
  +      return ERROR;
  +    case FATAL_INT:
  +      return FATAL;
  +    case OFF_INT:
  +      return OFF;
  +    default:
  +      return defaultLevel;
  +    }
  +  }
  +
  +  /**
  +   * Convert the string passed as argument to a level. If the
  +   * conversion fails, then this method returns the
  +   * <code>defaultLevel</code>.
  +   *
  +   * @param sArg The Level name
  +   * @param defaultLevel Level to return if no match is found
  +   * @return The matching Level
  +   */
  +  public static Level toLevel(String sArg, Level defaultLevel) {
  +    if (sArg == null) {
  +      return defaultLevel;
  +    }
  +
  +    String s = sArg.toUpperCase();
  +
  +    if (s.equals("ALL")) {
  +      return ALL;
  +    }
  +
  +    if (s.equals("TRACE")) {
  +      return TRACE;
  +    }
  +
  +    if (s.equals("DEBUG")) {
  +      return DEBUG;
  +    }
  +
  +    if (s.equals("INFO")) {
  +      return INFO;
  +    }
  +
  +    if (s.equals("WARN")) {
  +      return WARN;
  +    }
  +
  +    if (s.equals("ERROR")) {
  +      return ERROR;
  +    }
  +
  +    if (s.equals("FATAL")) {
  +      return FATAL;
  +    }
   
  -	return defaultLevel;
  +    if (s.equals("OFF")) {
  +      return OFF;
       }
  +
  +    return defaultLevel;
  +  }
   }
   
   // End of class: Level.java
  
  
  

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