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

Eliminate serialization of component preset files

Browse Source 
Relabel "Legacy Component Checkbox" to "Legacy Database Checkbox" to make clearer
This commit is contained in:
JoePfeiffer 2022-01-26 09:54:28 -07:00
parent 6507d4f93a
commit 0cd5dcbe09
4 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/resources/l10n/messages.properties
View File

@ -2023,7 +2023,7 @@ ComponentPresetChooserDialog.menu.sortAsc = Sort Ascending
ComponentPresetChooserDialog.menu.sortDesc = Sort Descending ComponentPresetChooserDialog.menu.sortDesc = Sort Descending
ComponentPresetChooserDialog.menu.units = Units ComponentPresetChooserDialog.menu.units = Units
ComponentPresetChooserDialog.checkbox.showAllCompatible = Show all compatible ComponentPresetChooserDialog.checkbox.showAllCompatible = Show all compatible
ComponentPresetChooserDialog.checkbox.showLegacyCheckBox = Show Legacy Components ComponentPresetChooserDialog.checkbox.showLegacyCheckBox = Show Legacy Database
ComponentPresetChooserDialog.lbl.favorites = Select to add preset to drop-down menu ComponentPresetChooserDialog.lbl.favorites = Select to add preset to drop-down menu
table.column.Favorite = Favorite table.column.Favorite = Favorite
table.column.Legacy = Legacy table.column.Legacy = Legacy

25
swing/build.xml
View File

@ -64,6 +64,7 @@
<target name="clean" description="Removes all build artifacts"> <target name="clean" description="Removes all build artifacts">
<delete dir="${build.dir}"/> <delete dir="${build.dir}"/>
<delete dir="${tmp.dir}/"/> <delete dir="${tmp.dir}/"/>
<delete dir="${resources.dir}/datafiles/presets"/>
</target> </target>
@ -75,7 +76,7 @@
</target> </target>
<!-- Executible Eclipse-Jar-In-Jar style JAR --> <!-- Executible Eclipse-Jar-In-Jar style JAR -->
<target name="jar" depends="build,serialize-presets" description="Create the OpenRocket executable JAR"> <target name="jar" depends="build,copy-orc-files" description="Create the OpenRocket executable JAR">
<mkdir dir="${jar.dir}" /> <mkdir dir="${jar.dir}" />
<jar destfile="${jar.file}" basedir="${classes.dir}"> <jar destfile="${jar.file}" basedir="${classes.dir}">
<manifest> <manifest>
@ -124,16 +125,6 @@
</jar> </jar>
</target> </target>
<target name="serialize-presets" depends="build" description="Preprocess the orc preset files into serialized form">
<java classname="net.sf.openrocket.utils.SerializePresets"
fork="true"
classpathref="run-classpath"
failonerror="true">
<arg value="resources-src/datafiles/legacy_components"/>
<arg value="resources-src/datafiles/components/orc"/>
</java>
</target>
<!-- CONVERT vendor csv to ORC files --> <!-- CONVERT vendor csv to ORC files -->
<macrodef name="build-orc-file"> <macrodef name="build-orc-file">
<attribute name="dir"/> <attribute name="dir"/>
@ -168,6 +159,18 @@
</for> </for>
</target> </target>
<!-- COPY orc files from source directories to build directory -->
<target name="copy-orc-files"
description="Copy orc files">
<copy todir="${resources.dir}/datafiles/presets">
<fileset dir="${resources-src.dir}/datafiles/legacy_components"/>
</copy>
<copy todir="${resources.dir}/datafiles/presets">
<fileset dir="${resources-src.dir}/datafiles/components/orc"/>
</copy>
</target>
<!-- DIST-SRC --> <!-- DIST-SRC -->
<target name="dist-src"> <target name="dist-src">
<echo> <echo>

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

Binary file not shown.

14
swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java
View File

@ -91,23 +91,17 @@ public class ComponentPresetDatabaseLoader extends AsynchronousDatabaseLoader {
*/ */
private void loadPresetComponents() { private void loadPresetComponents() {
log.info("Loading component presets from " + SYSTEM_PRESET_DIR); log.info("Loading component presets from " + SYSTEM_PRESET_DIR);
FileIterator iterator = DirectoryIterator.findDirectory(SYSTEM_PRESET_DIR, new SimpleFileFilter("", false, "ser")); FileIterator iterator = DirectoryIterator.findDirectory(SYSTEM_PRESET_DIR, new SimpleFileFilter("", false, "orc"));
if(iterator == null) if(iterator == null)
return; return;
while (iterator.hasNext()) { while (iterator.hasNext()) {
Pair<String, InputStream> f = iterator.next(); Pair<String, InputStream> f = iterator.next();
try { Collection<ComponentPreset> presets = loadFile(f.getU(), f.getV());
ObjectInputStream ois = new ObjectInputStream(f.getV()); componentPresetDao.addAll(presets);
@SuppressWarnings("unchecked")
List<ComponentPreset> list = (List<ComponentPreset>) ois.readObject();
componentPresetDao.addAll(list);
fileCount++; fileCount++;
presetCount += list.size(); presetCount += presets.size();
} catch (Exception ex) {
throw new BugException(ex);
}
} }
} }