Skip to content

Commit 2005e7e

Browse files
committed
LogService: extract logging methods to a superinterface
We are going to add support for multiple Logger objects in the same SciJava context. The LogService instance will itself be the default Logger, but there will be others as well.
1 parent 7dfcea0 commit 2005e7e

File tree

2 files changed

+89
-43
lines changed

2 files changed

+89
-43
lines changed

src/main/java/org/scijava/log/LogService.java

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*
4646
* @author Curtis Rueden
4747
*/
48-
public interface LogService extends SciJavaService {
48+
public interface LogService extends SciJavaService, Logger {
4949

5050
/** System property to set for overriding the default logging level. */
5151
String LOG_LEVEL_PROPERTY = "scijava.log.level";
@@ -71,48 +71,6 @@ public interface LogService extends SciJavaService {
7171
@Deprecated
7272
int TRACE = LogLevel.TRACE;
7373

74-
void debug(Object msg);
75-
76-
void debug(Throwable t);
77-
78-
void debug(Object msg, Throwable t);
79-
80-
void error(Object msg);
81-
82-
void error(Throwable t);
83-
84-
void error(Object msg, Throwable t);
85-
86-
void info(Object msg);
87-
88-
void info(Throwable t);
89-
90-
void info(Object msg, Throwable t);
91-
92-
void trace(Object msg);
93-
94-
void trace(Throwable t);
95-
96-
void trace(Object msg, Throwable t);
97-
98-
void warn(Object msg);
99-
100-
void warn(Throwable t);
101-
102-
void warn(Object msg, Throwable t);
103-
104-
boolean isDebug();
105-
106-
boolean isError();
107-
108-
boolean isInfo();
109-
110-
boolean isTrace();
111-
112-
boolean isWarn();
113-
114-
int getLevel();
115-
11674
void setLevel(int level);
11775

11876
void setLevel(String classOrPackageName, int level);
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
/*
2+
* #%L
3+
* SciJava Common shared library for SciJava software.
4+
* %%
5+
* Copyright (C) 2009 - 2017 Board of Regents of the University of
6+
* Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
7+
* Institute of Molecular Cell Biology and Genetics.
8+
* %%
9+
* Redistribution and use in source and binary forms, with or without
10+
* modification, are permitted provided that the following conditions are met:
11+
*
12+
* 1. Redistributions of source code must retain the above copyright notice,
13+
* this list of conditions and the following disclaimer.
14+
* 2. Redistributions in binary form must reproduce the above copyright notice,
15+
* this list of conditions and the following disclaimer in the documentation
16+
* and/or other materials provided with the distribution.
17+
*
18+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
22+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28+
* POSSIBILITY OF SUCH DAMAGE.
29+
* #L%
30+
*/
31+
32+
package org.scijava.log;
33+
34+
/**
35+
* Interface for objects which can produce log messages.
36+
* <p>
37+
* It provides methods for logging messages, exception stack traces and
38+
* combinations of the two.
39+
* </p>
40+
*
41+
* @author Curtis Rueden
42+
* @see LogLevel
43+
* @see LogService
44+
*/
45+
public interface Logger {
46+
47+
void debug(Object msg);
48+
49+
void debug(Throwable t);
50+
51+
void debug(Object msg, Throwable t);
52+
53+
void error(Object msg);
54+
55+
void error(Throwable t);
56+
57+
void error(Object msg, Throwable t);
58+
59+
void info(Object msg);
60+
61+
void info(Throwable t);
62+
63+
void info(Object msg, Throwable t);
64+
65+
void trace(Object msg);
66+
67+
void trace(Throwable t);
68+
69+
void trace(Object msg, Throwable t);
70+
71+
void warn(Object msg);
72+
73+
void warn(Throwable t);
74+
75+
void warn(Object msg, Throwable t);
76+
77+
boolean isDebug();
78+
79+
boolean isError();
80+
81+
boolean isInfo();
82+
83+
boolean isTrace();
84+
85+
boolean isWarn();
86+
87+
int getLevel();
88+
}

0 commit comments

Comments
 (0)