ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Allot of fixes

Browse source
This commit is contained in:
Ziver Koc 2010-04-15 20:52:34 +00:00
parent 694e3081bb
commit 952a388cf1
22 changed files with 1197 additions and 408 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/zutil/log/StandardLogFormatter.java
View file

@ -1,6 +1,8 @@
package zutil.log;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.logging.Level;
import java.util.regex.Pattern;
@ -8,44 +10,43 @@ public class StandardLogFormatter implements LogFormatter{
// The split pattern where the
private static final Pattern splitter = Pattern.compile("\n");
// the stream should print time stamp
private boolean timeStamp = false;
private boolean timeStamp = true;
//The time stamp style
private String timeStampString = "yyyy-MM-dd HH:mm:ss:SSS#";
private SimpleDateFormat dateFormatter = new SimpleDateFormat("HH:mm:ss ");
// If displaying class names are enabled
private boolean className = true;
// Specifies the max length of the longest class name
private int max_class_name = 0;
// Cache for the class padding
private static HashMap<String,String> padd_cache = new HashMap<String,String>();
// Date temp file
private Date date = new Date();
public String format(String source, Level level, String msg) {
StringBuilder data = new StringBuilder();
switch(level.intValue()){
case /* SEVERE */ 1000: data.append("SEVERE : "); break;
case /* WARNING */ 900 : data.append("WARNING: "); break;
case /* INFO */ 800 : data.append("INFO : "); break;
case /* CONFIG */ 700 : data.append("CONFIG : "); break;
case /* FINE */ 500 : data.append("FINE : "); break;
case /* FINER */ 400 : data.append("FINER : "); break;
case /* FINEST */ 300 : data.append("FINEST : "); break;
if( timeStamp ){
date.setTime( System.currentTimeMillis() );
data.append( dateFormatter.format(date) );
}
if( timeStamp && className ){
data.append( getTime() );
data.append( " " );
data.append( paddSourceName(source) );
data.append( ": " );
}
else if( timeStamp ){
data.append( getTime() );
data.append( " " );
}
else if( className ){
data.append( paddSourceName(source) );
data.append( ": " );
switch( level.intValue() ){
case /* SEVERE */ 1000: data.append("SEVERE "); break;
case /* WARNING */ 900 : data.append("WARNING "); break;
case /* INFO */ 800 : data.append("INFO "); break;
case /* CONFIG */ 700 : data.append("CONFIG "); break;
case /* FINE */ 500 : data.append("FINE "); break;
case /* FINER */ 400 : data.append("FINER "); break;
case /* FINEST */ 300 : data.append("FINEST "); break;
}
StringBuilder ret = new StringBuilder();
if( className ){
data.append( paddSourceName(source) );
}
data.append( ": " );
StringBuffer ret = new StringBuffer();
String[] array = splitter.split( msg );
for( int i=0; i<array.length ;++i ){
if( i!=0 )
@ -54,6 +55,7 @@ public class StandardLogFormatter implements LogFormatter{
ret.append( data );
ret.append( array[i] );
}
ret.append( '\n' );
return ret.toString();
}
@ -72,14 +74,7 @@ public class StandardLogFormatter implements LogFormatter{
* @param ts is the String to send to SimpleDateFormat
*/
public void setTimeStamp(String ts){
timeStampString = ts;
}
/**
* @return the time stamp
*/
private String getTime(){
return (new SimpleDateFormat(timeStampString)).format(new java.util.Date()).toString();
dateFormatter = new SimpleDateFormat(ts);
}
/**
@ -95,6 +90,10 @@ public class StandardLogFormatter implements LogFormatter{
* @return the Class name
*/
private String paddSourceName(String source){
String tmp = padd_cache.get(source);
if( tmp != null )
return tmp;
if( source.length() > max_class_name )
max_class_name = source.length();
@ -102,7 +101,9 @@ public class StandardLogFormatter implements LogFormatter{
for( int i=source.length(); i<max_class_name; ++i ) {
sb.append( ' ' );
}
return sb.toString();
tmp = sb.toString();
padd_cache.put(source, tmp);
return tmp;
}