echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Util: Consolidate two copies of WriterOutputStream into jetty-i2p.jar

Browse Source
This commit is contained in:
zzz
2017-12-18 12:45:04 +00:00
parent 71640590bc
commit be004cd350
4 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java
View File

@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletResponse;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.data.ByteArray; import net.i2p.data.ByteArray;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.servlet.util.WriterOutputStream;
import net.i2p.util.ByteCache; import net.i2p.util.ByteCache;
import net.i2p.util.Log; import net.i2p.util.Log;
import net.i2p.util.SystemVersion; import net.i2p.util.SystemVersion;

19
apps/i2psnark/java/src/org/klomp/snark/web/WriterOutputStream.java
View File

@ -1,19 +0,0 @@
package org.klomp.snark.web;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
/**
* Treat a writer as an output stream. Quick 'n dirty, none
* of that "intarnasheeonaleyzayshun" stuff. So we can treat
* the jsp's PrintWriter as an OutputStream
*
* @since Jetty 7 copied from routerconsole
*/
class WriterOutputStream extends OutputStream {
private final Writer _writer;
public WriterOutputStream(Writer writer) { _writer = writer; }
public void write(int b) throws IOException { _writer.write(b); }
}

7
apps/routerconsole/java/src/net/i2p/router/web/helpers/WriterOutputStream.java → apps/jetty/java/src/net/i2p/servlet/util/WriterOutputStream.java
View File

@ -1,4 +1,4 @@
package net.i2p.router.web.helpers; package net.i2p.servlet.util;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -8,10 +8,13 @@ import java.io.Writer;
* Treat a writer as an output stream. Quick 'n dirty, none * Treat a writer as an output stream. Quick 'n dirty, none
* of that "intarnasheeonaleyzayshun" stuff. So we can treat * of that "intarnasheeonaleyzayshun" stuff. So we can treat
* the jsp's PrintWriter as an OutputStream * the jsp's PrintWriter as an OutputStream
*
* @since 0.9.33 consolidated from routerconsole and i2psnark
*/ */
public class WriterOutputStream extends OutputStream { public class WriterOutputStream extends OutputStream {
private Writer _writer; private final Writer _writer;
public WriterOutputStream(Writer writer) { _writer = writer; } public WriterOutputStream(Writer writer) { _writer = writer; }
public void write(int b) throws IOException { _writer.write(b); } public void write(int b) throws IOException { _writer.write(b); }
} }

1
apps/routerconsole/java/src/net/i2p/router/web/helpers/StatHelper.java
View File

@ -6,6 +6,7 @@ import java.util.Set;
import net.i2p.data.DataFormatException; import net.i2p.data.DataFormatException;
import net.i2p.data.Hash; import net.i2p.data.Hash;
import net.i2p.router.web.HelperBase; import net.i2p.router.web.HelperBase;
import net.i2p.servlet.util.WriterOutputStream;
/** /**
* Dump the peer profile data if given a full B64 peer string or prefix. * Dump the peer profile data if given a full B64 peer string or prefix.