Merge pull request #2481 from JoePfeiffer/fix-2479

Cleanups to component database directories; more robust manufacturer search

core/build.gradle

@@ -134,7 +134,7 @@ tasks.register('copyReadmeMain', Copy) {
     }
 }
 
-def externalComponentsPath = './src/main/resources/datafiles/components'
+def externalComponentsPath = './src/main/resources/datafiles/components/database'
 def externalResourceComponents = './resources-src/datafiles/openrocket-database'
 
 // Initializes the submodules in Git.
@@ -167,6 +167,10 @@ tasks.register('externalComponentsCopy', Copy) {
     from(externalResourceComponents + '/orc') {
         include '**/*'
     }
+    from(externalResourceComponents) {
+        include 'LICENSE'
+        include 'README.md'
+    }
     into externalComponentsPath
     exclude '**/*.bak'
     includeEmptyDirs = false

core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java

@@ -107,7 +107,7 @@ public List<ComponentPreset> listForTypes(List<ComponentPreset.Type> types) {
 	public List<ComponentPreset> find(String manufacturer, String partNo) {
 		List<ComponentPreset> presets = new ArrayList<ComponentPreset>();
 		for (ComponentPreset preset : list) {
-			if (preset.getManufacturer().getSimpleName().equals(manufacturer) && preset.getPartNo().equals(partNo)) {
+			if (preset.getManufacturer().matches(manufacturer) && preset.getPartNo().equals(partNo)) {
 				presets.add(preset);
 			}
 		}

core/src/main/java/info/openrocket/core/database/ComponentPresetDatabaseLoader.java

@@ -18,7 +18,7 @@
 
 /**
  * 
- * Loader that gets all component preset from the database in directory datafiles/preset
+ * Loader that gets all component preset from the database in subdirectories of datafiles/components
  *
  */
 public class ComponentPresetDatabaseLoader extends AsynchronousDatabaseLoader {
@@ -84,7 +84,7 @@ private void loadUserComponents() {
 
 	/**
 	 * loads the default preset components into the database
-	 * uses the file directory from "datafiles/presets"
+	 * uses the file directory from "datafiles/components"
 	 */
 	private void loadPresetComponents() {
 		log.info("Loading component presets from " + SYSTEM_PRESET_DIR);

core/src/main/java/info/openrocket/core/motor/Manufacturer.java

@@ -90,6 +90,9 @@ void add(Manufacturer m) {
 		manufacturers.add(new Manufacturer("Kosdon by AeroTech", "Kosdon by AeroTech", Motor.Type.RELOAD,
 				"K", "KBA", "K-AT", "KOS", "KOSDON", "KOSDON/AT", "KOSDON/AEROTECH"));
 
+		manufacturers.add(new Manufacturer("LOC/Precision", "LOC/Precision", Motor.Type.UNKNOWN,
+										   "LOC"));
+
 		manufacturers.add(new Manufacturer("Loki Research", "Loki Research", Motor.Type.RELOAD,
 				"LOKI", "LR"));