Skip to content

Commit f6ecf81

Browse files
committed
UIService: Remove obsolete App API
The App can (and should) be obtained from the AppService.
1 parent 9841458 commit f6ecf81

File tree

3 files changed

+0
-31
lines changed

3 files changed

+0
-31
lines changed

src/main/java/org/scijava/ui/AbstractUserInterface.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import java.util.List;
3535

36-
import org.scijava.app.App;
3736
import org.scijava.app.StatusService;
3837
import org.scijava.command.CommandService;
3938
import org.scijava.display.Display;
@@ -208,10 +207,4 @@ protected void createUI() {
208207
restoreLocation();
209208
}
210209

211-
// -- Helper methods --
212-
213-
protected App getApp() {
214-
return uiService.getApp();
215-
}
216-
217210
}

src/main/java/org/scijava/ui/DefaultUIService.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@
3838
import java.util.List;
3939
import java.util.Map;
4040

41-
import org.scijava.app.App;
4241
import org.scijava.app.AppService;
43-
import org.scijava.app.SciJavaApp;
4442
import org.scijava.app.StatusService;
4543
import org.scijava.app.event.StatusEvent;
4644
import org.scijava.command.CommandService;
@@ -135,27 +133,13 @@ public final class DefaultUIService extends AbstractService implements
135133
/** Whether lazy initialization is complete. */
136134
private boolean initialized;
137135

138-
/** Application associated with the user interface. */
139-
private App app;
140-
141136
/** The default user interface to use, if one is not explicitly specified. */
142137
private UserInterface defaultUI;
143138

144139
private boolean activationInvocationPending = false;
145140

146141
// -- UIService methods --
147142

148-
@Override
149-
public App getApp() {
150-
if (!initialized) discoverUIs();
151-
return app;
152-
}
153-
154-
@Override
155-
public void setApp(final App app) {
156-
this.app = app;
157-
}
158-
159143
@Override
160144
public void addUI(final UserInterface ui) {
161145
addUI(null, ui);
@@ -469,7 +453,6 @@ private Map<String, UserInterface> uiMap() {
469453
private synchronized void discoverUIs() {
470454
if (initialized) return;
471455

472-
app = appService.getApp(SciJavaApp.NAME);
473456
displayViewers = new ArrayList<DisplayViewer<?>>();
474457
uiList = new ArrayList<UserInterface>();
475458
uiMap = new HashMap<String, UserInterface>();

src/main/java/org/scijava/ui/UIService.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.io.File;
3535
import java.util.List;
3636

37-
import org.scijava.app.App;
3837
import org.scijava.app.StatusService;
3938
import org.scijava.app.event.StatusEvent;
4039
import org.scijava.display.Display;
@@ -55,12 +54,6 @@ public interface UIService extends SciJavaService {
5554
/** System property to set for overriding the default UI. */
5655
String UI_PROPERTY = "scijava.ui";
5756

58-
/** Gets the {@link App} associated with the user interface. */
59-
App getApp();
60-
61-
/** Sets the {@link App} associated with the user interface. */
62-
void setApp(final App app);
63-
6457
/**
6558
* Adds the given UI to those managed by the service.
6659
* <p>

0 commit comments

Comments
 (0)