Skip to content

Commit 9fb20a9

Browse files
committed
MutableModuleInfo: move default method impls to iface
1 parent 9572dac commit 9fb20a9

File tree

2 files changed

+21
-24
lines changed

2 files changed

+21
-24
lines changed

src/main/java/org/scijava/module/DefaultMutableModuleInfo.java

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -87,28 +87,4 @@ public void removeOutput(final ModuleItem<?> output) {
8787
outputMap().remove(output.getName());
8888
outputList().remove(output);
8989
}
90-
91-
// -- ModuleInfo methods --
92-
93-
@Override
94-
public String getDelegateClassName() {
95-
return getModuleClass().getName();
96-
}
97-
98-
@Override
99-
public Class<?> loadDelegateClass() {
100-
return getModuleClass();
101-
}
102-
103-
@Override
104-
public Module createModule() throws ModuleException {
105-
try {
106-
return getModuleClass().newInstance();
107-
}
108-
catch (final Exception e) {
109-
// NB: Several types of exceptions; simpler to handle them all the same.
110-
throw new ModuleException(e);
111-
}
112-
}
113-
11490
}

src/main/java/org/scijava/module/MutableModuleInfo.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,25 @@ public interface MutableModuleInfo extends ModuleInfo {
6464
/** Removes an output from the list. */
6565
void removeOutput(ModuleItem<?> output);
6666

67+
// -- ModuleInfo methods --
68+
69+
@Override
70+
default String getDelegateClassName() {
71+
return getModuleClass().getName();
72+
}
73+
74+
@Override
75+
default Class<?> loadDelegateClass() {
76+
return getModuleClass();
77+
}
78+
79+
@Override
80+
default Module createModule() throws ModuleException {
81+
try {
82+
return getModuleClass().newInstance();
83+
}
84+
catch (final InstantiationException | IllegalAccessException exc) {
85+
throw new ModuleException(exc);
86+
}
87+
}
6788
}

0 commit comments

Comments
 (0)