Skip to content

Commit 857c1e8

Browse files
committed
OptionsService: move default method impls to iface
1 parent 9fb20a9 commit 857c1e8

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

src/main/java/org/scijava/options/DefaultOptionsService.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,6 @@ public <O extends OptionsPlugin> O getOptions(final Class<O> optionsClass) {
7272
return objects == null || objects.isEmpty() ? null : objects.get(0);
7373
}
7474

75-
@Override
76-
public void reset() {
77-
final List<OptionsPlugin> optionsPlugins = getInstances();
78-
for (final OptionsPlugin plugin : optionsPlugins) {
79-
plugin.reset();
80-
}
81-
}
82-
8375
// -- SingletonService methods --
8476

8577
@Override
@@ -93,12 +85,4 @@ public List<OptionsPlugin> getInstances() {
9385

9486
return instances;
9587
}
96-
97-
// -- PTService methods --
98-
99-
@Override
100-
public Class<OptionsPlugin> getPluginType() {
101-
return OptionsPlugin.class;
102-
}
103-
10488
}

src/main/java/org/scijava/options/OptionsService.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131

3232
package org.scijava.options;
3333

34+
import java.util.List;
35+
3436
import org.scijava.plugin.SingletonService;
3537
import org.scijava.service.SciJavaService;
3638

@@ -53,6 +55,17 @@ public interface OptionsService extends SingletonService<OptionsPlugin>,
5355
*
5456
* @see OptionsPlugin#reset()
5557
*/
56-
void reset();
58+
default void reset() {
59+
final List<OptionsPlugin> optionsPlugins = getInstances();
60+
for (final OptionsPlugin plugin : optionsPlugins) {
61+
plugin.reset();
62+
}
63+
}
64+
65+
// -- PTService methods --
5766

67+
@Override
68+
default Class<OptionsPlugin> getPluginType() {
69+
return OptionsPlugin.class;
70+
}
5871
}

0 commit comments

Comments
 (0)