[jetrix-cvs] SF.net SVN: jetrix:[812] jetrix/trunk/src/java/net/jetrix

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

Revision: 812
          http://jetrix.svn.sourceforge.net/jetrix/?rev=812&view=rev
Author:   smanux
Date:     2009-09-13 21:35:55 +0000 (Sun, 13 Sep 2009)

Log Message:
-----------
Fixed the encoding inconsistency with the winlist and log files (thanks to Dmitry V.)

Modified Paths:
--------------
    jetrix/trunk/src/java/net/jetrix/LogManager.java
    jetrix/trunk/src/java/net/jetrix/winlist/SimpleWinlist.java
    jetrix/trunk/src/java/net/jetrix/winlist/TetrixWinlist.java

Modified: jetrix/trunk/src/java/net/jetrix/LogManager.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/LogManager.java	2009-06-26 17:59:06 UTC (rev 811)
+++ jetrix/trunk/src/java/net/jetrix/LogManager.java	2009-09-13 21:35:55 UTC (rev 812)
@@ -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/trunk/src/java/net/jetrix/winlist/SimpleWinlist.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/winlist/SimpleWinlist.java	2009-06-26 17:59:06 UTC (rev 811)
+++ jetrix/trunk/src/java/net/jetrix/winlist/SimpleWinlist.java	2009-09-13 21:35:55 UTC (rev 812)
@@ -98,7 +98,7 @@
         int i = scores.indexOf(example);
         if (i != -1)
         {
-            score = (Score) scores.get(i);
+            score = scores.get(i);
         }
 
         return score;
@@ -234,8 +234,8 @@
             {
                 try
                 {
-                    reader = new BufferedReader(new FileReader(file));
-                    String line = null;
+                    reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), ServerConfig.ENCODING));
+                    String line;
                     while ((line = reader.readLine()) != null)
                     {
                         String[] fields = line.split("\t");
@@ -271,7 +271,7 @@
             File file = new File(id + ".winlist");
             try
             {
-                writer = new BufferedWriter(new FileWriter(file));
+                writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), ServerConfig.ENCODING));
 
                 for (Score score : scores)
                 {

Modified: jetrix/trunk/src/java/net/jetrix/winlist/TetrixWinlist.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/winlist/TetrixWinlist.java	2009-06-26 17:59:06 UTC (rev 811)
+++ jetrix/trunk/src/java/net/jetrix/winlist/TetrixWinlist.java	2009-09-13 21:35:55 UTC (rev 812)
@@ -98,7 +98,7 @@
                 Score score = null;
                 if (i < scores.size())
                 {
-                    score = (Score) scores.get(i);
+                    score = scores.get(i);
                 }
 
                 byte[] struct = buildStruct(score);
@@ -142,7 +142,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];
 
@@ -152,11 +152,8 @@
             struct[0] = score.getType() == Score.TYPE_PLAYER ? (byte) 'p' : (byte) 't';
 
             // name
-            byte[] name = score.getName().getBytes();
-            for (int i = 0; i < name.length; i++)
-            {
-                struct[i + 1] = name[i];
-            }
+            byte[] name = score.getName().getBytes(ServerConfig.ENCODING);
+            System.arraycopy(name, 0, struct, 1, name.length);
 
             // score
             struct[35] = (byte) ((score.getScore() >> 24) % 256);


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