Skip to content

Commit 97c3961

Browse files
committed
WidgetService: move default method impls to iface
1 parent e518575 commit 97c3961

File tree

2 files changed

+21
-37
lines changed

2 files changed

+21
-37
lines changed

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

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,7 @@
3131

3232
package org.scijava.widget;
3333

34-
import java.util.List;
35-
36-
import org.scijava.log.LogService;
37-
import org.scijava.module.Module;
38-
import org.scijava.module.ModuleItem;
3934
import org.scijava.plugin.AbstractWrapperService;
40-
import org.scijava.plugin.Parameter;
4135
import org.scijava.plugin.Plugin;
4236
import org.scijava.service.Service;
4337

@@ -51,33 +45,5 @@ public class DefaultWidgetService extends
5145
AbstractWrapperService<WidgetModel, InputWidget<?, ?>> implements
5246
WidgetService
5347
{
54-
55-
@Parameter
56-
private LogService log;
57-
58-
// -- WidgetService methods --
59-
60-
@Override
61-
public WidgetModel createModel(InputPanel<?, ?> inputPanel, Module module,
62-
ModuleItem<?> item, List<?> objectPool)
63-
{
64-
return new DefaultWidgetModel(getContext(), inputPanel, module, item,
65-
objectPool);
66-
}
67-
68-
// -- PTService methods --
69-
70-
@Override
71-
@SuppressWarnings({"rawtypes", "unchecked"})
72-
public Class<InputWidget<?, ?>> getPluginType() {
73-
return (Class) InputWidget.class;
74-
}
75-
76-
// -- Typed methods --
77-
78-
@Override
79-
public Class<WidgetModel> getType() {
80-
return WidgetModel.class;
81-
}
82-
48+
// NB: No implementation needed.
8349
}

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,25 @@ public interface WidgetService extends
5959
* @param item
6060
* @param objectPool
6161
*/
62-
WidgetModel createModel(InputPanel<?, ?> inputPanel, Module module,
63-
ModuleItem<?> item, List<?> objectPool);
62+
default WidgetModel createModel(InputPanel<?, ?> inputPanel, Module module,
63+
ModuleItem<?> item, List<?> objectPool)
64+
{
65+
return new DefaultWidgetModel(getContext(), inputPanel, module, item,
66+
objectPool);
67+
}
6468

69+
// -- PTService methods --
70+
71+
@Override
72+
@SuppressWarnings({"rawtypes", "unchecked"})
73+
default Class<InputWidget<?, ?>> getPluginType() {
74+
return (Class) InputWidget.class;
75+
}
76+
77+
// -- Typed methods --
78+
79+
@Override
80+
default Class<WidgetModel> getType() {
81+
return WidgetModel.class;
82+
}
6583
}

0 commit comments

Comments
 (0)