Skip to content

Commit c112815

Browse files
committed
Add new services to the gateway
1 parent db5eee7 commit c112815

File tree

2 files changed

+99
-0
lines changed

2 files changed

+99
-0
lines changed

src/main/java/org/scijava/AbstractGateway.java

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,28 @@
3535
import org.scijava.app.AppService;
3636
import org.scijava.app.SciJavaApp;
3737
import org.scijava.app.StatusService;
38+
import org.scijava.command.CommandService;
3839
import org.scijava.console.ConsoleService;
40+
import org.scijava.display.DisplayService;
3941
import org.scijava.event.EventHistory;
4042
import org.scijava.event.EventService;
4143
import org.scijava.io.IOService;
4244
import org.scijava.log.LogService;
45+
import org.scijava.menu.MenuService;
46+
import org.scijava.module.ModuleService;
4347
import org.scijava.object.ObjectService;
48+
import org.scijava.options.OptionsService;
49+
import org.scijava.platform.AppEventService;
50+
import org.scijava.platform.PlatformService;
4451
import org.scijava.plugin.AbstractRichPlugin;
4552
import org.scijava.plugin.PluginService;
53+
import org.scijava.script.ScriptService;
4654
import org.scijava.service.Service;
4755
import org.scijava.text.TextService;
4856
import org.scijava.thread.ThreadService;
57+
import org.scijava.tool.IconService;
58+
import org.scijava.tool.ToolService;
59+
import org.scijava.widget.WidgetService;
4960

5061
/**
5162
* Abstract superclass for {@link Gateway} implementations.
@@ -84,16 +95,31 @@ public Service get(final String serviceClassName) {
8495

8596
// -- Gateway methods - services --
8697

98+
@Override
99+
public AppEventService appEvent() {
100+
return get(AppEventService.class);
101+
}
102+
87103
@Override
88104
public AppService app() {
89105
return get(AppService.class);
90106
}
91107

108+
@Override
109+
public CommandService command() {
110+
return get(CommandService.class);
111+
}
112+
92113
@Override
93114
public ConsoleService console() {
94115
return get(ConsoleService.class);
95116
}
96117

118+
@Override
119+
public DisplayService display() {
120+
return get(DisplayService.class);
121+
}
122+
97123
@Override
98124
public EventHistory eventHistory() {
99125
return get(EventHistory.class);
@@ -104,6 +130,11 @@ public EventService event() {
104130
return get(EventService.class);
105131
}
106132

133+
@Override
134+
public IconService icon() {
135+
return get(IconService.class);
136+
}
137+
107138
@Override
108139
public IOService io() {
109140
return get(IOService.class);
@@ -114,16 +145,41 @@ public LogService log() {
114145
return get(LogService.class);
115146
}
116147

148+
@Override
149+
public MenuService menu() {
150+
return get(MenuService.class);
151+
}
152+
153+
@Override
154+
public ModuleService module() {
155+
return get(ModuleService.class);
156+
}
157+
117158
@Override
118159
public ObjectService object() {
119160
return get(ObjectService.class);
120161
}
121162

163+
@Override
164+
public OptionsService options() {
165+
return get(OptionsService.class);
166+
}
167+
168+
@Override
169+
public PlatformService platform() {
170+
return get(PlatformService.class);
171+
}
172+
122173
@Override
123174
public PluginService plugin() {
124175
return get(PluginService.class);
125176
}
126177

178+
@Override
179+
public ScriptService script() {
180+
return get(ScriptService.class);
181+
}
182+
127183
@Override
128184
public StatusService status() {
129185
return get(StatusService.class);
@@ -139,6 +195,16 @@ public ThreadService thread() {
139195
return get(ThreadService.class);
140196
}
141197

198+
@Override
199+
public ToolService tool() {
200+
return get(ToolService.class);
201+
}
202+
203+
@Override
204+
public WidgetService widget() {
205+
return get(WidgetService.class);
206+
}
207+
142208
// -- Gateway methods - application --
143209

144210
@Override

src/main/java/org/scijava/Gateway.java

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,29 @@
3434
import org.scijava.app.App;
3535
import org.scijava.app.AppService;
3636
import org.scijava.app.StatusService;
37+
import org.scijava.command.CommandService;
3738
import org.scijava.console.ConsoleService;
39+
import org.scijava.display.DisplayService;
3840
import org.scijava.event.EventHistory;
3941
import org.scijava.event.EventService;
4042
import org.scijava.io.IOService;
4143
import org.scijava.log.LogService;
44+
import org.scijava.menu.MenuService;
45+
import org.scijava.module.ModuleService;
4246
import org.scijava.object.ObjectService;
47+
import org.scijava.options.OptionsService;
48+
import org.scijava.platform.AppEventService;
49+
import org.scijava.platform.PlatformService;
4350
import org.scijava.plugin.Plugin;
4451
import org.scijava.plugin.PluginService;
4552
import org.scijava.plugin.RichPlugin;
53+
import org.scijava.script.ScriptService;
4654
import org.scijava.service.Service;
4755
import org.scijava.text.TextService;
4856
import org.scijava.thread.ThreadService;
57+
import org.scijava.tool.IconService;
58+
import org.scijava.tool.ToolService;
59+
import org.scijava.widget.WidgetService;
4960

5061
/**
5162
* Interface for convenience classes that wrap a {@link Context} to provide
@@ -130,28 +141,50 @@ public interface Gateway extends RichPlugin {
130141

131142
// -- Gateway methods - services --
132143

144+
AppEventService appEvent();
145+
133146
AppService app();
134147

148+
CommandService command();
149+
135150
ConsoleService console();
136151

152+
DisplayService display();
153+
137154
EventHistory eventHistory();
138155

139156
EventService event();
140157

158+
IconService icon();
159+
141160
IOService io();
142161

143162
LogService log();
144163

164+
MenuService menu();
165+
166+
ModuleService module();
167+
145168
ObjectService object();
146169

170+
OptionsService options();
171+
172+
PlatformService platform();
173+
147174
PluginService plugin();
148175

176+
ScriptService script();
177+
149178
StatusService status();
150179

151180
TextService text();
152181

153182
ThreadService thread();
154183

184+
ToolService tool();
185+
186+
WidgetService widget();
187+
155188
// -- Gateway methods - application --
156189

157190
/** @see org.scijava.app.AppService */

0 commit comments

Comments
 (0)