Merge pull request #1678 from JoePfeiffer/fix-1668a

Tidy up directories a little and better identify legacy components

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "swing/resources-src/datafiles/components"]
-	path = swing/resources-src/datafiles/components
+	path = swing/resources-src/datafiles/components-dbcook
 	url = https://github.com/dbcook/openrocket-database.git

swing/build.xml

@@ -64,7 +64,7 @@
 	<target name="clean" description="Removes all build artifacts">
 		<delete dir="${build.dir}"/>
 		<delete dir="${tmp.dir}/"/>
-		<delete dir="${resources.dir}/datafiles/presets"/>
+		<delete dir="${resources.dir}/datafiles/components"/>
 	</target>
 		
 	
@@ -144,7 +144,7 @@
 				classpathref="run-classpath"
 				failonerror="true">
 				<arg value="@{dir}"/>
-				<arg value="${resources-src.dir}/datafiles/presets/@{vendor}.orc"/>
+				<arg value="${resources-src.dir}/datafiles/components-openrocket/@{vendor}.orc"/>
 			</java>
 		</sequential>
 	</macrodef>
@@ -169,7 +169,7 @@
 
 	<!-- COPY orc files from source directories to build directory	-->
 	<target name="check-database" description="check component database">
-		<available file="${resources-src.dir}/datafiles/components/orc" property="database"/>
+		<available file="${resources-src.dir}/datafiles/components-dbcook/orc" property="database"/>
 	</target>
 
 	<target name="copy-orc-files" depends="check-database"
@@ -188,8 +188,8 @@ ${line.separator}
 If you retrieved this code by downloading and uncompressing a zip file, ${line.separator}
 you must do the same for the submodule.  Download the code ${line.separator}
 from https://github.com/dbcook/openrocket-database and uncompress it.${line.separator}
-Copy the files and directories under the openrocket-database-master ${line.separator}
-into ${resources-src.dir}/datafiles/components/ ${line.separator}
+Copy the files and directories under openrocket-database-master ${line.separator}
+into ${resources-src.dir}/datafiles/components-dbcook/ ${line.separator}
 ${line.separator}
 After including the database submodule, you will be able to build
 ${line.separator}
@@ -201,15 +201,15 @@ the .jar file
 				</not>
 			</condition>
 	  	</fail>
-	  	<copy todir="${resources.dir}/datafiles/presets">
-			<fileset dir="${resources-src.dir}/datafiles/legacy_components"/>
+	  	<copy todir="${resources.dir}/datafiles/components">
+			<fileset dir="${resources-src.dir}/datafiles/components-openrocket"/>
 	  	</copy>
-	  	<copy todir="${resources.dir}/datafiles/presets">
-			<fileset dir="${resources-src.dir}/datafiles/components/orc"/>
+	  	<copy todir="${resources.dir}/datafiles/components">
+			<fileset dir="${resources-src.dir}/datafiles/components-dbcook/orc"/>
 	  	</copy>
 	  	<copy
-		    file="${resources-src.dir}/datafiles/components/LICENSE"
-		    todir="${resources.dir}/datafiles/presets">
+		    file="${resources-src.dir}/datafiles/components-dbcook/LICENSE"
+		    todir="${resources.dir}/datafiles/components">
 	  	</copy>
 	</target>
 

swing/resources-src/datafiles/components-openrocket/bms-legacy.orc

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OpenRocketComponent>
   <Version>0.1</Version>
+  <Legacy />
     <Materials>
         <Material UnitsOfMeasure="g/cm3">
             <Name>Balsa</Name>

swing/resources-src/datafiles/components-openrocket/fliskits-legacy.orc

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OpenRocketComponent>
   <Version>0.1</Version>
+  <Legacy />
     <Materials>
         <Material UnitsOfMeasure="g/cm3">
             <Name>Balsa</Name>

swing/resources-src/datafiles/components-openrocket/giantleaprocketry-legacy.orc

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OpenRocketComponent>
   <Version>0.1</Version>
+  <Legacy />
     <Materials>
         <Material UnitsOfMeasure="g/cm3">
             <Name>Birch</Name>

swing/resources-src/datafiles/components-openrocket/publicmissiles-legacy.orc

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OpenRocketComponent>
   <Version>0.1</Version>
+  <Legacy />
     <Materials>
         <Material UnitsOfMeasure="g/m">
             <Name>1/16 In. braided nylon</Name>

swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java

@@ -28,7 +28,7 @@ public class ComponentPresetDatabaseLoader extends AsynchronousDatabaseLoader {
 	
 	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 presetCount = 0;