Skip to content

Commit 81270b0

Browse files
ctruedenctrueden
committed
NWidget -> Widget
1 parent 8728af3 commit 81270b0

7 files changed

Lines changed: 74 additions & 74 deletions

File tree

‎swing-widget/src/main/java/org/scijava/swing/widget/SwingNumberWidgetFactory.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@
2525
import net.miginfocom.swing.MigLayout;
2626

2727
import org.scijava.convert.ConvertService;
28-
import org.scijava.widget.NAbstractWidget;
29-
import org.scijava.widget.NNumberWidget;
30-
import org.scijava.widget.NWidget;
31-
import org.scijava.widget.NWidgetFactory;
32-
import org.scijava.widget.NWidgetPanelFactory;
33-
import org.scijava.widget.NWidgets;
28+
import org.scijava.widget.AbstractWidget;
29+
import org.scijava.widget.NumberWidget;
30+
import org.scijava.widget.Widget;
31+
import org.scijava.widget.WidgetFactory;
32+
import org.scijava.widget.WidgetPanelFactory;
33+
import org.scijava.widget.Widgets;
3434
import org.scijava.plugin.Parameter;
3535
import org.scijava.plugin.Plugin;
3636
import org.scijava.struct.MemberInstance;
3737
import org.scijava.thread.ThreadService;
3838
import org.scijava.ui.swing.widget.SpinnerNumberModelFactory;
3939
import org.scijava.util.ClassUtils;
4040

41-
@Plugin(type = NWidgetFactory.class)
41+
@Plugin(type = WidgetFactory.class)
4242
public class SwingNumberWidgetFactory implements SwingWidgetFactory {
4343

4444
@Parameter
@@ -53,16 +53,16 @@ public boolean supports(final MemberInstance<?> model) {
5353
}
5454

5555
@Override
56-
public NSwingWidget create(final MemberInstance<?> model,
57-
final NWidgetPanelFactory<? extends NSwingWidget> panelFactory)
56+
public SwingWidget create(final MemberInstance<?> model,
57+
final WidgetPanelFactory<? extends SwingWidget> panelFactory)
5858
{
5959
return new Widget(model);
6060
}
6161

6262
// -- Helper classes --
6363

64-
private class Widget extends NAbstractWidget implements NSwingWidget,
65-
NNumberWidget, AdjustmentListener, ChangeListener
64+
private class Widget extends AbstractWidget implements SwingWidget,
65+
NumberWidget, AdjustmentListener, ChangeListener
6666
{
6767

6868
private JPanel panel;
@@ -83,14 +83,14 @@ public JPanel getComponent() {
8383
"[fill,grow|pref]");
8484
panel.setLayout(layout);
8585

86-
final Number min = number(NWidgets.minimum(this), null);
87-
final Number max = number(NWidgets.maximum(this), null);
88-
final Number softMin = number(NWidgets.softMinimum(this), min);
89-
final Number softMax = number(NWidgets.softMaximum(this), max);
90-
final Number stepSize = number(NWidgets.stepSize(this), 1);
86+
final Number min = number(Widgets.minimum(this), null);
87+
final Number max = number(Widgets.maximum(this), null);
88+
final Number softMin = number(Widgets.softMinimum(this), min);
89+
final Number softMax = number(Widgets.softMaximum(this), max);
90+
final Number stepSize = number(Widgets.stepSize(this), 1);
9191

9292
// add optional widgets, if specified
93-
if (NWidgets.isStyle(this, SCROLL_BAR_STYLE)) {
93+
if (Widgets.isStyle(this, SCROLL_BAR_STYLE)) {
9494
int smx = softMax.intValue();
9595
if (smx < Integer.MAX_VALUE) smx++;
9696
scrollBar =
@@ -101,7 +101,7 @@ public JPanel getComponent() {
101101
getComponent().add(scrollBar);
102102
scrollBar.addAdjustmentListener(this);
103103
}
104-
else if (NWidgets.isStyle(this, SLIDER_STYLE)) {
104+
else if (Widgets.isStyle(this, SLIDER_STYLE)) {
105105
slider =
106106
new JSlider(softMin.intValue(), softMax.intValue(), softMin.intValue());
107107
slider.setMajorTickSpacing((softMax.intValue() - softMin.intValue()) / 4);

‎swing-widget/src/main/java/org/scijava/swing/widget/SwingObjectWidgetFactory.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@
99
import net.miginfocom.swing.MigLayout;
1010

1111
import org.scijava.ValidityException;
12-
import org.scijava.widget.NAbstractWidget;
13-
import org.scijava.widget.NObjectWidget;
14-
import org.scijava.widget.NWidgetFactory;
15-
import org.scijava.widget.NWidgetPanel;
16-
import org.scijava.widget.NWidgetPanelFactory;
17-
import org.scijava.widget.NWidgetService;
18-
import org.scijava.widget.swing.NSwingWidgetPanelFactory.WidgetPanel;
12+
import org.scijava.widget.AbstractWidget;
13+
import org.scijava.widget.ObjectWidget;
14+
import org.scijava.widget.WidgetFactory;
15+
import org.scijava.widget.WidgetPanel;
16+
import org.scijava.widget.WidgetPanelFactory;
17+
import org.scijava.widget.WidgetService;
18+
import org.scijava.widget.swing.SwingWidgetPanelFactory.WidgetPanel;
1919
import org.scijava.object.ObjectService;
2020
import org.scijava.param.ParameterStructs;
2121
import org.scijava.plugin.Parameter;
2222
import org.scijava.plugin.Plugin;
2323
import org.scijava.struct.MemberInstance;
2424
import org.scijava.struct.StructInstance;
2525

26-
@Plugin(type = NWidgetFactory.class)
26+
@Plugin(type = WidgetFactory.class)
2727
public class SwingObjectWidgetFactory implements SwingWidgetFactory {
2828

2929
@Parameter
30-
private NWidgetService widgetService;
30+
private WidgetService widgetService;
3131

3232
@Parameter
3333
private ObjectService objectService;
@@ -38,8 +38,8 @@ public boolean supports(final MemberInstance<?> model) {
3838
}
3939

4040
@Override
41-
public NSwingWidget create(final MemberInstance<?> memberInstance,
42-
final NWidgetPanelFactory<? extends NSwingWidget> panelFactory)
41+
public SwingWidget create(final MemberInstance<?> memberInstance,
42+
final WidgetPanelFactory<? extends SwingWidget> panelFactory)
4343
{
4444
return new Widget<>(memberInstance, panelFactory);
4545
}
@@ -54,18 +54,18 @@ private <T> List<T> choices(MemberInstance<T> model) {
5454

5555
// -- Helper classes --
5656

57-
private class Widget<C> extends NAbstractWidget implements NSwingWidget,
58-
NObjectWidget
57+
private class Widget<C> extends AbstractWidget implements SwingWidget,
58+
ObjectWidget
5959
{
6060

6161
private JPanel panel;
6262
private List<JPanel> subPanels;
6363
private MemberInstance<C> typedModel;
6464

65-
private NWidgetPanelFactory<? extends NSwingWidget> panelFactory;
65+
private WidgetPanelFactory<? extends SwingWidget> panelFactory;
6666

6767
public Widget(final MemberInstance<C> model,
68-
NWidgetPanelFactory<? extends NSwingWidget> panelFactory)
68+
WidgetPanelFactory<? extends SwingWidget> panelFactory)
6969
{
7070
super(model);
7171
this.typedModel = model;
@@ -114,7 +114,7 @@ private void refreshSubPanel(final JComboBox<?> comboBox) {
114114
}
115115

116116
private <S> JPanel createPanel(final StructInstance<S> structInstance) {
117-
final NWidgetPanel<S> widgetPanel = widgetService.createPanel(
117+
final WidgetPanel<S> widgetPanel = widgetService.createPanel(
118118
structInstance, panelFactory);
119119
if (!(widgetPanel instanceof SwingWidgetPanelFactory.WidgetPanel))
120120
throw new IllegalStateException("OMGWTF");

‎swing-widget/src/main/java/org/scijava/swing/widget/SwingTextWidgetFactory.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
import net.miginfocom.swing.MigLayout;
1515

1616
import org.scijava.log.LogService;
17-
import org.scijava.widget.NAbstractWidget;
18-
import org.scijava.widget.NTextWidget;
19-
import org.scijava.widget.NWidgetFactory;
20-
import org.scijava.widget.NWidgetPanelFactory;
21-
import org.scijava.widget.NWidgets;
17+
import org.scijava.widget.AbstractWidget;
18+
import org.scijava.widget.TextWidget;
19+
import org.scijava.widget.WidgetFactory;
20+
import org.scijava.widget.WidgetPanelFactory;
21+
import org.scijava.widget.Widgets;
2222
import org.scijava.plugin.Parameter;
2323
import org.scijava.plugin.Plugin;
2424
import org.scijava.struct.MemberInstance;
2525
import org.scijava.ui.swing.widget.DocumentSizeFilter;
2626
import org.scijava.util.ClassUtils;
2727

28-
@Plugin(type = NWidgetFactory.class)
28+
@Plugin(type = WidgetFactory.class)
2929
public class SwingTextWidgetFactory implements SwingWidgetFactory {
3030

3131
@Parameter
@@ -37,16 +37,16 @@ public boolean supports(final MemberInstance<?> model) {
3737
}
3838

3939
@Override
40-
public NSwingWidget create(final MemberInstance<?> model,
41-
final NWidgetPanelFactory<? extends NSwingWidget> panelFactory)
40+
public SwingWidget create(final MemberInstance<?> model,
41+
final WidgetPanelFactory<? extends SwingWidget> panelFactory)
4242
{
4343
return new Widget(model);
4444
}
4545

4646
// -- Helper classes --
4747

48-
private class Widget extends NAbstractWidget implements NSwingWidget,
49-
NTextWidget, DocumentListener
48+
private class Widget extends AbstractWidget implements SwingWidget,
49+
TextWidget, DocumentListener
5050
{
5151

5252
private JPanel panel;
@@ -66,14 +66,14 @@ public JPanel getComponent() {
6666
panel.setLayout(layout);
6767

6868
final int columns = //
69-
NWidgets.intProperty(this, COLUMNS_PROPERTY, 6);
69+
Widgets.intProperty(this, COLUMNS_PROPERTY, 6);
7070

7171
// construct text widget of the appropriate style, if specified
72-
if (NWidgets.isStyle(this, AREA_STYLE)) {
73-
final int rows = NWidgets.intProperty(this, ROWS_PROPERTY, 5);
72+
if (Widgets.isStyle(this, AREA_STYLE)) {
73+
final int rows = Widgets.intProperty(this, ROWS_PROPERTY, 5);
7474
textComponent = new JTextArea("", rows, columns);
7575
}
76-
else if (NWidgets.isStyle(this, PASSWORD_STYLE)) {
76+
else if (Widgets.isStyle(this, PASSWORD_STYLE)) {
7777
textComponent = new JPasswordField("", columns);
7878
}
7979
else {

swing-widget/src/main/java/org/scijava/swing/widget/NSwingWidget.java renamed to swing-widget/src/main/java/org/scijava/swing/widget/SwingWidget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scijava.widget.swing;
1+
package org.scijava.swing.widget;
22

33
import javax.swing.JPanel;
44

‎swing-widget/src/main/java/org/scijava/swing/widget/SwingWidgetFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.scijava.swing.widget;
22

3-
import org.scijava.widget.NWidgetFactory;
3+
import org.scijava.widget.WidgetFactory;
44

5-
public interface SwingWidgetFactory extends NWidgetFactory<NSwingWidget> {
5+
public interface SwingWidgetFactory extends WidgetFactory<SwingWidget> {
66

77
@Override
8-
default Class<NSwingWidget> widgetType() {
9-
return NSwingWidget.class;
8+
default Class<SwingWidget> widgetType() {
9+
return SwingWidget.class;
1010
}
1111
}

‎swing-widget/src/main/java/org/scijava/swing/widget/SwingWidgetPanelFactory.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,42 @@
88

99
import net.miginfocom.swing.MigLayout;
1010

11-
import org.scijava.widget.NAbstractWidgetPanel;
12-
import org.scijava.widget.NWidgetPanel;
13-
import org.scijava.widget.NWidgets;
14-
import org.scijava.widget.NWidgetPanelFactory;
11+
import org.scijava.widget.AbstractWidgetPanel;
12+
import org.scijava.widget.WidgetPanel;
13+
import org.scijava.widget.Widgets;
14+
import org.scijava.widget.WidgetPanelFactory;
1515
import org.scijava.plugin.Plugin;
1616
import org.scijava.struct.StructInstance;
1717
import org.scijava.widget.UIComponent;
1818

19-
@Plugin(type = NWidgetPanelFactory.class)
19+
@Plugin(type = WidgetPanelFactory.class)
2020
public class SwingWidgetPanelFactory implements
21-
NWidgetPanelFactory<NSwingWidget>
21+
WidgetPanelFactory<SwingWidget>
2222
{
2323

2424
@Override
25-
public <C> NWidgetPanel<C> create(final StructInstance<C> struct,
26-
final List<? extends NSwingWidget> widgets)
25+
public <C> WidgetPanel<C> create(final StructInstance<C> struct,
26+
final List<? extends SwingWidget> widgets)
2727
{
2828
return new WidgetPanel<>(struct, widgets);
2929
}
3030

3131
@Override
32-
public Class<NSwingWidget> widgetType() {
33-
return NSwingWidget.class;
32+
public Class<SwingWidget> widgetType() {
33+
return SwingWidget.class;
3434
}
3535

3636
// -- Helper classes --
3737

38-
public class WidgetPanel<C> extends NAbstractWidgetPanel<C> implements
38+
public class WidgetPanel<C> extends AbstractWidgetPanel<C> implements
3939
UIComponent<JPanel>
4040
{
4141

42-
private final List<? extends NSwingWidget> widgets;
42+
private final List<? extends SwingWidget> widgets;
4343
private JPanel panel;
4444

4545
public WidgetPanel(final StructInstance<C> struct,
46-
final List<? extends NSwingWidget> widgets)
46+
final List<? extends SwingWidget> widgets)
4747
{
4848
super(struct);
4949
this.widgets = widgets;
@@ -58,13 +58,13 @@ public JPanel getComponent() {
5858
new MigLayout("fillx,wrap 2", "[right]10[fill,grow]");
5959
panel.setLayout(layout);
6060

61-
for (final NSwingWidget widget : widgets) {
61+
for (final SwingWidget widget : widgets) {
6262
// add widget to panel
63-
final String label = NWidgets.label(widget);
63+
final String label = Widgets.label(widget);
6464
if (label != null) {
6565
// widget is prefixed by a label
6666
final JLabel l = new JLabel(label);
67-
final String desc = NWidgets.description(widget);
67+
final String desc = Widgets.description(widget);
6868
if (desc != null && !desc.isEmpty()) l.setToolTipText(desc);
6969
panel.add(l);
7070
panel.add(widget.getComponent());

‎swing-widget/src/main/java/org/scijava/swing/widget/SwingWidgets.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33

44
import javax.swing.JComponent;
55

6-
import org.scijava.widget.NWidget;
7-
import org.scijava.widget.NWidgets;
6+
import org.scijava.widget.Widget;
7+
import org.scijava.widget.Widgets;
88

9-
/** Utility class for working with {@link NWidget}s and Swing. */
9+
/** Utility class for working with {@link Widget}s and Swing. */
1010
public final class SwingWidgets {
1111

1212
private SwingWidgets() {
1313
// NB: Prevent instantiation of utility class.
1414
}
1515

1616
/** Assigns the widget's description as the given component's tool tip. */
17-
public static void setToolTip(final NWidget widget, final JComponent c) {
18-
final String desc = NWidgets.description(widget);
17+
public static void setToolTip(final Widget widget, final JComponent c) {
18+
final String desc = Widgets.description(widget);
1919
if (desc == null || desc.isEmpty()) return;
2020
c.setToolTipText(desc);
2121
}

0 commit comments

Comments
 (0)