Skip to content

Commit 4916f7a

Browse files
committed
ConvertService: return collection
Instead of returning a List of input candidates, we can generalize to Collection.
1 parent df8a770 commit 4916f7a

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/main/java/org/scijava/convert/ConvertService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
package org.scijava.convert;
3333

3434
import java.lang.reflect.Type;
35-
import java.util.List;
35+
import java.util.Collection;
3636

3737
import org.scijava.plugin.HandlerService;
3838

@@ -103,5 +103,5 @@ public interface ConvertService extends
103103
*/
104104
boolean supports(Class<?> src, Type dest);
105105

106-
List<Object> getCompatibleInputs(Class<?> dest);
106+
Collection<Object> getCompatibleInputs(Class<?> dest);
107107
}

src/main/java/org/scijava/convert/DefaultConvertService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333

3434
import java.lang.reflect.Type;
3535
import java.util.ArrayList;
36+
import java.util.Collection;
3637
import java.util.HashSet;
37-
import java.util.List;
3838
import java.util.Set;
3939

4040
import org.scijava.plugin.Plugin;
@@ -102,7 +102,7 @@ public boolean supports(final Class<?> src, final Type dest) {
102102
}
103103

104104
@Override
105-
public List<Object> getCompatibleInputs(Class<?> dest) {
105+
public Collection<Object> getCompatibleInputs(Class<?> dest) {
106106
Set<Object> objects = new HashSet<Object>();
107107

108108
for (final Converter c : getInstances()) {

src/main/java/org/scijava/widget/AbstractInputHarvester.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ private <T> WidgetModel addInput(final InputPanel<P, W> inputPanel,
150150
@SuppressWarnings("unchecked")
151151
private List<?> getObjects(final Class<?> type) {
152152
@SuppressWarnings("rawtypes")
153-
List compatibleInputs = convertService.getCompatibleInputs(type);
153+
List compatibleInputs =
154+
new ArrayList(convertService.getCompatibleInputs(type));
154155
compatibleInputs.addAll(objectService.getObjects(type));
155156
return compatibleInputs;
156157
}

0 commit comments

Comments
 (0)