diff --git a/core/resources/datafiles/presets/system.ser b/core/resources/datafiles/presets/system.ser index 625e63631..1bab522ca 100644 Binary files a/core/resources/datafiles/presets/system.ser and b/core/resources/datafiles/presets/system.ser differ diff --git a/core/src/net/sf/openrocket/startup/SerializePresets.java b/core/src/net/sf/openrocket/startup/SerializePresets.java index 72f23c6a7..03ce866fa 100644 --- a/core/src/net/sf/openrocket/startup/SerializePresets.java +++ b/core/src/net/sf/openrocket/startup/SerializePresets.java @@ -6,43 +6,48 @@ import java.io.InputStream; import java.io.ObjectOutputStream; import java.util.Collection; import java.util.List; +import java.util.Locale; import net.sf.openrocket.database.ComponentPresetDatabase; import net.sf.openrocket.file.iterator.DirectoryIterator; import net.sf.openrocket.file.iterator.FileIterator; import net.sf.openrocket.gui.util.SimpleFileFilter; import net.sf.openrocket.gui.util.SwingPreferences; +import net.sf.openrocket.l10n.ResourceBundleTranslator; import net.sf.openrocket.preset.ComponentPreset; import net.sf.openrocket.preset.xml.OpenRocketComponentLoader; import net.sf.openrocket.util.Pair; public class SerializePresets { - + /** * @param args */ public static void main(String[] args) throws Exception { - - Application.setPreferences( new SwingPreferences() ); - + + Application.setPreferences(new SwingPreferences()); + Application.setBaseTranslator(new ResourceBundleTranslator("l10n.messages")); + + Locale.setDefault(Locale.ENGLISH); + ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase() { - + @Override protected void load() { - FileIterator iterator = DirectoryIterator.findDirectory("resources-src/datafiles/presets", new SimpleFileFilter("",false,"orc")); - - if ( iterator == null ) { + FileIterator iterator = DirectoryIterator.findDirectory("resources-src/datafiles/presets", new SimpleFileFilter("", false, "orc")); + + if (iterator == null) { throw new RuntimeException("Can't find resources-src/presets directory"); } - while( iterator.hasNext() ) { - Pair f = iterator.next(); + while (iterator.hasNext()) { + Pair f = iterator.next(); String fileName = f.getU(); InputStream is = f.getV(); - + OpenRocketComponentLoader loader = new OpenRocketComponentLoader(); Collection presets = loader.load(is, fileName); - + this.addAll(presets); } @@ -56,7 +61,7 @@ public class SerializePresets { Application.getLogger().info("Total number of presets = " + list.size()); - File outFile = new File("resources/datafiles/presets","system.ser"); + File outFile = new File("resources/datafiles/presets", "system.ser"); FileOutputStream ofs = new FileOutputStream(outFile); ObjectOutputStream oos = new ObjectOutputStream(ofs); @@ -66,5 +71,4 @@ public class SerializePresets { ofs.flush(); ofs.close(); } - }