diff --git a/xref/info/ronjenkins/slf4bukkit/BukkitColorMapper.html b/xref/info/ronjenkins/slf4bukkit/ColorMapper.html
similarity index 97%
rename from xref/info/ronjenkins/slf4bukkit/BukkitColorMapper.html
rename to xref/info/ronjenkins/slf4bukkit/ColorMapper.html
index 8041620..7d3cce0 100644
--- a/xref/info/ronjenkins/slf4bukkit/BukkitColorMapper.html
+++ b/xref/info/ronjenkins/slf4bukkit/ColorMapper.html
@@ -1,11 +1,11 @@
BukkitColorMapper xref
+ColorMapper xref
+
1
2
3
@@ -38,7 +38,7 @@
30
31
32
-33 public final class BukkitColorMapper {
+33 public final class ColorMapper {
34
35
36 private static final Map<ChatColor, String> MAP = ImmutableMap.<ChatColor, String>builder()
@@ -77,7 +77,7 @@
69 public static String map(final String input) {
70 if (input == null ) { return "" ; }
71 String output = input;
-72 for (final Map.Entry<ChatColor, String> mapping : BukkitColorMapper.MAP.entrySet()) {
+72 for (final Map.Entry<ChatColor, String> mapping : ColorMapper.MAP.entrySet()) {
73 output = output.replace(mapping.getKey().toString(), mapping.getValue());
74 }
75 return output;
diff --git a/xref/info/ronjenkins/slf4bukkit/BukkitColorMarker.html b/xref/info/ronjenkins/slf4bukkit/ColorMarker.html
similarity index 57%
rename from xref/info/ronjenkins/slf4bukkit/BukkitColorMarker.html
rename to xref/info/ronjenkins/slf4bukkit/ColorMarker.html
index f6fb9e3..5e705d9 100644
--- a/xref/info/ronjenkins/slf4bukkit/BukkitColorMarker.html
+++ b/xref/info/ronjenkins/slf4bukkit/ColorMarker.html
@@ -1,11 +1,11 @@
BukkitColorMarker xref
+ColorMarker xref
+
1
2
3
@@ -31,133 +31,130 @@
23 import org.slf4j.Marker;
24
25
-26
-27
+26
+27
28
29
30
-31 public enum BukkitColorMarker implements Marker {
+31 public enum ColorMarker implements Marker {
32
33 AQUA(ChatColor.AQUA), BLACK(ChatColor.BLACK), BLUE(ChatColor.BLUE),
-34 BOLD(ChatColor.BOLD), DARK_AQUA(ChatColor.DARK_AQUA),
-35 DARK_BLUE(ChatColor.DARK_BLUE), DARK_GRAY(ChatColor.DARK_GRAY),
-36 DARK_GREEN(ChatColor.DARK_GREEN), DARK_PURPLE(ChatColor.DARK_PURPLE),
-37 DARK_RED(ChatColor.DARK_RED), GOLD(ChatColor.GOLD), GRAY(ChatColor.GRAY),
-38 GREEN(ChatColor.GREEN), ITALIC(ChatColor.ITALIC),
-39 LIGHT_PURPLE(ChatColor.LIGHT_PURPLE), MAGIC(ChatColor.MAGIC),
-40 RED(ChatColor.RED), RESET(ChatColor.RESET),
-41 STRIKETHROUGH(ChatColor.STRIKETHROUGH), UNDERLINE(ChatColor.UNDERLINE),
-42 WHITE(ChatColor.WHITE), YELLOW(ChatColor.YELLOW);
-43
-44 private final ChatColor value;
-45
-46 private BukkitColorMarker (final ChatColor value) {
-47 this .value = value;
-48 }
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58 @Override
-59 public void add(final Marker reference) {
-60 throw new UnsupportedOperationException();
-61 }
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72 @Override
-73 public boolean contains(final Marker other) {
-74
-75 return false;
-76 }
-77
-78
-79
-80
-81
-82
-83 @Override
-84 public boolean contains(final String name) {
-85 return false;
-86 }
-87
-88
-89
-90
-91
-92
-93 @Override
-94 public String getName() {
-95 return this .name();
-96 }
-97
-98
-99
-100
-101
-102
-103 public ChatColor getValue() {
-104 return this .value;
-105 }
-106
-107
-108
-109
-110
-111
-112 @Override
-113 @SuppressWarnings({ "all" , "deprecation" })
-114 public boolean hasChildren() {
-115 return false;
-116 }
-117
-118
-119
-120
-121
-122
-123 @Override
-124 public boolean hasReferences() {
-125
-126 return false;
-127 }
-128
-129
-130
-131
-132
-133
-134 @Override
-135 public Iterator<Marker> iterator() {
-136 return Collections.emptyIterator();
-137 }
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147 @Override
-148 public boolean remove(final Marker reference) {
-149 throw new UnsupportedOperationException();
-150 }
-151
-152 }
+34 DARK_AQUA(ChatColor.DARK_AQUA), DARK_BLUE(ChatColor.DARK_BLUE),
+35 DARK_GRAY(ChatColor.DARK_GRAY), DARK_GREEN(ChatColor.DARK_GREEN),
+36 DARK_PURPLE(ChatColor.DARK_PURPLE), DARK_RED(ChatColor.DARK_RED),
+37 GOLD(ChatColor.GOLD), GRAY(ChatColor.GRAY), GREEN(ChatColor.GREEN),
+38 LIGHT_PURPLE(ChatColor.LIGHT_PURPLE), NONE(ChatColor.RESET),
+39 RED(ChatColor.RED), WHITE(ChatColor.WHITE), YELLOW(ChatColor.YELLOW);
+40
+41 private final ChatColor value;
+42
+43 private ColorMarker (final ChatColor value) {
+44 this .value = value;
+45 }
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55 @Override
+56 public void add(final Marker reference) {
+57 throw new UnsupportedOperationException();
+58 }
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69 @Override
+70 public boolean contains(final Marker other) {
+71
+72 return false;
+73 }
+74
+75
+76
+77
+78
+79
+80 @Override
+81 public boolean contains(final String name) {
+82 return false;
+83 }
+84
+85
+86
+87
+88
+89
+90 @Override
+91 public String getName() {
+92 return this .name();
+93 }
+94
+95
+96
+97
+98
+99
+100 public ChatColor getValue() {
+101 return this .value;
+102 }
+103
+104
+105
+106
+107
+108
+109 @Override
+110 @SuppressWarnings({ "all" , "deprecation" })
+111 public boolean hasChildren() {
+112 return false;
+113 }
+114
+115
+116
+117
+118
+119
+120 @Override
+121 public boolean hasReferences() {
+122
+123 return false;
+124 }
+125
+126
+127
+128
+129
+130
+131 @Override
+132 public Iterator<Marker> iterator() {
+133 return Collections.emptyIterator();
+134 }
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144 @Override
+145 public boolean remove(final Marker reference) {
+146 throw new UnsupportedOperationException();
+147 }
+148
+149 }
ColorString xref
+
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17 package info.ronjenkins.slf4bukkit;
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27 public final class ColorString {
+28
+29 private ColorMarker currentColor = ColorMarker.NONE;
+30 private final StringBuilder value = new StringBuilder();
+31
+32
+33 public ColorString () {
+34 }
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44 public ColorString aqua(final String append) {
+45 synchronized (this .value) {
+46 this .setColor(ColorMarker.AQUA);
+47 this .value.append(append);
+48 return this ;
+49 }
+50 }
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60 public ColorString black(final String append) {
+61 synchronized (this .value) {
+62 this .setColor(ColorMarker.BLACK);
+63 this .value.append(append);
+64 return this ;
+65 }
+66 }
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76 public ColorString blue(final String append) {
+77 synchronized (this .value) {
+78 this .setColor(ColorMarker.BLUE);
+79 this .value.append(append);
+80 return this ;
+81 }
+82 }
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92 public ColorString darkAqua(final String append) {
+93 synchronized (this .value) {
+94 this .setColor(ColorMarker.DARK_AQUA);
+95 this .value.append(append);
+96 return this ;
+97 }
+98 }
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108 public ColorString darkBlue(final String append) {
+109 synchronized (this .value) {
+110 this .setColor(ColorMarker.DARK_BLUE);
+111 this .value.append(append);
+112 return this ;
+113 }
+114 }
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124 public ColorString darkGray(final String append) {
+125 synchronized (this .value) {
+126 this .setColor(ColorMarker.DARK_GRAY);
+127 this .value.append(append);
+128 return this ;
+129 }
+130 }
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140 public ColorString darkGreen(final String append) {
+141 synchronized (this .value) {
+142 this .setColor(ColorMarker.DARK_GREEN);
+143 this .value.append(append);
+144 return this ;
+145 }
+146 }
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156 public ColorString darkRed(final String append) {
+157 synchronized (this .value) {
+158 this .setColor(ColorMarker.DARK_RED);
+159 this .value.append(append);
+160 return this ;
+161 }
+162 }
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172 public ColorString gold(final String append) {
+173 synchronized (this .value) {
+174 this .setColor(ColorMarker.GOLD);
+175 this .value.append(append);
+176 return this ;
+177 }
+178 }
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188 public ColorString gray(final String append) {
+189 synchronized (this .value) {
+190 this .setColor(ColorMarker.GRAY);
+191 this .value.append(append);
+192 return this ;
+193 }
+194 }
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204 public ColorString green(final String append) {
+205 synchronized (this .value) {
+206 this .setColor(ColorMarker.GREEN);
+207 this .value.append(append);
+208 return this ;
+209 }
+210 }
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220 public ColorString none(final String append) {
+221 synchronized (this .value) {
+222 this .setColor(ColorMarker.NONE);
+223 this .value.append(append);
+224 return this ;
+225 }
+226 }
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236 public ColorString pink(final String append) {
+237 synchronized (this .value) {
+238 this .setColor(ColorMarker.LIGHT_PURPLE);
+239 this .value.append(append);
+240 return this ;
+241 }
+242 }
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252 public ColorString purple(final String append) {
+253 synchronized (this .value) {
+254 this .setColor(ColorMarker.DARK_PURPLE);
+255 this .value.append(append);
+256 return this ;
+257 }
+258 }
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268 public ColorString red(final String append) {
+269 synchronized (this .value) {
+270 this .setColor(ColorMarker.RED);
+271 this .value.append(append);
+272 return this ;
+273 }
+274 }
+275
+276
+277
+278
+279
+280
+281
+282 @Override
+283 public String toString() {
+284 synchronized (this .value) {
+285 this .setColor(ColorMarker.NONE);
+286 return this .value.toString();
+287 }
+288 }
+289
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
+300 public String toString(final ColorMarker color) {
+301 synchronized (this .value) {
+302 if (color == null ) { return this .toString(); }
+303 this .setColor(color);
+304 return this .value.toString();
+305 }
+306 }
+307
+308
+309
+310
+311
+312
+313
+314
+315
+316 public ColorString white(final String append) {
+317 synchronized (this .value) {
+318 this .setColor(ColorMarker.WHITE);
+319 this .value.append(append);
+320 return this ;
+321 }
+322 }
+323
+324
+325
+326
+327
+328
+329
+330
+331
+332 public ColorString yellow(final String append) {
+333 synchronized (this .value) {
+334 this .setColor(ColorMarker.YELLOW);
+335 this .value.append(append);
+336 return this ;
+337 }
+338 }
+339
+340 private void setColor(final ColorMarker color) {
+341 synchronized (this .value) {
+342 if (color != this .currentColor) {
+343 this .value.append(color.getValue());
+344 this .currentColor = color;
+345 }
+346 }
+347 }
+348
+349 }
+
+SLF4Bukkit 0.1.2 Reference Package info.ronjenkins.slf4bukkit
+ SLF4Bukkit 0.1.3 Reference Package info.ronjenkins.slf4bukkit
diff --git a/xref/info/ronjenkins/slf4bukkit/package-summary.html b/xref/info/ronjenkins/slf4bukkit/package-summary.html
index e615637..b4b267e 100644
--- a/xref/info/ronjenkins/slf4bukkit/package-summary.html
+++ b/xref/info/ronjenkins/slf4bukkit/package-summary.html
@@ -3,7 +3,7 @@
SLF4Bukkit 0.1.2 Reference Package info.ronjenkins.slf4bukkit
+ SLF4Bukkit 0.1.3 Reference Package info.ronjenkins.slf4bukkit
- BukkitColorMapper
+ ColorMapper
- BukkitColorMarker
+ ColorMarker
+
+
+
+
+ ColorString
diff --git a/xref/org/slf4j/impl/BukkitPluginLoggerAdapter.html b/xref/org/slf4j/impl/BukkitLoggerAdapter.html
similarity index 55%
rename from xref/org/slf4j/impl/BukkitPluginLoggerAdapter.html
rename to xref/org/slf4j/impl/BukkitLoggerAdapter.html
index 7ffcee1..27b1387 100644
--- a/xref/org/slf4j/impl/BukkitPluginLoggerAdapter.html
+++ b/xref/org/slf4j/impl/BukkitLoggerAdapter.html
@@ -1,11 +1,11 @@
BukkitPluginLoggerAdapter xref
+BukkitLoggerAdapter xref
+
1
2
3
@@ -52,920 +52,1007 @@
44
45 package org.slf4j.impl;
46
-47 import info.ronjenkins.slf4bukkit.BukkitColorMapper;
-48 import info.ronjenkins.slf4bukkit.BukkitColorMarker;
+47 import info.ronjenkins.slf4bukkit.ColorMapper;
+48 import info.ronjenkins.slf4bukkit.ColorMarker;
49
50 import java.io.IOException;
51 import java.io.InputStream;
52 import java.util.ArrayList;
53 import java.util.Arrays;
-54 import java.util.List;
-55 import java.util.Map;
-56
-57 import org.apache.commons.lang.exception.ExceptionUtils;
-58 import org.bukkit.Bukkit;
-59 import org.bukkit.ChatColor;
-60 import org.bukkit.plugin.Plugin;
-61 import org.slf4j.Logger;
-62 import org.slf4j.Marker;
-63 import org.slf4j.event.Level;
-64 import org.slf4j.helpers.FormattingTuple;
-65 import org.slf4j.helpers.MessageFormatter;
-66 import org.yaml.snakeyaml.Yaml;
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
+54 import java.util.HashMap;
+55 import java.util.List;
+56 import java.util.Map;
+57
+58 import org.apache.commons.lang.exception.ExceptionUtils;
+59 import org.bukkit.Bukkit;
+60 import org.bukkit.ChatColor;
+61 import org.bukkit.configuration.ConfigurationSection;
+62 import org.bukkit.plugin.Plugin;
+63 import org.slf4j.Logger;
+64 import org.slf4j.Marker;
+65 import org.slf4j.event.Level;
+66 import org.slf4j.helpers.FormattingTuple;
+67 import org.slf4j.helpers.MessageFormatter;
+68 import org.yaml.snakeyaml.Yaml;
+69
+70 import com.google.common.collect.ImmutableMap;
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
169
170
-171
-172
-173
-174
-175
-176
-177
-178
-179 public final class BukkitPluginLoggerAdapter implements Logger {
-180
-181
-182 private static transient Plugin BUKKIT_PLUGIN;
-183 private static transient String BUKKIT_PLUGIN_NAME;
-184
-185 private static final String CONFIG_FALLBACK_DEFAULT_LOG_LEVEL = "info" ;
-186 private static final boolean CONFIG_FALLBACK_SHOW_HEADER = false;
-187 private static final boolean CONFIG_FALLBACK_SHOW_LOG_NAME = false;
-188 private static final boolean CONFIG_FALLBACK_SHOW_SHORT_LOG_NAME = true ;
-189 private static final boolean CONFIG_FALLBACK_SHOW_THREAD_NAME = false;
-190 private static final String CONFIG_KEY_DEFAULT_LOG_LEVEL = "slf4j.defaultLogLevel" ;
-191 private static final String CONFIG_KEY_PREFIX_LOG = "slf4j.log." ;
-192 private static final String CONFIG_KEY_SHOW_HEADER = "slf4j.showHeader" ;
-193 private static final String CONFIG_KEY_SHOW_LOG_NAME = "slf4j.showLogName" ;
-194 private static final String CONFIG_KEY_SHOW_SHORT_LOG_NAME = "slf4j.showShortLogName" ;
-195 private static final String CONFIG_KEY_SHOW_THREAD_NAME = "slf4j.showThreadName" ;
-196 private static Level CONFIG_VALUE_DEFAULT_LOG_LEVEL;
-197 private static boolean CONFIG_VALUE_SHOW_HEADER;
-198 private static boolean CONFIG_VALUE_SHOW_LOG_NAME;
-199 private static boolean CONFIG_VALUE_SHOW_SHORT_LOG_NAME;
-200 private static boolean CONFIG_VALUE_SHOW_THREAD_NAME;
-201
-202 private static final Object INITIALIZATION_LOCK = new Object();
-203
-204 private final String name;
-205
-206 private transient String shortLogName = null ;
-207
-208
-209
-210 BukkitPluginLoggerAdapter (final String name) {
-211 this .name = name;
-212 }
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222 public static void init(final boolean reinitialize) {
-223 synchronized (BukkitPluginLoggerAdapter.INITIALIZATION_LOCK) {
-224
-225 if (reinitialize) {
-226 BukkitPluginLoggerAdapter.BUKKIT_PLUGIN = null ;
-227 BukkitPluginLoggerAdapter.BUKKIT_PLUGIN_NAME = null ;
-228 } else if (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN != null ) { return ; }
-229
-230 if (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN_NAME == null ) {
-231 InputStream pluginYmlFile = null ;
-232 try {
-233 pluginYmlFile = BukkitPluginLoggerAdapter.class .getClassLoader()
-234 .getResource("plugin.yml" )
-235 .openStream();
-236 final Yaml yaml = new Yaml();
-237 @SuppressWarnings("rawtypes" )
-238 final Map pluginYml = (Map) yaml.load(pluginYmlFile);
-239 BukkitPluginLoggerAdapter.BUKKIT_PLUGIN_NAME = (String) pluginYml.get("name" );
-240 } catch (final IOException e) {
-241 throw new IllegalStateException(e);
-242 } finally {
-243 if (pluginYmlFile != null ) {
-244 try {
-245 pluginYmlFile.close();
-246 } catch (final IOException e) {
-247 e.printStackTrace();
-248 }
-249 }
-250 }
-251 }
-252
-253
-254
-255
-256 BukkitPluginLoggerAdapter.BUKKIT_PLUGIN = Bukkit.getPluginManager()
-257 .getPlugin(BukkitPluginLoggerAdapter.BUKKIT_PLUGIN_NAME);
-258
-259
-260
-261
-262
-263 BukkitPluginLoggerAdapter.CONFIG_VALUE_DEFAULT_LOG_LEVEL = BukkitPluginLoggerAdapter.stringToLevel(BukkitPluginLoggerAdapter.getStringProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_DEFAULT_LOG_LEVEL,
-264 BukkitPluginLoggerAdapter.CONFIG_FALLBACK_DEFAULT_LOG_LEVEL));
-265 if (BukkitPluginLoggerAdapter.CONFIG_VALUE_DEFAULT_LOG_LEVEL == null ) {
-266 BukkitPluginLoggerAdapter.CONFIG_VALUE_DEFAULT_LOG_LEVEL = BukkitPluginLoggerAdapter.stringToLevel(BukkitPluginLoggerAdapter.CONFIG_FALLBACK_DEFAULT_LOG_LEVEL);
-267 }
-268 BukkitPluginLoggerAdapter.CONFIG_VALUE_SHOW_HEADER = BukkitPluginLoggerAdapter.getBooleanProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_SHOW_HEADER,
-269 BukkitPluginLoggerAdapter.CONFIG_FALLBACK_SHOW_HEADER);
-270 BukkitPluginLoggerAdapter.CONFIG_VALUE_SHOW_LOG_NAME = BukkitPluginLoggerAdapter.getBooleanProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_SHOW_LOG_NAME,
-271 BukkitPluginLoggerAdapter.CONFIG_FALLBACK_SHOW_LOG_NAME);
-272 BukkitPluginLoggerAdapter.CONFIG_VALUE_SHOW_SHORT_LOG_NAME = BukkitPluginLoggerAdapter.getBooleanProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_SHOW_SHORT_LOG_NAME,
-273 BukkitPluginLoggerAdapter.CONFIG_FALLBACK_SHOW_SHORT_LOG_NAME);
-274 BukkitPluginLoggerAdapter.CONFIG_VALUE_SHOW_THREAD_NAME = BukkitPluginLoggerAdapter.getBooleanProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_SHOW_THREAD_NAME,
-275 BukkitPluginLoggerAdapter.CONFIG_FALLBACK_SHOW_THREAD_NAME);
-276 }
-277 }
-278
-279
-280
-281
-282
-283
-284
-285
-286
-287
-288
-289
-290
-291 private static boolean getBooleanProperty(final String name,
-292 final boolean defaultValue) {
-293 synchronized (BukkitPluginLoggerAdapter.INITIALIZATION_LOCK) {
-294 if (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN == null ) { return defaultValue; }
-295 final String prop = BukkitPluginLoggerAdapter.BUKKIT_PLUGIN.getConfig()
-296 .getString(name);
-297 if ("true" .equalsIgnoreCase(prop)) { return true ; }
-298 if ("false" .equalsIgnoreCase(prop)) { return false; }
-299 return defaultValue;
-300 }
-301 }
-302
-303
-304
-305
-306
-307
-308
-309 private static java.util.logging.Logger getBukkitLogger() {
-310 synchronized (BukkitPluginLoggerAdapter.INITIALIZATION_LOCK) {
-311 return BukkitPluginLoggerAdapter.BUKKIT_PLUGIN == null ? Bukkit.getLogger()
-312 : BukkitPluginLoggerAdapter.BUKKIT_PLUGIN.getLogger();
-313 }
-314 }
-315
-316
-317
-318
-319
-320
-321
-322
-323
-324
-325
-326 private static String getStringProperty(final String name,
-327 final String defaultValue) {
-328 synchronized (BukkitPluginLoggerAdapter.INITIALIZATION_LOCK) {
-329 if (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN == null ) { return defaultValue; }
-330 final String prop = BukkitPluginLoggerAdapter.BUKKIT_PLUGIN.getConfig()
-331 .getString(name);
-332 return (prop == null ) ? defaultValue : prop;
-333 }
-334 }
-335
-336
-337
-338
-339
-340
-341
-342
-343
-344
-345
-346
-347
-348
-349
-350 private static java.util.logging.Level
-351 slf4jLevelIntToBukkitJULLevel(final Level slf4jLevel) {
-352 java.util.logging.Level julLevel;
-353 switch (slf4jLevel) {
-354 case ERROR:
-355 julLevel = java.util.logging.Level.SEVERE;
-356 break ;
-357 case WARN:
-358 julLevel = java.util.logging.Level.WARNING;
-359 break ;
-360 default :
-361
-362
-363
-364 julLevel = java.util.logging.Level.INFO;
-365 break ;
-366 }
-367 return julLevel;
-368 }
-369
-370
-371
-372
-373
-374
-375
-376
-377
-378 private static Level stringToLevel(final String levelStr) {
-379 if ("trace" .equalsIgnoreCase(levelStr)) {
-380 return Level.TRACE;
-381 } else if ("debug" .equalsIgnoreCase(levelStr)) {
-382 return Level.DEBUG;
-383 } else if ("info" .equalsIgnoreCase(levelStr)) {
-384 return Level.INFO;
-385 } else if ("warn" .equalsIgnoreCase(levelStr)) {
-386 return Level.WARN;
-387 } else if ("error" .equalsIgnoreCase(levelStr)) {
-388 return Level.ERROR;
-389 } else {
-390 return null ;
-391 }
-392 }
-393
-394 @Override
-395 public void debug(final Marker marker, final String msg) {
-396 if (!this .isDebugEnabled()) { return ; }
-397 this .log(Level.DEBUG, marker, msg, null );
-398 }
-399
-400 @Override
-401 public void debug(final Marker marker, final String format, final Object arg) {
-402 if (!this .isDebugEnabled()) { return ; }
-403 this .formatAndLog(Level.DEBUG, marker, format, arg, null );
-404 }
-405
-406 @Override
-407 public void debug(final Marker marker, final String format,
-408 final Object... arguments) {
-409 if (!this .isDebugEnabled()) { return ; }
-410 this .formatAndLog(Level.DEBUG, marker, format, arguments);
-411 }
-412
-413 @Override
-414 public void debug(final Marker marker, final String format,
-415 final Object arg1, final Object arg2) {
-416 if (!this .isDebugEnabled()) { return ; }
-417 this .formatAndLog(Level.DEBUG, marker, format, arg1, arg2);
-418 }
-419
-420 @Override
-421 public void debug(final Marker marker, final String msg, final Throwable t) {
-422 if (!this .isDebugEnabled()) { return ; }
-423 this .log(Level.DEBUG, marker, msg, t);
-424 }
-425
-426 @Override
-427 public void debug(final String msg) {
-428 if (!this .isDebugEnabled()) { return ; }
-429 this .log(Level.DEBUG, null , msg, null );
-430 }
-431
-432 @Override
-433 public void debug(final String format, final Object arg) {
-434 if (!this .isDebugEnabled()) { return ; }
-435 this .formatAndLog(Level.DEBUG, null , format, arg, null );
-436 }
-437
-438 @Override
-439 public void debug(final String format, final Object... arguments) {
-440 if (!this .isDebugEnabled()) { return ; }
-441 this .formatAndLog(Level.DEBUG, null , format, arguments);
-442 }
-443
-444 @Override
-445 public void debug(final String format, final Object arg1, final Object arg2) {
-446 if (!this .isDebugEnabled()) { return ; }
-447 this .formatAndLog(Level.DEBUG, null , format, arg1, arg2);
-448 }
-449
-450 @Override
-451 public void debug(final String msg, final Throwable t) {
-452 if (!this .isDebugEnabled()) { return ; }
-453 this .log(Level.DEBUG, null , msg, t);
-454 }
-455
-456 @Override
-457 public void error(final Marker marker, final String msg) {
-458 if (!this .isErrorEnabled()) { return ; }
-459 this .log(Level.ERROR, marker, msg, null );
-460 }
-461
-462 @Override
-463 public void error(final Marker marker, final String format, final Object arg) {
-464 if (!this .isErrorEnabled()) { return ; }
-465 this .formatAndLog(Level.ERROR, marker, format, arg, null );
-466 }
-467
-468 @Override
-469 public void error(final Marker marker, final String format,
-470 final Object... arguments) {
-471 if (!this .isErrorEnabled()) { return ; }
-472 this .formatAndLog(Level.ERROR, marker, format, arguments);
-473 }
-474
-475 @Override
-476 public void error(final Marker marker, final String format,
-477 final Object arg1, final Object arg2) {
-478 if (!this .isErrorEnabled()) { return ; }
-479 this .formatAndLog(Level.ERROR, marker, format, arg1, arg2);
-480 }
-481
-482 @Override
-483 public void error(final Marker marker, final String msg, final Throwable t) {
-484 if (!this .isErrorEnabled()) { return ; }
-485 this .log(Level.ERROR, marker, msg, t);
-486 }
-487
-488 @Override
-489 public void error(final String msg) {
-490 if (!this .isErrorEnabled()) { return ; }
-491 this .log(Level.ERROR, null , msg, null );
-492 }
-493
-494 @Override
-495 public void error(final String format, final Object arg) {
-496 if (!this .isErrorEnabled()) { return ; }
-497 this .formatAndLog(Level.ERROR, null , format, arg, null );
-498 }
-499
-500 @Override
-501 public void error(final String format, final Object... arguments) {
-502 if (!this .isErrorEnabled()) { return ; }
-503 this .formatAndLog(Level.ERROR, null , format, arguments);
-504 }
-505
-506 @Override
-507 public void error(final String format, final Object arg1, final Object arg2) {
-508 if (!this .isErrorEnabled()) { return ; }
-509 this .formatAndLog(Level.ERROR, null , format, arg1, arg2);
-510 }
-511
-512 @Override
-513 public void error(final String msg, final Throwable t) {
-514 if (!this .isErrorEnabled()) { return ; }
-515 this .log(Level.ERROR, null , msg, t);
-516 }
-517
-518 @Override
-519 public String getName() {
-520 return this .name;
-521 }
-522
-523 @Override
-524 public void info(final Marker marker, final String msg) {
-525 if (!this .isInfoEnabled()) { return ; }
-526 this .log(Level.INFO, marker, msg, null );
-527 }
-528
-529 @Override
-530 public void info(final Marker marker, final String format, final Object arg) {
-531 if (!this .isInfoEnabled()) { return ; }
-532 this .formatAndLog(Level.INFO, marker, format, arg, null );
-533 }
-534
-535 @Override
-536 public void info(final Marker marker, final String format,
-537 final Object... arguments) {
-538 if (!this .isInfoEnabled()) { return ; }
-539 this .formatAndLog(Level.INFO, marker, format, arguments);
-540 }
-541
-542 @Override
-543 public void info(final Marker marker, final String format, final Object arg1,
-544 final Object arg2) {
-545 if (!this .isInfoEnabled()) { return ; }
-546 this .formatAndLog(Level.INFO, marker, format, arg1, arg2);
-547 }
-548
-549 @Override
-550 public void info(final Marker marker, final String msg, final Throwable t) {
-551 if (!this .isInfoEnabled()) { return ; }
-552 this .log(Level.INFO, marker, msg, t);
-553 }
-554
-555 @Override
-556 public void info(final String msg) {
-557 if (!this .isInfoEnabled()) { return ; }
-558 this .log(Level.INFO, null , msg, null );
-559 }
-560
-561 @Override
-562 public void info(final String format, final Object arg) {
-563 if (!this .isInfoEnabled()) { return ; }
-564 this .formatAndLog(Level.INFO, null , format, arg, null );
-565 }
-566
-567 @Override
-568 public void info(final String format, final Object... arguments) {
-569 if (!this .isInfoEnabled()) { return ; }
-570 this .formatAndLog(Level.INFO, null , format, arguments);
-571 }
-572
-573 @Override
-574 public void info(final String format, final Object arg1, final Object arg2) {
-575 if (!this .isInfoEnabled()) { return ; }
-576 this .formatAndLog(Level.INFO, null , format, arg1, arg2);
-577 }
-578
-579 @Override
-580 public void info(final String msg, final Throwable t) {
-581 if (!this .isInfoEnabled()) { return ; }
-582 this .log(Level.INFO, null , msg, t);
-583 }
-584
-585 @Override
-586 public boolean isDebugEnabled() {
-587 return this .isLevelEnabled(Level.DEBUG);
-588 }
-589
-590 @Override
-591 public boolean isDebugEnabled(final Marker marker) {
-592 return this .isLevelEnabled(Level.DEBUG);
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190 public final class BukkitLoggerAdapter implements Logger {
+191
+192
+193 private static transient Plugin BUKKIT_PLUGIN;
+194 private static transient String BUKKIT_PLUGIN_NAME;
+195
+196 private static final String CONFIG_FALLBACK_DEFAULT_LOG_LEVEL = "info" ;
+197 private static final Map<Level, ColorMarker> CONFIG_FALLBACK_LEVEL_COLORS = BukkitLoggerAdapter.fallbackLevelColors();
+198 private static final boolean CONFIG_FALLBACK_SHOW_HEADER = false;
+199 private static final boolean CONFIG_FALLBACK_SHOW_LOG_NAME = false;
+200 private static final boolean CONFIG_FALLBACK_SHOW_SHORT_LOG_NAME = true ;
+201 private static final boolean CONFIG_FALLBACK_SHOW_THREAD_NAME = false;
+202 private static final String CONFIG_KEY_DEFAULT_LOG_LEVEL = "slf4j.defaultLogLevel" ;
+203 private static final String CONFIG_KEY_LEVEL_COLORS = "slf4j.colors" ;
+204 private static final String CONFIG_KEY_PREFIX_LOG = "slf4j.log." ;
+205 private static final String CONFIG_KEY_SHOW_HEADER = "slf4j.showHeader" ;
+206 private static final String CONFIG_KEY_SHOW_LOG_NAME = "slf4j.showLogName" ;
+207 private static final String CONFIG_KEY_SHOW_SHORT_LOG_NAME = "slf4j.showShortLogName" ;
+208 private static final String CONFIG_KEY_SHOW_THREAD_NAME = "slf4j.showThreadName" ;
+209 private static Level CONFIG_VALUE_DEFAULT_LOG_LEVEL;
+210 private static Map<Level, ColorMarker> CONFIG_VALUE_LEVEL_COLORS;
+211 private static boolean CONFIG_VALUE_SHOW_HEADER;
+212 private static boolean CONFIG_VALUE_SHOW_LOG_NAME;
+213 private static boolean CONFIG_VALUE_SHOW_SHORT_LOG_NAME;
+214 private static boolean CONFIG_VALUE_SHOW_THREAD_NAME;
+215
+216 private static final Object INITIALIZATION_LOCK = new Object();
+217
+218 private final String name;
+219
+220 private transient String shortLogName = null ;
+221
+222
+223
+224 BukkitLoggerAdapter (final String name) {
+225 this .name = name;
+226 }
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236 public static void init(final boolean reinitialize) {
+237 synchronized (BukkitLoggerAdapter.INITIALIZATION_LOCK) {
+238
+239 if (reinitialize) {
+240 BukkitLoggerAdapter.BUKKIT_PLUGIN = null ;
+241 BukkitLoggerAdapter.BUKKIT_PLUGIN_NAME = null ;
+242 } else if (BukkitLoggerAdapter.BUKKIT_PLUGIN != null ) { return ; }
+243
+244 if (BukkitLoggerAdapter.BUKKIT_PLUGIN_NAME == null ) {
+245 InputStream pluginYmlFile = null ;
+246 try {
+247 pluginYmlFile = BukkitLoggerAdapter.class .getClassLoader()
+248 .getResource("plugin.yml" )
+249 .openStream();
+250 final Yaml yaml = new Yaml();
+251 @SuppressWarnings("rawtypes" )
+252 final Map pluginYml = (Map) yaml.load(pluginYmlFile);
+253 BukkitLoggerAdapter.BUKKIT_PLUGIN_NAME = (String) pluginYml.get("name" );
+254 } catch (final IOException e) {
+255 throw new IllegalStateException(e);
+256 } finally {
+257 if (pluginYmlFile != null ) {
+258 try {
+259 pluginYmlFile.close();
+260 } catch (final IOException e) {
+261 e.printStackTrace();
+262 }
+263 }
+264 }
+265 }
+266
+267
+268
+269
+270 BukkitLoggerAdapter.BUKKIT_PLUGIN = Bukkit.getPluginManager()
+271 .getPlugin(BukkitLoggerAdapter.BUKKIT_PLUGIN_NAME);
+272
+273
+274
+275
+276
+277 BukkitLoggerAdapter.CONFIG_VALUE_DEFAULT_LOG_LEVEL = BukkitLoggerAdapter.stringToLevel(BukkitLoggerAdapter.getStringProperty(BukkitLoggerAdapter.CONFIG_KEY_DEFAULT_LOG_LEVEL,
+278 BukkitLoggerAdapter.CONFIG_FALLBACK_DEFAULT_LOG_LEVEL));
+279 if (BukkitLoggerAdapter.CONFIG_VALUE_DEFAULT_LOG_LEVEL == null ) {
+280 BukkitLoggerAdapter.CONFIG_VALUE_DEFAULT_LOG_LEVEL = BukkitLoggerAdapter.stringToLevel(BukkitLoggerAdapter.CONFIG_FALLBACK_DEFAULT_LOG_LEVEL);
+281 }
+282 BukkitLoggerAdapter.CONFIG_VALUE_LEVEL_COLORS = BukkitLoggerAdapter.getLevelColorsMap(BukkitLoggerAdapter.CONFIG_KEY_LEVEL_COLORS,
+283 BukkitLoggerAdapter.CONFIG_FALLBACK_LEVEL_COLORS);
+284 BukkitLoggerAdapter.CONFIG_VALUE_SHOW_HEADER = BukkitLoggerAdapter.getBooleanProperty(BukkitLoggerAdapter.CONFIG_KEY_SHOW_HEADER,
+285 BukkitLoggerAdapter.CONFIG_FALLBACK_SHOW_HEADER);
+286 BukkitLoggerAdapter.CONFIG_VALUE_SHOW_LOG_NAME = BukkitLoggerAdapter.getBooleanProperty(BukkitLoggerAdapter.CONFIG_KEY_SHOW_LOG_NAME,
+287 BukkitLoggerAdapter.CONFIG_FALLBACK_SHOW_LOG_NAME);
+288 BukkitLoggerAdapter.CONFIG_VALUE_SHOW_SHORT_LOG_NAME = BukkitLoggerAdapter.getBooleanProperty(BukkitLoggerAdapter.CONFIG_KEY_SHOW_SHORT_LOG_NAME,
+289 BukkitLoggerAdapter.CONFIG_FALLBACK_SHOW_SHORT_LOG_NAME);
+290 BukkitLoggerAdapter.CONFIG_VALUE_SHOW_THREAD_NAME = BukkitLoggerAdapter.getBooleanProperty(BukkitLoggerAdapter.CONFIG_KEY_SHOW_THREAD_NAME,
+291 BukkitLoggerAdapter.CONFIG_FALLBACK_SHOW_THREAD_NAME);
+292 }
+293 }
+294
+295
+296
+297
+298
+299
+300 private static Map<Level, ColorMarker> fallbackLevelColors() {
+301 return ImmutableMap.<Level, ColorMarker> builder()
+302 .put(Level.ERROR, ColorMarker.RED)
+303 .put(Level.WARN, ColorMarker.YELLOW)
+304 .put(Level.INFO, ColorMarker.NONE)
+305 .put(Level.DEBUG, ColorMarker.NONE)
+306 .put(Level.TRACE, ColorMarker.NONE).build();
+307 }
+308
+309
+310
+311
+312
+313
+314
+315
+316
+317
+318
+319
+320
+321 private static boolean getBooleanProperty(final String name,
+322 final boolean defaultValue) {
+323 synchronized (BukkitLoggerAdapter.INITIALIZATION_LOCK) {
+324 if (BukkitLoggerAdapter.BUKKIT_PLUGIN == null ) { return defaultValue; }
+325 final String prop = BukkitLoggerAdapter.BUKKIT_PLUGIN.getConfig()
+326 .getString(name);
+327 if ("true" .equalsIgnoreCase(prop)) { return true ; }
+328 if ("false" .equalsIgnoreCase(prop)) { return false; }
+329 return defaultValue;
+330 }
+331 }
+332
+333
+334
+335
+336
+337
+338
+339 private static java.util.logging.Logger getBukkitLogger() {
+340 synchronized (BukkitLoggerAdapter.INITIALIZATION_LOCK) {
+341 return BukkitLoggerAdapter.BUKKIT_PLUGIN == null ? Bukkit.getLogger()
+342 : BukkitLoggerAdapter.BUKKIT_PLUGIN.getLogger();
+343 }
+344 }
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354
+355
+356
+357
+358
+359
+360
+361 private static Map<Level, ColorMarker>
+362 getLevelColorsMap(final String property,
+363 final Map<Level, ColorMarker> defaultValues) {
+364 synchronized (BukkitLoggerAdapter.INITIALIZATION_LOCK) {
+365
+366 if (BukkitLoggerAdapter.BUKKIT_PLUGIN == null ) { return defaultValues; }
+367 final ConfigurationSection config = BukkitLoggerAdapter.BUKKIT_PLUGIN.getConfig()
+368 .getConfigurationSection(property);
+369
+370 if (config == null ) { return defaultValues; }
+371
+372 final Map<String, Object> configValues = config.getValues(false);
+373 final Map<Level, ColorMarker> convertedConfigValues = new HashMap<Level, ColorMarker>();
+374 for (final Map.Entry<String, Object> configValue : configValues.entrySet()) {
+375 final String levelName = configValue.getKey().toUpperCase();
+376 final String formatName = configValue.getValue().toString()
+377 .toUpperCase();
+378 Level level;
+379 ColorMarker format;
+380 try {
+381 level = Level.valueOf(levelName);
+382 format = ColorMarker.valueOf(formatName);
+383 } catch (final IllegalArgumentException e) {
+384
+385 continue ;
+386 }
+387 convertedConfigValues.put(level, format);
+388 }
+389
+390 final Map<Level, ColorMarker> finalConfigValues = new HashMap<Level, ColorMarker>();
+391 finalConfigValues.putAll(defaultValues);
+392 finalConfigValues.putAll(convertedConfigValues);
+393
+394 return ImmutableMap.<Level, ColorMarker> builder()
+395 .putAll(finalConfigValues).build();
+396 }
+397 }
+398
+399
+400
+401
+402
+403
+404
+405
+406
+407
+408
+409 private static String getStringProperty(final String name,
+410 final String defaultValue) {
+411 synchronized (BukkitLoggerAdapter.INITIALIZATION_LOCK) {
+412 if (BukkitLoggerAdapter.BUKKIT_PLUGIN == null ) { return defaultValue; }
+413 final String prop = BukkitLoggerAdapter.BUKKIT_PLUGIN.getConfig()
+414 .getString(name);
+415 return (prop == null ) ? defaultValue : prop;
+416 }
+417 }
+418
+419
+420
+421
+422
+423
+424
+425
+426
+427
+428
+429
+430
+431
+432
+433 private static java.util.logging.Level
+434 slf4jLevelIntToBukkitJULLevel(final Level slf4jLevel) {
+435 java.util.logging.Level julLevel;
+436 switch (slf4jLevel) {
+437 case ERROR:
+438 julLevel = java.util.logging.Level.SEVERE;
+439 break ;
+440 case WARN:
+441 julLevel = java.util.logging.Level.WARNING;
+442 break ;
+443 default :
+444
+445
+446
+447 julLevel = java.util.logging.Level.INFO;
+448 break ;
+449 }
+450 return julLevel;
+451 }
+452
+453
+454
+455
+456
+457
+458
+459
+460
+461 private static Level stringToLevel(final String levelStr) {
+462 if ("trace" .equalsIgnoreCase(levelStr)) {
+463 return Level.TRACE;
+464 } else if ("debug" .equalsIgnoreCase(levelStr)) {
+465 return Level.DEBUG;
+466 } else if ("info" .equalsIgnoreCase(levelStr)) {
+467 return Level.INFO;
+468 } else if ("warn" .equalsIgnoreCase(levelStr)) {
+469 return Level.WARN;
+470 } else if ("error" .equalsIgnoreCase(levelStr)) {
+471 return Level.ERROR;
+472 } else {
+473 return null ;
+474 }
+475 }
+476
+477 @Override
+478 public void debug(final Marker marker, final String msg) {
+479 if (!this .isDebugEnabled()) { return ; }
+480 this .log(Level.DEBUG, marker, msg, null );
+481 }
+482
+483 @Override
+484 public void debug(final Marker marker, final String format, final Object arg) {
+485 if (!this .isDebugEnabled()) { return ; }
+486 this .formatAndLog(Level.DEBUG, marker, format, arg, null );
+487 }
+488
+489 @Override
+490 public void debug(final Marker marker, final String format,
+491 final Object... arguments) {
+492 if (!this .isDebugEnabled()) { return ; }
+493 this .formatAndLog(Level.DEBUG, marker, format, arguments);
+494 }
+495
+496 @Override
+497 public void debug(final Marker marker, final String format,
+498 final Object arg1, final Object arg2) {
+499 if (!this .isDebugEnabled()) { return ; }
+500 this .formatAndLog(Level.DEBUG, marker, format, arg1, arg2);
+501 }
+502
+503 @Override
+504 public void debug(final Marker marker, final String msg, final Throwable t) {
+505 if (!this .isDebugEnabled()) { return ; }
+506 this .log(Level.DEBUG, marker, msg, t);
+507 }
+508
+509 @Override
+510 public void debug(final String msg) {
+511 if (!this .isDebugEnabled()) { return ; }
+512 this .log(Level.DEBUG, null , msg, null );
+513 }
+514
+515 @Override
+516 public void debug(final String format, final Object arg) {
+517 if (!this .isDebugEnabled()) { return ; }
+518 this .formatAndLog(Level.DEBUG, null , format, arg, null );
+519 }
+520
+521 @Override
+522 public void debug(final String format, final Object... arguments) {
+523 if (!this .isDebugEnabled()) { return ; }
+524 this .formatAndLog(Level.DEBUG, null , format, arguments);
+525 }
+526
+527 @Override
+528 public void debug(final String format, final Object arg1, final Object arg2) {
+529 if (!this .isDebugEnabled()) { return ; }
+530 this .formatAndLog(Level.DEBUG, null , format, arg1, arg2);
+531 }
+532
+533 @Override
+534 public void debug(final String msg, final Throwable t) {
+535 if (!this .isDebugEnabled()) { return ; }
+536 this .log(Level.DEBUG, null , msg, t);
+537 }
+538
+539 @Override
+540 public void error(final Marker marker, final String msg) {
+541 if (!this .isErrorEnabled()) { return ; }
+542 this .log(Level.ERROR, marker, msg, null );
+543 }
+544
+545 @Override
+546 public void error(final Marker marker, final String format, final Object arg) {
+547 if (!this .isErrorEnabled()) { return ; }
+548 this .formatAndLog(Level.ERROR, marker, format, arg, null );
+549 }
+550
+551 @Override
+552 public void error(final Marker marker, final String format,
+553 final Object... arguments) {
+554 if (!this .isErrorEnabled()) { return ; }
+555 this .formatAndLog(Level.ERROR, marker, format, arguments);
+556 }
+557
+558 @Override
+559 public void error(final Marker marker, final String format,
+560 final Object arg1, final Object arg2) {
+561 if (!this .isErrorEnabled()) { return ; }
+562 this .formatAndLog(Level.ERROR, marker, format, arg1, arg2);
+563 }
+564
+565 @Override
+566 public void error(final Marker marker, final String msg, final Throwable t) {
+567 if (!this .isErrorEnabled()) { return ; }
+568 this .log(Level.ERROR, marker, msg, t);
+569 }
+570
+571 @Override
+572 public void error(final String msg) {
+573 if (!this .isErrorEnabled()) { return ; }
+574 this .log(Level.ERROR, null , msg, null );
+575 }
+576
+577 @Override
+578 public void error(final String format, final Object arg) {
+579 if (!this .isErrorEnabled()) { return ; }
+580 this .formatAndLog(Level.ERROR, null , format, arg, null );
+581 }
+582
+583 @Override
+584 public void error(final String format, final Object... arguments) {
+585 if (!this .isErrorEnabled()) { return ; }
+586 this .formatAndLog(Level.ERROR, null , format, arguments);
+587 }
+588
+589 @Override
+590 public void error(final String format, final Object arg1, final Object arg2) {
+591 if (!this .isErrorEnabled()) { return ; }
+592 this .formatAndLog(Level.ERROR, null , format, arg1, arg2);
593 }
594
595 @Override
-596 public boolean isErrorEnabled() {
-597 return this .isLevelEnabled(Level.ERROR);
-598 }
-599
-600 @Override
-601 public boolean isErrorEnabled(final Marker marker) {
-602 return this .isLevelEnabled(Level.ERROR);
-603 }
-604
-605 @Override
-606 public boolean isInfoEnabled() {
-607 return this .isLevelEnabled(Level.INFO);
-608 }
-609
-610 @Override
-611 public boolean isInfoEnabled(final Marker marker) {
-612 return this .isLevelEnabled(Level.INFO);
-613 }
-614
-615 @Override
-616 public boolean isTraceEnabled() {
-617 return this .isLevelEnabled(Level.TRACE);
-618 }
-619
-620 @Override
-621 public boolean isTraceEnabled(final Marker marker) {
-622 return this .isLevelEnabled(Level.TRACE);
+596 public void error(final String msg, final Throwable t) {
+597 if (!this .isErrorEnabled()) { return ; }
+598 this .log(Level.ERROR, null , msg, t);
+599 }
+600
+601 @Override
+602 public String getName() {
+603 return this .name;
+604 }
+605
+606 @Override
+607 public void info(final Marker marker, final String msg) {
+608 if (!this .isInfoEnabled()) { return ; }
+609 this .log(Level.INFO, marker, msg, null );
+610 }
+611
+612 @Override
+613 public void info(final Marker marker, final String format, final Object arg) {
+614 if (!this .isInfoEnabled()) { return ; }
+615 this .formatAndLog(Level.INFO, marker, format, arg, null );
+616 }
+617
+618 @Override
+619 public void info(final Marker marker, final String format,
+620 final Object... arguments) {
+621 if (!this .isInfoEnabled()) { return ; }
+622 this .formatAndLog(Level.INFO, marker, format, arguments);
623 }
624
625 @Override
-626 public boolean isWarnEnabled() {
-627 return this .isLevelEnabled(Level.WARN);
-628 }
-629
-630 @Override
-631 public boolean isWarnEnabled(final Marker marker) {
-632 return this .isLevelEnabled(Level.WARN);
-633 }
-634
-635 @Override
-636 public void trace(final Marker marker, final String msg) {
-637 if (!this .isTraceEnabled()) { return ; }
-638 this .log(Level.TRACE, marker, msg, null );
-639 }
-640
-641 @Override
-642 public void trace(final Marker marker, final String format, final Object arg) {
-643 if (!this .isTraceEnabled()) { return ; }
-644 this .formatAndLog(Level.TRACE, marker, format, arg, null );
-645 }
-646
-647 @Override
-648 public void trace(final Marker marker, final String format,
-649 final Object... arguments) {
-650 if (!this .isTraceEnabled()) { return ; }
-651 this .formatAndLog(Level.TRACE, marker, format, arguments);
-652 }
-653
-654 @Override
-655 public void trace(final Marker marker, final String format,
-656 final Object arg1, final Object arg2) {
-657 if (!this .isTraceEnabled()) { return ; }
-658 this .formatAndLog(Level.TRACE, marker, format, arg1, arg2);
-659 }
-660
-661 @Override
-662 public void trace(final Marker marker, final String msg, final Throwable t) {
-663 if (!this .isTraceEnabled()) { return ; }
-664 this .log(Level.TRACE, marker, msg, t);
-665 }
-666
-667 @Override
-668 public void trace(final String msg) {
-669 if (!this .isTraceEnabled()) { return ; }
-670 this .log(Level.TRACE, null , msg, null );
+626 public void info(final Marker marker, final String format, final Object arg1,
+627 final Object arg2) {
+628 if (!this .isInfoEnabled()) { return ; }
+629 this .formatAndLog(Level.INFO, marker, format, arg1, arg2);
+630 }
+631
+632 @Override
+633 public void info(final Marker marker, final String msg, final Throwable t) {
+634 if (!this .isInfoEnabled()) { return ; }
+635 this .log(Level.INFO, marker, msg, t);
+636 }
+637
+638 @Override
+639 public void info(final String msg) {
+640 if (!this .isInfoEnabled()) { return ; }
+641 this .log(Level.INFO, null , msg, null );
+642 }
+643
+644 @Override
+645 public void info(final String format, final Object arg) {
+646 if (!this .isInfoEnabled()) { return ; }
+647 this .formatAndLog(Level.INFO, null , format, arg, null );
+648 }
+649
+650 @Override
+651 public void info(final String format, final Object... arguments) {
+652 if (!this .isInfoEnabled()) { return ; }
+653 this .formatAndLog(Level.INFO, null , format, arguments);
+654 }
+655
+656 @Override
+657 public void info(final String format, final Object arg1, final Object arg2) {
+658 if (!this .isInfoEnabled()) { return ; }
+659 this .formatAndLog(Level.INFO, null , format, arg1, arg2);
+660 }
+661
+662 @Override
+663 public void info(final String msg, final Throwable t) {
+664 if (!this .isInfoEnabled()) { return ; }
+665 this .log(Level.INFO, null , msg, t);
+666 }
+667
+668 @Override
+669 public boolean isDebugEnabled() {
+670 return this .isLevelEnabled(Level.DEBUG);
671 }
672
673 @Override
-674 public void trace(final String format, final Object arg) {
-675 if (!this .isTraceEnabled()) { return ; }
-676 this .formatAndLog(Level.TRACE, null , format, arg, null );
-677 }
-678
-679 @Override
-680 public void trace(final String format, final Object... arguments) {
-681 if (!this .isTraceEnabled()) { return ; }
-682 this .formatAndLog(Level.TRACE, null , format, arguments);
-683 }
-684
-685 @Override
-686 public void trace(final String format, final Object arg1, final Object arg2) {
-687 if (!this .isTraceEnabled()) { return ; }
-688 this .formatAndLog(Level.TRACE, null , format, arg1, arg2);
-689 }
-690
-691 @Override
-692 public void trace(final String msg, final Throwable t) {
-693 if (!this .isTraceEnabled()) { return ; }
-694 this .log(Level.TRACE, null , msg, t);
-695 }
-696
-697 @Override
-698 public void warn(final Marker marker, final String msg) {
-699 if (!this .isWarnEnabled()) { return ; }
-700 this .log(Level.WARN, marker, msg, null );
+674 public boolean isDebugEnabled(final Marker marker) {
+675 return this .isLevelEnabled(Level.DEBUG);
+676 }
+677
+678 @Override
+679 public boolean isErrorEnabled() {
+680 return this .isLevelEnabled(Level.ERROR);
+681 }
+682
+683 @Override
+684 public boolean isErrorEnabled(final Marker marker) {
+685 return this .isLevelEnabled(Level.ERROR);
+686 }
+687
+688 @Override
+689 public boolean isInfoEnabled() {
+690 return this .isLevelEnabled(Level.INFO);
+691 }
+692
+693 @Override
+694 public boolean isInfoEnabled(final Marker marker) {
+695 return this .isLevelEnabled(Level.INFO);
+696 }
+697
+698 @Override
+699 public boolean isTraceEnabled() {
+700 return this .isLevelEnabled(Level.TRACE);
701 }
702
703 @Override
-704 public void warn(final Marker marker, final String format, final Object arg) {
-705 if (!this .isWarnEnabled()) { return ; }
-706 this .formatAndLog(Level.WARN, marker, format, arg, null );
-707 }
-708
-709 @Override
-710 public void warn(final Marker marker, final String format,
-711 final Object... arguments) {
-712 if (!this .isWarnEnabled()) { return ; }
-713 this .formatAndLog(Level.WARN, marker, format, arguments);
-714 }
-715
-716 @Override
-717 public void warn(final Marker marker, final String format, final Object arg1,
-718 final Object arg2) {
-719 if (!this .isWarnEnabled()) { return ; }
-720 this .formatAndLog(Level.WARN, marker, format, arg1, arg2);
-721 }
-722
-723 @Override
-724 public void warn(final Marker marker, final String msg, final Throwable t) {
-725 if (!this .isWarnEnabled()) { return ; }
-726 this .log(Level.WARN, marker, msg, t);
-727 }
-728
-729 @Override
-730 public void warn(final String msg) {
-731 if (!this .isWarnEnabled()) { return ; }
-732 this .log(Level.WARN, null , msg, null );
-733 }
-734
-735 @Override
-736 public void warn(final String format, final Object arg) {
-737 if (!this .isWarnEnabled()) { return ; }
-738 this .formatAndLog(Level.WARN, null , format, arg, null );
-739 }
-740
-741 @Override
-742 public void warn(final String format, final Object... arguments) {
-743 if (!this .isWarnEnabled()) { return ; }
-744 this .formatAndLog(Level.WARN, null , format, arguments);
-745 }
-746
-747 @Override
-748 public void warn(final String format, final Object arg1, final Object arg2) {
-749 if (!this .isWarnEnabled()) { return ; }
-750 this .formatAndLog(Level.WARN, null , format, arg1, arg2);
-751 }
-752
-753 @Override
-754 public void warn(final String msg, final Throwable t) {
-755 if (!this .isWarnEnabled()) { return ; }
-756 this .log(Level.WARN, null , msg, t);
-757 }
-758
-759
-760
-761
-762
-763
-764
-765
-766 private String computeShortName() {
-767 final List<String> splitName = new ArrayList<String>();
-768 splitName.addAll(Arrays.asList(this .name.split("\\." )));
-769 final int shortNameLength = ((splitName.size() - 1) * 2)
-770 + splitName.get(splitName.size() - 1).length();
-771 final String finalName = splitName.remove(splitName.size() - 1);
-772 final StringBuffer shortName = new StringBuffer(shortNameLength);
-773 for (final String part : splitName) {
-774 shortName.append(part.charAt(0)).append('.');
-775 }
-776 shortName.append(finalName);
-777 return shortName.toString();
+704 public boolean isTraceEnabled(final Marker marker) {
+705 return this .isLevelEnabled(Level.TRACE);
+706 }
+707
+708 @Override
+709 public boolean isWarnEnabled() {
+710 return this .isLevelEnabled(Level.WARN);
+711 }
+712
+713 @Override
+714 public boolean isWarnEnabled(final Marker marker) {
+715 return this .isLevelEnabled(Level.WARN);
+716 }
+717
+718 @Override
+719 public void trace(final Marker marker, final String msg) {
+720 if (!this .isTraceEnabled()) { return ; }
+721 this .log(Level.TRACE, marker, msg, null );
+722 }
+723
+724 @Override
+725 public void trace(final Marker marker, final String format, final Object arg) {
+726 if (!this .isTraceEnabled()) { return ; }
+727 this .formatAndLog(Level.TRACE, marker, format, arg, null );
+728 }
+729
+730 @Override
+731 public void trace(final Marker marker, final String format,
+732 final Object... arguments) {
+733 if (!this .isTraceEnabled()) { return ; }
+734 this .formatAndLog(Level.TRACE, marker, format, arguments);
+735 }
+736
+737 @Override
+738 public void trace(final Marker marker, final String format,
+739 final Object arg1, final Object arg2) {
+740 if (!this .isTraceEnabled()) { return ; }
+741 this .formatAndLog(Level.TRACE, marker, format, arg1, arg2);
+742 }
+743
+744 @Override
+745 public void trace(final Marker marker, final String msg, final Throwable t) {
+746 if (!this .isTraceEnabled()) { return ; }
+747 this .log(Level.TRACE, marker, msg, t);
+748 }
+749
+750 @Override
+751 public void trace(final String msg) {
+752 if (!this .isTraceEnabled()) { return ; }
+753 this .log(Level.TRACE, null , msg, null );
+754 }
+755
+756 @Override
+757 public void trace(final String format, final Object arg) {
+758 if (!this .isTraceEnabled()) { return ; }
+759 this .formatAndLog(Level.TRACE, null , format, arg, null );
+760 }
+761
+762 @Override
+763 public void trace(final String format, final Object... arguments) {
+764 if (!this .isTraceEnabled()) { return ; }
+765 this .formatAndLog(Level.TRACE, null , format, arguments);
+766 }
+767
+768 @Override
+769 public void trace(final String format, final Object arg1, final Object arg2) {
+770 if (!this .isTraceEnabled()) { return ; }
+771 this .formatAndLog(Level.TRACE, null , format, arg1, arg2);
+772 }
+773
+774 @Override
+775 public void trace(final String msg, final Throwable t) {
+776 if (!this .isTraceEnabled()) { return ; }
+777 this .log(Level.TRACE, null , msg, t);
778 }
779
-780
-781
-782
-783
-784
-785
-786
-787 private Level determineCurrentLevel() {
-788
-789 String tempName = this .name;
-790 Level level = null ;
-791 int indexOfLastDot = tempName.length();
-792 while ((level == null ) && (indexOfLastDot > -1)) {
-793 tempName = tempName.substring(0, indexOfLastDot);
-794 level = BukkitPluginLoggerAdapter.stringToLevel(BukkitPluginLoggerAdapter.getStringProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_PREFIX_LOG
-795 + tempName,
-796 null ));
-797 indexOfLastDot = String.valueOf(tempName).lastIndexOf("." );
-798 }
-799
-800 return (level == null ) ? BukkitPluginLoggerAdapter.CONFIG_VALUE_DEFAULT_LOG_LEVEL
-801 : level;
-802 }
-803
-804
-805
-806
-807
-808
-809
-810
-811
-812
-813
-814
-815
-816 private void formatAndLog(final Level level, final Marker marker,
-817 final String format, final Object... arguments) {
-818 if (!this .isLevelEnabled(level)) { return ; }
-819 final FormattingTuple tp = MessageFormatter.arrayFormat(format, arguments);
-820 this .log(level, marker, tp.getMessage(), tp.getThrowable());
-821 }
-822
-823
-824
-825
-826
-827
-828
-829
-830
-831
-832
-833
-834
-835
-836
-837 private void formatAndLog(final Level level, final Marker marker,
-838 final String format, final Object arg1,
-839 final Object arg2) {
-840 if (!this .isLevelEnabled(level)) { return ; }
-841 final FormattingTuple tp = MessageFormatter.format(format, arg1, arg2);
-842 this .log(level, marker, tp.getMessage(), tp.getThrowable());
-843 }
-844
-845
-846
-847
-848
-849
-850
-851
-852 private boolean isLevelEnabled(final Level logLevel) {
-853
-854
-855
-856 BukkitPluginLoggerAdapter.init(false);
-857
-858
-859
-860
-861
-862
-863 final Level currentLogLevel = this .determineCurrentLevel();
-864 return (logLevel.toInt() >= currentLogLevel.toInt())
-865 && (BukkitPluginLoggerAdapter.getBukkitLogger().isLoggable(BukkitPluginLoggerAdapter.slf4jLevelIntToBukkitJULLevel(logLevel)));
-866 }
-867
-868
-869
-870
-871
-872
-873
-874
-875
-876
-877
-878
-879
-880
-881 private void log(final Level level, final Marker marker,
-882 final String message, final Throwable throwable) {
-883 final java.util.logging.Logger logger;
-884 synchronized (BukkitPluginLoggerAdapter.INITIALIZATION_LOCK) {
-885
-886 if (!this .isLevelEnabled(level)) { return ; }
-887
-888 logger = BukkitPluginLoggerAdapter.getBukkitLogger();
-889 }
-890
-891
-892 final StringBuilder buf = new StringBuilder(32);
-893 boolean hasHeader = false;
-894
-895
-896 if (marker instanceof BukkitColorMarker) {
-897 buf.append(((BukkitColorMarker) marker).getValue());
-898 }
-899
-900
-901 if (BukkitPluginLoggerAdapter.CONFIG_VALUE_SHOW_HEADER) {
-902 hasHeader = true ;
-903 buf.append("[SLF4J]" );
-904 }
+780 @Override
+781 public void warn(final Marker marker, final String msg) {
+782 if (!this .isWarnEnabled()) { return ; }
+783 this .log(Level.WARN, marker, msg, null );
+784 }
+785
+786 @Override
+787 public void warn(final Marker marker, final String format, final Object arg) {
+788 if (!this .isWarnEnabled()) { return ; }
+789 this .formatAndLog(Level.WARN, marker, format, arg, null );
+790 }
+791
+792 @Override
+793 public void warn(final Marker marker, final String format,
+794 final Object... arguments) {
+795 if (!this .isWarnEnabled()) { return ; }
+796 this .formatAndLog(Level.WARN, marker, format, arguments);
+797 }
+798
+799 @Override
+800 public void warn(final Marker marker, final String format, final Object arg1,
+801 final Object arg2) {
+802 if (!this .isWarnEnabled()) { return ; }
+803 this .formatAndLog(Level.WARN, marker, format, arg1, arg2);
+804 }
+805
+806 @Override
+807 public void warn(final Marker marker, final String msg, final Throwable t) {
+808 if (!this .isWarnEnabled()) { return ; }
+809 this .log(Level.WARN, marker, msg, t);
+810 }
+811
+812 @Override
+813 public void warn(final String msg) {
+814 if (!this .isWarnEnabled()) { return ; }
+815 this .log(Level.WARN, null , msg, null );
+816 }
+817
+818 @Override
+819 public void warn(final String format, final Object arg) {
+820 if (!this .isWarnEnabled()) { return ; }
+821 this .formatAndLog(Level.WARN, null , format, arg, null );
+822 }
+823
+824 @Override
+825 public void warn(final String format, final Object... arguments) {
+826 if (!this .isWarnEnabled()) { return ; }
+827 this .formatAndLog(Level.WARN, null , format, arguments);
+828 }
+829
+830 @Override
+831 public void warn(final String format, final Object arg1, final Object arg2) {
+832 if (!this .isWarnEnabled()) { return ; }
+833 this .formatAndLog(Level.WARN, null , format, arg1, arg2);
+834 }
+835
+836 @Override
+837 public void warn(final String msg, final Throwable t) {
+838 if (!this .isWarnEnabled()) { return ; }
+839 this .log(Level.WARN, null , msg, t);
+840 }
+841
+842
+843
+844
+845
+846
+847
+848
+849 private String computeShortName() {
+850 final List<String> splitName = new ArrayList<String>();
+851 splitName.addAll(Arrays.asList(this .name.split("\\." )));
+852 final int shortNameLength = ((splitName.size() - 1) * 2)
+853 + splitName.get(splitName.size() - 1).length();
+854 final String finalName = splitName.remove(splitName.size() - 1);
+855 final StringBuffer shortName = new StringBuffer(shortNameLength);
+856 for (final String part : splitName) {
+857 shortName.append(part.charAt(0)).append('.');
+858 }
+859 shortName.append(finalName);
+860 return shortName.toString();
+861 }
+862
+863
+864
+865
+866
+867
+868
+869
+870 private Level determineCurrentLevel() {
+871
+872 String tempName = this .name;
+873 Level level = null ;
+874 int indexOfLastDot = tempName.length();
+875 while ((level == null ) && (indexOfLastDot > -1)) {
+876 tempName = tempName.substring(0, indexOfLastDot);
+877 level = BukkitLoggerAdapter.stringToLevel(BukkitLoggerAdapter.getStringProperty(BukkitLoggerAdapter.CONFIG_KEY_PREFIX_LOG
+878 + tempName,
+879 null ));
+880 indexOfLastDot = String.valueOf(tempName).lastIndexOf("." );
+881 }
+882
+883 return (level == null ) ? BukkitLoggerAdapter.CONFIG_VALUE_DEFAULT_LOG_LEVEL
+884 : level;
+885 }
+886
+887
+888
+889
+890
+891
+892
+893
+894
+895
+896
+897
+898
+899 private void formatAndLog(final Level level, final Marker marker,
+900 final String format, final Object... arguments) {
+901 if (!this .isLevelEnabled(level)) { return ; }
+902 final FormattingTuple tp = MessageFormatter.arrayFormat(format, arguments);
+903 this .log(level, marker, tp.getMessage(), tp.getThrowable());
+904 }
905
-906
-907
-908 switch (level) {
-909 case TRACE:
-910 hasHeader = true ;
-911 buf.append("[TRACE]" );
-912 break ;
-913 case DEBUG:
-914 hasHeader = true ;
-915 buf.append("[DEBUG]" );
-916 break ;
-917 default :
-918 break ;
-919 }
-920
-921
-922 if (BukkitPluginLoggerAdapter.CONFIG_VALUE_SHOW_THREAD_NAME) {
-923 hasHeader = true ;
-924 buf.append('[');
-925 buf.append(Thread.currentThread().getName());
-926 buf.append("]" );
-927 }
-928
-929
-930 if (hasHeader) {
-931 buf.append(' ');
-932 }
-933
-934
-935 if (BukkitPluginLoggerAdapter.CONFIG_VALUE_SHOW_LOG_NAME) {
-936 buf.append('{').append(this .name).append("} " );
-937 } else if (BukkitPluginLoggerAdapter.CONFIG_VALUE_SHOW_SHORT_LOG_NAME) {
-938 if (this .shortLogName == null ) {
-939 this .shortLogName = this .computeShortName();
-940 }
-941 buf.append('{').append(this .shortLogName).append("} " );
-942 }
-943
-944
-945 buf.append(message);
-946
-947
-948 if (throwable != null ) {
-949 buf.append('\n').append(ExceptionUtils.getFullStackTrace(throwable)
-950 .trim());
-951 }
-952
-953
-954 buf.append(ChatColor.RESET);
-955
-956
-957 logger.log(BukkitPluginLoggerAdapter.slf4jLevelIntToBukkitJULLevel(level),
-958 BukkitColorMapper.map(buf.toString()));
-959 }
-960 }
+906
+907
+908
+909
+910
+911
+912
+913
+914
+915
+916
+917
+918
+919
+920 private void formatAndLog(final Level level, final Marker marker,
+921 final String format, final Object arg1,
+922 final Object arg2) {
+923 if (!this .isLevelEnabled(level)) { return ; }
+924 final FormattingTuple tp = MessageFormatter.format(format, arg1, arg2);
+925 this .log(level, marker, tp.getMessage(), tp.getThrowable());
+926 }
+927
+928
+929
+930
+931
+932
+933
+934
+935 private boolean isLevelEnabled(final Level logLevel) {
+936
+937
+938
+939 BukkitLoggerAdapter.init(false);
+940
+941
+942
+943
+944
+945
+946 final Level currentLogLevel = this .determineCurrentLevel();
+947 return (logLevel.toInt() >= currentLogLevel.toInt())
+948 && (BukkitLoggerAdapter.getBukkitLogger().isLoggable(BukkitLoggerAdapter.slf4jLevelIntToBukkitJULLevel(logLevel)));
+949 }
+950
+951
+952
+953
+954
+955
+956
+957
+958
+959
+960
+961
+962
+963
+964 private void log(final Level level, final Marker marker,
+965 final String message, final Throwable throwable) {
+966 final java.util.logging.Logger logger;
+967 synchronized (BukkitLoggerAdapter.INITIALIZATION_LOCK) {
+968
+969 if (!this .isLevelEnabled(level)) { return ; }
+970
+971 logger = BukkitLoggerAdapter.getBukkitLogger();
+972 }
+973
+974
+975 final StringBuilder buf = new StringBuilder(32);
+976 boolean hasHeader = false;
+977
+978
+979
+980 if (marker instanceof ColorMarker) {
+981 buf.append(((ColorMarker) marker).getValue());
+982 } else {
+983 buf.append(BukkitLoggerAdapter.CONFIG_VALUE_LEVEL_COLORS.get(level)
+984 .getValue());
+985 }
+986
+987
+988 if (BukkitLoggerAdapter.CONFIG_VALUE_SHOW_HEADER) {
+989 hasHeader = true ;
+990 buf.append("[SLF4J]" );
+991 }
+992
+993
+994
+995 switch (level) {
+996 case TRACE:
+997 hasHeader = true ;
+998 buf.append("[TRACE]" );
+999 break ;
+1000 case DEBUG:
+1001 hasHeader = true ;
+1002 buf.append("[DEBUG]" );
+1003 break ;
+1004 default :
+1005 break ;
+1006 }
+1007
+1008
+1009 if (BukkitLoggerAdapter.CONFIG_VALUE_SHOW_THREAD_NAME) {
+1010 hasHeader = true ;
+1011 buf.append('[');
+1012 buf.append(Thread.currentThread().getName());
+1013 buf.append("]" );
+1014 }
+1015
+1016
+1017 if (hasHeader) {
+1018 buf.append(' ');
+1019 }
+1020
+1021
+1022 if (BukkitLoggerAdapter.CONFIG_VALUE_SHOW_LOG_NAME) {
+1023 buf.append('{').append(this .name).append("} " );
+1024 } else if (BukkitLoggerAdapter.CONFIG_VALUE_SHOW_SHORT_LOG_NAME) {
+1025 if (this .shortLogName == null ) {
+1026 this .shortLogName = this .computeShortName();
+1027 }
+1028 buf.append('{').append(this .shortLogName).append("} " );
+1029 }
+1030
+1031
+1032 buf.append(message);
+1033
+1034
+1035 if (throwable != null ) {
+1036 buf.append('\n').append(ExceptionUtils.getFullStackTrace(throwable)
+1037 .trim());
+1038 }
+1039
+1040
+1041 buf.append(ChatColor.RESET);
+1042
+1043
+1044 logger.log(BukkitLoggerAdapter.slf4jLevelIntToBukkitJULLevel(level),
+1045 ColorMapper.map(buf.toString()));
+1046 }
+1047 }
BukkitPluginLoggerFactory xref
+BukkitLoggerFactory xref
+
1
2
3
@@ -60,23 +60,23 @@
52
53
54
-55
+55
56
57
58
59
-60 public class BukkitPluginLoggerFactory implements ILoggerFactory {
+60 public class BukkitLoggerFactory implements ILoggerFactory {
61
62 ConcurrentMap<String, Logger> loggerMap;
63
-64 public BukkitPluginLoggerFactory () {
+64 public BukkitLoggerFactory () {
65 this .loggerMap = new ConcurrentHashMap<String, Logger>();
66
67 java.util.logging.LogManager.getLogManager();
68 }
69
70
-71
+71
72
73 @Override
74 public Logger getLogger(final String name) {
@@ -84,7 +84,7 @@
76 if (bukkitLogger != null ) {
77 return bukkitLogger;
78 } else {
-79 final Logger newInstance = new BukkitPluginLoggerAdapter (name);
+79 final Logger newInstance = new BukkitLoggerAdapter (name);
80 final Logger oldInstance = this .loggerMap.putIfAbsent(name, newInstance);
81 return oldInstance == null ? newInstance : oldInstance;
82 }
diff --git a/xref/org/slf4j/impl/StaticLoggerBinder.html b/xref/org/slf4j/impl/StaticLoggerBinder.html
index 7745a53..7a1ce31 100644
--- a/xref/org/slf4j/impl/StaticLoggerBinder.html
+++ b/xref/org/slf4j/impl/StaticLoggerBinder.html
@@ -70,9 +70,9 @@
62
63
64
-65 public static String REQUESTED_API_VERSION = "1.6.99" ;
+65 public static String REQUESTED_API_VERSION = "1.6.99" ;
66
-67 private static final String loggerFactoryClassStr = BukkitPluginLoggerFactory.class .getName();
+67 private static final String loggerFactoryClassStr = BukkitLoggerFactory.class .getName();
68
69
70
@@ -86,7 +86,7 @@
78 private final ILoggerFactory loggerFactory;
79
80 private StaticLoggerBinder () {
-81 this .loggerFactory = new BukkitPluginLoggerFactory ();
+81 this .loggerFactory = new BukkitLoggerFactory ();
82 }
83
84
diff --git a/xref/org/slf4j/impl/package-frame.html b/xref/org/slf4j/impl/package-frame.html
index 476fa22..a9e4a8b 100644
--- a/xref/org/slf4j/impl/package-frame.html
+++ b/xref/org/slf4j/impl/package-frame.html
@@ -3,7 +3,7 @@
SLF4Bukkit 0.1.2 Reference Package org.slf4j.impl
+ SLF4Bukkit 0.1.3 Reference Package org.slf4j.impl
- BukkitPluginLoggerAdapter
+ BukkitLoggerAdapter
- BukkitPluginLoggerFactory
+ BukkitLoggerFactory
StaticLoggerBinder
diff --git a/xref/org/slf4j/impl/package-summary.html b/xref/org/slf4j/impl/package-summary.html
index 0498c7a..1735969 100644
--- a/xref/org/slf4j/impl/package-summary.html
+++ b/xref/org/slf4j/impl/package-summary.html
@@ -3,7 +3,7 @@
SLF4Bukkit 0.1.2 Reference Package org.slf4j.impl
+ SLF4Bukkit 0.1.3 Reference Package org.slf4j.impl
- BukkitPluginLoggerAdapter
+ BukkitLoggerAdapter
- BukkitPluginLoggerFactory
+ BukkitLoggerFactory
diff --git a/xref/overview-frame.html b/xref/overview-frame.html
index 057aa98..9e3bad1 100644
--- a/xref/overview-frame.html
+++ b/xref/overview-frame.html
@@ -3,7 +3,7 @@
SLF4Bukkit 0.1.2 Reference
+ SLF4Bukkit 0.1.3 Reference
SLF4Bukkit 0.1.2 Reference
+ SLF4Bukkit 0.1.3 Reference
SLF4Bukkit 0.1.2 Reference
+ SLF4Bukkit 0.1.3 Reference
