[jetrix-cvs] SF.net SVN: jetrix:[813] jetrix/branches/0.2.x/src/java/net/jetrix

[<sm...@us...>]

Revision: 813
          http://jetrix.svn.sourceforge.net/jetrix/?rev=813&view=rev
Author:   smanux
Date:     2009-09-13 22:00:05 +0000 (Sun, 13 Sep 2009)

Log Message:
-----------
Fixed the encoding inconsistency with the winlist and log files (backported from the trunk)

Modified Paths:
--------------
    jetrix/branches/0.2.x/src/java/net/jetrix/LogManager.java
    jetrix/branches/0.2.x/src/java/net/jetrix/winlist/SimpleWinlist.java
    jetrix/branches/0.2.x/src/java/net/jetrix/winlist/TetrixWinlist.java

Modified: jetrix/branches/0.2.x/src/java/net/jetrix/LogManager.java
===================================================================
--- jetrix/branches/0.2.x/src/java/net/jetrix/LogManager.java	2009-09-13 21:35:55 UTC (rev 812)
+++ jetrix/branches/0.2.x/src/java/net/jetrix/LogManager.java	2009-09-13 22:00:05 UTC (rev 813)
@@ -66,6 +66,7 @@
 
             FileHandler fileHandler = new FileHandler(config.getAccessLogPath(), 1000000, 10);
             fileHandler.setLevel(Level.CONFIG);
+            fileHandler.setEncoding(ServerConfig.ENCODING);
             log.addHandler(fileHandler);
             fileHandler.setFormatter(new TimestampFormatter("yyyy-MM-dd HH:mm:ss", false));
         }

Modified: jetrix/branches/0.2.x/src/java/net/jetrix/winlist/SimpleWinlist.java
===================================================================
--- jetrix/branches/0.2.x/src/java/net/jetrix/winlist/SimpleWinlist.java	2009-09-13 21:35:55 UTC (rev 812)
+++ jetrix/branches/0.2.x/src/java/net/jetrix/winlist/SimpleWinlist.java	2009-09-13 22:00:05 UTC (rev 813)
@@ -234,7 +234,7 @@
             {
                 try
                 {
-                    reader = new BufferedReader(new FileReader(file));
+                    reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), ServerConfig.ENCODING));
                     String line = null;
                     while ((line = reader.readLine()) != null)
                     {
@@ -280,7 +280,7 @@
             BufferedWriter writer = null;
             try
             {
-                writer = new BufferedWriter(new FileWriter(id + ".winlist"));
+                writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(id + ".winlist"), ServerConfig.ENCODING));
 
                 for (Score score : scores)
                 {

Modified: jetrix/branches/0.2.x/src/java/net/jetrix/winlist/TetrixWinlist.java
===================================================================
--- jetrix/branches/0.2.x/src/java/net/jetrix/winlist/TetrixWinlist.java	2009-09-13 21:35:55 UTC (rev 812)
+++ jetrix/branches/0.2.x/src/java/net/jetrix/winlist/TetrixWinlist.java	2009-09-13 22:00:05 UTC (rev 813)
@@ -134,7 +134,7 @@
     /**
      * Build a tetrix winlist structure from a score.
      */
-    protected byte[] buildStruct(Score score)
+    protected byte[] buildStruct(Score score) throws IOException
     {
         byte[] struct = new byte[STRUCT_SIZE];
 
@@ -144,7 +144,7 @@
             struct[0] = score.getType() == Score.TYPE_PLAYER ? (byte) 'p' : (byte) 't';
 
             // name
-            byte[] name = score.getName().getBytes();
+            byte[] name = score.getName().getBytes(ServerConfig.ENCODING);
             for (int i = 0; i < name.length; i++)
             {
                 struct[i + 1] = name[i];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.