Skip to content

Commit fc3f61a

Browse files
ctruedenctrueden
committed
WIP - JPMS
1 parent 0a17bf8 commit fc3f61a

File tree

720 files changed

+3105
-2724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

720 files changed

+3105
-2724
lines changed

‎pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>27.0.1</version>
8+
<version>999</version>
99
<relativePath />
1010
</parent>
1111

1212
<artifactId>scijava-common</artifactId>
13-
<version>2.83.1-SNAPSHOT</version>
13+
<version>999</version>
1414

1515
<name>SciJava Common</name>
1616
<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
@@ -162,6 +162,9 @@
162162
Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
163163
Institute of Molecular Cell Biology and Genetics, University of
164164
Konstanz, and KNIME GmbH.</license.copyrightOwners>
165+
166+
<scijava.jvm.version>11</scijava.jvm.version>
167+
<scijava.jvm.build.version>[11,11.9999]</scijava.jvm.build.version>
165168
</properties>
166169

167170
<dependencies>
@@ -223,7 +226,7 @@ Konstanz, and KNIME GmbH.</license.copyrightOwners>
223226
</execution>
224227
</executions>
225228
<configuration>
226-
<mainClass>org.scijava.annotations.EclipseHelper</mainClass>
229+
<mainClass>org.scijava.common.annotations.EclipseHelper</mainClass>
227230
</configuration>
228231
</plugin>
229232
</plugins>

‎src/main/java/module-info.java‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
module org.scijava.common {
2+
3+
exports org.scijava.common;
4+
exports org.scijava.common.annotations.legacy;
5+
exports org.scijava.common.annotations;
6+
exports org.scijava.common.app.event;
7+
exports org.scijava.common.app;
8+
exports org.scijava.common.cache;
9+
exports org.scijava.common.command.console;
10+
exports org.scijava.common.command.run;
11+
exports org.scijava.common.command;
12+
exports org.scijava.common.console;
13+
exports org.scijava.common.convert;
14+
exports org.scijava.common.display.event.input;
15+
exports org.scijava.common.display.event.window;
16+
exports org.scijava.common.display.event;
17+
exports org.scijava.common.display;
18+
exports org.scijava.common.download;
19+
exports org.scijava.common.event;
20+
exports org.scijava.common.input;
21+
exports org.scijava.common.io.console;
22+
exports org.scijava.common.io.event;
23+
exports org.scijava.common.io.handle;
24+
exports org.scijava.common.io.location;
25+
exports org.scijava.common.io.nio;
26+
exports org.scijava.common.io;
27+
exports org.scijava.common.log;
28+
exports org.scijava.common.main.console;
29+
exports org.scijava.common.main.run;
30+
exports org.scijava.common.main;
31+
exports org.scijava.common.menu.event;
32+
exports org.scijava.common.menu;
33+
exports org.scijava.common.module.event;
34+
exports org.scijava.common.module.process;
35+
exports org.scijava.common.module.run;
36+
exports org.scijava.common.module;
37+
exports org.scijava.common.object.event;
38+
exports org.scijava.common.object;
39+
exports org.scijava.common.options.event;
40+
exports org.scijava.common.options;
41+
exports org.scijava.common.parse;
42+
exports org.scijava.common.platform.event;
43+
exports org.scijava.common.platform;
44+
exports org.scijava.common.plugin.event;
45+
exports org.scijava.common.plugin;
46+
exports org.scijava.common.prefs;
47+
exports org.scijava.common.run.console;
48+
exports org.scijava.common.run;
49+
exports org.scijava.common.script.console;
50+
exports org.scijava.common.script.io;
51+
exports org.scijava.common.script.process;
52+
exports org.scijava.common.script.run;
53+
exports org.scijava.common.script;
54+
exports org.scijava.common.service.event;
55+
exports org.scijava.common.service;
56+
exports org.scijava.common.startup;
57+
exports org.scijava.common.task.event;
58+
exports org.scijava.common.task;
59+
exports org.scijava.common.test;
60+
exports org.scijava.common.text.io;
61+
exports org.scijava.common.text;
62+
exports org.scijava.common.thread;
63+
exports org.scijava.common.tool.event;
64+
exports org.scijava.common.tool;
65+
exports org.scijava.common.ui.console;
66+
exports org.scijava.common.ui.dnd.event;
67+
exports org.scijava.common.ui.dnd;
68+
exports org.scijava.common.ui.event;
69+
exports org.scijava.common.ui.headless;
70+
exports org.scijava.common.ui.headlessUI;
71+
exports org.scijava.common.ui.viewer.text;
72+
exports org.scijava.common.ui.viewer;
73+
exports org.scijava.common.ui;
74+
exports org.scijava.common.util;
75+
exports org.scijava.common.welcome.event;
76+
exports org.scijava.common.welcome;
77+
exports org.scijava.common.widget;
78+
79+
requires org.scijava.parse;
80+
requires eventbus;
81+
requires java.base;
82+
requires java.compiler;
83+
requires java.desktop;
84+
requires java.scripting;
85+
requires java.xml;
86+
requires java.prefs;
87+
88+
provides javax.annotation.processing.Processor with org.scijava.common.annotations.AnnotationProcessor;
89+
}

src/main/java/org/scijava/AbstractBasicDetails.java renamed to src/main/java/org/scijava/common/AbstractBasicDetails.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
* #L%
3131
*/
3232

33-
package org.scijava;
33+
package org.scijava.common;
3434

3535
import java.util.HashMap;
3636
import java.util.Map;
3737

38-
import org.scijava.util.StringMaker;
38+
import org.scijava.common.util.StringMaker;
3939

4040
/**
4141
* Abstract superclass of {@link BasicDetails} implementations.

src/main/java/org/scijava/AbstractContextual.java renamed to src/main/java/org/scijava/common/AbstractContextual.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
* #L%
3131
*/
3232

33-
package org.scijava;
33+
package org.scijava.common;
3434

35-
import org.scijava.event.EventHandler;
36-
import org.scijava.plugin.Parameter;
35+
import org.scijava.common.event.EventHandler;
36+
import org.scijava.common.plugin.Parameter;
3737

3838
/**
3939
* Abstract base class for {@link Contextual} objects.

src/main/java/org/scijava/AbstractGateway.java renamed to src/main/java/org/scijava/common/AbstractGateway.java

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -30,42 +30,42 @@
3030
* #L%
3131
*/
3232

33-
package org.scijava;
34-
35-
import org.scijava.app.App;
36-
import org.scijava.app.AppService;
37-
import org.scijava.app.SciJavaApp;
38-
import org.scijava.app.StatusService;
39-
import org.scijava.command.CommandService;
40-
import org.scijava.console.ConsoleService;
41-
import org.scijava.convert.ConvertService;
42-
import org.scijava.display.DisplayService;
43-
import org.scijava.event.EventHistory;
44-
import org.scijava.event.EventService;
45-
import org.scijava.input.InputService;
46-
import org.scijava.io.IOService;
47-
import org.scijava.io.RecentFileService;
48-
import org.scijava.log.LogService;
49-
import org.scijava.main.MainService;
50-
import org.scijava.menu.MenuService;
51-
import org.scijava.module.ModuleService;
52-
import org.scijava.object.ObjectService;
53-
import org.scijava.options.OptionsService;
54-
import org.scijava.platform.AppEventService;
55-
import org.scijava.platform.PlatformService;
56-
import org.scijava.plugin.AbstractRichPlugin;
57-
import org.scijava.plugin.PluginInfo;
58-
import org.scijava.plugin.PluginService;
59-
import org.scijava.prefs.PrefService;
60-
import org.scijava.script.ScriptService;
61-
import org.scijava.service.Service;
62-
import org.scijava.startup.StartupService;
63-
import org.scijava.text.TextService;
64-
import org.scijava.thread.ThreadService;
65-
import org.scijava.tool.IconService;
66-
import org.scijava.tool.ToolService;
67-
import org.scijava.ui.UIService;
68-
import org.scijava.widget.WidgetService;
33+
package org.scijava.common;
34+
35+
import org.scijava.common.app.App;
36+
import org.scijava.common.app.AppService;
37+
import org.scijava.common.app.SciJavaApp;
38+
import org.scijava.common.app.StatusService;
39+
import org.scijava.common.command.CommandService;
40+
import org.scijava.common.console.ConsoleService;
41+
import org.scijava.common.convert.ConvertService;
42+
import org.scijava.common.display.DisplayService;
43+
import org.scijava.common.event.EventHistory;
44+
import org.scijava.common.event.EventService;
45+
import org.scijava.common.input.InputService;
46+
import org.scijava.common.io.IOService;
47+
import org.scijava.common.io.RecentFileService;
48+
import org.scijava.common.log.LogService;
49+
import org.scijava.common.main.MainService;
50+
import org.scijava.common.menu.MenuService;
51+
import org.scijava.common.module.ModuleService;
52+
import org.scijava.common.object.ObjectService;
53+
import org.scijava.common.options.OptionsService;
54+
import org.scijava.common.platform.AppEventService;
55+
import org.scijava.common.platform.PlatformService;
56+
import org.scijava.common.plugin.AbstractRichPlugin;
57+
import org.scijava.common.plugin.PluginInfo;
58+
import org.scijava.common.plugin.PluginService;
59+
import org.scijava.common.prefs.PrefService;
60+
import org.scijava.common.script.ScriptService;
61+
import org.scijava.common.service.Service;
62+
import org.scijava.common.startup.StartupService;
63+
import org.scijava.common.text.TextService;
64+
import org.scijava.common.thread.ThreadService;
65+
import org.scijava.common.tool.IconService;
66+
import org.scijava.common.tool.ToolService;
67+
import org.scijava.common.ui.UIService;
68+
import org.scijava.common.widget.WidgetService;
6969

7070
/**
7171
* Abstract superclass for {@link Gateway} implementations.

src/main/java/org/scijava/AbstractUIDetails.java renamed to src/main/java/org/scijava/common/AbstractUIDetails.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
* #L%
3131
*/
3232

33-
package org.scijava;
33+
package org.scijava.common;
3434

35-
import org.scijava.util.StringMaker;
35+
import org.scijava.common.util.StringMaker;
3636

3737
/**
3838
* Abstract superclass of {@link UIDetails} implementations.

src/main/java/org/scijava/BasicDetails.java renamed to src/main/java/org/scijava/common/BasicDetails.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* #L%
3131
*/
3232

33-
package org.scijava;
33+
package org.scijava.common;
3434

3535
/**
3636
* An interface defining basic characteristics including name, label,

src/main/java/org/scijava/Cancelable.java renamed to src/main/java/org/scijava/common/Cancelable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* #L%
3131
*/
3232

33-
package org.scijava;
33+
package org.scijava.common;
3434

3535
/**
3636
* An operation that can be canceled.

src/main/java/org/scijava/Context.java renamed to src/main/java/org/scijava/common/Context.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* #L%
3131
*/
3232

33-
package org.scijava;
33+
package org.scijava.common;
3434

3535
import java.lang.reflect.Field;
3636
import java.lang.reflect.Method;
@@ -41,18 +41,18 @@
4141
import java.util.Collections;
4242
import java.util.List;
4343

44-
import org.scijava.event.ContextDisposingEvent;
45-
import org.scijava.event.EventHandler;
46-
import org.scijava.event.EventService;
47-
import org.scijava.log.LogService;
48-
import org.scijava.plugin.Parameter;
49-
import org.scijava.plugin.PluginIndex;
50-
import org.scijava.service.Service;
51-
import org.scijava.service.ServiceHelper;
52-
import org.scijava.service.ServiceIndex;
53-
import org.scijava.util.ClassUtils;
54-
import org.scijava.util.Query;
55-
import org.scijava.util.Types;
44+
import org.scijava.common.event.ContextDisposingEvent;
45+
import org.scijava.common.event.EventHandler;
46+
import org.scijava.common.event.EventService;
47+
import org.scijava.common.log.LogService;
48+
import org.scijava.common.plugin.Parameter;
49+
import org.scijava.common.plugin.PluginIndex;
50+
import org.scijava.common.service.Service;
51+
import org.scijava.common.service.ServiceHelper;
52+
import org.scijava.common.service.ServiceIndex;
53+
import org.scijava.common.util.ClassUtils;
54+
import org.scijava.common.util.Query;
55+
import org.scijava.common.util.Types;
5656

5757
/**
5858
* Top-level SciJava application context, which initializes and maintains a list
@@ -199,12 +199,12 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
199199
* Creates a new SciJava application context with all available services from
200200
* the specified PluginIndex. This allows a base set of available plugins to
201201
* be defined, and is useful when plugins that would not be returned by the
202-
* {@link PluginIndex}'s {@link org.scijava.plugin.PluginFinder} are desired.
202+
* {@link PluginIndex}'s {@link org.scijava.common.plugin.PluginFinder} are desired.
203203
*
204204
* @param pluginIndex The plugin index to use when discovering and indexing
205205
* plugins. If you wish to completely control how services are
206206
* discovered (i.e., use your own
207-
* {@link org.scijava.plugin.PluginFinder} implementation), then you
207+
* {@link org.scijava.common.plugin.PluginFinder} implementation), then you
208208
* can pass a custom {@link PluginIndex} here. Passing null will
209209
* result in a default plugin index being constructed and used.
210210
* @see #Context(Collection, PluginIndex, boolean)
@@ -217,7 +217,7 @@ public Context(final PluginIndex pluginIndex) {
217217
* Creates a new SciJava application context with the specified services (and
218218
* any required service dependencies). Service dependency candidates are
219219
* selected from those discovered by the given {@link PluginIndex}'s
220-
* associated {@link org.scijava.plugin.PluginFinder}.
220+
* associated {@link org.scijava.common.plugin.PluginFinder}.
221221
*
222222
* @param serviceClasses A collection of types that implement the
223223
* {@link Service} interface (e.g., {@code DisplayService.class}).
@@ -226,7 +226,7 @@ public Context(final PluginIndex pluginIndex) {
226226
* @param pluginIndex The plugin index to use when discovering and indexing
227227
* plugins. If you wish to completely control how services are
228228
* discovered (i.e., use your own
229-
* {@link org.scijava.plugin.PluginFinder} implementation), then you
229+
* {@link org.scijava.common.plugin.PluginFinder} implementation), then you
230230
* can pass a custom {@link PluginIndex} here. Passing null will
231231
* result in a default plugin index being constructed and used.
232232
* @see #Context(Collection, PluginIndex, boolean)
@@ -241,7 +241,7 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
241241
* Creates a new SciJava application context with the specified services (and
242242
* any required service dependencies). Service dependency candidates are
243243
* selected from those discovered by the given {@link PluginIndex}'s
244-
* associated {@link org.scijava.plugin.PluginFinder}.
244+
* associated {@link org.scijava.common.plugin.PluginFinder}.
245245
* <p>
246246
* NB: Context creation is an important step of a SciJava application's
247247
* lifecycle. Particularly in environments where more than one implementation
@@ -259,7 +259,7 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
259259
* @param pluginIndex The plugin index to use when discovering and indexing
260260
* plugins. If you wish to completely control how services are
261261
* discovered (i.e., use your own
262-
* {@link org.scijava.plugin.PluginFinder} implementation), then you
262+
* {@link org.scijava.common.plugin.PluginFinder} implementation), then you
263263
* can pass a custom {@link PluginIndex} here. Passing null will
264264
* result in a default plugin index being constructed and used.
265265
* @param strict Whether context creation will fail fast when there is an

src/main/java/org/scijava/Contextual.java renamed to src/main/java/org/scijava/common/Contextual.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
* #L%
3131
*/
3232

33-
package org.scijava;
33+
package org.scijava.common;
3434

35-
import org.scijava.plugin.Parameter;
36-
import org.scijava.service.Service;
35+
import org.scijava.common.plugin.Parameter;
36+
import org.scijava.common.service.Service;
3737

3838
/**
3939
* An object that belongs to a SciJava application context.

0 commit comments

Comments
 (0)