Commit 43469c9
committed
Revert "WidgetModel: deprecate getChoices & move to iface"
This reverts commit 8794f7a.
This change broke scijava-ui-swing, because item.getChoices() can
return null. However, even when guarding against null, there is
another problem: the current implementation in DefaultWidgetModel
leans on the ObjectService, which is not accessible at the
WidgetModel interface level. So for now, let's just revert this
change. All seems to work fine without meddling here.1 parent 3239804 commit 43469c9
File tree
2 files changed
+18
-7
lines changed- src/main/java/org/scijava/widget
2 files changed
+18
-7
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
221 | 232 | | |
222 | 233 | | |
223 | 234 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
134 | 134 | | |
135 | 135 | | |
136 | 136 | | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
144 | 144 | | |
145 | 145 | | |
146 | 146 | | |
| |||
0 commit comments