Skip to content

Commit d9aba5f

Browse files
thsc42thsc42
committed
replaced (hopefully all) remaining direct access attempts to System.out and System.err beside Log class.
1 parent 884f313 commit d9aba5f

17 files changed

+103
-117
lines changed

‎src/main/java/net/sharksystem/asap/apps/gossip/GossipUI.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.sharksystem.asap.utils.ASAPLogHelper;
88
import net.sharksystem.asap.cmdline.TCPStream;
99
import net.sharksystem.asap.cmdline.TCPStreamCreatedListener;
10+
import net.sharksystem.utils.Log;
1011
import net.sharksystem.utils.SerializationHelper;
1112

1213
import java.io.IOException;
@@ -29,14 +30,14 @@ public GossipUI(String peerName, int portnumber, List<Integer> portnumberlist) {
2930
this.portnumber = portnumber;
3031
this.remotePortNumber = portnumberlist;
3132

32-
System.out.println("start peer " + this.peerName);
33-
System.out.println("local port " + this.portnumber);
34-
System.out.println("try to connect to ports " + this.remotePortNumber);
33+
Log.writeLog(this, "start peer " + this.peerName);
34+
Log.writeLog(this, "local port " + this.portnumber);
35+
Log.writeLog(this, "try to connect to ports " + this.remotePortNumber);
3536
}
3637

3738
public static void main(String args[]) throws InterruptedException {
3839
if(args.length < 3) {
39-
System.err.println("Peer name, local port and least one port required to establish a network");
40+
Log.writeLogErr(GossipUI.class, "Peer name, local port and least one port required to establish a network");
4041
System.exit(0);
4142
}
4243

@@ -57,9 +58,9 @@ public static void main(String args[]) throws InterruptedException {
5758
}
5859

5960
private void println(String msg) {
60-
System.out.println("///////////////////////////////////////////////////");
61-
System.out.println("Example: " + msg);
62-
System.out.println("///////////////////////////////////////////////////");
61+
Log.writeLog(this, "///////////////////////////////////////////////////");
62+
Log.writeLog(this, "Example: " + msg);
63+
Log.writeLog(this, "///////////////////////////////////////////////////");
6364
}
6465

6566
private void go() {

‎src/main/java/net/sharksystem/asap/apps/testsupport/TestASAPConnectionHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.sharksystem.asap.protocol.ASAPConnection;
77
import net.sharksystem.asap.protocol.ASAPConnectionListener;
88
import net.sharksystem.asap.protocol.ASAPOnlineMessageSource;
9+
import net.sharksystem.utils.Log;
910

1011
import java.io.IOException;
1112
import java.io.InputStream;
@@ -34,7 +35,7 @@ public ASAPConnection handleConnection(InputStream inputStream, OutputStream out
3435
}
3536

3637
private ASAPConnection dummyHandleConnection() {
37-
System.out.println("handleConnection");
38+
Log.writeLog(this, "handleConnection");
3839
return new ASAPConnection() {
3940
@Override
4041
public CharSequence getEncounteredPeer() {

‎src/main/java/net/sharksystem/asap/cmdline/CmdLineUI.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ public void doPrintAllInformation() throws ASAPException {
637637

638638
for (CharSequence format : asapInternalPeer.getFormats()) {
639639
ASAPEngine asapStorage = asapInternalPeer.getEngineByFormat(format);
640-
System.out.println("storage: " + format);
640+
this.standardOut.println("storage: " + format);
641641
for (CharSequence uri : asapStorage.getChannelURIs()) {
642642
this.printChannelInfo(asapStorage, uri, format);
643643
}
@@ -660,7 +660,7 @@ public void doPrintStorageInformation(String parameterString) throws ASAPExcepti
660660
// first - get storage
661661
ASAPInternalStorage asapStorage = this.getEngine(peername, appName);
662662
if(asapStorage == null) {
663-
System.err.println("storage does not exist: " + peername + ":" + appName);
663+
this.standardError.println("storage does not exist: " + peername + ":" + appName);
664664
return;
665665
}
666666

‎src/main/java/net/sharksystem/asap/cmdline/ExampleASAPChunkReceivedListener.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.sharksystem.asap.ASAPHop;
44
import net.sharksystem.asap.ASAPMessages;
55
import net.sharksystem.asap.engine.ASAPChunkAssimilatedListener;
6+
import net.sharksystem.utils.Log;
67

78
import java.io.IOException;
89
import java.util.ArrayList;
@@ -28,7 +29,7 @@ public void chunkStored(String format, String senderE2E, String uri, int era,
2829

2930
@Override
3031
public void transientMessagesReceived(ASAPMessages transientMessages, ASAPHop asapHop) throws IOException {
31-
System.out.println("transient message received - TODO?");
32+
Log.writeLog(this, "transient message received - TODO?");
3233
}
3334

3435
public List<ASAPChunkReceivedParameters> getReceivedList() { return this.receivedList; }
@@ -40,7 +41,7 @@ public class ASAPChunkReceivedParameters {
4041
private final int era;
4142

4243
private ASAPChunkReceivedParameters(String format, String sender, String uri, int era) {
43-
System.out.println("ASAPChunkReceivedParameters: chunk received: " + format + " | " + sender + " | " + uri);
44+
Log.writeLog(this, "ASAPChunkReceivedParameters: chunk received: " + format + " | " + sender + " | " + uri);
4445
this.format = format;
4546
this.sender = sender;
4647
this.uri = uri;

‎src/main/java/net/sharksystem/asap/cmdline/TCPStream.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package net.sharksystem.asap.cmdline;
22

3+
import net.sharksystem.utils.Log;
4+
35
import java.io.IOException;
46
import java.io.InputStream;
57
import java.io.OutputStream;
@@ -58,7 +60,7 @@ public void kill() {
5860
this.tcpServer.kill();
5961
}
6062
} catch (IOException e) {
61-
System.err.println("TCPChannel: problems while killing: " + e.getLocalizedMessage());
63+
Log.writeLogErr(this, "TCPChannel: problems while killing: " + e.getLocalizedMessage());
6264
}
6365
}
6466

@@ -67,8 +69,8 @@ public void run() {
6769
this.createThread = Thread.currentThread();
6870
try {
6971
if(this.asServer) {
70-
System.out.println(
71-
"TCPChannel: note: this implementation will only accept *one* connection attempt as server");
72+
Log.writeLog(this,
73+
"TCPChannel: note: this implementation will only accept *one* connection attempt as server");
7274
this.tcpServer = new TCPServer();
7375
this.socket = tcpServer.getSocket();
7476
} else {
@@ -83,7 +85,7 @@ public void run() {
8385
} catch (IOException ex) {
8486
//<<<<<<<<<<<<<<<<<<debug
8587
String s = "couldn't establish connection";
86-
System.out.println(s);
88+
Log.writeLog(this, s);
8789
this.fatalError = true;
8890
}
8991
}
@@ -92,7 +94,7 @@ public void close() throws IOException {
9294
if(this.socket != null) {
9395
this.socket.close();
9496
//<<<<<<<<<<<<<<<<<<debug
95-
System.out.println("socket closed");
97+
Log.writeLog(this, "socket closed");
9698
}
9799
}
98100

@@ -142,7 +144,7 @@ public void checkConnected() throws IOException {
142144
if(this.socket == null) {
143145
//<<<<<<<<<<<<<<<<<<debug
144146
String s = "no socket yet - should call connect first";
145-
System.out.println(s);
147+
Log.writeLog(this, s);
146148
//>>>>>>>>>>>>>>>>>>>debug
147149
throw new IOException(s);
148150
}
@@ -174,7 +176,7 @@ Socket getSocket() throws IOException {
174176
b.append("opened port ");
175177
b.append(port);
176178
b.append(" on localhost and wait");
177-
System.out.println(b.toString());
179+
Log.writeLog(this, b.toString());
178180
//>>>>>>>>>>>>>>>>>>>debug
179181

180182
Socket socket = this.srvSocket.accept();
@@ -184,7 +186,7 @@ Socket getSocket() throws IOException {
184186
b.append(name);
185187
b.append("): ");
186188
b.append("connected");
187-
System.out.println(b.toString());
189+
Log.writeLog(this, b.toString());
188190
//>>>>>>>>>>>>>>>>>>>debug
189191

190192
return socket;
@@ -212,7 +214,7 @@ Socket getSocket() throws IOException {
212214
b.append("): ");
213215
b.append("try to connect localhost port ");
214216
b.append(port);
215-
System.out.println(b.toString());
217+
Log.writeLog(this, b.toString());
216218
//>>>>>>>>>>>>>>>>>>>debug
217219
Socket socket = new Socket("localhost", port);
218220
return socket;
@@ -225,7 +227,7 @@ Socket getSocket() throws IOException {
225227
b.append("): ");
226228
b.append("failed / wait and re-try");
227229
b.append(port);
228-
System.out.println(b.toString());
230+
Log.writeLog(this, b.toString());
229231
try {
230232
Thread.sleep(waitInMillis);
231233
} catch (InterruptedException ex) {

0 commit comments

Comments
 (0)