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

Added alternative query arguments for listForTypes which takes a list instead of array.

Browse Source
This commit is contained in:
Kevin Ruland 2012-04-19 16:04:33 +00:00
parent 6c67c2266a
commit a1f07531fa
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/database/ComponentPresetDao.java
View File

@ -23,6 +23,8 @@ public interface ComponentPresetDao {
public List<ComponentPreset> listForType( ComponentPreset.Type type, boolean favorite ); public List<ComponentPreset> listForType( ComponentPreset.Type type, boolean favorite );
public List<ComponentPreset> listForTypes( ComponentPreset.Type ... type ); public List<ComponentPreset> listForTypes( ComponentPreset.Type ... type );
public List<ComponentPreset> listForTypes( List<ComponentPreset.Type> types );
public void setFavorite( ComponentPreset preset, boolean favorite ); public void setFavorite( ComponentPreset preset, boolean favorite );

7
core/src/net/sf/openrocket/database/ComponentPresetDatabase.java
View File

@ -124,7 +124,7 @@ public class ComponentPresetDatabase extends Database<ComponentPreset> implement
for( ComponentPreset preset : list ) { for( ComponentPreset preset : list ) {
ComponentPreset.Type presetType = preset.get(ComponentPreset.TYPE); ComponentPreset.Type presetType = preset.get(ComponentPreset.TYPE);
typeLoop: for( int i=0; i<type.length; i++ ) { typeLoop: for( int i=0; i<type.length; i++ ) {
if ( !presetType.equals(type) ) { if ( presetType.equals(type[i]) ) {
result.add(preset); result.add(preset);
break typeLoop; // from inner loop. break typeLoop; // from inner loop.
} }
@ -134,6 +134,11 @@ public class ComponentPresetDatabase extends Database<ComponentPreset> implement
return result; return result;
} }
@Override
public List<ComponentPreset> listForTypes( List<ComponentPreset.Type> types ) {
return listForTypes( (ComponentPreset.Type[]) types.toArray() );
}
@Override @Override
public List<ComponentPreset> find(String manufacturer, String partNo) { public List<ComponentPreset> find(String manufacturer, String partNo) {
List<ComponentPreset> presets = new ArrayList<ComponentPreset>(); List<ComponentPreset> presets = new ArrayList<ComponentPreset>();