Skip to content

Commit 4d75dbd

Browse files
committed
logger
1 parent 292135c commit 4d75dbd

File tree

3 files changed

+64
-12
lines changed

3 files changed

+64
-12
lines changed

src/main/java/dev/jsinco/abstractjavafilelib/AbstractFileManager.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package dev.jsinco.abstractjavafilelib;
22

3-
import org.slf4j.Logger;
4-
53
import java.io.File;
64
import java.io.IOException;
75
import java.io.InputStream;
@@ -11,7 +9,7 @@
119
public abstract class AbstractFileManager extends ConfigurationSection {
1210

1311
protected final static File dataFolder = FileLibSettings.getDataFolder();
14-
protected final static Logger logger = FileLibSettings.getLogger();
12+
protected final static LibLogger logger = FileLibSettings.getLogger();
1513

1614
protected final File file;
1715

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
package dev.jsinco.abstractjavafilelib;
22

3-
import org.slf4j.Logger;
4-
import org.slf4j.LoggerFactory;
53

64
import java.io.File;
5+
import java.util.logging.Logger;
76

87
public abstract class FileLibSettings {
98

109
private static File dataFolder;
11-
private static Logger logger;
10+
private static LibLogger libLogger;
1211

1312
public static void set(File dataFolder, Logger logger) {
1413
FileLibSettings.dataFolder = dataFolder;
15-
FileLibSettings.logger = logger;
14+
libLogger = new LibLogger(logger);
15+
}
16+
17+
public static void set(File dataFolder, org.slf4j.Logger logger) {
18+
FileLibSettings.dataFolder = dataFolder;
19+
libLogger = new LibLogger(logger);
1620
}
1721

1822
public static File getDataFolder() {
@@ -21,15 +25,16 @@ public static File getDataFolder() {
2125
File jarFile = new File(path);
2226
String jarDir = jarFile.getParentFile().getAbsolutePath();
2327

24-
dataFolder = new File(jarDir);
28+
dataFolder = new File(jarDir + File.separator + "data");
29+
dataFolder.mkdirs();
2530
}
2631
return dataFolder;
2732
}
2833

29-
public static Logger getLogger() {
30-
if (logger == null) {
31-
logger = LoggerFactory.getLogger(AbstractFileManager.class);
34+
public static LibLogger getLogger() {
35+
if (libLogger == null) {
36+
libLogger = new LibLogger(Logger.getGlobal());
3237
}
33-
return logger;
38+
return libLogger;
3439
}
3540
}
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package dev.jsinco.abstractjavafilelib;
2+
3+
import java.util.logging.Logger;
4+
5+
public class LibLogger {
6+
7+
private Logger logger;
8+
private org.slf4j.Logger slf4jLogger;
9+
10+
public LibLogger(Logger logger) {
11+
this.logger = logger;
12+
}
13+
14+
public LibLogger(org.slf4j.Logger logger) {
15+
this.slf4jLogger = logger;
16+
}
17+
18+
public void info(String message) {
19+
if (logger != null) {
20+
logger.info(message);
21+
} else if (slf4jLogger != null) {
22+
slf4jLogger.info(message);
23+
}
24+
}
25+
26+
public void error(String message) {
27+
if (logger != null) {
28+
logger.severe(message);
29+
} else if (slf4jLogger != null) {
30+
slf4jLogger.error(message);
31+
}
32+
}
33+
34+
public void warn(String message) {
35+
if (logger != null) {
36+
logger.warning(message);
37+
} else if (slf4jLogger != null) {
38+
slf4jLogger.warn(message);
39+
}
40+
}
41+
42+
public void debug(String message) {
43+
if (logger != null) {
44+
logger.fine(message);
45+
} else if (slf4jLogger != null) {
46+
slf4jLogger.debug(message);
47+
}
48+
}
49+
}

0 commit comments

Comments
 (0)