Skip to content

Improve handling of default values #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2015
Merged

Improve handling of default values #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>6.1.0</version>
<version>7.1.0</version>
<relativePath />
</parent>

Expand Down
15 changes: 12 additions & 3 deletions src/main/java/org/scijava/ui/swing/widget/SwingNumberWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;

import org.scijava.module.ModuleService;
import org.scijava.plugin.Parameter;
import org.scijava.plugin.Plugin;
import org.scijava.thread.ThreadService;
import org.scijava.util.NumberUtils;
import org.scijava.widget.InputWidget;
import org.scijava.widget.NumberWidget;
import org.scijava.widget.WidgetModel;
Expand All @@ -73,6 +73,9 @@ public class SwingNumberWidget extends SwingInputWidget<Number> implements
@Parameter
private ThreadService threadService;

@Parameter
private ModuleService moduleService;

private JScrollBar scrollBar;
private JSlider slider;
private JSpinner spinner;
Expand Down Expand Up @@ -123,8 +126,14 @@ else if (model.isStyle(NumberWidget.SLIDER_STYLE)) {
// add spinner widget
final Class<?> type = model.getItem().getType();
if (model.getValue() == null) {
final Number defaultValue = NumberUtils.getDefaultValue(min, max, type);
model.setValue(defaultValue);
final Object defaultValue =
moduleService.getDefaultValue(model.getItem());
if (!(defaultValue instanceof Number)) {
throw new IllegalStateException("Invalid default value type: " +
defaultValue.getClass().getName());
}
final Number defaultNumber = (Number) defaultValue;
model.setValue(defaultNumber);
}
final Number value = (Number) model.getValue();
final SpinnerNumberModel spinnerModel =
Expand Down