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

Move swing/resources/datafiles/presets to swing/resources/datafiles/components for consistency with our external terminology (internally the code still says "presets"; needs to change some day

Browse Source
This commit is contained in:
JoePfeiffer 2022-09-16 09:39:08 -06:00
parent 9b2780d378
commit ff72965ce4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swing/build.xml
View File

@ -64,7 +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"/> <delete dir="${resources.dir}/datafiles/components"/>
</target> </target>
@ -144,7 +144,7 @@
classpathref="run-classpath" classpathref="run-classpath"
failonerror="true"> failonerror="true">
<arg value="@{dir}"/> <arg value="@{dir}"/>
<arg value="${resources-src.dir}/datafiles/presets/@{vendor}.orc"/> <arg value="${resources-src.dir}/datafiles/components/@{vendor}.orc"/>
</java> </java>
</sequential> </sequential>
</macrodef> </macrodef>
@ -201,15 +201,15 @@ the .jar file
</not> </not>
</condition> </condition>
</fail> </fail>
<copy todir="${resources.dir}/datafiles/presets"> <copy todir="${resources.dir}/datafiles/components">
<fileset dir="${resources-src.dir}/datafiles/legacy_components"/> <fileset dir="${resources-src.dir}/datafiles/legacy_components"/>
</copy> </copy>
<copy todir="${resources.dir}/datafiles/presets"> <copy todir="${resources.dir}/datafiles/components">
<fileset dir="${resources-src.dir}/datafiles/components/orc"/> <fileset dir="${resources-src.dir}/datafiles/components/orc"/>
</copy> </copy>
<copy <copy
file="${resources-src.dir}/datafiles/components/LICENSE" file="${resources-src.dir}/datafiles/components/LICENSE"
todir="${resources.dir}/datafiles/presets"> todir="${resources.dir}/datafiles/components">
</copy> </copy>
</target> </target>

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

@ -28,7 +28,7 @@ public class ComponentPresetDatabaseLoader extends AsynchronousDatabaseLoader {
private final static Logger log = LoggerFactory.getLogger(ComponentPresetDatabaseLoader.class); private final static Logger log = LoggerFactory.getLogger(ComponentPresetDatabaseLoader.class);
private static final String SYSTEM_PRESET_DIR = "datafiles/presets"; private static final String SYSTEM_PRESET_DIR = "datafiles/components";
private int fileCount = 0; private int fileCount = 0;
private int presetCount = 0; private int presetCount = 0;