Skip to content

Commit fe31154

Browse files
committed
added logging
1 parent 91bed1d commit fe31154

File tree

5 files changed

+75
-15
lines changed

5 files changed

+75
-15
lines changed

pom.xml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,32 @@
5858
<artifactId>json</artifactId>
5959
<version>20201115</version>
6060
</dependency>
61+
<!-- unit testing -->
6162
<dependency>
6263
<groupId>org.junit.jupiter</groupId>
6364
<artifactId>junit-jupiter-api</artifactId>
6465
<version>5.0.0-M5</version>
6566
<scope>test</scope>
6667
</dependency>
67-
<!-- for logging -->
68+
<!-- unit testing -->
6869
<dependency>
69-
<groupId>ch.qos.logback</groupId>
70-
<artifactId>logback-classic</artifactId>
71-
<version>1.2.10</version>
70+
<groupId>org.assertj</groupId>
71+
<artifactId>assertj-swing-junit</artifactId>
72+
<version>3.9.2</version>
73+
<scope>test</scope>
7274
</dependency>
7375
<!-- for logging -->
76+
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
7477
<dependency>
7578
<groupId>org.slf4j</groupId>
7679
<artifactId>slf4j-api</artifactId>
77-
<version>1.7.32</version>
80+
<version>1.7.35</version>
81+
</dependency>
82+
<!-- for logging -->
83+
<dependency>
84+
<groupId>ch.qos.logback</groupId>
85+
<artifactId>logback-classic</artifactId>
86+
<version>1.2.11</version>
7887
</dependency>
7988
</dependencies>
8089

src/main/java/com/marginallyClever/nodeGraphSwing/Donatello.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,16 @@
1717
import java.util.ArrayList;
1818
import java.util.List;
1919

20+
import org.slf4j.Logger;
21+
import org.slf4j.LoggerFactory;
22+
2023
/**
2124
* {@link Donatello} is a Graphic User Interface to edit a {@link NodeGraph}.
2225
* @author Dan Royer
2326
* @since 2022-02-01
2427
*/
2528
public class Donatello extends JPanel {
29+
private static final Logger logger = LoggerFactory.getLogger(Donatello.class);
2630
/**
2731
* Used by save and load actions
2832
*/
@@ -522,7 +526,7 @@ public static void setSystemLookAndFeel() {
522526
try {
523527
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
524528
} catch (Exception e) {
525-
System.out.println("System look and feel could not be set.");
529+
logger.debug("System look and feel could not be set.");
526530
}
527531
}
528532

src/main/java/com/marginallyClever/nodeGraphSwing/PropertiesHelper.java

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import com.marginallyClever.nodeGraphCore.DAO4JSONFactory;
44
import com.marginallyClever.nodeGraphCore.NodeFactory;
5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
57

68
import java.util.*;
79
import java.util.List;
@@ -12,32 +14,36 @@
1214
* @since 2022-02-01
1315
*/
1416
public class PropertiesHelper {
17+
private static final Logger logger = LoggerFactory.getLogger(PropertiesHelper.class);
18+
1519
public static void showProperties() {
16-
System.out.println("------------------------------------------------");
20+
logger.debug("------------------------------------------------");
1721
Properties p = System.getProperties();
1822
List<String> names = new ArrayList<>(p.stringPropertyNames());
1923
Collections.sort(names);
2024
for (String name : names) {
21-
System.out.println( name +" = "+ p.get(name));
25+
logger.debug("{} = {}", name, p.get(name));
2226
}
23-
System.out.println("------------------------------------------------");
27+
logger.debug("------------------------------------------------");
2428
}
2529

2630
public static void listAllNodes() {
27-
String add = "Nodes: ";
31+
String sum = "";
32+
String add = "";
2833
for (String n : NodeFactory.getNames()) {
29-
System.out.print(add + n);
34+
sum += add + n;
3035
add = ", ";
3136
}
32-
System.out.println(".");
37+
logger.debug("Nodes: {}.",sum);
3338
}
3439

3540
public static void listAllDAO() {
36-
String add="DAOs: ";
41+
String sum = "";
42+
String add = "";
3743
for(String n : DAO4JSONFactory.getNames()) {
38-
System.out.print(add + n);
44+
sum += add + n;
3945
add = ", ";
4046
}
41-
System.out.println(".");
47+
logger.debug("DAOs: {}.",sum);
4248
}
4349
}

src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
module com.marginallyClever.nodeGraphCore {
99
requires java.desktop;
1010
requires org.json;
11+
requires org.slf4j;
1112

1213
uses com.marginallyClever.nodeGraphCore.NodeRegistry;
1314
provides com.marginallyClever.nodeGraphCore.NodeRegistry with

src/main/resources/logback.xml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE configuration>
3+
<configuration>
4+
5+
<if condition='property("DEV").equals("true")'>
6+
<then>
7+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
8+
<encoder>
9+
<pattern>%d %-5level %logger{35} - %msg %n</pattern>
10+
</encoder>
11+
</appender>
12+
13+
<logger name="com.marginallyClever.makelangelo.nodeGraphSwing" level="debug" />
14+
<root>
15+
<appender-ref ref="STDOUT" />
16+
</root>
17+
</then>
18+
</if>
19+
20+
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
21+
<file>${user.home}/.makelangelo/makelangelo.log</file>
22+
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
23+
<fileNamePattern>${user.home}/.makelangelo/makelangelo.%i.log</fileNamePattern>
24+
<minIndex>1</minIndex>
25+
<maxIndex>1</maxIndex>
26+
</rollingPolicy>
27+
28+
<triggeringPolicy class="com.marginallyClever.convenience.log.RollOncePerSessionTriggeringPolicy"/>
29+
<encoder>
30+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
31+
</encoder>
32+
</appender>
33+
34+
<logger name="com.marginallyClever" level="debug" />
35+
36+
<root level="info">
37+
<appender-ref ref="FILE" />
38+
</root>
39+
40+
</configuration>

0 commit comments

Comments
 (0)