[Gridarta-commit] SF.net SVN: gridarta: [1100] trunk/crossfire/src/cfeditor/Spells.java

[<aki...@us...>]

Revision: 1100
          http://svn.sourceforge.net/gridarta/?rev=1100&view=rev
Author:   akirschbaum
Date:     2006-12-15 16:27:38 -0800 (Fri, 15 Dec 2006)

Log Message:
-----------
Unify code.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/Spells.java

Modified: trunk/crossfire/src/cfeditor/Spells.java
===================================================================
--- trunk/crossfire/src/cfeditor/Spells.java	2006-12-16 00:21:28 UTC (rev 1099)
+++ trunk/crossfire/src/cfeditor/Spells.java	2006-12-16 00:27:38 UTC (rev 1100)
@@ -22,13 +22,15 @@
 package cfeditor;
 
 import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.JFileChooser;
@@ -102,9 +104,6 @@
         List<String> list = null;               // growable array of spellnames+numbers
         String tmp;                       // tmp String for spell names
 
-        final FileWriter fileWriter;            // file writer for "spells.def"
-        final BufferedWriter bufferedWriter;    // buffered writer
-
         if (spellfile.getName().equalsIgnoreCase("spellist.h")) {
             list = new ArrayList<String>();
             FileReader fileReader = null;
@@ -180,36 +179,36 @@
             }
 
             try {
-                fileWriter = new FileWriter(dfile);
-                bufferedWriter = new BufferedWriter(fileWriter);
+                final PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(dfile), "utf-8"));
+                try {
+                    // header:
+                    out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
+                    out.println("<spells>");
+                    out.println("<!--");
+                    out.println("  ##########################################################");
+                    out.println("  #   You may add new spells to this file, but there's no  #");
+                    out.println("  #  need to do it because the file can be autogenerated.  #");
+                    out.println("  # In the editor, select menu \"Resources->Collect Spells\" #");
+                    out.println("  #        to generate a new version of this file.         #");
+                    out.println("  ##########################################################\n-->");
 
-                // header:
-                bufferedWriter.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
-                bufferedWriter.write("<spells>\n<!--\n");
-                bufferedWriter.write("  ##########################################################\n");
-                bufferedWriter.write("  #   You may add new spells to this file, but there's no  #\n");
-                bufferedWriter.write("  #  need to do it because the file can be autogenerated.  #\n");
-                bufferedWriter.write("  # In the editor, select menu \"Resources->Collect Spells\" #\n");
-                bufferedWriter.write("  #        to generate a new version of this file.         #\n");
-                bufferedWriter.write("  ##########################################################\n-->\n");
-
-                // write spell-entries:
-                for (final String entry : list) {
-                    tmp = String.valueOf(entry);
-                    final String id = tmp.substring(0, tmp.indexOf(" ")).trim();
-                    final String name = tmp.substring(tmp.indexOf(" ") + 1).trim();
-                    String space = "";
-                    if (id.length() == 1) {
-                        space = "  ";
-                    } else if (id.length() == 2) {
-                        space = " ";
+                    // write spell-entries:
+                    for (final String entry : list) {
+                        tmp = String.valueOf(entry);
+                        final String id = tmp.substring(0, tmp.indexOf(" ")).trim();
+                        final String name = tmp.substring(tmp.indexOf(" ") + 1).trim();
+                        String space = "";
+                        if (id.length() == 1) {
+                            space = "  ";
+                        } else if (id.length() == 2) {
+                            space = " ";
+                        }
+                        out.println("  <spell id=\"" + id + "\"" + space + " name=\"" + name + "\" />");
                     }
-                    bufferedWriter.write("  <spell id=\"" + id + "\"" + space + " name=\"" + name + "\" />\n");
+                    out.println("</spells>");
+                } finally {
+                    out.close();
                 }
-                bufferedWriter.write("</spells>");
-
-                bufferedWriter.close();
-                fileWriter.close();
                 return list.size();
             } catch (final IOException e) {
                 log.error("Cannot write file '" + dfile.getAbsolutePath() + "'!");


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