Author: bback
Date: 2006-03-14 19:29:20 +0000 (Tue, 14 Mar 2006)
New Revision: 8253
Modified:
trunk/apps/frost-0.7/source/frost/FileAccess.java
trunk/apps/frost-0.7/source/frost/SettingsFun.java
trunk/apps/frost-0.7/source/frost/ext/AltEdit.java
trunk/apps/frost-0.7/source/frost/gui/HelpFrame.java
trunk/apps/frost-0.7/source/frost/gui/MessageFrame.java
trunk/apps/frost-0.7/source/frost/gui/preferences/NewsPanel.java
trunk/apps/frost-0.7/source/frost/threads/NotifyByEmailThread.java
Log:
UTF-8 enhancements
Modified: trunk/apps/frost-0.7/source/frost/FileAccess.java
===================================================================
--- trunk/apps/frost-0.7/source/frost/FileAccess.java 2006-03-14 14:07:12 UTC
(rev 8252)
+++ trunk/apps/frost-0.7/source/frost/FileAccess.java 2006-03-14 19:29:20 UTC
(rev 8253)
@@ -1,395 +1,405 @@
-/*
- FileAccess.java / File Access
- Copyright (C) 2001 Jan-Thomas Czornack <jantho at users.sourceforge.net>
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-package frost;
-
-import java.awt.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.*;
-import java.util.List;
-import java.util.logging.*;
-
-import javax.swing.*;
-
-public class FileAccess {
-
- private static Logger logger =
Logger.getLogger(FileAccess.class.getName());
-
- /**
- * Writes a file to disk after opening a saveDialog window
- * @param parent The parent component, often 'this' can be used
- * @param conten The data to write to disk.
- * @param lastUsedDirectory The saveDialog starts at this directory
- * @param title The saveDialog gets this title
- */
- public static void saveDialog(Component parent, String content, String
lastUsedDirectory, String title) {
-
- final JFileChooser fc = new JFileChooser(lastUsedDirectory);
- fc.setDialogTitle(title);
- fc.setFileHidingEnabled(true);
- fc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
- fc.setMultiSelectionEnabled(false);
-
- int returnVal = fc.showSaveDialog(parent);
- if (returnVal == JFileChooser.APPROVE_OPTION) {
- File file = fc.getSelectedFile();
- if (file != null) {
-
MainFrame.frostSettings.setValue("lastUsedDirectory", file.getParent());
- if (!file.isDirectory()) {
- writeFile(content, file, "UTF-8");
- }
- }
- }
- }
-
- /**
- * Reads a file and returns it's content in a byte[]
- * @param file the file to read
- * @return byte[] with the files content
- */
- public static byte[] readByteArray(String filename) {
- return readByteArray(new File(filename));
- }
-
- public static byte[] readByteArray(File file) {
- try {
- byte[] data = new byte[(int)file.length()];
- FileInputStream fileIn = new FileInputStream(file);
- DataInputStream din = new DataInputStream(fileIn);
- din.readFully(data);
- fileIn.close();
- return data;
- } catch( IOException e ) {
- logger.log(Level.SEVERE, "Exception thrown in
readByteArray(File file)", e);
- }
- return null;
- }
-
- /**
- * Returns all files starting from given directory/file that have a given
extension.
- */
- public static ArrayList getAllEntries(File file, final String extension) {
- ArrayList files = new ArrayList();
- getAllFiles(file, extension, files);
- return files;
- }
-
- /**
- * Returns all files starting from given directory/file that have a given
extension.
- */
- private static void getAllFiles(File file, String extension, ArrayList
filesLst) {
- if( file != null ) {
- if( file.isDirectory() ) {
- File[] dirfiles = file.listFiles();
- if( dirfiles != null ) {
- for( int i = 0; i < dirfiles.length; i++ ) {
- getAllFiles(dirfiles[i], extension, filesLst); //
process recursive
- }
- }
- }
- if( extension.length() == 0 || file.getName().endsWith(extension)
) {
- filesLst.add(file);
- }
- }
- }
-
- /**
- * Writes zip file
- */
-// public static boolean writeZipFile(byte[] content, String entry, File
file) {
-// if (content == null || content.length == 0) {
-// Exception e = new Exception();
-// e.fillInStackTrace();
-// logger.log(Level.SEVERE, "Tried to zip an empty file!
Send this output to a dev"+
-// " and
describe what you were doing.", e);
-// return false;
-// }
-// try {
-// ZipOutputStream zos = new ZipOutputStream(new
FileOutputStream(file));
-// zos.setLevel(9); // maximum compression
-// ZipEntry ze = new ZipEntry(entry);
-// ze.setSize(content.length);
-// zos.putNextEntry(ze);
-// zos.write(content);
-// zos.flush(); //do this before closeEntry()
-// zos.closeEntry();
-// zos.close();
-// return true;
-// } catch( Throwable e ) {
-// logger.log(Level.SEVERE, "Exception thrown in
writeZipFile(byte[] content, String entry, File file)", e);
-// return false;
-// }
-// }
-
- /**
- * Reads first zip file entry and returns content in a byte[].
- */
-// public static byte[] readZipFileBinary(File file) {
-// if( !file.isFile() || file.length() == 0 ) {
-// return null;
-// }
-//
-// final int bufferSize = 4096;
-// ZipInputStream zis = null;
-// try {
-// zis = new ZipInputStream(new FileInputStream(file));
-// ByteArrayOutputStream out = new ByteArrayOutputStream();
-// zis.getNextEntry();
-//
-// byte[] zipData = new byte[bufferSize];
-// while( true ) {
-// int len = zis.read(zipData);
-// if( len < 0 ) {
-// break;
-// }
-// out.write(zipData, 0, len);
-// }
-// zis.close();
-// return out.toByteArray();
-//
-// } catch( FileNotFoundException e ) {
-// logger.log(Level.SEVERE, "Exception thrown in
readZipFile(String path)", e);
-// }
-// catch( IOException e ) {
-// try { if( zis != null) zis.close(); } catch(Throwable t) { }
-// logger.log(Level.SEVERE, "Exception thrown in readZipFile(String
path) \n" +
-// "Offending file saved as badfile.zip,
send to a dev for analysis", e);
-// copyFile(file.getPath(), "badfile.zip");
-// }
-// return null;
-// }
-
- /**
- * Reads file and returns a Vector of lines
- */
- public static List readLines(File file) {
- return readLines(file.getPath());
- }
-
- public static List readLines(String path) {
- String line;
- ArrayList data = new ArrayList();
- try {
- BufferedReader f = new BufferedReader(new FileReader(path));
- while( (line = f.readLine()) != null ) {
- data.add(line.trim());
- }
- f.close();
- } catch (IOException e) {
- logger.log(Level.SEVERE, "Exception thrown in readLines(String
path)", e);
- }
- return data;
- }
-
- /**
- * Reads a file and returns its contents in a String
- */
- public static String readFile(File file) {
- return readFile(file.getPath());
- }
-
- public static String readFile(String path) {
- String line;
- StringBuffer stringBuffer = new StringBuffer();
- try {
- BufferedReader f = new BufferedReader(new FileReader(path));
- while( (line = f.readLine()) != null ) {
- stringBuffer.append(line).append("\n");
- }
- f.close();
- } catch (IOException e) {
- logger.log(Level.SEVERE, "Exception thrown in readFile(String
path)", e);
- }
- return stringBuffer.toString();
- }
-
- /**
- * Reads a file, line by line, and adds a \n after each one. You can
specify the encoding to use when reading.
- *
- * @param path
- * @param encoding
- * @return the contents of the file
- */
- public static String readFile(String path, String encoding) {
- String line;
- StringBuffer stringBuffer = new StringBuffer();
- try {
- InputStreamReader iSReader = new InputStreamReader(new
FileInputStream(path), encoding);
- BufferedReader reader = new BufferedReader(iSReader);
- while ((line = reader.readLine()) != null) {
- stringBuffer.append(line).append("\n");
- }
- reader.close();
- } catch (IOException e) {
- logger.log(Level.SEVERE, "Exception thrown in
readFile(String path, String encoding)", e);
- }
- return stringBuffer.toString();
- }
-
- /**
- * Writes a file "file" to "path"
- */
- public static boolean writeFile(String content, String filename) {
- return writeFile(content, new File(filename));
- }
-
- /**
- * Writes a file "file" to "path", being able to specify the encoding
- */
- public static boolean writeFile(String content, String filename, String
encoding) {
- return writeFile(content, new File(filename), encoding);
- }
-
- public static boolean writeFile(String content, File file) {
- OutputStreamWriter f1 = null;
- try {
- // write the file in single byte codepage (default could be a DBCS
codepage)
- try {
- f1 = new OutputStreamWriter(new FileOutputStream(file),
"ISO-8859-1");
- } catch(UnsupportedEncodingException e) {
- f1 = new FileWriter(file);
- }
- f1.write(content);
- f1.close();
- return true;
- } catch( Throwable e ) {
- logger.log(Level.SEVERE, "Exception thrown in
writeFile(String content, File file)", e);
- if( f1 != null ) {
- try { f1.close(); } catch(Throwable t) {}
- }
- }
- return false;
- }
-
- public static boolean writeFile(byte[] content, File file) {
- try {
- FileOutputStream s = new FileOutputStream(file);
- s.write(content);
- s.close();
- return true;
- } catch( Throwable e ) {
- logger.log(Level.SEVERE, "Exception thrown in writeFile(byte[]
content, File file)", e);
- }
- return false;
- }
-
- public static boolean writeFile(String content, File file, String
encoding) {
- try {
- FileOutputStream outputStream = new
FileOutputStream(file);
- OutputStreamWriter outputWriter = new
OutputStreamWriter(outputStream, encoding);
-
- BufferedReader inputReader = new BufferedReader(new
StringReader(content));
- String lineSeparator =
System.getProperty("line.separator");
- String line = inputReader.readLine();
-
- while (line != null) {
- outputWriter.write(line + lineSeparator);
- line = inputReader.readLine();
- }
-
- outputWriter.close();
- inputReader.close();
- return true;
- } catch (Throwable e) {
- logger.log(Level.SEVERE, "Exception thrown in
writeFile(String content, File file, String encoding)", e);
- }
- return false;
- }
-
- /**
- * Deletes the given directory and ALL FILES/DIRS IN IT !!!
- * USE CAREFUL !!!
- */
- public static boolean deleteDir(File dir) {
- if( dir.isDirectory() ) {
- String[] children = dir.list();
- for( int i = 0; i < children.length; i++ ) {
- boolean success = deleteDir(new File(dir, children[i]));
- if( !success ) {
- return false;
- }
- }
- }
- // The directory is now empty so delete it
- return dir.delete();
- }
-
- /**
- * This method copies the contents of one file to another. If the
destination file didn't exist, it is created. If
- * it did exist, its contents are overwritten.
- *
- * @param sourceName
- * name of the source file
- * @param destName
- * name of the destination file
- */
- public static boolean copyFile(String sourceName, String destName) {
- FileChannel sourceChannel = null;
- FileChannel destChannel = null;
- boolean wasOk = false;
- try {
- sourceChannel = new FileInputStream(sourceName).getChannel();
- destChannel = new FileOutputStream(destName).getChannel();
- destChannel.transferFrom(sourceChannel, 0, sourceChannel.size());
- wasOk = true;
- } catch (Throwable exception) {
- logger.log(Level.SEVERE, "Exception in copyFile", exception);
- } finally {
- if (sourceChannel != null) {
- try { sourceChannel.close(); } catch (IOException ex) {}
- }
- if (destChannel != null) {
- try { destChannel.close(); } catch (IOException ex) {}
- }
- }
- return wasOk;
- }
-
-
- /**
- * This method compares 2 file byte by byte.
- * Returns true if they are equals, or false.
- */
- public static boolean compareFiles(File f1, File f2) {
- try {
- BufferedInputStream s1 = new BufferedInputStream(new
FileInputStream(f1));
- BufferedInputStream s2 = new BufferedInputStream(new
FileInputStream(f2));
- int i1, i2;
- boolean equals = false;
- while(true) {
- i1 = s1.read();
- i2 = s2.read();
- if( i1 != i2 ) {
- equals = false;
- break;
- }
- if( i1 < 0 && i2 < 0 ) {
- equals = true; // both at EOF
- break;
- }
- }
- s1.close();
- s2.close();
- return equals;
- } catch(Throwable e) {
- return false;
- }
- }
-}
+/*
+ FileAccess.java / File Access
+ Copyright (C) 2001 Jan-Thomas Czornack <jantho at users.sourceforge.net>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+package frost;
+
+import java.awt.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.*;
+import java.util.List;
+import java.util.logging.*;
+import java.util.zip.*;
+
+import javax.swing.*;
+
+public class FileAccess {
+
+ private static Logger logger =
Logger.getLogger(FileAccess.class.getName());
+
+ /**
+ * Writes a file to disk after opening a saveDialog window
+ * @param parent The parent component, often 'this' can be used
+ * @param conten The data to write to disk.
+ * @param lastUsedDirectory The saveDialog starts at this directory
+ * @param title The saveDialog gets this title
+ */
+ public static void saveDialog(Component parent, String content, String
lastUsedDirectory, String title) {
+
+ final JFileChooser fc = new JFileChooser(lastUsedDirectory);
+ fc.setDialogTitle(title);
+ fc.setFileHidingEnabled(true);
+ fc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+ fc.setMultiSelectionEnabled(false);
+
+ int returnVal = fc.showSaveDialog(parent);
+ if (returnVal == JFileChooser.APPROVE_OPTION) {
+ File file = fc.getSelectedFile();
+ if (file != null) {
+
MainFrame.frostSettings.setValue("lastUsedDirectory", file.getParent());
+ if (!file.isDirectory()) {
+ writeFile(content, file, "UTF-8");
+ }
+ }
+ }
+ }
+
+ /**
+ * Reads a file and returns it's content in a byte[]
+ * @param file the file to read
+ * @return byte[] with the files content
+ */
+ public static byte[] readByteArray(String filename) {
+ return readByteArray(new File(filename));
+ }
+
+ public static byte[] readByteArray(File file) {
+ try {
+ byte[] data = new byte[(int)file.length()];
+ FileInputStream fileIn = new FileInputStream(file);
+ DataInputStream din = new DataInputStream(fileIn);
+ din.readFully(data);
+ fileIn.close();
+ return data;
+ } catch( IOException e ) {
+ logger.log(Level.SEVERE, "Exception thrown in
readByteArray(File file)", e);
+ }
+ return null;
+ }
+
+ /**
+ * Returns all files starting from given directory/file that have a given
extension.
+ */
+ public static ArrayList getAllEntries(File file, final String extension) {
+ ArrayList files = new ArrayList();
+ getAllFiles(file, extension, files);
+ return files;
+ }
+
+ /**
+ * Returns all files starting from given directory/file that have a given
extension.
+ */
+ private static void getAllFiles(File file, String extension, ArrayList
filesLst) {
+ if( file != null ) {
+ if( file.isDirectory() ) {
+ File[] dirfiles = file.listFiles();
+ if( dirfiles != null ) {
+ for( int i = 0; i < dirfiles.length; i++ ) {
+ getAllFiles(dirfiles[i], extension, filesLst); //
process recursive
+ }
+ }
+ }
+ if( extension.length() == 0 || file.getName().endsWith(extension)
) {
+ filesLst.add(file);
+ }
+ }
+ }
+
+ /**
+ * Writes zip file
+ */
+ public static boolean writeZipFile(byte[] content, String entry, File
file) {
+ if (content == null || content.length == 0) {
+ Exception e = new Exception();
+ e.fillInStackTrace();
+ logger.log(Level.SEVERE, "Tried to zip an empty file!
Send this output to a dev"+
+ " and
describe what you were doing.", e);
+ return false;
+ }
+ try {
+ ZipOutputStream zos = new ZipOutputStream(new
FileOutputStream(file));
+ zos.setLevel(9); // maximum compression
+ ZipEntry ze = new ZipEntry(entry);
+ ze.setSize(content.length);
+ zos.putNextEntry(ze);
+ zos.write(content);
+ zos.flush(); //do this before closeEntry()
+ zos.closeEntry();
+ zos.close();
+ return true;
+ } catch( Throwable e ) {
+ logger.log(Level.SEVERE, "Exception thrown in
writeZipFile(byte[] content, String entry, File file)", e);
+ return false;
+ }
+ }
+
+ /**
+ * Reads first zip file entry and returns content in a byte[].
+ */
+ public static byte[] readZipFileBinary(File file) {
+ if( !file.isFile() || file.length() == 0 ) {
+ return null;
+ }
+
+ final int bufferSize = 4096;
+ ZipInputStream zis = null;
+ try {
+ zis = new ZipInputStream(new FileInputStream(file));
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ zis.getNextEntry();
+
+ byte[] zipData = new byte[bufferSize];
+ while( true ) {
+ int len = zis.read(zipData);
+ if( len < 0 ) {
+ break;
+ }
+ out.write(zipData, 0, len);
+ }
+ zis.close();
+ return out.toByteArray();
+
+ } catch( FileNotFoundException e ) {
+ logger.log(Level.SEVERE, "Exception thrown in
readZipFile(String path)", e);
+ }
+ catch( IOException e ) {
+ try { if( zis != null) zis.close(); } catch(Throwable t) { }
+ logger.log(Level.SEVERE, "Exception thrown in readZipFile(String
path) \n" +
+ "Offending file saved as badfile.zip,
send to a dev for analysis", e);
+ copyFile(file.getPath(), "badfile.zip");
+ }
+ return null;
+ }
+
+ /**
+ * Reads file and returns a List of lines.
+ * Encoding "ISO-8859-1" is used.
+ */
+ public static List readLines(File file) {
+ return readLines(file, "ISO-8859-1");
+ }
+ /**
+ * Reads file and returns a List of lines
+ */
+ public static List readLines(File file, String encoding) {
+ String line;
+ ArrayList data = new ArrayList();
+ try {
+ InputStreamReader iSReader = new InputStreamReader(new
FileInputStream(file), encoding);
+ BufferedReader reader = new BufferedReader(iSReader);
+ while( (line = reader.readLine()) != null ) {
+ data.add(line.trim());
+ }
+ reader.close();
+ } catch (IOException e) {
+ logger.log(Level.SEVERE, "Exception thrown in readLines(String
path, String encoding)", e);
+ }
+ return data;
+ }
+
+ /**
+ * Reads a file and returns its contents in a String
+ */
+ public static String readFile(File file) {
+ String line;
+ StringBuffer stringBuffer = new StringBuffer();
+ try {
+ BufferedReader f = new BufferedReader(new FileReader(file));
+ while( (line = f.readLine()) != null ) {
+ stringBuffer.append(line).append("\n");
+ }
+ f.close();
+ } catch (IOException e) {
+ logger.log(Level.SEVERE, "Exception thrown in readFile(String
path)", e);
+ }
+ return stringBuffer.toString();
+ }
+
+ /**
+ * Reads a file, line by line, and adds a \n after each one. You can
specify the encoding to use when reading.
+ *
+ * @param path
+ * @param encoding
+ * @return the contents of the file
+ */
+ public static String readFile(File file, String encoding) {
+ String line;
+ StringBuffer stringBuffer = new StringBuffer();
+ try {
+ InputStreamReader iSReader = new InputStreamReader(new
FileInputStream(file), encoding);
+ BufferedReader reader = new BufferedReader(iSReader);
+ while ((line = reader.readLine()) != null) {
+ stringBuffer.append(line).append("\n");
+ }
+ reader.close();
+ } catch (IOException e) {
+ logger.log(Level.SEVERE, "Exception thrown in
readFile(String path, String encoding)", e);
+ }
+ return stringBuffer.toString();
+ }
+
+ /**
+ * Writes a file "file" to "path"
+ */
+ public static boolean writeFile(String content, String filename) {
+ return writeFile(content, new File(filename));
+ }
+
+ /**
+ * Writes a file "file" to "path", being able to specify the encoding
+ */
+ public static boolean writeFile(String content, String filename, String
encoding) {
+ return writeFile(content, new File(filename), encoding);
+ }
+
+ /**
+ * Writes a text file in ISO-8859-1 encoding.
+ */
+ public static boolean writeFile(String content, File file) {
+ OutputStreamWriter f1 = null;
+ try {
+ // write the file in single byte codepage (default could be a DBCS
codepage)
+ try {
+ f1 = new OutputStreamWriter(new FileOutputStream(file),
"ISO-8859-1");
+ } catch(UnsupportedEncodingException e) {
+ f1 = new FileWriter(file);
+ }
+ f1.write(content);
+ f1.close();
+ return true;
+ } catch( Throwable e ) {
+ logger.log(Level.SEVERE, "Exception thrown in
writeFile(String content, File file)", e);
+ if( f1 != null ) {
+ try { f1.close(); } catch(Throwable t) {}
+ }
+ }
+ return false;
+ }
+
+ public static boolean writeFile(byte[] content, File file) {
+ try {
+ FileOutputStream s = new FileOutputStream(file);
+ s.write(content);
+ s.close();
+ return true;
+ } catch( Throwable e ) {
+ logger.log(Level.SEVERE, "Exception thrown in writeFile(byte[]
content, File file)", e);
+ }
+ return false;
+ }
+
+ /**
+ * Writes a text file in specified encoding. Converts line separators to
target platform.
+ */
+ public static boolean writeFile(String content, File file, String
encoding) {
+ OutputStreamWriter outputWriter = null;
+ try {
+ outputWriter = new OutputStreamWriter(new
FileOutputStream(file), encoding);
+
+ BufferedReader inputReader = new BufferedReader(new
StringReader(content));
+ String lineSeparator =
System.getProperty("line.separator");
+ String line = inputReader.readLine();
+
+ while (line != null) {
+ outputWriter.write(line + lineSeparator);
+ line = inputReader.readLine();
+ }
+
+ outputWriter.close();
+ inputReader.close();
+ return true;
+ } catch (Throwable e) {
+ logger.log(Level.SEVERE, "Exception thrown in
writeFile(String content, File file, String encoding)", e);
+ if( outputWriter != null ) {
+ try { outputWriter.close(); } catch(Throwable t) {}
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Deletes the given directory and ALL FILES/DIRS IN IT !!!
+ * USE CAREFUL !!!
+ */
+ public static boolean deleteDir(File dir) {
+ if( dir.isDirectory() ) {
+ String[] children = dir.list();
+ for( int i = 0; i < children.length; i++ ) {
+ boolean success = deleteDir(new File(dir, children[i]));
+ if( !success ) {
+ return false;
+ }
+ }
+ }
+ // The directory is now empty so delete it
+ return dir.delete();
+ }
+
+ /**
+ * This method copies the contents of one file to another. If the
destination file didn't exist, it is created. If
+ * it did exist, its contents are overwritten.
+ *
+ * @param sourceName
+ * name of the source file
+ * @param destName
+ * name of the destination file
+ */
+ public static boolean copyFile(String sourceName, String destName) {
+ FileChannel sourceChannel = null;
+ FileChannel destChannel = null;
+ boolean wasOk = false;
+ try {
+ sourceChannel = new FileInputStream(sourceName).getChannel();
+ destChannel = new FileOutputStream(destName).getChannel();
+ destChannel.transferFrom(sourceChannel, 0, sourceChannel.size());
+ wasOk = true;
+ } catch (Throwable exception) {
+ logger.log(Level.SEVERE, "Exception in copyFile", exception);
+ } finally {
+ if (sourceChannel != null) {
+ try { sourceChannel.close(); } catch (IOException ex) {}
+ }
+ if (destChannel != null) {
+ try { destChannel.close(); } catch (IOException ex) {}
+ }
+ }
+ return wasOk;
+ }
+
+
+ /**
+ * This method compares 2 file byte by byte.
+ * Returns true if they are equals, or false.
+ */
+ public static boolean compareFiles(File f1, File f2) {
+ try {
+ BufferedInputStream s1 = new BufferedInputStream(new
FileInputStream(f1));
+ BufferedInputStream s2 = new BufferedInputStream(new
FileInputStream(f2));
+ int i1, i2;
+ boolean equals = false;
+ while(true) {
+ i1 = s1.read();
+ i2 = s2.read();
+ if( i1 != i2 ) {
+ equals = false;
+ break;
+ }
+ if( i1 < 0 && i2 < 0 ) {
+ equals = true; // both at EOF
+ break;
+ }
+ }
+ s1.close();
+ s2.close();
+ return equals;
+ } catch(Throwable e) {
+ return false;
+ }
+ }
+}
Modified: trunk/apps/frost-0.7/source/frost/SettingsFun.java
===================================================================
--- trunk/apps/frost-0.7/source/frost/SettingsFun.java 2006-03-14 14:07:12 UTC
(rev 8252)
+++ trunk/apps/frost-0.7/source/frost/SettingsFun.java 2006-03-14 19:29:20 UTC
(rev 8253)
@@ -43,7 +43,7 @@
File checkFile = new File(filename);
if( checkFile.isFile() )
{
- List lines = FileAccess.readLines(filename);
+ List lines = FileAccess.readLines(checkFile);
return getValue( lines, value );
}
return "";
Modified: trunk/apps/frost-0.7/source/frost/ext/AltEdit.java
===================================================================
--- trunk/apps/frost-0.7/source/frost/ext/AltEdit.java 2006-03-14 14:07:12 UTC
(rev 8252)
+++ trunk/apps/frost-0.7/source/frost/ext/AltEdit.java 2006-03-14 19:29:20 UTC
(rev 8253)
@@ -102,7 +102,7 @@
sb.append(oldText).append(linesep); // contains new from-header-line
sb.append(TEXT_MARKER).append(linesep);
- if( FileAccess.writeFile(sb.toString(), editFile) == false ) {
+ if( FileAccess.writeFile(sb.toString(), editFile, "UTF-8") == false ) {
JOptionPane.showMessageDialog(parentFrame,
"Could not create message file for alternate editor:
"+editFile.getPath(),
"Error",
@@ -123,7 +123,7 @@
return false;
}
- List lines = FileAccess.readLines(editFile);
+ List lines = FileAccess.readLines(editFile, "UTF-8");
if( lines.size() < 4 ) { // subject marker,subject,from line, text
marker
JOptionPane.showMessageDialog(parentFrame,
"The message file returned by the alternate editor is
invalid.",
Modified: trunk/apps/frost-0.7/source/frost/gui/HelpFrame.java
===================================================================
--- trunk/apps/frost-0.7/source/frost/gui/HelpFrame.java 2006-03-14
14:07:12 UTC (rev 8252)
+++ trunk/apps/frost-0.7/source/frost/gui/HelpFrame.java 2006-03-14
19:29:20 UTC (rev 8253)
@@ -72,7 +72,7 @@
//------------------------------------------------------------------------
comboBox.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(ActionEvent e) {
- textArea.setText(FileAccess.readFile("help/" +
(String)comboBox.getSelectedItem() + ".txt"));
+ textArea.setText(FileAccess.readFile(new File("help/" +
(String)comboBox.getSelectedItem() + ".txt")));
textArea.setCaretPosition(0);
}
});
Modified: trunk/apps/frost-0.7/source/frost/gui/MessageFrame.java
===================================================================
--- trunk/apps/frost-0.7/source/frost/gui/MessageFrame.java 2006-03-14
14:07:12 UTC (rev 8252)
+++ trunk/apps/frost-0.7/source/frost/gui/MessageFrame.java 2006-03-14
19:29:20 UTC (rev 8253)
@@ -755,7 +755,7 @@
File signatureFile = new File("signature.txt");
if (signatureFile.isFile()) {
- signature = FileAccess.readFile("signature.txt",
"UTF-8").trim();
+ signature = FileAccess.readFile(signatureFile,
"UTF-8").trim();
if( signature != null ) {
signature = signature.trim();
if( signature.length() > 0 ) {
Modified: trunk/apps/frost-0.7/source/frost/gui/preferences/NewsPanel.java
===================================================================
--- trunk/apps/frost-0.7/source/frost/gui/preferences/NewsPanel.java
2006-03-14 14:07:12 UTC (rev 8252)
+++ trunk/apps/frost-0.7/source/frost/gui/preferences/NewsPanel.java
2006-03-14 19:29:20 UTC (rev 8253)
@@ -174,7 +174,7 @@
//Load signature
File signature = new File("signature.txt");
if (signature.isFile()) {
-
getSignatureTextArea().setText(FileAccess.readFile("signature.txt", "UTF-8"));
+
getSignatureTextArea().setText(FileAccess.readFile(signature, "UTF-8"));
}
}
Modified: trunk/apps/frost-0.7/source/frost/threads/NotifyByEmailThread.java
===================================================================
--- trunk/apps/frost-0.7/source/frost/threads/NotifyByEmailThread.java
2006-03-14 14:07:12 UTC (rev 8252)
+++ trunk/apps/frost-0.7/source/frost/threads/NotifyByEmailThread.java
2006-03-14 19:29:20 UTC (rev 8253)
@@ -68,7 +68,7 @@
&& body.length() > 0
&& body.length() < 64 * 1024)
{
- template = FileAccess.readFile(body.getPath());
+ template = FileAccess.readFile(body);
} else {
template = "Hello\n, this is the automatic Frost email
notifier. " +
"The download of file <filename> has
completed.\n\n";
