AfflictionNetworks/samskivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some tidying.

Browse Source
This commit is contained in:
Michael Bayne
2013-05-28 17:10:45 -07:00
parent e3ea2ce0a5
commit 74ab7c6319
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/samskivert/net/cddb/CDDB.java
+10 -11
View File
@@ -148,8 +148,8 @@ public class CDDB
// establish our socket connection and IO streams // establish our socket connection and IO streams
InetAddress addr = InetAddress.getByName(hostname); InetAddress addr = InetAddress.getByName(hostname);
_sock = new Socket(addr, port); _sock = new Socket(addr, port);
_in = new BufferedReader(new InputStreamReader(_sock.getInputStream(), "ISO-8859-1")); _in = new BufferedReader(new InputStreamReader(_sock.getInputStream(), ISO8859));
_out = new PrintStream(new BufferedOutputStream(_sock.getOutputStream()), false, "ISO-8859-1"); _out = new PrintStream(new BufferedOutputStream(_sock.getOutputStream()), false, ISO8859);
// first read (and discard) the banner string // first read (and discard) the banner string
_in.readLine(); _in.readLine();
@@ -158,8 +158,8 @@ public class CDDB
Response rsp = request("proto 6"); Response rsp = request("proto 6");
if (rsp.code == 201 || rsp.code == 501) { if (rsp.code == 201 || rsp.code == 501) {
// Protocol 6 uses UTF-8 // Protocol 6 uses UTF-8
_in = new BufferedReader(new InputStreamReader(_sock.getInputStream(), "UTF-8")); _in = new BufferedReader(new InputStreamReader(_sock.getInputStream(), UTF8));
_out = new PrintStream(new BufferedOutputStream(_sock.getOutputStream()), false, "UTF-8"); _out = new PrintStream(new BufferedOutputStream(_sock.getOutputStream()), false, UTF8);
} }
// send a hello request // send a hello request
@@ -219,13 +219,10 @@ public class CDDB
} }
/** /**
* Fetches the list of categories supported by the server. * Fetches and returns the list of categories supported by the server.
* *
* @return the categories * @throws IOException if a problem occurs chatting to the server.
* @throws IOException * @throws CDDBException if the server responds with an error.
* if a problem occurs chatting to the server
* @throws CDDBException
* if the server responds with an error
*/ */
public String[] lscat() public String[] lscat()
throws IOException, CDDBException throws IOException, CDDBException
@@ -542,4 +539,6 @@ public class CDDB
protected Socket _sock; protected Socket _sock;
protected BufferedReader _in; protected BufferedReader _in;
protected PrintStream _out; protected PrintStream _out;
protected static final String ISO8859 = "ISO-8859-1", UTF8 = "UTF-8";
} }