From f7c5fd18cdc59292b2c72164791757cefbad7bd1 Mon Sep 17 00:00:00 2001
From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Thu, 19 Apr 2012 16:04:33 +0000
Subject: [PATCH] Added alternative query arguments for listForTypes which
 takes a list instead of array.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@572 180e2498-e6e9-4542-8430-84ac67f01cd8
---
 .../src/net/sf/openrocket/database/ComponentPresetDao.java | 2 ++
 .../sf/openrocket/database/ComponentPresetDatabase.java    | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/net/sf/openrocket/database/ComponentPresetDao.java b/core/src/net/sf/openrocket/database/ComponentPresetDao.java
index 8d79967f..4984caeb 100644
--- a/core/src/net/sf/openrocket/database/ComponentPresetDao.java
+++ b/core/src/net/sf/openrocket/database/ComponentPresetDao.java
@@ -23,6 +23,8 @@ public interface ComponentPresetDao {
 	public List<ComponentPreset> listForType( ComponentPreset.Type type, boolean favorite );
 
 	public List<ComponentPreset> listForTypes( ComponentPreset.Type ... type );
+	
+	public List<ComponentPreset> listForTypes( List<ComponentPreset.Type> types );
 
 	public void setFavorite( ComponentPreset preset, boolean favorite );
 	
diff --git a/core/src/net/sf/openrocket/database/ComponentPresetDatabase.java b/core/src/net/sf/openrocket/database/ComponentPresetDatabase.java
index d7cab153..6ff12cea 100644
--- a/core/src/net/sf/openrocket/database/ComponentPresetDatabase.java
+++ b/core/src/net/sf/openrocket/database/ComponentPresetDatabase.java
@@ -124,7 +124,7 @@ public class ComponentPresetDatabase extends Database<ComponentPreset> implement
 		for( ComponentPreset preset : list ) {
 			ComponentPreset.Type presetType = preset.get(ComponentPreset.TYPE);
 			typeLoop: for( int i=0; i<type.length; i++ ) {
-				if ( !presetType.equals(type) ) {
+				if ( presetType.equals(type[i]) ) {
 					result.add(preset);
 					break typeLoop; // from inner loop.
 				}
@@ -134,6 +134,11 @@ public class ComponentPresetDatabase extends Database<ComponentPreset> implement
 		return result;
 	}
 
+	@Override
+	public List<ComponentPreset> listForTypes( List<ComponentPreset.Type> types ) {
+		return listForTypes( (ComponentPreset.Type[]) types.toArray() );
+	}
+	
 	@Override
 	public List<ComponentPreset> find(String manufacturer, String partNo) {
 		List<ComponentPreset> presets = new ArrayList<ComponentPreset>();
-- 
2.30.2