From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Thu, 12 Apr 2012 05:10:43 +0000 (+0000)
Subject: Fixed bug in loader which caused it to load only a single csv file.
X-Git-Tag: upstream/12.09^2~373
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=3297779760cf31bb46b439ec5f41a06e6644be14;p=debian%2Fopenrocket

Fixed bug in loader which caused it to load only a single csv file.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@541 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/core/src/net/sf/openrocket/database/ComponentPresetDatabase.java b/core/src/net/sf/openrocket/database/ComponentPresetDatabase.java
index 50d32125..032b1997 100644
--- a/core/src/net/sf/openrocket/database/ComponentPresetDatabase.java
+++ b/core/src/net/sf/openrocket/database/ComponentPresetDatabase.java
@@ -27,9 +27,7 @@ public class ComponentPresetDatabase extends Database<ComponentPreset> implement
 			
 			List<ComponentPreset> returnval = new ArrayList<ComponentPreset>();
 			
-			InputStream is = ComponentPresetDao.class.getResourceAsStream("/datafiles/bodytubepresets.csv");
-
-			PresetCSVReader parser = new PresetCSVReader(is);
+			PresetCSVReader parser = new PresetCSVReader(stream);
 			List<TypedPropertyMap> list = parser.parse();
 			for( TypedPropertyMap o : list ) {
 				try {