Skip to content

Commit 69b3feb

Browse files
committed
Move Named method overrides to their own section
1 parent 432cd23 commit 69b3feb

File tree

4 files changed

+43
-35
lines changed

4 files changed

+43
-35
lines changed

src/main/java/org/scijava/AbstractBasicDetails.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ public String toString() {
7171

7272
// -- BasicDetails methods --
7373

74-
@Override
75-
public String getName() {
76-
return name;
77-
}
78-
7974
@Override
8075
public String getLabel() {
8176
return label;
@@ -96,11 +91,6 @@ public String get(final String key) {
9691
return values.get(key);
9792
}
9893

99-
@Override
100-
public void setName(final String name) {
101-
this.name = name;
102-
}
103-
10494
@Override
10595
public void setLabel(final String label) {
10696
this.label = label;
@@ -116,4 +106,16 @@ public void set(String key, String value) {
116106
values.put(key, value);
117107
}
118108

109+
// -- Named methods --
110+
111+
@Override
112+
public String getName() {
113+
return name;
114+
}
115+
116+
@Override
117+
public void setName(final String name) {
118+
this.name = name;
119+
}
120+
119121
}

src/main/java/org/scijava/command/CommandModuleItem.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,6 @@ public List<T> getChoices() {
167167

168168
// -- BasicDetails methods --
169169

170-
@Override
171-
public String getName() {
172-
return field.getName();
173-
}
174-
175170
@Override
176171
public String getLabel() {
177172
return getParameter().label();
@@ -198,4 +193,11 @@ public String get(final String key) {
198193
return null;
199194
}
200195

196+
// -- Named methods --
197+
198+
@Override
199+
public String getName() {
200+
return field.getName();
201+
}
202+
201203
}

src/main/java/org/scijava/command/DynamicCommandInfo.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,6 @@ public void setSelected(final boolean selected) {
248248

249249
// -- BasicDetails methods --
250250

251-
@Override
252-
public String getName() {
253-
return info.getName();
254-
}
255-
256251
@Override
257252
public String getLabel() {
258253
return info.getLabel();
@@ -263,11 +258,6 @@ public String getDescription() {
263258
return info.getDescription();
264259
}
265260

266-
@Override
267-
public void setName(final String name) {
268-
info.setName(name);
269-
}
270-
271261
@Override
272262
public void setLabel(final String label) {
273263
info.setLabel(label);
@@ -278,6 +268,18 @@ public void setDescription(final String description) {
278268
info.setDescription(description);
279269
}
280270

271+
// -- Named methods --
272+
273+
@Override
274+
public String getName() {
275+
return info.getName();
276+
}
277+
278+
@Override
279+
public void setName(final String name) {
280+
info.setName(name);
281+
}
282+
281283
// -- Validated methods --
282284

283285
@Override

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,6 @@ public List<T> getChoices() {
296296

297297
// -- BasicDetails methods --
298298

299-
@Override
300-
public String getName() {
301-
return name;
302-
}
303-
304299
@Override
305300
public String getLabel() {
306301
return label;
@@ -311,11 +306,6 @@ public String getDescription() {
311306
return description;
312307
}
313308

314-
@Override
315-
public void setName(final String name) {
316-
this.name = name;
317-
}
318-
319309
@Override
320310
public void setLabel(final String label) {
321311
this.label = label;
@@ -326,4 +316,16 @@ public void setDescription(final String description) {
326316
this.description = description;
327317
}
328318

319+
// -- Named methods --
320+
321+
@Override
322+
public String getName() {
323+
return name;
324+
}
325+
326+
@Override
327+
public void setName(final String name) {
328+
this.name = name;
329+
}
330+
329331
}

0 commit comments

Comments
 (0)