Menu
▾
▴
[jtcfrost-cvs] frost-wot/source/frost Mixed.java,1.6,1.7 Frost.java,1.12,1.13 Startup.java,1.29,1.30 MainFrame.java,1.104,1.105 Core.java,1.131,1.132 FileAccess.java,1.85,1.86
Update of /cvsroot/jtcfrost/frost-wot/source/frost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25924/source/frost Modified Files: Mixed.java Frost.java Startup.java MainFrame.java Core.java FileAccess.java Log Message: fixes and updates Index: Core.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/Core.java,v retrieving revision 1.131 retrieving revision 1.132 diff -C2 -d -r1.131 -r1.132 *** Core.java 25 Apr 2006 11:22:51 -0000 1.131 --- Core.java 26 Apr 2006 08:58:33 -0000 1.132 *************** *** 64,68 **** private static Core instance = new Core(); ! private static Locale locale = null; private static List knownBoards = new ArrayList(); //list of known boards --- 64,68 ---- private static Core instance = new Core(); ! private static String localeName = null; private static List knownBoards = new ArrayList(); //list of known boards *************** *** 783,788 **** } ! public static void setLocale(Locale locale) { ! Core.locale = locale; } --- 783,788 ---- } ! public static void setLocale(String localeName) { ! Core.localeName = localeName; } *************** *** 839,845 **** */ private void initializeLanguage() { ! if (locale != null) { // use locale specified on command line (overrides config setting) ! Language.initializeWithLocale(locale); } else { String lang = frostSettings.getValue("locale"); --- 839,845 ---- */ private void initializeLanguage() { ! if (localeName != null) { // use locale specified on command line (overrides config setting) ! Language.initializeWithName(localeName); } else { String lang = frostSettings.getValue("locale"); Index: Frost.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/Frost.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Frost.java 5 Apr 2006 10:38:49 -0000 1.12 --- Frost.java 26 Apr 2006 08:58:33 -0000 1.13 *************** *** 97,100 **** --- 97,101 ---- showHelp(); } + // TODO: add -localefile xxx to test properties files } } catch (ArrayIndexOutOfBoundsException exception) { *************** *** 107,114 **** * @param string the name of the new locale */ ! private static void setLocale(String newLocale) { ! Locale locale = new Locale(newLocale); ! Locale.setDefault(locale); ! Core.setLocale(locale); } --- 108,113 ---- * @param string the name of the new locale */ ! private static void setLocale(String newLocaleName) { ! Core.setLocale(newLocaleName); } Index: MainFrame.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/MainFrame.java,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** MainFrame.java 25 Apr 2006 11:22:51 -0000 1.104 --- MainFrame.java 26 Apr 2006 08:58:33 -0000 1.105 *************** *** 634,638 **** languageJapaneseMenuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! setLanguageResource("ja"); } }); --- 634,638 ---- languageJapaneseMenuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! setLanguageResource("jp"); } }); Index: FileAccess.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/FileAccess.java,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** FileAccess.java 9 Apr 2006 17:06:22 -0000 1.85 --- FileAccess.java 26 Apr 2006 08:58:33 -0000 1.86 *************** *** 419,421 **** --- 419,440 ---- } } + + /** + * Copys a file from the jar file to disk + * @param resource This is the file's name in the jar + * @param file This is the destination file + */ + public static void copyFromResource(String resource, File file) throws IOException { + if (!file.isFile()) { + InputStream input = MainFrame.class.getResourceAsStream(resource); + FileOutputStream output = new FileOutputStream(file); + byte[] data = new byte[4096]; + int bytesRead; + while ((bytesRead = input.read(data)) != -1) { + output.write(data, 0, bytesRead); + } + input.close(); + output.close(); + } + } } Index: Startup.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/Startup.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Startup.java 22 Mar 2006 20:15:17 -0000 1.29 --- Startup.java 26 Apr 2006 08:58:33 -0000 1.30 *************** *** 46,50 **** File execfile = new File("exec.bat"); if( !execfile.isFile() ) ! Mixed.copyFromResource("/data/exec.bat", execfile); } catch (IOException e) { ; --- 46,50 ---- File execfile = new File("exec.bat"); if( !execfile.isFile() ) ! FileAccess.copyFromResource("/data/exec.bat", execfile); } catch (IOException e) { ; *************** *** 54,58 **** File tray1file = new File("exec" + fileSeparator + "JSysTray.dll"); if( !tray1file.isFile() ) ! Mixed.copyFromResource("/data/JSysTray.dll", tray1file); } catch (IOException e) { ; --- 54,58 ---- File tray1file = new File("exec" + fileSeparator + "JSysTray.dll"); if( !tray1file.isFile() ) ! FileAccess.copyFromResource("/data/JSysTray.dll", tray1file); } catch (IOException e) { ; Index: Mixed.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/Mixed.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Mixed.java 5 Apr 2006 10:38:49 -0000 1.6 --- Mixed.java 26 Apr 2006 08:58:33 -0000 1.7 *************** *** 19,54 **** package frost; ! import java.io.*; ! import java.util.logging.Logger; - public final class Mixed - { private static Logger logger = Logger.getLogger(Mixed.class.getName()); private static char[] invalidChars = { '/', '\\', '?', '*', '<', '>', '\"', ':', '|', '#' }; - //FIXME: this one is missing the "&" char as opposed to MessageObject() - - /** - * Copys a file from the jar file to disk - * @param resource This is the file's name in the jar - * @param file This is the destination file - */ - public static void copyFromResource(String resource, File file) - throws IOException - { - if (!file.isFile()) - { - InputStream input = MainFrame.class.getResourceAsStream(resource); - FileOutputStream output = new FileOutputStream(file); - byte[] data = new byte[128]; - int bytesRead; - - while ((bytesRead = input.read(data)) != -1) - output.write(data, 0, bytesRead); - - input.close(); - output.close(); - } - } /** --- 19,30 ---- package frost; ! import java.util.logging.*; ! ! public final class Mixed { private static Logger logger = Logger.getLogger(Mixed.class.getName()); + // FIXME: this one is missing the "&" char as opposed to MessageObject() private static char[] invalidChars = { '/', '\\', '?', '*', '<', '>', '\"', ':', '|', '#' }; /** *************** *** 62,65 **** --- 38,42 ---- } } + /** * Makes sure that the string does not contain ]]> - the only *************** *** 69,76 **** */ public static String makeSafeXML(String text) { ! if (text == null) return null; int index; ! while((index = text.indexOf("]]>")) !=-1) ! text = text.substring(0,index) + "___"+text.substring(index+3,text.length()); return text; } --- 46,56 ---- */ public static String makeSafeXML(String text) { ! if (text == null) { ! return null; ! } int index; ! while((index = text.indexOf("]]>")) != -1) { ! text = text.substring(0,index) + "___" + text.substring(index+3,text.length()); ! } return text; } *************** *** 134,140 **** public static boolean containsForeign(String text){ //REDFLAG: implement? ! char[] chars = text.toCharArray(); ! Character c = new Character(chars[0]); ! return false; } --- 114,119 ---- public static boolean containsForeign(String text){ //REDFLAG: implement? ! // char[] chars = text.toCharArray(); ! // Character c = new Character(chars[0]); return false; } |