hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #76 from kruland2607/master

Browse Source 
Serialized preset database needs to translator and en locale.
This commit is contained in:
kruland2607 2013-04-25 19:52:58 -07:00
commit 3c8ffbf5b1
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/resources/datafiles/presets/system.ser
View File

Binary file not shown.

32
core/src/net/sf/openrocket/startup/SerializePresets.java
View File

@ -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<String,InputStream> f = iterator.next();
while (iterator.hasNext()) {
Pair<String, InputStream> f = iterator.next();
String fileName = f.getU();
InputStream is = f.getV();
OpenRocketComponentLoader loader = new OpenRocketComponentLoader();
Collection<ComponentPreset> 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();
}
}