natas_hw
/
slf4j
mirror of https://github.com/qos-ch/slf4j
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add git attributes 

Added suggested git attributes & the few files that needed to change to
comply as a result.
This commit is contained in:
Jeremy Landis 2014-05-06 20:28:13 -04:00
parent 86a79edef6
commit dd7ec6b31e
5 changed files with 1384 additions and 1362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.gitattributes vendored Normal file
View File

@ -0,0 +1,22 @@
# Auto detect text files and perform LF normalization
* text=auto
# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union
# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain

1104
slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerAdapter.java
View File

File diff suppressed because it is too large Load Diff

246
slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerFactory.java
View File

@ -1,124 +1,124 @@
/*
* Copyright (c) 2004-2013 QOS.ch
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
package org.slf4j.impl;
import org.slf4j.ILoggerFactory;
import org.slf4j.Logger;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/**
* AndroidLoggerFactory is an implementation of {@link ILoggerFactory} returning
* the appropriately named {@link AndroidLoggerFactory} instance.
*
* @author Andrey Korzhevskiy <a.korzhevskiy@gmail.com>
*/
class AndroidLoggerFactory implements ILoggerFactory {
static final String ANONYMOUS_TAG = "null";
static final int TAG_MAX_LENGTH = 23;
private final ConcurrentMap<String, Logger> loggerMap = new ConcurrentHashMap<String, Logger>();
/**
* Return an appropriate {@link AndroidLoggerAdapter} instance by name.
*/
public Logger getLogger(String name) {
String tag = loggerNameToTag(name);
Logger logger = loggerMap.get(tag);
if (logger == null) {
Logger newInstance = new AndroidLoggerAdapter(tag);
Logger oldInstance = loggerMap.putIfAbsent(tag, newInstance);
logger = oldInstance == null ? newInstance : oldInstance;
}
return logger;
}
/**
* Tag names cannot be longer than {@value #TAG_MAX_LENGTH} characters on Android platform.
*
* Returns the short logger tag (up to {@value #TAG_MAX_LENGTH} characters) for the given logger name.
* Traditionally loggers are named by fully-qualified Java classes; this
* method attempts to return a concise identifying part of such names.
*
* See also:
* android/system/core/include/cutils/property.h
* android/frameworks/base/core/jni/android_util_Log.cpp
* dalvik.system.DalvikLogging
*
*/
static String loggerNameToTag(String loggerName) {
// Anonymous logger
if (loggerName == null) {
return ANONYMOUS_TAG;
}
int length = loggerName.length();
if (length <= TAG_MAX_LENGTH) {
return loggerName;
}
int tagLength = 0;
int lastTokenIndex = 0;
int lastPeriodIndex;
StringBuilder tagName = new StringBuilder(TAG_MAX_LENGTH + 3);
while ((lastPeriodIndex = loggerName.indexOf('.', lastTokenIndex)) != -1) {
tagName.append(loggerName.charAt(lastTokenIndex));
// token of one character appended as is otherwise truncate it to one character
int tokenLength = lastPeriodIndex - lastTokenIndex;
if (tokenLength > 1) {
tagName.append('*');
}
tagName.append('.');
lastTokenIndex = lastPeriodIndex + 1;
// check if name is already too long
tagLength = tagName.length();
if (tagLength > TAG_MAX_LENGTH) {
return getSimpleName(loggerName);
}
}
// Either we had no useful dot location at all
// or last token would exceed TAG_MAX_LENGTH
int tokenLength = length - lastTokenIndex;
if (tagLength == 0 || (tagLength + tokenLength) > TAG_MAX_LENGTH) {
return getSimpleName(loggerName);
}
// last token (usually class name) appended as is
tagName.append(loggerName, lastTokenIndex, length);
return tagName.toString();
}
private static String getSimpleName(String loggerName) {
// Take leading part and append '*' to indicate that it was truncated
int length = loggerName.length();
int lastPeriodIndex = loggerName.lastIndexOf('.');
return lastPeriodIndex != -1 && length - (lastPeriodIndex + 1) <= TAG_MAX_LENGTH
? loggerName.substring(lastPeriodIndex + 1)
: '*' + loggerName.substring(length - TAG_MAX_LENGTH + 1);
}
/*
* Copyright (c) 2004-2013 QOS.ch
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
package org.slf4j.impl;
import org.slf4j.ILoggerFactory;
import org.slf4j.Logger;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/**
* AndroidLoggerFactory is an implementation of {@link ILoggerFactory} returning
* the appropriately named {@link AndroidLoggerFactory} instance.
*
* @author Andrey Korzhevskiy <a.korzhevskiy@gmail.com>
*/
class AndroidLoggerFactory implements ILoggerFactory {
static final String ANONYMOUS_TAG = "null";
static final int TAG_MAX_LENGTH = 23;
private final ConcurrentMap<String, Logger> loggerMap = new ConcurrentHashMap<String, Logger>();
/**
* Return an appropriate {@link AndroidLoggerAdapter} instance by name.
*/
public Logger getLogger(String name) {
String tag = loggerNameToTag(name);
Logger logger = loggerMap.get(tag);
if (logger == null) {
Logger newInstance = new AndroidLoggerAdapter(tag);
Logger oldInstance = loggerMap.putIfAbsent(tag, newInstance);
logger = oldInstance == null ? newInstance : oldInstance;
}
return logger;
}
/**
* Tag names cannot be longer than {@value #TAG_MAX_LENGTH} characters on Android platform.
*
* Returns the short logger tag (up to {@value #TAG_MAX_LENGTH} characters) for the given logger name.
* Traditionally loggers are named by fully-qualified Java classes; this
* method attempts to return a concise identifying part of such names.
*
* See also:
* android/system/core/include/cutils/property.h
* android/frameworks/base/core/jni/android_util_Log.cpp
* dalvik.system.DalvikLogging
*
*/
static String loggerNameToTag(String loggerName) {
// Anonymous logger
if (loggerName == null) {
return ANONYMOUS_TAG;
}
int length = loggerName.length();
if (length <= TAG_MAX_LENGTH) {
return loggerName;
}
int tagLength = 0;
int lastTokenIndex = 0;
int lastPeriodIndex;
StringBuilder tagName = new StringBuilder(TAG_MAX_LENGTH + 3);
while ((lastPeriodIndex = loggerName.indexOf('.', lastTokenIndex)) != -1) {
tagName.append(loggerName.charAt(lastTokenIndex));
// token of one character appended as is otherwise truncate it to one character
int tokenLength = lastPeriodIndex - lastTokenIndex;
if (tokenLength > 1) {
tagName.append('*');
}
tagName.append('.');
lastTokenIndex = lastPeriodIndex + 1;
// check if name is already too long
tagLength = tagName.length();
if (tagLength > TAG_MAX_LENGTH) {
return getSimpleName(loggerName);
}
}
// Either we had no useful dot location at all
// or last token would exceed TAG_MAX_LENGTH
int tokenLength = length - lastTokenIndex;
if (tagLength == 0 || (tagLength + tokenLength) > TAG_MAX_LENGTH) {
return getSimpleName(loggerName);
}
// last token (usually class name) appended as is
tagName.append(loggerName, lastTokenIndex, length);
return tagName.toString();
}
private static String getSimpleName(String loggerName) {
// Take leading part and append '*' to indicate that it was truncated
int length = loggerName.length();
int lastPeriodIndex = loggerName.lastIndexOf('.');
return lastPeriodIndex != -1 && length - (lastPeriodIndex + 1) <= TAG_MAX_LENGTH
? loggerName.substring(lastPeriodIndex + 1)
: '*' + loggerName.substring(length - TAG_MAX_LENGTH + 1);
}
}

1306
slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java
View File

File diff suppressed because it is too large Load Diff

68
slf4j-simple/src/test/resources/simplelogger.properties
View File

@ -1,34 +1,34 @@
# SLF4J's SimpleLogger configuration file
# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
# Default logging detail level for all instances of SimpleLogger.
# Must be one of ("trace", "debug", "info", "warn", or "error").
# If not specified, defaults to "info".
#org.slf4j.simpleLogger.defaultLogLevel=info
# Logging detail level for a SimpleLogger instance named "xxxxx".
# Must be one of ("trace", "debug", "info", "warn", or "error").
# If not specified, the default logging detail level is used.
#org.slf4j.simpleLogger.log.xxxxx=
# Set to true if you want the current date and time to be included in output messages.
# Default is false, and will output the number of milliseconds elapsed since startup.
#org.slf4j.simpleLogger.showDateTime=false
# The date and time format to be used in the output messages.
# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
# If the format is not specified or is invalid, the default format is used.
# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
# Set to true if you want to output the current thread name.
# Defaults to true.
#org.slf4j.simpleLogger.showThreadName=true
# Set to true if you want the Logger instance name to be included in output messages.
# Defaults to true.
#org.slf4j.simpleLogger.showLogName=true
# Set to true if you want the last component of the name to be included in output messages.
# Defaults to false.
#org.slf4j.simpleLogger.showShortLogName=false
# SLF4J's SimpleLogger configuration file
# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
# Default logging detail level for all instances of SimpleLogger.
# Must be one of ("trace", "debug", "info", "warn", or "error").
# If not specified, defaults to "info".
#org.slf4j.simpleLogger.defaultLogLevel=info
# Logging detail level for a SimpleLogger instance named "xxxxx".
# Must be one of ("trace", "debug", "info", "warn", or "error").
# If not specified, the default logging detail level is used.
#org.slf4j.simpleLogger.log.xxxxx=
# Set to true if you want the current date and time to be included in output messages.
# Default is false, and will output the number of milliseconds elapsed since startup.
#org.slf4j.simpleLogger.showDateTime=false
# The date and time format to be used in the output messages.
# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
# If the format is not specified or is invalid, the default format is used.
# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
# Set to true if you want to output the current thread name.
# Defaults to true.
#org.slf4j.simpleLogger.showThreadName=true
# Set to true if you want the Logger instance name to be included in output messages.
# Defaults to true.
#org.slf4j.simpleLogger.showLogName=true
# Set to true if you want the last component of the name to be included in output messages.
# Defaults to false.
#org.slf4j.simpleLogger.showShortLogName=false