Skip to content
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

Fix for imagej/imagej-legacy#239 #313

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for imagej/imagej-legacy#239 #313

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
14 changes: 11 additions & 3 deletions src/main/java/net/imagej/legacy/plugin/MacroPreprocessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,21 @@ public void process(final Module module) {
if (ij1Helper == null) return;
if (!ij1Helper.isMacro()) return;
for (final ModuleItem<?> input : module.getInfo().inputs()) {
final Class<?> type = input.getType();
final String name = input.getName();
final String value = ij1Helper.getMacroParameter(name);
if (value == null) {
// no macro parameter value provided
if (ColorTable.class.equals(type) || ItemVisibility.MESSAGE.equals(input.getVisibility())) {
// resolve display messages and color tables. For the latter, a macro parameter
// value is provided but IJM cannot do anything with it. See #239 for details
module.resolveInput(name);
continue;
}
if (value == null) { // no macro parameter value provided
if (Button.class.equals(type)) {
module.resolveInput(name); // resolve buttons
}
continue;
}
final Class<?> type = input.getType();
if (!convertService.supports(value, type)) {
// cannot convert macro value into the input's actual type
continue;
Expand Down