- * Delegates to {@link Context#inject(Object)} to do the actual work of
- * setting the context, injecting service parameters, and registering
+ * Delegates to {@link Context#inject(Object)} to do the actual work of setting
+ * the context, injecting service parameters, and registering
* {@link EventHandler} methods as event subscribers.
*
- *
+ *
* @author Curtis Rueden
* @see Context#inject(Object)
*/
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 944c2dff0..2e554ec44 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -67,7 +67,7 @@
/**
* Abstract superclass for {@link Gateway} implementations.
- *
+ *
* @author Mark Hiner
* @author Curtis Rueden
*/
@@ -191,7 +191,7 @@ public InputService input() {
public IOService io() {
return get(IOService.class);
}
-
+
@Override
public LocationService location() {
return get(LocationService.class);
diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index 3590c19e3..20788352c 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,10 +33,12 @@
/**
* Abstract superclass of {@link UIDetails} implementations.
- *
+ *
* @author Curtis Rueden
*/
-public abstract class AbstractUIDetails extends AbstractBasicDetails implements UIDetails {
+public abstract class AbstractUIDetails extends AbstractBasicDetails implements
+ UIDetails
+{
/** Path to this object's suggested position in the menu structure. */
private MenuPath menuPath;
diff --git a/src/main/java/org/scijava/BasicDetails.java b/src/main/java/org/scijava/BasicDetails.java
index d2288061b..04f952fec 100644
--- a/src/main/java/org/scijava/BasicDetails.java
+++ b/src/main/java/org/scijava/BasicDetails.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -32,7 +32,7 @@
/**
* An interface defining basic characteristics including name, label,
* description, and a table of key/value pairs.
- *
+ *
* @author Curtis Rueden
*/
public interface BasicDetails extends Named {
diff --git a/src/main/java/org/scijava/Cancelable.java b/src/main/java/org/scijava/Cancelable.java
index 0c36b0066..5898af1fc 100644
--- a/src/main/java/org/scijava/Cancelable.java
+++ b/src/main/java/org/scijava/Cancelable.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,7 +31,7 @@
/**
* An operation that can be canceled.
- *
+ *
* @author Curtis Rueden
*/
public interface Cancelable {
@@ -48,14 +48,14 @@ public interface Cancelable {
* during execution, and stop doing whatever it is doing if the flag has been
* tripped.
*
- *
+ *
* @param reason A message describing why the operation is being canceled.
*/
void cancel(String reason);
/**
* Gets a message describing why the operation was canceled.
- *
+ *
* @return The reason for cancelation, which may be null if no reason was
* given, or if the operation was not in fact canceled.
*/
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 50014ad17..6c342fb7f 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -110,8 +110,8 @@ public class Context implements Disposable, AutoCloseable {
private boolean strict;
/**
- * False if the context is currently active; true if the context
- * has already been disposed, or is in the process of being disposed.
+ * False if the context is currently active; true if the context has already
+ * been disposed, or is in the process of being disposed.
*/
private boolean disposed;
@@ -270,8 +270,8 @@ public Context(final Collection> serviceClasses,
* NB: Instiantiation of a Context has an implied requirement of a
* corresponding call to {@link Context#dispose()} at the end of the SciJava
* applicaton's lifecycle. This cleans up any remaining resources and allows
- * the JVM to exit gracefully. This is called automatically when constructed as
- * an {@link AutoCloseable}.
+ * the JVM to exit gracefully. This is called automatically when constructed
+ * as an {@link AutoCloseable}.
*
*
* @param serviceClasses A collection of types that implement the
@@ -442,7 +442,7 @@ public void inject(final Object o) {
* values would not, without needing to hardcode type comparison checks
* against the {@link Service} and {@link Context} types.
*
- *
+ *
* @param type The type of the @{@link Parameter}-annotated field.
* @return True iff a member field of the given type would have its value
* assigned.
@@ -483,7 +483,7 @@ public static List> serviceClassList(
/**
* Gets the class loader to use. This will be the current thread's context
* class loader if non-null; otherwise it will be the system class loader.
- *
+ *
* @see Thread#getContextClassLoader()
* @see ClassLoader#getSystemClassLoader()
*/
@@ -615,7 +615,8 @@ private synchronized void doDispose(final boolean announce) {
CONTEXTS.remove(this);
if (announce) {
final EventService eventService = getService(EventService.class);
- if (eventService != null) eventService.publish(new ContextDisposingEvent());
+ if (eventService != null) eventService.publish(
+ new ContextDisposingEvent());
}
// NB: Dispose services in reverse order.
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index 4d83ca900..5df3859cc 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* An object that belongs to a SciJava application context.
- *
+ *
* @author Lee Kamentsky
* @author Curtis Rueden
*/
@@ -42,7 +42,7 @@ public interface Contextual {
/**
* Gets the application context to which the object belongs.
- *
+ *
* @see #getContext()
* @throws NullContextException if the context has not yet been set via
* {@link #setContext(Context)}.
@@ -52,7 +52,7 @@ public interface Contextual {
/**
* Gets the application context to which the object belongs, or null if
* {@link #setContext(Context)} has not yet been called on this object.
- *
+ *
* @see #context()
*/
Context getContext();
@@ -65,7 +65,7 @@ public interface Contextual {
* objects do not support later alteration of the context, and will throw
* {@link IllegalStateException} if this method is invoked again.
*
- *
+ *
* @see Context#inject(Object)
* @throws IllegalStateException If the object already has a context.
* @throws IllegalArgumentException If the object has a required
@@ -76,5 +76,4 @@ default void setContext(final Context context) {
context.inject(this);
}
-
}
diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index f3ac3548b..0b8ce0222 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,7 +31,7 @@
/**
* An object that knows how to clean up after itself.
- *
+ *
* @author Curtis Rueden
*/
public interface Disposable {
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 9222f058c..d6b99baff 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -75,10 +75,12 @@
* Let's say we have a {@code Kraken} service and a {@code Cow} service. Using
* the {@code Context} directly, the code would look like:
*
* To perform these actions, you have to know a priori to ask for a
* {@code Cow} and a {@code Kraken}; i.e., your IDE's code completion will not
@@ -89,16 +91,26 @@
* But if we create a {@code Gateway} class called {@code Animals} with the
* following signatures:
*
+ *
*
- * public Cow cow() { return get(Cow.class); }
- * public Kraken kraken() { return get(Kraken.class); }
* This provides succinct yet explicit access to the {@code Cow} and
* {@code Kraken} services; it is a simple two-layer access to functionality,
@@ -113,7 +125,7 @@
* implementing this interface, it is encouraged to instead extend
* {@link AbstractGateway}, for convenience.
*
In some circumstances (e.g., when running headless), dispose the
* context after launch operations are complete.
*
- *
+ *
* @param args The arguments to pass to the application.
*/
void launch(String... args);
@@ -147,7 +159,7 @@ public interface Gateway extends RichPlugin, Disposable {
/**
* Returns an implementation of the requested {@link Service}, if it exists in
* the underlying {@link Context}.
- *
+ *
* @param serviceClass the requested {@link Service}
* @return The singleton instance of the given class
* @throws NullContextException if the application context is not set.
@@ -158,7 +170,7 @@ public interface Gateway extends RichPlugin, Disposable {
/**
* Returns an implementation of the {@link Service} with the given class name,
* if it exists in the underlying {@link Context}.
- *
+ *
* @param serviceClassName name of the requested {@link Service}
* @return The singleton instance of the requested {@link Service}
* @throws NullContextException if the application context is not set.
@@ -241,11 +253,11 @@ public interface Gateway extends RichPlugin, Disposable {
/**
* Gets this application context's {@link LocationService}.
- *
+ *
* @return The {@link LocationService} of this application context.
*/
LocationService location();
-
+
/**
* Gets this application context's {@link LogService}.
*
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index a1be1c4e7..b5a7f9777 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
* do multiple potentially equivalent objects need to be synthesized and then
* compared using {@link Object#equals}.
*
- *
+ *
* @author Curtis Rueden
*/
public interface Identifiable {
diff --git a/src/main/java/org/scijava/Initializable.java b/src/main/java/org/scijava/Initializable.java
index bd7de998f..1674e68ac 100644
--- a/src/main/java/org/scijava/Initializable.java
+++ b/src/main/java/org/scijava/Initializable.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,7 +31,7 @@
/**
* Interface for objects which can be initialized.
- *
+ *
* @author Curtis Rueden
*/
public interface Initializable {
diff --git a/src/main/java/org/scijava/Instantiable.java b/src/main/java/org/scijava/Instantiable.java
index 7f1d82077..21c6fb121 100644
--- a/src/main/java/org/scijava/Instantiable.java
+++ b/src/main/java/org/scijava/Instantiable.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,7 +31,7 @@
/**
* An interface declaring the ability to create objects.
- *
+ *
* @param The type of objects that can be created.
* @author Curtis Rueden
*/
@@ -50,7 +50,7 @@ public interface Instantiable {
* Note that this class may not be precisely {@code T.class} but instead a
* subclass thereof.
*
- *
+ *
* @see org.scijava.plugin.PluginInfo for an example of an
* {@code Instantiable} type that typically instantiates objects of a
* subtype of {@code T} rather than {@code T} itself.
diff --git a/src/main/java/org/scijava/InstantiableException.java b/src/main/java/org/scijava/InstantiableException.java
index e2df38650..9dadfb9b7 100644
--- a/src/main/java/org/scijava/InstantiableException.java
+++ b/src/main/java/org/scijava/InstantiableException.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,7 +31,7 @@
/**
* An exception thrown when an {@link Instantiable} cannot create an object.
- *
+ *
* @author Curtis Rueden
*/
public class InstantiableException extends Exception {
diff --git a/src/main/java/org/scijava/ItemIO.java b/src/main/java/org/scijava/ItemIO.java
index c4198b74b..2fe8d4937 100644
--- a/src/main/java/org/scijava/ItemIO.java
+++ b/src/main/java/org/scijava/ItemIO.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -40,9 +40,9 @@
*
BOTH: item is both an input and an output for the module. This type is
* used to indicate an object that is mutated somehow during execution.
*
- *
+ *
* @author Curtis Rueden
*/
public enum ItemIO {
- INPUT, OUTPUT, BOTH
+ INPUT, OUTPUT, BOTH
}
diff --git a/src/main/java/org/scijava/ItemVisibility.java b/src/main/java/org/scijava/ItemVisibility.java
index 47b0e9276..c2b8abd46 100644
--- a/src/main/java/org/scijava/ItemVisibility.java
+++ b/src/main/java/org/scijava/ItemVisibility.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,36 +31,36 @@
/**
* Defines the "visibility" of a parameter.
- *
+ *
* @author Curtis Rueden
*/
public enum ItemVisibility {
- /**
- * Item is included in the history for purposes of data provenance, and
- * included as a parameter when recording scripts.
- */
- NORMAL,
+ /**
+ * Item is included in the history for purposes of data provenance, and
+ * included as a parameter when recording scripts.
+ */
+ NORMAL,
- /**
- * Item is excluded from the history for the purposes of data provenance, but
- * still included as a parameter when recording scripts.
- */
- TRANSIENT,
+ /**
+ * Item is excluded from the history for the purposes of data provenance,
+ * but still included as a parameter when recording scripts.
+ */
+ TRANSIENT,
- /**
- * Item is excluded from the history for the purposes of data provenance, and
- * also excluded as a parameter when recording scripts. This option should
- * only be used for items with no effect on the final output, such as a
- * "verbose" flag.
- */
- INVISIBLE,
+ /**
+ * Item is excluded from the history for the purposes of data provenance,
+ * and also excluded as a parameter when recording scripts. This option
+ * should only be used for items with no effect on the final output, such as
+ * a "verbose" flag.
+ */
+ INVISIBLE,
- /**
- * As {@link #INVISIBLE}, and further indicating that the item's value is
- * intended as a message to the user (e.g., in the input harvester panel)
- * rather than an actual parameter to the module execution.
- */
- MESSAGE
+ /**
+ * As {@link #INVISIBLE}, and further indicating that the item's value is
+ * intended as a message to the user (e.g., in the input harvester panel)
+ * rather than an actual parameter to the module execution.
+ */
+ MESSAGE
}
diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index 5184b2552..57635a427 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,7 +35,7 @@
/**
* An object whose location is defined by a URL string.
- *
+ *
* @author Curtis Rueden
*/
public interface Locatable {
diff --git a/src/main/java/org/scijava/MenuEntry.java b/src/main/java/org/scijava/MenuEntry.java
index d436963fc..2f3752847 100644
--- a/src/main/java/org/scijava/MenuEntry.java
+++ b/src/main/java/org/scijava/MenuEntry.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
/**
* One component of a menu path, for use with {@link MenuPath}.
- *
+ *
* @author Curtis Rueden
* @author Johannes Schindelin
*/
@@ -56,8 +56,8 @@ public MenuEntry(final String name, final double weight) {
setWeight(weight);
}
- public MenuEntry(final String name, final double weight,
- final char mnemonic, final Accelerator acc, final String iconPath)
+ public MenuEntry(final String name, final double weight, final char mnemonic,
+ final Accelerator acc, final String iconPath)
{
setName(name);
setWeight(weight);
diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index 941c4a860..794720a44 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* A path in a hierarchical menu structure, for use with {@link UIDetails}.
- *
+ *
* @author Curtis Rueden
*/
public class MenuPath extends ArrayList {
@@ -60,7 +60,7 @@ public MenuPath(final Collection extends MenuEntry> menuEntries) {
/**
* Creates a menu path with entries parsed from the given string. Assumes
* {@code >} as the separator (e.g., {@code File>New>Image}).
- *
+ *
* @see #PATH_SEPARATOR
*/
public MenuPath(final String path) {
diff --git a/src/main/java/org/scijava/Named.java b/src/main/java/org/scijava/Named.java
index bdb669e16..fc59210e7 100644
--- a/src/main/java/org/scijava/Named.java
+++ b/src/main/java/org/scijava/Named.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,7 +31,7 @@
/**
* Interface for things that have names.
- *
+ *
* @author Lee Kamentsky
*/
public interface Named {
diff --git a/src/main/java/org/scijava/NoSuchServiceException.java b/src/main/java/org/scijava/NoSuchServiceException.java
index 4f25b47d3..9b4922f0a 100644
--- a/src/main/java/org/scijava/NoSuchServiceException.java
+++ b/src/main/java/org/scijava/NoSuchServiceException.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -32,7 +32,7 @@
/**
* An exception thrown when a {@link Gateway} cannot obtain a
* {@link org.scijava.service.Service}.
- *
+ *
* @author Mark Hiner
* @author Curtis Rueden
*/
diff --git a/src/main/java/org/scijava/NullContextException.java b/src/main/java/org/scijava/NullContextException.java
index 32eca3f18..f6f92aeff 100644
--- a/src/main/java/org/scijava/NullContextException.java
+++ b/src/main/java/org/scijava/NullContextException.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,14 +31,14 @@
/**
* An exception thrown when a {@link Context} is null, but shouldn't be.
- *
+ *
* @author Curtis Rueden
*/
public class NullContextException extends RuntimeException {
private static final String DEFAULT_MESSAGE =
- "Before attempting to use this object, "
- + "please set its context by calling the setContext(...) method.";
+ "Before attempting to use this object, " +
+ "please set its context by calling the setContext(...) method.";
public NullContextException() {
this(DEFAULT_MESSAGE);
diff --git a/src/main/java/org/scijava/Optional.java b/src/main/java/org/scijava/Optional.java
index 34b10025a..985db07fd 100644
--- a/src/main/java/org/scijava/Optional.java
+++ b/src/main/java/org/scijava/Optional.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -32,16 +32,15 @@
/**
* A marker interface for optional SciJava components.
*
- * Some components might be discoverable, but cannot always be initialized,
- * e.g. when relying on proprietary libraries. Such components can be marked
- * with this interface to indicate that failure to initialize should not
- * necessarily cause the entire application context to collapse, for example.
+ * Some components might be discoverable, but cannot always be initialized, e.g.
+ * when relying on proprietary libraries. Such components can be marked with
+ * this interface to indicate that failure to initialize should not necessarily
+ * cause the entire application context to collapse, for example.
*
- *
+ *
* @author Johannes Schindelin
* @see org.scijava.service.Service
*/
public interface Optional {
// NB: Marker interface.
}
-
diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index 8ecc6c528..a0bde7688 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,21 +33,21 @@
/**
* An object that can be sorted according to priority.
- *
+ *
* @author Curtis Rueden
*/
public interface Prioritized extends Comparable {
/**
* Gets the sort priority of the object.
- *
+ *
* @see Priority
*/
double getPriority();
/**
* Sets the sort priority of the object.
- *
+ *
* @see Priority
*/
void setPriority(double priority);
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index e2fbddfd0..c4746626b 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,7 +31,7 @@
/**
* Constants for specifying an item's priority.
- *
+ *
* @author Johannes Schindelin
* @author Curtis Rueden
* @see org.scijava.Prioritized#getPriority()
@@ -74,10 +74,11 @@ private Priority() {
/** Priority for items that very strongly prefer to be sorted late. */
public static final double EXTREMELY_LOW = -1000000;
- /** Priority for items that must be sorted last.
+ /**
+ * Priority for items that must be sorted last.
*
- * Note that it is still possible to prioritize something later
- * than this value (e.g., for testing purposes), although doing so strongly
+ * Note that it is still possible to prioritize something later than
+ * this value (e.g., for testing purposes), although doing so strongly
* discouraged in production.
*
*/
@@ -94,17 +95,17 @@ private Priority() {
* impose logic beyond that of this method, for breaking ties, if a total
* ordering consistent with equals is always required.
*
- *
+ *
* @return -1 if {@code p1}'s priority is higher than {@code p2}'s, 1 if
* {@code p2}'s priority is higher than {@code p1}'s, or 0 if they
* have the same priority.
* @see org.scijava.util.ClassUtils#compare(Class, Class)
*/
public static int compare(final Prioritized p1, final Prioritized p2) {
- final double priority1 =
- p1 == null ? Double.NEGATIVE_INFINITY : p1.getPriority();
- final double priority2 =
- p2 == null ? Double.NEGATIVE_INFINITY : p2.getPriority();
+ final double priority1 = p1 == null ? Double.NEGATIVE_INFINITY : p1
+ .getPriority();
+ final double priority2 = p2 == null ? Double.NEGATIVE_INFINITY : p2
+ .getPriority();
if (priority1 == priority2) return 0;
// NB: We invert the ordering here, so that large values come first,
// rather than the typical natural ordering of smaller values first.
@@ -115,7 +116,7 @@ public static int compare(final Prioritized p1, final Prioritized p2) {
* Injects the specified priority into the given object. Note that this is
* only possible if the given object implements the {@link Prioritized}
* interface.
- *
+ *
* @param o The object to which the priority should be assigned.
* @return true If the priority was successfully injected.
*/
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index 90a3be54c..735d0df07 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -39,7 +39,7 @@
* Main entry point into SciJava. This class enables working with SciJava
* services in a simple way, while retaining extensibility (i.e., access to
* third-party services).
- *
+ *
* @author Curtis Rueden
*/
@Plugin(type = Gateway.class, name = "sj")
@@ -54,7 +54,7 @@ public SciJava() {
/**
* Creates a new Scijava application context.
- *
+ *
* @param empty If true, the context will be empty; otherwise, it will be
* initialized with all available services.
*/
@@ -79,7 +79,7 @@ public SciJava(final boolean empty) {
* To avoid this, we have opted to use raw types and suppress the relevant
* warning here instead.
*
- *
+ *
* @param serviceClasses A list of types that implement the {@link Service}
* interface (e.g., {@code LogService.class}).
* @throws ClassCastException If any of the given arguments do not implement
@@ -93,7 +93,7 @@ public SciJava(final Class... serviceClasses) {
/**
* Creates a new SciJava application context with the specified services (and
* any required service dependencies).
- *
+ *
* @param serviceClasses A collection of types that implement the
* {@link Service} interface (e.g., {@code LogService.class}).
*/
@@ -104,7 +104,7 @@ public SciJava(final Collection> serviceClasses) {
/**
* Creates a new SciJava application context which wraps the given existing
* SciJava context.
- *
+ *
* @see Context
*/
public SciJava(final Context context) {
diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index 552d1fd00..1b89d966e 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -32,7 +32,7 @@
/**
* An object with an associated type (i.e., {@link Class}), which can be queried
* at runtime.
- *
+ *
* @author Curtis Rueden
*/
public interface Typed {
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index 896c6bb18..98a9182c9 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,14 +35,14 @@
/**
* An interface defining details useful for generating relevant user interface
* elements.
- *
+ *
* @author Curtis Rueden
*/
public interface UIDetails extends BasicDetails, Prioritized {
/**
* The default, application-level menu root.
- *
+ *
* @see #getMenuRoot()
*/
String APPLICATION_MENU_ROOT = "app";
diff --git a/src/main/java/org/scijava/Validated.java b/src/main/java/org/scijava/Validated.java
index 4fabe278a..c93dfb444 100644
--- a/src/main/java/org/scijava/Validated.java
+++ b/src/main/java/org/scijava/Validated.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* An object whose validity can be confirmed after initialization. If the object
* is deemed invalid, a list of reasons for invalidity can be requested.
- *
+ *
* @author Curtis Rueden
*/
public interface Validated {
@@ -47,7 +47,7 @@ public interface Validated {
/**
* Gets the list of problems encountered while initializing the object.
- *
+ *
* @return The list of problems, or a zero-length list in the case of
* {@link #isValid()} returning true.
*/
diff --git a/src/main/java/org/scijava/ValidityProblem.java b/src/main/java/org/scijava/ValidityProblem.java
index b95d1e02b..d6d41c861 100644
--- a/src/main/java/org/scijava/ValidityProblem.java
+++ b/src/main/java/org/scijava/ValidityProblem.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -36,7 +36,7 @@
* Unlike most exceptions, {@code ValidityException} is typically not thrown,
* but rather only recorded for future reference.
*
- *
+ *
* @author Curtis Rueden
*/
public class ValidityProblem extends Exception {
diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index eb5c0cda5..f4f3bf9ec 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
/**
* An object that knows its version.
- *
+ *
* @author Curtis Rueden
*/
public interface Versioned {
@@ -43,5 +43,4 @@ default String getVersion() {
return VersionUtils.getVersion(getClass());
}
-
}
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index 730739ca6..17ed97d10 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -53,7 +53,7 @@
* describe the class which was annotated together with the specific annotation
* fields.
*
- *
+ *
* @author Johannes Schindelin
*/
public abstract class AbstractIndexWriter {
@@ -94,8 +94,8 @@ protected synchronized void write(final StreamFactory factory)
for (Entry> entry : map.entrySet()) {
final String annotationName = entry.getKey();
merge(annotationName, factory);
- final PrintStream out =
- new PrintStream(factory.openOutput(annotationName));
+ final PrintStream out = new PrintStream(factory.openOutput(
+ annotationName));
for (Object o : entry.getValue().values()) {
writeObject(out, adapt(o));
}
@@ -110,7 +110,7 @@ protected synchronized void write(final StreamFactory factory)
* This method is used to read previously-indexed annotations and reconcile
* them with the newly-generated ones just.
*
- *
+ *
* @param annotationName the name of the annotation for which the index
* contains the annotated classes
* @param factory the factory to generate input and output streams given an
@@ -136,8 +136,8 @@ protected synchronized void merge(final String annotationName,
int changedCount = m.size();
boolean hasObsoletes = false;
- final IndexReader reader =
- new IndexReader(in, annotationName + " from " + in);
+ final IndexReader reader = new IndexReader(in, annotationName + " from " +
+ in);
try {
for (;;) {
@SuppressWarnings("unchecked")
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index 33338727a..ea6bba710 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -46,10 +46,11 @@
/**
* Combines annotation indexes from all JAR files on the classpath.
- *
+ *
* @author Curtis Rueden
*/
-public class AnnotationCombiner extends AbstractIndexWriter implements Combiner
+public class AnnotationCombiner extends AbstractIndexWriter implements
+ Combiner
{
private static final String PREFIX = "META-INF/json/";
@@ -74,8 +75,8 @@ public void combine(File outputDirectory) throws Exception {
@SuppressWarnings("unchecked")
final Class extends Annotation> annotation =
(Class extends Annotation>) loader.loadClass(annotationName);
- for (IndexItem extends Annotation> item : Index
- .load(annotation, loader))
+ for (IndexItem extends Annotation> item : Index.load(annotation,
+ loader))
{
add(adapt(item.annotation()), annotationName, item.className());
}
@@ -89,8 +90,8 @@ public Set getAnnotationFiles() throws IOException {
final HashSet files = new HashSet<>();
for (final String prefix : new String[] { PREFIX, LEGACY_PREFIX }) {
- final Enumeration directories =
- Context.getClassLoader().getResources(prefix);
+ final Enumeration directories = Context.getClassLoader()
+ .getResources(prefix);
while (directories.hasMoreElements()) {
final URL url = directories.nextElement();
for (final URL annotationIndexURL : FileUtils.listContents(url)) {
@@ -99,8 +100,8 @@ public Set getAnnotationFiles() throws IOException {
continue;
}
final int length = string.length();
- add(files, PREFIX +
- string.substring(string.lastIndexOf('/', length - 1) + 1, length));
+ add(files, PREFIX + string.substring(string.lastIndexOf('/', length -
+ 1) + 1, length));
}
}
}
@@ -151,8 +152,9 @@ public boolean isClassObsolete(String className) {
}
// -- Main method --
-
+
public static void main(final String[] args) throws Exception {
- new AnnotationCombiner().combine(args.length > 0 ? new File(args[0]) : null);
+ new AnnotationCombiner().combine(args.length > 0 ? new File(args[0])
+ : null);
}
}
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index e9acebd7c..9d5bb04fe 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -70,7 +70,7 @@
/**
* The annotation processor for use with Java 8 and earlier.
- *
+ *
* @author Johannes Schindelin
*/
@SupportedSourceVersion(SourceVersion.RELEASE_8)
@@ -100,8 +100,8 @@ public boolean process(final Set extends TypeElement> elements,
processingEnv.getMessager().printMessage(Kind.ERROR, out.toString());
}
catch (final IOException e2) {
- processingEnv.getMessager().printMessage(Kind.ERROR,
- e2.getMessage() + " while printing " + e.getMessage());
+ processingEnv.getMessager().printMessage(Kind.ERROR, e2.getMessage() +
+ " while printing " + e.getMessage());
}
}
return false;
@@ -127,26 +127,25 @@ public void add(final TypeElement element) {
originatingElements.put(annotationName, originating);
}
- for (final Element annotated : roundEnv
- .getElementsAnnotatedWith(element))
+ for (final Element annotated : roundEnv.getElementsAnnotatedWith(
+ element))
{
switch (annotated.getKind()) {
case ANNOTATION_TYPE:
case CLASS:
case ENUM:
case INTERFACE:
- final String className =
- utils.getBinaryName((TypeElement) annotated).toString();
- final Map values =
- adapt(annotated.getAnnotationMirrors(), element.asType());
+ final String className = utils.getBinaryName(
+ (TypeElement) annotated).toString();
+ final Map values = adapt(annotated
+ .getAnnotationMirrors(), element.asType());
super.add(values, annotationName, className);
originating.add(annotated);
break;
default:
- processingEnv.getMessager().printMessage(
- Kind.ERROR,
- "Cannot handle annotated element of kind " +
- annotated.getKind());
+ processingEnv.getMessager().printMessage(Kind.ERROR,
+ "Cannot handle annotated element of kind " + annotated
+ .getKind());
}
}
}
@@ -197,9 +196,8 @@ else if (o instanceof TypeMirror) {
else if (o instanceof VariableElement) {
final VariableElement element = (VariableElement) o;
final Map result = new TreeMap<>();
- final String enumName =
- utils.getBinaryName((TypeElement) element.getEnclosingElement())
- .toString();
+ final String enumName = utils.getBinaryName((TypeElement) element
+ .getEnclosingElement()).toString();
final String valueName = element.getSimpleName().toString();
result.put("enum", enumName);
result.put("value", valueName);
@@ -211,12 +209,11 @@ else if (o instanceof VariableElement) {
}
private AnnotationMirror getMirror(final TypeElement element) {
- for (final AnnotationMirror candidate : utils
- .getAllAnnotationMirrors(element))
+ for (final AnnotationMirror candidate : utils.getAllAnnotationMirrors(
+ element))
{
- final Name binaryName =
- utils.getBinaryName((TypeElement) candidate.getAnnotationType()
- .asElement());
+ final Name binaryName = utils.getBinaryName((TypeElement) candidate
+ .getAnnotationType().asElement());
if (binaryName.contentEquals(Indexable.class.getName())) {
return candidate;
}
@@ -243,9 +240,9 @@ public OutputStream openOutput(final String annotationName)
{
final List originating = originatingElements.get(annotationName);
final String path = Index.INDEX_PREFIX + annotationName;
- final FileObject fileObject =
- filer.createResource(StandardLocation.CLASS_OUTPUT, "", path,
- originating.toArray(new Element[originating.size()]));
+ final FileObject fileObject = filer.createResource(
+ StandardLocation.CLASS_OUTPUT, "", path, originating.toArray(
+ new Element[originating.size()]));
// Verify that the generated file is in the META-INF/json/ subdirectory;
// Despite our asking for it explicitly, the DefaultFileManager will
@@ -255,9 +252,8 @@ public OutputStream openOutput(final String annotationName)
if (uri != null && uri.endsWith("/" + path)) {
return fileObject.openOutputStream();
}
- final String prefix =
- uri == null ? "" : uri.substring(0, uri.length() -
- annotationName.length());
+ final String prefix = uri == null ? "" : uri.substring(0, uri.length() -
+ annotationName.length());
final File file = new File(prefix + path);
final File parent = file.getParentFile();
if (parent != null && !parent.isDirectory() && !parent.mkdirs()) {
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 98ec12da7..a008e42e4 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -41,7 +41,7 @@
* An analyzer to parse {@code @Plugin} annotations inside a {@code .class}
* file without loading the class. The idea is to inspect the classfile to parse
* the annotation attributes.
- *
+ *
* @author Johannes Schindelin
*/
class ByteCodeAnalyzer {
@@ -101,12 +101,12 @@ private double getDoubleConstant(final int index) {
final int offset = poolOffsets[index - 1];
if (getU1(offset) != 6) throw new RuntimeException("Constant " + index +
" does not refer to a double");
- return Double.longBitsToDouble((getU4(offset + 1) << 32) |
- getU4(offset + 5));
+ return Double.longBitsToDouble((getU4(offset + 1) << 32) | getU4(offset +
+ 5));
}
- // See https://en.wikipedia.org/wiki/Java_class_file#The_constant_pool for the
- // meaning of the offsets behind these numbers
+ // See https://en.wikipedia.org/wiki/Java_class_file#The_constant_pool for the
+ // meaning of the offsets behind these numbers
private void getConstantPoolOffsets() {
final int poolCount = getU2(8) - 1;
poolOffsets = new int[poolCount];
@@ -116,8 +116,8 @@ private void getConstantPoolOffsets() {
final int tag = getU1(offset);
if (tag == 7 || tag == 8 || tag == 16) offset += 3;
else if (tag == 15) offset += 4;
- else if (tag == 3 || tag == 4 || tag == 9 || tag == 10
- || tag == 11 || tag == 12 || tag == 18) offset += 5;
+ else if (tag == 3 || tag == 4 || tag == 9 || tag == 10 || tag == 11 ||
+ tag == 12 || tag == 18) offset += 5;
else if (tag == 5 || tag == 6) {
poolOffsets[++i] = offset;
offset += 9;
@@ -177,8 +177,8 @@ private void getAllAttributes() {
private Attribute[] getAttributes(final int offset) {
final Attribute[] result = new Attribute[getU2(offset)];
for (int i = 0; i < result.length; i++)
- result[i] =
- new Attribute(i == 0 ? offset + 2 : result[i - 1].attributeEndOffset);
+ result[i] = new Attribute(i == 0 ? offset + 2 : result[i -
+ 1].attributeEndOffset);
return result;
}
@@ -201,19 +201,17 @@ private String getName() {
}
private Map> getAnnotations() {
- final Map> annotations =
- new TreeMap<>();
+ final Map> annotations = new TreeMap<>();
for (final Attribute attr : attributes) {
if ("RuntimeVisibleAnnotations".equals(attr.getName())) {
final byte[] buf = attr.attribute;
int count = getU2(buf, 0);
int offset = 2;
for (int i = 0; i < count; i++) {
- final String className =
- raw2className(getStringConstant(getU2(buf, offset)));
+ final String className = raw2className(getStringConstant(getU2(buf,
+ offset)));
offset += 2;
- final Map values =
- new TreeMap<>();
+ final Map values = new TreeMap<>();
annotations.put(className, values);
offset = parseAnnotationValues(buf, offset, values);
}
@@ -249,18 +247,16 @@ private int parseAnnotationValue(byte[] buf, int offset,
offset += 2;
break;
case 'C':
- value =
- Character.valueOf((char) getIntegerConstant(getU2(buf, offset)));
+ value = Character.valueOf((char) getIntegerConstant(getU2(buf,
+ offset)));
offset += 2;
break;
case 'S':
- value =
- Short.valueOf((short) getIntegerConstant(getU2(buf, offset)));
+ value = Short.valueOf((short) getIntegerConstant(getU2(buf, offset)));
offset += 2;
break;
case 'I':
- value =
- Integer.valueOf((int) getIntegerConstant(getU2(buf, offset)));
+ value = Integer.valueOf((int) getIntegerConstant(getU2(buf, offset)));
offset += 2;
break;
case 'J':
@@ -294,8 +290,7 @@ private int parseAnnotationValue(byte[] buf, int offset,
break;
}
case 'e': {
- final Map enumValue =
- new TreeMap<>();
+ final Map enumValue = new TreeMap<>();
enumValue.put("enum", raw2className(getStringConstant(getU2(buf,
offset))));
offset += 2;
diff --git a/src/main/java/org/scijava/annotations/DirectoryIndexer.java b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
index 1f52f9565..dc611e96d 100644
--- a/src/main/java/org/scijava/annotations/DirectoryIndexer.java
+++ b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -48,7 +48,7 @@
* That will be the time when we can index the annotations, even if Eclipse
* decided not to run any annotation processor.
*
- *
+ *
* @author Johannes Schindelin
*/
public class EclipseHelper extends DirectoryIndexer {
- private static final String FORCE_ANNOTATION_INDEX_PROPERTY = "force.annotation.index";
+ private static final String FORCE_ANNOTATION_INDEX_PROPERTY =
+ "force.annotation.index";
static Set indexed = new HashSet<>();
private boolean bannerShown;
- private static boolean debug =
- "debug".equals(System.getProperty("scijava.log.level"));
+ private static boolean debug = "debug".equals(System.getProperty(
+ "scijava.log.level"));
private boolean autoDetectEclipse = true;
private static void debug(final String message) {
@@ -120,14 +121,12 @@ private static void debug(final String message) {
* first class path element (or for tests, the first two), and only if it is a
* local directory.
*
- *
+ *
* @param loader the class loader whose class path to inspect
*/
public static void updateAnnotationIndex(final ClassLoader loader) {
debug("Checking class loader: " + loader);
- if (loader == null ||
- !(loader instanceof URLClassLoader))
- {
+ if (loader == null || !(loader instanceof URLClassLoader)) {
debug("Not an URLClassLoader: " + loader);
return;
}
@@ -139,8 +138,8 @@ public static void updateAnnotationIndex(final ClassLoader loader) {
for (final URL url : ((URLClassLoader) loader).getURLs()) {
debug("Checking URL: " + url);
if (helper.autoDetectEclipse && first) {
- if (!"file".equals(url.getProtocol()) ||
- (!url.getPath().endsWith("/") && !url.getPath().contains("surefire")))
+ if (!"file".equals(url.getProtocol()) || (!url.getPath().endsWith(
+ "/") && !url.getPath().contains("surefire")))
{
debug("Not Eclipse because first entry is: " + url);
return;
@@ -186,12 +185,14 @@ private void maybeIndex(final URL url, final ClassLoader loader) {
* but crucially also the target/classes/ and target/test-classes/
* directories which may need to be indexed.
*/
- if (!autoDetectEclipse || url.toString().matches(".*/target/surefire/surefirebooter[0-9]*\\.jar")) try {
+ if (!autoDetectEclipse || url.toString().matches(
+ ".*/target/surefire/surefirebooter[0-9]*\\.jar")) try
+ {
final JarFile jar = new JarFile(file);
Manifest manifest = jar.getManifest();
if (manifest != null) {
- final String classPath =
- manifest.getMainAttributes().getValue(Name.CLASS_PATH);
+ final String classPath = manifest.getMainAttributes().getValue(
+ Name.CLASS_PATH);
if (classPath != null) {
for (final String element : classPath.split(" +"))
try {
@@ -218,8 +219,8 @@ private void maybeIndex(final URL url, final ClassLoader loader) {
private void index(File directory, ClassLoader loader) {
debug("Directory: " + directory);
if (!directory.canWrite() || upToDate(directory) || isIJ1(directory)) {
- debug("can write: " + directory.canWrite() + ", up-to-date: " +
- upToDate(directory) + ", : is IJ1: " + isIJ1(directory));
+ debug("can write: " + directory.canWrite() + ", up-to-date: " + upToDate(
+ directory) + ", : is IJ1: " + isIJ1(directory));
return;
}
final File jsonDirectory = new File(directory, Index.INDEX_PREFIX);
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index dd56ab83e..3c6ae5d05 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -45,13 +45,13 @@
*
* You would call it like this:
*
- *
+ *
*
* for (IndexItem<MyAnnotation> item : Index.load(MyAnnotation.class)) {
- * // do something with item.annotation() and/or item.className()
+ * // do something with item.annotation() and/or item.className()
* }
*
- *
+ *
* @author Johannes Schindelin
*/
class IndexReader {
@@ -69,15 +68,15 @@ class IndexReader {
}
IndexReader(final InputStream in, final String isName) {
- this.in =
- in instanceof PushbackInputStream ? (PushbackInputStream) in
- : new PushbackInputStream(new BufferedInputStream(in));
+ this.in = in instanceof PushbackInputStream ? (PushbackInputStream) in
+ : new PushbackInputStream(new BufferedInputStream(in));
this.originalISName = isName;
}
public Object next() throws IOException {
int c = in.read();
- while (Character.isWhitespace(c)) c = in.read();
+ while (Character.isWhitespace(c))
+ c = in.read();
if (c < 0) {
return null;
}
@@ -159,8 +158,8 @@ else if (c < '0' || c > '9') {
if (c == '"') {
return readString();
}
- throw new IOException("Unexpected char: '" + (char) c + "'"+
- ((originalISName.length()>0) ? " from "+originalISName : ""));
+ throw new IOException("Unexpected char: '" + (char) c + "'" +
+ ((originalISName.length() > 0) ? " from " + originalISName : ""));
}
public void close() throws IOException {
@@ -183,9 +182,8 @@ private int readCharacter(int first) throws IOException {
if (c == '\\') {
c = in.read();
if (c == 'u') {
- String hex =
- "" + ((char) in.read()) + ((char) in.read()) + ((char) in.read()) +
- ((char) in.read());
+ String hex = "" + ((char) in.read()) + ((char) in.read()) + ((char) in
+ .read()) + ((char) in.read());
c = Integer.parseInt(hex, 16);
}
else if (c != '\\' && c != '"') {
@@ -198,7 +196,8 @@ else if (c != '\\' && c != '"') {
private void expect(char expect) throws IOException {
int c = in.read();
if (c != expect) {
- throw new IOException("Expected '" + expect + "', got '" + (char) c + "'");
+ throw new IOException("Expected '" + expect + "', got '" + (char) c +
+ "'");
}
}
@@ -211,7 +210,8 @@ private int expect(char a, char b) throws IOException {
return 1;
}
throw new IOException("Expected '" + a + "' or '" + b + "', got '" +
- (char) c + "'"+((originalISName.length()>0) ? " from "+originalISName : ""));
+ (char) c + "'" + ((originalISName.length() > 0) ? " from " +
+ originalISName : ""));
}
private void expect(String match) throws IOException {
@@ -222,7 +222,7 @@ private void expect(String match) throws IOException {
private IndexReader() {
this.in = null;
- this.originalISName="";
+ this.originalISName = "";
}
static IndexReader getLegacyReader(final InputStream in) throws IOException {
diff --git a/src/main/java/org/scijava/annotations/Indexable.java b/src/main/java/org/scijava/annotations/Indexable.java
index deb8f7d65..aca9bfed1 100644
--- a/src/main/java/org/scijava/annotations/Indexable.java
+++ b/src/main/java/org/scijava/annotations/Indexable.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -40,7 +40,7 @@
* All annotations that want to be indexed need to be annotated with
* {@code @Indexable}.
*
- *
+ *
* @author Johannes Schindelin
*/
@Retention(RetentionPolicy.RUNTIME)
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index 5b3d0d129..9b04ba4bc 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
* current class path library is incompatible with the one used to serialize the
* data.
*
- *
+ *
* @author Johannes Schindelin
*/
public class LegacyReader {
@@ -74,8 +74,8 @@ public LegacyReader(final InputStream in) throws IOException {
this.in = new BufferedInputStream(in);
short signature = (short) read16();
if (signature != STREAM_MAGIC) {
- throw new IOException("Unrecognized signature: 0x" +
- Integer.toHexString(signature));
+ throw new IOException("Unrecognized signature: 0x" + Integer.toHexString(
+ signature));
}
int version = read16();
if (version != STREAM_VERSION) {
@@ -122,16 +122,16 @@ else if (c == TC_CLASSDESC) {
return newClassDesc();
}
else {
- throw new UnsupportedOperationException("Unexpected token: 0x" +
- Integer.toHexString(c));
+ throw new UnsupportedOperationException("Unexpected token: 0x" + Integer
+ .toHexString(c));
}
}
private void expectToken(int token) throws IOException {
int c = read8();
if (c != token) {
- throw new UnsupportedOperationException("Unexpected token: 0x" +
- Integer.toHexString(c));
+ throw new UnsupportedOperationException("Unexpected token: 0x" + Integer
+ .toHexString(c));
}
}
@@ -224,8 +224,8 @@ else if (c == TC_REFERENCE) {
superClassDesc = references.get(handle);
}
else if (c != TC_NULL) {
- throw new UnsupportedOperationException("Unexpected token: 0x" +
- Integer.toHexString(c));
+ throw new UnsupportedOperationException("Unexpected token: 0x" + Integer
+ .toHexString(c));
}
return result;
@@ -324,12 +324,12 @@ private class BoxedPrimitiveClassDesc extends NonPrimitiveClassDesc {
private final Class> clazz;
- public BoxedPrimitiveClassDesc(final Class> clazz, final String simpleName)
+ public BoxedPrimitiveClassDesc(final Class> clazz,
+ final String simpleName)
{
super(toSimpleName(clazz), "value", simpleName);
- this.clazz =
- clazz == Double.class || clazz == Float.class ? Double.class
- : clazz == Boolean.class ? Boolean.class : Long.class;
+ this.clazz = clazz == Double.class || clazz == Float.class ? Double.class
+ : clazz == Boolean.class ? Boolean.class : Long.class;
}
@Override
@@ -354,8 +354,7 @@ public static String toSimpleName(Class> clazz) {
return "L" + clazz.getName().replace('.', '/') + ";";
}
- private final Map classDescs =
- new HashMap<>();
+ private final Map classDescs = new HashMap<>();
{
new ClassDesc("B") {
@@ -467,7 +466,8 @@ public Map readExtra(final Map map)
// implements serialVersionUID 8683452581122892189L
@Override
- public Object readExtra(final Map map) throws IOException
+ public Object readExtra(final Map map)
+ throws IOException
{
int size = (int) (long) (Long) map.get("size");
@@ -489,7 +489,8 @@ public Object readExtra(final Map map) throws IOException
{
@Override
- public Object readExtra(final Map map) throws IOException
+ public Object readExtra(final Map map)
+ throws IOException
{
map.put("class", map.get("className"));
return map;
@@ -500,17 +501,19 @@ public Object readExtra(final Map map) throws IOException
{
@Override
- public Object readExtra(final Map map) throws IOException
+ public Object readExtra(final Map map)
+ throws IOException
{
return map.get("values");
}
};
- new NonPrimitiveClassDesc("Lnet/java/sezpoz/impl/SerEnumConst;",
- "enumName", "Ljava/lang/String;", "constName", "Ljava/lang/String;")
+ new NonPrimitiveClassDesc("Lnet/java/sezpoz/impl/SerEnumConst;", "enumName",
+ "Ljava/lang/String;", "constName", "Ljava/lang/String;")
{
@Override
- public Object readExtra(final Map map) throws IOException
+ public Object readExtra(final Map map)
+ throws IOException
{
map.put("enum", map.get("enumName"));
map.put("value", map.get("constName"));
@@ -522,7 +525,8 @@ public Object readExtra(final Map map) throws IOException
{
@Override
- public Object readExtra(final Map map) throws IOException
+ public Object readExtra(final Map map)
+ throws IOException
{
return map.get("name");
}
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index eaa37331d..19bd60ca2 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -37,7 +37,7 @@
/**
* Abstract superclass of {@link App} implementations.
- *
+ *
* @author Curtis Rueden
*/
public abstract class AbstractApp extends AbstractRichPlugin implements App {
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index bf4bf0721..16003d2fc 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -47,7 +47,7 @@
* implementing this interface, it is encouraged to instead extend
* {@link AbstractApp}, for convenience.
*
- *
+ *
* @author Curtis Rueden
* @see Plugin
* @see AppService
@@ -59,7 +59,6 @@ default String getTitle() {
return getInfo().getName();
}
-
/** The Maven {@code groupId} of the application. */
String getGroupId();
@@ -79,7 +78,7 @@ default String getTitle() {
/**
* Gets a string with information about the application.
- *
+ *
* @param mem If true, memory usage information is included.
*/
default String getInfo(final boolean mem) {
@@ -118,8 +117,8 @@ default File getBaseDirectory() {
}
/**
- * Displays information about the application. Typically this action
- * takes the form as About dialog in the UI, and/or a message on the console.
+ * Displays information about the application. Typically this action takes the
+ * form as About dialog in the UI, and/or a message on the console.
*/
void about();
@@ -147,7 +146,7 @@ default void quit() {
* SciJava conforms to the Semantic
* Versioning specification.
*
- *
+ *
* @return The application version, in {@code major.minor.micro} format.
*/
@Override
diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index 582860a36..346e06c53 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -37,7 +37,7 @@
/**
* Interface for application-level functionality.
- *
+ *
* @author Curtis Rueden
*/
public interface AppService extends SingletonService, SciJavaService {
@@ -54,7 +54,7 @@ default App getApp() {
/**
* Gets the table of associated applications, keyed by name.
- *
+ *
* @see org.scijava.plugin.Plugin#name()
*/
Map getApps();
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index 8a97162b6..da0eab6d2 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -46,11 +46,13 @@
/**
* Default service for application-level functionality.
- *
+ *
* @author Curtis Rueden
*/
@Plugin(type = Service.class)
-public class DefaultAppService extends AbstractSingletonService implements AppService {
+public class DefaultAppService extends AbstractSingletonService implements
+ AppService
+{
@Parameter
private LogService log;
@@ -76,7 +78,8 @@ public Map getApps() {
// -- Event handlers --
@EventHandler(key = "org.scijava.app.AppService#about")
- protected void onEvent(@SuppressWarnings("unused") final AppAboutEvent event)
+ protected void onEvent(
+ @SuppressWarnings("unused") final AppAboutEvent event)
{
getApp().about();
}
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
index 38e3e555d..28be70a27 100644
--- a/src/main/java/org/scijava/app/DefaultStatusService.java
+++ b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,7 +38,7 @@
/**
* Default service for status notifications.
- *
+ *
* @author Curtis Rueden
*/
@Plugin(type = Service.class)
@@ -96,17 +96,15 @@ public String getStatusMessage(final String appName,
if (!"".equals(message)) return message;
return appService.getApp(appName).getInfo(false);
}
-
+
/**
- * Publish the status event to the event service.
- * The default behavior is to publish status asynchronously.
- * You can change this behavior by overriding this method
- * in a derived class.
- *
+ * Publish the status event to the event service. The default behavior is to
+ * publish status asynchronously. You can change this behavior by overriding
+ * this method in a derived class.
+ *
* @param statusEvent the event to send to status listeners.
*/
- protected void publish(final StatusEvent statusEvent)
- {
+ protected void publish(final StatusEvent statusEvent) {
eventService.publishLater(statusEvent);
}
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index 067184141..744bbeda5 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* Application metadata about SciJava Common.
- *
+ *
* @author Curtis Rueden
* @see AppService
*/
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
index 7896b9b4a..7d6935de6 100644
--- a/src/main/java/org/scijava/app/StatusService.java
+++ b/src/main/java/org/scijava/app/StatusService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* Interface for the status notification service.
- *
+ *
* @author Curtis Rueden
*/
public interface StatusService extends SciJavaService {
@@ -51,7 +51,7 @@ public interface StatusService extends SciJavaService {
/**
* Updates the status message and progress bar, optionally flagging the status
* notification as a warning.
- *
+ *
* @param progress New progress value
* @param maximum New progress maximum
* @param message New status message
@@ -69,7 +69,7 @@ public interface StatusService extends SciJavaService {
* Gets the status message of the given event. In the case of the empty string
* (""), an alternative default string will be returned instead using the
* application version of the given application.
- *
+ *
* @see StatusEvent#getStatusMessage()
* @see App#getInfo(boolean)
*/
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
index d1c055557..fac9f0f56 100644
--- a/src/main/java/org/scijava/app/event/StatusEvent.java
+++ b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
/**
* An event indicating a status update.
- *
+ *
* @author Curtis Rueden
*/
public class StatusEvent extends SciJavaEvent {
diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index aaa51c43d..3d61f14dd 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -65,7 +65,7 @@ public interface CacheService extends SciJavaService {
default V get(final Object key, final Callable valueLoader)
throws ExecutionException
{
- return (V)get(key);
+ return (V) get(key);
}
}
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index ffba4ebb4..83e377a5d 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/command/Command.java b/src/main/java/org/scijava/command/Command.java
index 3e99f2d3f..588651b11 100644
--- a/src/main/java/org/scijava/command/Command.java
+++ b/src/main/java/org/scijava/command/Command.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -46,7 +46,7 @@
* {@link ContextCommand} (or in some cases {@link ModuleCommand},
* {@link DynamicCommand} or {@link InteractiveCommand}) for convenience.
*
- *
+ *
* @author Curtis Rueden
* @see Plugin
* @see PluginService
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index f0b2bd34c..ca72b08a9 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -64,7 +64,7 @@
* implements {@link ModuleInfo}, allowing it to describe and instantiate the
* command in {@link Module} form.
*
- *
+ *
* @author Curtis Rueden
* @author Johannes Schindelin
* @author Grant Harris
@@ -91,16 +91,13 @@ public class CommandInfo extends PluginInfo implements ModuleInfo {
private boolean paramsParsed;
/** List of problems detected when parsing command parameters. */
- private final List problems =
- new ArrayList<>();
+ private final List problems = new ArrayList<>();
/** Table of inputs, keyed on name. */
- private final Map> inputMap =
- new HashMap<>();
+ private final Map> inputMap = new HashMap<>();
/** Table of outputs, keyed on name. */
- private final Map> outputMap =
- new HashMap<>();
+ private final Map> outputMap = new HashMap<>();
/** Ordered list of input items. */
private final List> inputList = new ArrayList<>();
@@ -112,7 +109,7 @@ public class CommandInfo extends PluginInfo implements ModuleInfo {
/**
* Creates a new command metadata object.
- *
+ *
* @param className The name of the class, which must implement
* {@link Command}.
*/
@@ -122,7 +119,7 @@ public CommandInfo(final String className) {
/**
* Creates a new command metadata object.
- *
+ *
* @param className The name of the class, which must implement
* {@link Command}.
* @param annotation The @{@link Plugin} annotation to associate with this
@@ -134,7 +131,7 @@ public CommandInfo(final String className, final Plugin annotation) {
/**
* Creates a new command metadata object.
- *
+ *
* @param commandClass The plugin class, which must implement {@link Command}.
*/
public CommandInfo(final Class extends Command> commandClass) {
@@ -143,7 +140,7 @@ public CommandInfo(final Class extends Command> commandClass) {
/**
* Creates a new command metadata object.
- *
+ *
* @param commandClass The plugin class, which must implement {@link Command}.
* @param annotation The @{@link Plugin} annotation to associate with this
* metadata object.
@@ -157,7 +154,7 @@ public CommandInfo(final Class extends Command> commandClass,
/**
* Creates a new command metadata object describing the same command as the
* given {@link PluginInfo}.
- *
+ *
* @param info The plugin metadata to wrap.
*/
public CommandInfo(final PluginInfo info) {
@@ -403,8 +400,8 @@ public String getIdentifier() {
boolean first = true;
for (final String name : pre.keySet()) {
final Object value = pre.get(name);
- final String sValue =
- value == null ? "" : value.toString().replaceAll("[^\\w]", "_");
+ final String sValue = value == null ? "" : value.toString().replaceAll(
+ "[^\\w]", "_");
if (first) {
sb.append(", ");
first = false;
@@ -441,8 +438,8 @@ private void checkFields(final Class> type) {
problems.add(new ValidityProblem("Delegate class is abstract"));
}
- final List fields =
- ClassUtils.getAnnotatedFields(type, Parameter.class);
+ final List fields = ClassUtils.getAnnotatedFields(type,
+ Parameter.class);
for (final Field f : fields) {
f.setAccessible(true); // expose private fields
@@ -461,8 +458,9 @@ private void checkFields(final Class> type) {
}
final String name = f.getName();
- if ((inputMap.containsKey(name) || outputMap.containsKey(name))
- && !Service.class.isAssignableFrom(f.getType())) {
+ if ((inputMap.containsKey(name) || outputMap.containsKey(name)) &&
+ !Service.class.isAssignableFrom(f.getType()))
+ {
// NB: Shadowed parameters are bad because they are ambiguous.
final String error = "Invalid duplicate parameter: " + f;
problems.add(new ValidityProblem(error));
@@ -486,8 +484,7 @@ private void checkFields(final Class> type) {
final boolean isPreset = presets.containsKey(name);
// add item to the relevant list (inputs or outputs)
- final CommandModuleItem
- *
+ *
* @author Curtis Rueden
* @author Johannes Schindelin
* @author Grant Harris
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index b9e602de5..d41983d0d 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -47,7 +47,7 @@
/**
* {@link ModuleItem} implementation describing an input or output of a command.
- *
+ *
* @author Curtis Rueden
*/
public class CommandModuleItem extends AbstractModuleItem {
@@ -101,8 +101,8 @@ public boolean isAutoFill() {
@Override
public boolean isRequired() {
- return getParameter().required() &&
- !Optional.class.isAssignableFrom(getType());
+ return getParameter().required() && !Optional.class.isAssignableFrom(
+ getType());
}
@Override
@@ -150,16 +150,16 @@ public T getDefaultValue() {
// NB: The default value for a command is the initial field value.
// E.g.:
//
- // @Parameter
- // private int weekdays = 5;
+ // @Parameter
+ // private int weekdays = 5;
//
// To obtain this information, we need to instantiate the module, then
// extract the value of the associated field.
//
// Of course, the command might do evil things like:
//
- // @Parameter
- // private long time = System.currentTimeMillis();
+ // @Parameter
+ // private long time = System.currentTimeMillis();
//
// In which case the default value will vary by instance. But there is
// nothing we can really do about that. This is only a best effort.
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 502113a69..5237687ea 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -54,7 +54,7 @@
* It asks the {@link PluginService} for available commands, then takes care of
* registering them with the {@link ModuleService}.
*
- *
+ *
* @author Curtis Rueden
* @see SciJavaPlugin
* @see ModuleService
@@ -124,7 +124,7 @@ List getCommandsOfClass(
* then a default one is created and then executed. This default command is
* not registered with the service for subsequent usage.
*
- *
+ *
* @param className Class name of the command to execute.
* @param process If true, executes the command with pre- and postprocessing
* steps from all available {@link PreprocessorPlugin}s and
@@ -140,8 +140,8 @@ List getCommandsOfClass(
* @return {@link Future} of the module instance being executed. Calling
* {@link Future#get()} will block until execution is complete.
*/
- Future
- run(String className, boolean process, Object... inputs);
+ Future run(String className, boolean process,
+ Object... inputs);
/**
* Executes the first command of the given class name.
@@ -150,7 +150,7 @@ List getCommandsOfClass(
* then a default one is created and then executed. This default command is
* not registered with the service for subsequent usage.
*
- *
+ *
* @param className Class name of the command to execute.
* @param process If true, executes the command with pre- and postprocessing
* steps from all available {@link PreprocessorPlugin}s and
@@ -174,7 +174,7 @@ Future run(String className, boolean process,
* default one is created and then executed. This default command is
* not registered with the service for subsequent usage.
*
- *
+ *
* @param Class of the command to execute.
* @param commandClass Class object of the command to execute.
* @param process If true, executes the command with pre- and postprocessing
@@ -201,7 +201,7 @@ Future run(Class commandClass,
* default one is created and then executed. This default command is
* not registered with the service for subsequent usage.
*
- *
+ *
* @param Class of the command to execute.
* @param commandClass Class object of the command to execute.
* @param process If true, executes the command with pre- and postprocessing
@@ -221,7 +221,7 @@ Future run(Class commandClass,
/**
* Executes the given command.
- *
+ *
* @param info The command to instantiate and run.
* @param process If true, executes the command with pre- and postprocessing
* steps from all available {@link PreprocessorPlugin}s and
@@ -237,12 +237,12 @@ Future run(Class commandClass,
* @return {@link Future} of the module instance being executed. Calling
* {@link Future#get()} will block until execution is complete.
*/
- Future
- run(CommandInfo info, boolean process, Object... inputs);
+ Future run(CommandInfo info, boolean process,
+ Object... inputs);
/**
* Executes the given command.
- *
+ *
* @param info The command to instantiate and run.
* @param process If true, executes the command with pre- and postprocessing
* steps from all available {@link PreprocessorPlugin}s and
diff --git a/src/main/java/org/scijava/command/ContextCommand.java b/src/main/java/org/scijava/command/ContextCommand.java
index ae9e3830e..a99eddafc 100644
--- a/src/main/java/org/scijava/command/ContextCommand.java
+++ b/src/main/java/org/scijava/command/ContextCommand.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -73,7 +73,7 @@
* not be able to use the latter paradigm above to invoke your code in a fully
* compile-time-safe way.
*
- *
+ *
* @author Curtis Rueden
*/
public abstract class ContextCommand extends AbstractContextual implements
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index f1d59a2b0..2900fbc52 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -55,7 +55,7 @@
* Default service for working with {@link Command}s. Available commands are
* obtained from the plugin service. Loading of the actual command classes can
* be deferred until a particular command's first execution.
- *
+ *
* @author Curtis Rueden
* @see Command
*/
@@ -132,17 +132,16 @@ public CommandInfo getCommand(final String className) {
public List getCommandsOfClass(
final Class commandClass)
{
- final List> plugins =
- pluginService.getPluginsOfClass(commandClass, Command.class);
+ final List> plugins = pluginService.getPluginsOfClass(
+ commandClass, Command.class);
final List commands = getCommands(plugins);
return commands;
}
@Override
- public List getCommandsOfClass(final String className)
- {
- final List> plugins =
- pluginService.getPluginsOfClass(className);
+ public List getCommandsOfClass(final String className) {
+ final List> plugins = pluginService
+ .getPluginsOfClass(className);
final List commands = getCommandsUnknown(downcast(plugins));
return commands;
}
@@ -206,8 +205,8 @@ public void initialize() {
commandMap = new HashMap<>();
// inform the module service of available commands
- final List> plugins =
- pluginService.getPluginsOfType(Command.class);
+ final List> plugins = pluginService.getPluginsOfType(
+ Command.class);
addCommands(plugins);
}
@@ -220,8 +219,7 @@ protected void onEvent(final PluginsRemovedEvent event) {
@EventHandler
protected void onEvent(final PluginsAddedEvent event) {
- final ArrayList> commands =
- new ArrayList<>();
+ final ArrayList> commands = new ArrayList<>();
findCommandPlugins(event.getItems(), commands);
addCommands(commands);
}
@@ -239,8 +237,8 @@ private CommandInfo getOrCreate(final String className) {
}
/**
- * Gets a {@link CommandInfo} for the given class, creating a new one if
- * none are registered with the service.
+ * Gets a {@link CommandInfo} for the given class, creating a new one if none
+ * are registered with the service.
*/
private CommandInfo getOrCreate(
final Class commandClass)
@@ -297,7 +295,7 @@ private List getCommandsUnknown(
/**
* Transfers command plugins from the source list to the destination list.
- *
+ *
* @param srcList The list to scan for matching plugins.
* @param destList The list to which matching plugins are added.
*/
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index 5d165192d..9e2ebd9e8 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -46,7 +46,7 @@
* greater configurability, but also greater complexity, than implementing the
* {@link Command} interface and using only @{@link Parameter} annotations on
* instance fields.
- *
+ *
* @author Curtis Rueden
*/
public abstract class DynamicCommand extends DefaultMutableModule implements
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index 738521744..10dadf74e 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -56,7 +56,7 @@
* well as provide metadata manipulation functionality such as
* {@link MutableModuleInfo#addInput(ModuleItem)}.
*
- *
+ *
* @author Curtis Rueden
*/
public class DynamicCommandInfo extends DefaultMutableModuleInfo {
@@ -84,7 +84,7 @@ public DynamicCommandInfo(final CommandInfo info,
* {@link ModuleItem} in question was of unknown (i.e., potentially
* non-mutable) origin.
*
- *
+ *
* @throws ClassCastException if input is not a {@link MutableModuleItem}.
*/
public MutableModuleItem getMutableInput(final String name,
@@ -104,7 +104,7 @@ public MutableModuleItem getMutableInput(final String name,
* {@link ModuleItem} in question was of unknown (i.e., potentially
* non-mutable) origin.
*
- *
+ *
* @throws ClassCastException if output is not a {@link MutableModuleItem}.
*/
public MutableModuleItem getMutableOutput(final String name,
diff --git a/src/main/java/org/scijava/command/Inputs.java b/src/main/java/org/scijava/command/Inputs.java
index a97d282f2..846cc4313 100644
--- a/src/main/java/org/scijava/command/Inputs.java
+++ b/src/main/java/org/scijava/command/Inputs.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -70,7 +70,8 @@
* wordInput.setLabel("Favorite word");
* wordInput.setChoices(Arrays.asList("quick", "brown", "fox"));
* wordInput.setDefaultValue("fox");
- * MutableModuleItem opacityInput = inputs.addInput("opacity", Double.class);
+ * MutableModuleItem opacityInput = inputs.addInput("opacity",
+ * Double.class);
* opacityInput.setMinimumValue(0.0);
* opacityInput.setMaximumValue(1.0);
* opacityInput.setDefaultValue(0.5);
diff --git a/src/main/java/org/scijava/command/Interactive.java b/src/main/java/org/scijava/command/Interactive.java
index 6f4d93375..d93fbed4b 100644
--- a/src/main/java/org/scijava/command/Interactive.java
+++ b/src/main/java/org/scijava/command/Interactive.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -40,7 +40,7 @@
*
* See {@link InteractiveCommand} for the most typical use case.
*
- *
+ *
* @author Curtis Rueden
* @see ModuleInfo#isInteractive()
*/
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index 1edf9a4b3..9a7ad4217 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -55,7 +55,7 @@
* add callback methods to affected inputs, for reacting to a change in the
* active display.
*
- *
+ *
* @author Curtis Rueden
*/
public abstract class InteractiveCommand extends DynamicCommand implements
@@ -74,12 +74,14 @@ public abstract class InteractiveCommand extends DynamicCommand implements
@Parameter
private LogService log;
- /** List of names of inputs to keep in sync when the active display changes. */
+ /**
+ * List of names of inputs to keep in sync when the active display changes.
+ */
private final String[] listenerNames;
/**
* Creates a new interactive command.
- *
+ *
* @param listenerNames The list of names of inputs to keep in sync when the
* active display changes. Each input must be a {@link Display}.
*/
diff --git a/src/main/java/org/scijava/command/ModuleCommand.java b/src/main/java/org/scijava/command/ModuleCommand.java
index 2a2bb9469..9499363bf 100644
--- a/src/main/java/org/scijava/command/ModuleCommand.java
+++ b/src/main/java/org/scijava/command/ModuleCommand.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -40,7 +40,7 @@
* A command which implements {@link Module} directly (rather than using the
* {@link CommandModule} adapter class). This is useful for commands which want
* to inspect and manipulate their own inputs and outputs programmatically.
- *
+ *
* @author Curtis Rueden
*/
public abstract class ModuleCommand extends AbstractModule implements
diff --git a/src/main/java/org/scijava/command/Previewable.java b/src/main/java/org/scijava/command/Previewable.java
index 330d8472c..ae9bfec25 100644
--- a/src/main/java/org/scijava/command/Previewable.java
+++ b/src/main/java/org/scijava/command/Previewable.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,7 +31,7 @@
/**
* An operation (usually a {@link Command}) whose results can be previewed.
- *
+ *
* @author Curtis Rueden
*/
public interface Previewable {
diff --git a/src/main/java/org/scijava/command/UnimplementedCommand.java b/src/main/java/org/scijava/command/UnimplementedCommand.java
index 763d324cf..31735b5be 100644
--- a/src/main/java/org/scijava/command/UnimplementedCommand.java
+++ b/src/main/java/org/scijava/command/UnimplementedCommand.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -32,7 +32,7 @@
/**
* A command that is not yet implemented. It exists so that stub commands can
* override it trivially, and act as markers of future functionality.
- *
+ *
* @author Curtis Rueden
*/
public abstract class UnimplementedCommand extends ContextCommand {
diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index e5dac33f2..7f0d9a959 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -64,15 +64,15 @@ public RunArgument() {
@Override
public void handle(final LinkedList args) {
- if (!supports(args))
- return;
+ if (!supports(args)) return;
log.warn("The --class flag is deprecated, and will\n" +
"be removed in a future release. Use --run instead.");
args.removeFirst(); // --class
final String commandToRun = args.removeFirst();
- final String paramString = ConsoleUtils.hasParam(args) ? args.removeFirst() : "";
+ final String paramString = ConsoleUtils.hasParam(args) ? args.removeFirst()
+ : "";
run(commandToRun, paramString);
}
@@ -81,8 +81,7 @@ public void handle(final LinkedList args) {
@Override
public boolean supports(final LinkedList args) {
- if (!super.supports(args))
- return false;
+ if (!super.supports(args)) return false;
return getInfo(args.get(1)) != null;
}
@@ -94,15 +93,16 @@ private void run(final String commandToRun, final String optionString) {
final CommandInfo info = getInfo(commandToRun);
// couldn't find anything to run
- if (info == null)
- return;
+ if (info == null) return;
// TODO: parse the optionString a la ImageJ1
- final Map inputMap = ConsoleUtils.parseParameterString(optionString, info, log);
+ final Map inputMap = ConsoleUtils.parseParameterString(
+ optionString, info, log);
try {
commandService.run(info, true, inputMap).get();
- } catch (final Exception exc) {
+ }
+ catch (final Exception exc) {
log.error(exc);
}
}
diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index d823f05f9..b3fa219ff 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -42,7 +42,7 @@
/**
* Runs the given {@link Command} class.
- *
+ *
* @author Curtis Rueden
*/
@Plugin(type = CodeRunner.class)
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index eff1cf185..82e713d16 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -43,6 +43,7 @@
public abstract class AbstractConsoleArgument extends
AbstractHandlerPlugin> implements ConsoleArgument
{
+
private int numArgs;
private Set flags;
@@ -53,11 +54,14 @@ public AbstractConsoleArgument() {
public AbstractConsoleArgument(final String... flags) {
this(1, flags);
}
-
- public AbstractConsoleArgument(final int requiredArgs, final String... flags) {
+
+ public AbstractConsoleArgument(final int requiredArgs,
+ final String... flags)
+ {
numArgs = requiredArgs;
this.flags = new HashSet<>();
- for (final String s : flags) this.flags.add(s);
+ for (final String s : flags)
+ this.flags.add(s);
}
// -- Typed methods --
@@ -85,8 +89,8 @@ protected boolean isFlag(final LinkedList args) {
* If the next argument is an appropriate parameter to a
* {@link ConsoleArgument}, retrieves it; otherwise, returns null.
*
- * @return The first argument of the given list, if it does not
- * start with a {@code '-'} character; or null otherwise.
+ * @return The first argument of the given list, if it does not start with a
+ * {@code '-'} character; or null otherwise.
*/
protected String getParam(final LinkedList args) {
if (args.isEmpty()) return null;
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index b51e8a549..b30ed8e75 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index e869933ed..bf14d6580 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -46,7 +46,7 @@
*/
public interface ConsoleService extends
HandlerService, ConsoleArgument>, SciJavaService
- // TODO: SJC3: Extend Listenable
+// TODO: SJC3: Extend Listenable
{
/** Handles arguments from an external source such as the command line. */
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 909aa3ea0..15734a03f 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -26,6 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
* #L%
*/
+
package org.scijava.console;
import java.util.HashMap;
@@ -45,25 +46,33 @@ public final class ConsoleUtils {
/** @deprecated Use {@link ParseService} instead. */
@Deprecated
- public static Map parseParameterString(final String parameterString) {
- return parseParameterString(parameterString, (CommandInfo)null);
+ public static Map parseParameterString(
+ final String parameterString)
+ {
+ return parseParameterString(parameterString, (CommandInfo) null);
}
/** @deprecated Use {@link ParseService} instead. */
@Deprecated
- public static Map parseParameterString(final String parameterString, final ModuleInfo info) {
+ public static Map parseParameterString(
+ final String parameterString, final ModuleInfo info)
+ {
return parseParameterString(parameterString, info, null);
}
/** @deprecated Use {@link ParseService} instead. */
@Deprecated
- public static Map parseParameterString(final String parameterString, final LogService log) {
+ public static Map parseParameterString(
+ final String parameterString, final LogService log)
+ {
return parseParameterString(parameterString, null, log);
}
/** @deprecated Use {@link ParseService} instead. */
@Deprecated
- public static Map parseParameterString(final String parameterString, final ModuleInfo info, final LogService log) {
+ public static Map parseParameterString(
+ final String parameterString, final ModuleInfo info, final LogService log)
+ {
final Map inputMap = new HashMap<>();
if (!parameterString.isEmpty()) {
@@ -74,13 +83,12 @@ public static Map parseParameterString(final String parameterStr
final String[] pairs = parameterString.split(",");
for (final String pair : pairs) {
final String[] split = pair.split("=");
- if (split.length == 2)
- inputMap.put(split[0], split[1]);
+ if (split.length == 2) inputMap.put(split[0], split[1]);
else if (inputs != null && inputs.hasNext() && split.length == 1) {
inputMap.put(inputs.next().getName(), split[0]);
}
- else if (log != null)
- log.error("Parameters must be formatted as a comma-separated list of key=value pairs");
+ else if (log != null) log.error(
+ "Parameters must be formatted as a comma-separated list of key=value pairs");
}
}
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index c129e56d2..fda294cfd 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -169,9 +169,7 @@ private MultiPrintStream multiPrintStream(final PrintStream ps) {
* identical references, not per-element object equality.
*
*/
- private boolean sameElements(final List l1,
- final List l2)
- {
+ private boolean sameElements(final List l1, final List l2) {
if (l1.size() != l2.size()) return false;
for (int i = 0; i < l1.size(); i++) {
if (l1.get(i) != l2.get(i)) return false;
@@ -219,8 +217,8 @@ private ThreadContext getRelevance() {
private void publish(final ThreadContext relevance, final String output) {
final Context context = getContext();
final boolean contextual = relevance == ThreadContext.SAME;
- final OutputEvent event =
- new OutputEvent(context, source, output, contextual);
+ final OutputEvent event = new OutputEvent(context, source, output,
+ contextual);
notifyListeners(event);
}
}
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index 1cc9803e9..ce73d8cf1 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/console/MultiPrintStream.java b/src/main/java/org/scijava/console/MultiPrintStream.java
index a194dc24d..3bca48215 100644
--- a/src/main/java/org/scijava/console/MultiPrintStream.java
+++ b/src/main/java/org/scijava/console/MultiPrintStream.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/console/OutputEvent.java b/src/main/java/org/scijava/console/OutputEvent.java
index dddd58e36..065c765ec 100644
--- a/src/main/java/org/scijava/console/OutputEvent.java
+++ b/src/main/java/org/scijava/console/OutputEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -50,7 +50,7 @@ public class OutputEvent extends SciJavaEvent {
/** Possible output sources. */
public enum Source {
- STDOUT, STDERR
+ STDOUT, STDERR
}
/** The source of the output. */
diff --git a/src/main/java/org/scijava/console/OutputListener.java b/src/main/java/org/scijava/console/OutputListener.java
index c86479e10..9486e2bc0 100644
--- a/src/main/java/org/scijava/console/OutputListener.java
+++ b/src/main/java/org/scijava/console/OutputListener.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index aa2f2ddfd..e8dbb1cce 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,7 +38,7 @@
/**
* Handles the {@code -D} command line argument, in an analogous way to tools
* such as Java and Maven.
- *
+ *
* @author Curtis Rueden
*/
@Plugin(type = ConsoleArgument.class)
@@ -79,5 +79,4 @@ public boolean supports(final LinkedList args) {
return SYS_PROP_PAT.matcher(arg).matches();
}
-
}
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 18d995afd..c97077ad4 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index a7f252b3c..b81113064 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
index f9b979947..4efb62b3b 100644
--- a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* Abstract superclass for {@link Converter} plugins that delegate to other
* converters to chain two conversion steps together.
- *
+ *
* @author Jan Eglinger
* @param the input type
* @param the delegate type
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index 18d5f5916..d1f885d01 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/convert/ArrayToStringConverter.java b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
index d141d5454..7ddd8b62f 100644
--- a/src/main/java/org/scijava/convert/ArrayToStringConverter.java
+++ b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -43,7 +43,7 @@
* {@link String}s. This {@link Converter} can convert any array whose component
* types can be converted into {@link String}s. By default, this
* {@link Converter} delimits the array elements with commas.
- *
+ *
* @author Gabriel Selzer
*/
@Plugin(type = Converter.class, priority = Priority.VERY_LOW)
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index 1e4e80ca6..d4e5de2b8 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -26,6 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
* #L%
*/
+
package org.scijava.convert;
import java.lang.reflect.Type;
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index 65ce220ba..8f6a4c960 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index 84e56de9d..dad4236d8 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -133,8 +133,8 @@ default boolean supports(final Class> src, final Class> dest) {
}
/**
- * @return A collection of instances that could be converted to the
- * specified class.
+ * @return A collection of instances that could be converted to the specified
+ * class.
*/
default Collection
- *
+ *
* @see #convert(Object, Type)
*/
default boolean canConvert(final Class> src, final Type dest) {
@@ -138,7 +138,7 @@ default boolean canConvert(final Class> src, final Type dest) {
* {@link NumberFormatException} when the conversion is actually attempted via
* the {@link Integer#Integer(String)} constructor.
*
- *
+ *
* @see #convert(Object, Class)
*/
default boolean canConvert(final Class> src, final Class> dest) {
@@ -220,7 +220,7 @@ default Object convert(final Object src, final Type dest) {
* and return those. But other behaviors are possible, depending on the
* converter implementation.
*
- *
+ *
* @param objects an initialized collection into which appropriate objects
* will be inserted.
*/
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index d14e64dce..b679c370e 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,7 +38,6 @@
* @author Mark Hiner
*/
@Plugin(type = Service.class)
-public class DefaultConvertService extends AbstractConvertService
-{
+public class DefaultConvertService extends AbstractConvertService {
// NB: No implementation needed.
}
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index b9f53256d..4040297be 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -62,8 +62,7 @@
*
String to Character
*
String to Enum
*
Objects where the destination Class has a constructor which takes that
- * Object
- *
+ * Object
*
*
* @author Mark Hiner
@@ -209,8 +208,8 @@ private Class> collectionClass(final Type type) {
.findFirst().orElse(null);
}
- private Object
- convertToArray(final Object value, final Class> componentType)
+ private Object convertToArray(final Object value,
+ final Class> componentType)
{
// First we make sure the value is a collection. This provides the simplest
// interface for iterating over all the elements. We use SciJava's
@@ -248,7 +247,8 @@ private Collection
- *
+ *
* @author Curtis Rueden
*/
@Plugin(type = PreprocessorPlugin.class, priority = Priority.VERY_HIGH)
@@ -65,16 +65,16 @@ public class ActiveDisplayPreprocessor extends AbstractPreprocessorPlugin {
public void process(final Module module) {
if (displayService == null || moduleService == null) return;
- final ModuleItem> displayInput =
- moduleService.getSingleInput(module, Display.class);
+ final ModuleItem> displayInput = moduleService.getSingleInput(module,
+ Display.class);
if (displayInput == null || !displayInput.isAutoFill()) return;
@SuppressWarnings("unchecked")
final Class extends Display>> displayType =
(Class extends Display>>) displayInput.getType();
- final Display> activeDisplay =
- displayService.getActiveDisplay(displayType);
+ final Display> activeDisplay = displayService.getActiveDisplay(
+ displayType);
if (activeDisplay == null) return;
final String name = displayInput.getName();
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index e75317060..1ab5cb8ed 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -39,7 +39,7 @@
//@Plugin(type = Display.class, priority = Priority.VERY_LOW)
/**
* Default display for objects, when no other displays are available.
- *
+ *
* @author Curtis Rueden
*/
public class DefaultDisplay extends AbstractDisplay
- *
+ *
* @author Curtis Rueden
* @author Grant Harris
* @see Plugin
@@ -56,7 +56,7 @@ public interface Display extends List, RichPlugin, Named {
/**
* Tests whether the display is capable of visualizing objects of the given
* class.
- *
+ *
* @param c The class to check for visualization capabilities.
* @return True if the display can handle certain objects of the given class;
* false if it cannot visualize any objects of that class.
@@ -75,7 +75,7 @@ default boolean canDisplay(final Object o) {
* This method is essentially the same as {@link #add} except that it accepts
* any {@link Object} regardless of type.
*
- *
+ *
* @throws IllegalArgumentException if the object cannot be displayed (i.e.,
* if {@link #canDisplay(Object)} returns false).
*/
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index a97064ce5..24c4ebd01 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -46,7 +46,7 @@
/**
* Displays outputs upon completion of a module execution.
- *
+ *
* @author Curtis Rueden
* @author Lee Kamentsky
* @author Barry DeZonia
@@ -77,7 +77,7 @@ public void process(final Module module) {
/**
* Displays output objects.
- *
+ *
* @param defaultName The default name for the display, if not already set.
* @param output The object to display.
*/
@@ -95,8 +95,8 @@ private boolean handleOutput(final String defaultName, final Object output) {
final ArrayList> displays = new ArrayList<>();
// get list of existing displays currently visualizing this output
- final List> existingDisplays =
- displayService.getDisplays(output);
+ final List> existingDisplays = displayService.getDisplays(
+ output);
displays.addAll(existingDisplays);
if (displays.isEmpty()) {
@@ -113,7 +113,7 @@ private boolean handleOutput(final String defaultName, final Object output) {
String name = null;
// TODO rework how displays are named
- if (output instanceof Named) name = ((Named)output).getName();
+ if (output instanceof Named) name = ((Named) output).getName();
if (name == null) name = defaultName;
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index dc2654396..b1bccd3b6 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -41,7 +41,7 @@
/**
* Interface for service that tracks available {@link Display}s.
- *
+ *
* @author Barry DeZonia
* @author Curtis Rueden
* @author Grant Harris
@@ -68,7 +68,7 @@ default PluginService pluginService() {
/**
* Set the active display.
- *
+ *
* @param display
*/
void setActiveDisplay(Display> display);
@@ -84,7 +84,7 @@ > PluginInfo> getDisplayPlugin(
/**
* Gets the display plugin of the given class name, or null if none.
- *
+ *
* @throws ClassCastException if the plugin found is not a display plugin.
*/
PluginInfo> getDisplayPlugin(String className);
@@ -113,7 +113,7 @@
> List> getDisplayPluginsOfType(
/**
* Checks whether the given name is already taken by an existing display.
- *
+ *
* @param name The name to check.
* @return true if the name is available, false if already taken.
*/
@@ -131,7 +131,7 @@
> List> getDisplayPluginsOfType(
* To create a {@link Display} without publishing an event, see
* {@link #createDisplayQuietly}.
*
- *
+ *
* @param o The object for which a display should be created. The object is
* then added to the display.
* @return Newly created {@code Display>} containing the given object. The
@@ -156,7 +156,7 @@
> List> getDisplayPluginsOfType(
* To create a {@link Display} without publishing an event, see
* {@link #createDisplayQuietly}.
*
- *
+ *
* @param name The name to be assigned to the display.
* @param o The object for which a display should be created. The object is
* then added to the display.
@@ -174,7 +174,7 @@
> List> getDisplayPluginsOfType(
* Creates a display for the given object, without publishing a
* {@link DisplayCreatedEvent}. Hence, the display will not be automatically
* shown or tracked.
- *
+ *
* @param o The object for which a display should be created. The object is
* then added to the display.
* @return Newly created {@code Display>} containing the given object. The
diff --git a/src/main/java/org/scijava/display/Displayable.java b/src/main/java/org/scijava/display/Displayable.java
index 4b38e060e..d4c4b284a 100644
--- a/src/main/java/org/scijava/display/Displayable.java
+++ b/src/main/java/org/scijava/display/Displayable.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -32,7 +32,7 @@
/**
* An interface used by classes that can draw on demand. Typically used by
* things like the Overlay classes.
- *
+ *
* @author Barry DeZonia
*/
public interface Displayable {
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
index f6eddb44f..18f4f28f3 100644
--- a/src/main/java/org/scijava/display/TextDisplay.java
+++ b/src/main/java/org/scijava/display/TextDisplay.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,14 +31,14 @@
/**
* Interface for text {@link Display}s.
- *
+ *
* @author Curtis Rueden
*/
public interface TextDisplay extends Display {
/**
* Add a line to the display.
- *
+ *
* @param text
*/
void append(String text);
diff --git a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
index 7af76b8b4..a5e6c03f8 100644
--- a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
/**
* An event indicating a display has become the active one.
- *
+ *
* @author Grant Harris
*/
public class DisplayActivatedEvent extends DisplayEvent {
diff --git a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
index eab8406e7..d5fcfaa5a 100644
--- a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* An event indicating a new display has been created.
- *
+ *
* @author Curtis Rueden
*/
public class DisplayCreatedEvent extends ObjectCreatedEvent {
diff --git a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
index aeda51f31..49e0309b1 100644
--- a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* An event indicating a display has been deleted.
- *
+ *
* @author Curtis Rueden
*/
public class DisplayDeletedEvent extends ObjectDeletedEvent {
diff --git a/src/main/java/org/scijava/display/event/DisplayEvent.java b/src/main/java/org/scijava/display/event/DisplayEvent.java
index 22bd5ffeb..8e905b6bb 100644
--- a/src/main/java/org/scijava/display/event/DisplayEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* An event indicating something has happened to a {@link Display}.
- *
+ *
* @author Curtis Rueden
*/
public abstract class DisplayEvent extends SciJavaEvent {
diff --git a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
index d609a2391..964a737c0 100644
--- a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* An event indicating a display has updated; e.g., an object has been added or
* removed.
- *
+ *
* @author Grant Harris
* @author Lee Kamentsky
*/
@@ -46,17 +46,17 @@ public class DisplayUpdatedEvent extends DisplayEvent {
*/
public enum DisplayUpdateLevel {
- /**
- * The data has changed, but the extents and decorations have not.
- * An example: changing the intensity of a single pixel.
- */
- UPDATE,
+ /**
+ * The data has changed, but the extents and decorations have not.
+ * An example: changing the intensity of a single pixel.
+ */
+ UPDATE,
- /**
- * The extents and decorations have changed.
- * An example: stretching an image so it's height changes.
- */
- REBUILD
+ /**
+ * The extents and decorations have changed.
+ * An example: stretching an image so it's height changes.
+ */
+ REBUILD
}
diff --git a/src/main/java/org/scijava/display/event/input/InputEvent.java b/src/main/java/org/scijava/display/event/input/InputEvent.java
index 877529707..9b1b31511 100644
--- a/src/main/java/org/scijava/display/event/input/InputEvent.java
+++ b/src/main/java/org/scijava/display/event/input/InputEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -36,7 +36,7 @@
/**
* An event indicating input device (e.g., keyboard or mouse) activity in a
* display.
- *
+ *
* @author Curtis Rueden
*/
public abstract class InputEvent extends DisplayEvent {
diff --git a/src/main/java/org/scijava/display/event/input/KyEvent.java b/src/main/java/org/scijava/display/event/input/KyEvent.java
index 3acf2bece..5d2f8228b 100644
--- a/src/main/java/org/scijava/display/event/input/KyEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -40,7 +40,7 @@
* It is named {@code KyEvent} rather than {@code KeyEvent} to avoid name
* clashes with the {@link java.awt.event.KeyEvent} hierarchy.
*
- *
+ *
* @author Curtis Rueden
*/
public abstract class KyEvent extends InputEvent {
@@ -66,7 +66,7 @@ public KeyCode getCode() {
/**
* Converts the key event into a corresponding accelerator.
- *
+ *
* @return an accelerator matching the key code and modifiers of the event.
*/
public Accelerator getAccelerator() {
@@ -77,8 +77,8 @@ public Accelerator getAccelerator() {
@Override
public String toString() {
- return super.toString() + "\n\tcharacter = '" + character +
- "'\n\tcode = " + code + "\n\taccelerator = " + getAccelerator();
+ return super.toString() + "\n\tcharacter = '" + character + "'\n\tcode = " +
+ code + "\n\taccelerator = " + getAccelerator();
}
}
diff --git a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
index 2c812389b..1e8141525 100644
--- a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,7 +35,7 @@
/**
* An event indicating a keyboard key was pressed in a display.
- *
+ *
* @author Curtis Rueden
*/
public class KyPressedEvent extends KyEvent {
diff --git a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
index 2ce597b48..5090425c7 100644
--- a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,7 +35,7 @@
/**
* An event indicating a keyboard key was released in a display.
- *
+ *
* @author Curtis Rueden
*/
public class KyReleasedEvent extends KyEvent {
diff --git a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
index a345748ab..d0c38ecdc 100644
--- a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -36,14 +36,13 @@
/**
* An event indicating a keyboard key was typed (i.e., pressed and released) in
* a display.
- *
+ *
* @author Curtis Rueden
*/
public class KyTypedEvent extends KyEvent {
- public KyTypedEvent(final Display> display,
- final InputModifiers modifiers, final int x, final int y,
- final char character, final KeyCode code)
+ public KyTypedEvent(final Display> display, final InputModifiers modifiers,
+ final int x, final int y, final char character, final KeyCode code)
{
super(display, modifiers, x, y, character, code);
}
diff --git a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
index 2e728f3af..2fc43aaf1 100644
--- a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* An event indicating mouse button activity in a display.
- *
+ *
* @author Curtis Rueden
* @author Grant Harris
*/
@@ -52,9 +52,9 @@ public abstract class MsButtonEvent extends MsEvent {
private final int numClicks;
private final boolean isPopupTrigger;
- public MsButtonEvent(final Display> display,
- final InputModifiers modifiers, final int x, final int y,
- final int button, final int numClicks, final boolean isPopupTrigger)
+ public MsButtonEvent(final Display> display, final InputModifiers modifiers,
+ final int x, final int y, final int button, final int numClicks,
+ final boolean isPopupTrigger)
{
super(display, modifiers, x, y);
this.button = button;
diff --git a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
index 8962c1a80..28bb5174a 100644
--- a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,14 +34,14 @@
/**
* An event indicating a mouse button was clicked in a display.
- *
+ *
* @author Curtis Rueden
*/
public class MsClickedEvent extends MsButtonEvent {
public MsClickedEvent(final Display> display,
- final InputModifiers modifiers, final int x, final int y,
- final int button, final int numClicks, final boolean isPopupTrigger)
+ final InputModifiers modifiers, final int x, final int y, final int button,
+ final int numClicks, final boolean isPopupTrigger)
{
super(display, modifiers, x, y, button, numClicks, isPopupTrigger);
}
diff --git a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
index 226453319..619d2fc08 100644
--- a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,14 +34,14 @@
/**
* An event indicating a mouse was dragged in a display.
- *
+ *
* @author Curtis Rueden
*/
public class MsDraggedEvent extends MsButtonEvent {
public MsDraggedEvent(final Display> display,
- final InputModifiers modifiers, final int x, final int y,
- final int button, final int numClicks, final boolean isPopupTrigger)
+ final InputModifiers modifiers, final int x, final int y, final int button,
+ final int numClicks, final boolean isPopupTrigger)
{
super(display, modifiers, x, y, button, numClicks, isPopupTrigger);
}
diff --git a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
index 1ee9e2cf5..62d2b8f1d 100644
--- a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
/**
* An event indicating a mouse cursor entered a display.
- *
+ *
* @author Curtis Rueden
*/
public class MsEnteredEvent extends MsEvent {
diff --git a/src/main/java/org/scijava/display/event/input/MsEvent.java b/src/main/java/org/scijava/display/event/input/MsEvent.java
index 5e1d047f0..f22af24bf 100644
--- a/src/main/java/org/scijava/display/event/input/MsEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,7 +38,7 @@
* It is named {@code MsEvent} rather than {@code MouseEvent} to avoid name
* clashes with the {@link java.awt.event.MouseEvent} hierarchy.
*
- *
+ *
* @author Curtis Rueden
*/
public abstract class MsEvent extends InputEvent {
diff --git a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
index f60eb58b2..e0e217e56 100644
--- a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,13 +34,13 @@
/**
* An event indicating a mouse cursor exited a display.
- *
+ *
* @author Curtis Rueden
*/
public class MsExitedEvent extends MsEvent {
- public MsExitedEvent(final Display> display,
- final InputModifiers modifiers, final int x, final int y)
+ public MsExitedEvent(final Display> display, final InputModifiers modifiers,
+ final int x, final int y)
{
super(display, modifiers, x, y);
}
diff --git a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
index ba737a960..2dabf4957 100644
--- a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,13 +34,13 @@
/**
* An event indicating a mouse was moved in a display.
- *
+ *
* @author Curtis Rueden
*/
public class MsMovedEvent extends MsEvent {
- public MsMovedEvent(final Display> display,
- final InputModifiers modifiers, final int x, final int y)
+ public MsMovedEvent(final Display> display, final InputModifiers modifiers,
+ final int x, final int y)
{
super(display, modifiers, x, y);
}
diff --git a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
index 19ca38bfd..5a6dda378 100644
--- a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,14 +34,14 @@
/**
* An event indicating a mouse button was pressed in a display.
- *
+ *
* @author Curtis Rueden
*/
public class MsPressedEvent extends MsButtonEvent {
public MsPressedEvent(final Display> display,
- final InputModifiers modifiers, final int x, final int y,
- final int button, final int numClicks, final boolean isPopupTrigger)
+ final InputModifiers modifiers, final int x, final int y, final int button,
+ final int numClicks, final boolean isPopupTrigger)
{
super(display, modifiers, x, y, button, numClicks, isPopupTrigger);
}
diff --git a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
index 219e62b73..d86a466a1 100644
--- a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,14 +34,14 @@
/**
* An event indicating a mouse button was released in a display.
- *
+ *
* @author Curtis Rueden
*/
public class MsReleasedEvent extends MsButtonEvent {
public MsReleasedEvent(final Display> display,
- final InputModifiers modifiers, final int x, final int y,
- final int button, final int numClicks, final boolean isPopupTrigger)
+ final InputModifiers modifiers, final int x, final int y, final int button,
+ final int numClicks, final boolean isPopupTrigger)
{
super(display, modifiers, x, y, button, numClicks, isPopupTrigger);
}
diff --git a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
index 8f0ec7c6b..2fe92d8b7 100644
--- a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,16 +34,15 @@
/**
* An event indicating a mouse wheel was moved in a display.
- *
+ *
* @author Curtis Rueden
*/
public class MsWheelEvent extends MsEvent {
private final int wheelRotation;
- public MsWheelEvent(final Display> display,
- final InputModifiers modifiers, final int x, final int y,
- final int wheelRotation)
+ public MsWheelEvent(final Display> display, final InputModifiers modifiers,
+ final int x, final int y, final int wheelRotation)
{
super(display, modifiers, x, y);
this.wheelRotation = wheelRotation;
diff --git a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
index 380cc2185..be9432c4c 100644
--- a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
/**
* An event indicating a display window has been activated.
- *
+ *
* @author Curtis Rueden
*/
public class WinActivatedEvent extends WinEvent {
diff --git a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
index 7e11f2581..7106965dd 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
/**
* An event indicating a display window has been closed.
- *
+ *
* @author Curtis Rueden
*/
public class WinClosedEvent extends WinEvent {
diff --git a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
index f8573f746..bf0eb0cb9 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
/**
* An event indicating a display window is in the process of closing.
- *
+ *
* @author Curtis Rueden
*/
public class WinClosingEvent extends WinEvent {
diff --git a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
index c1f8f7d03..4fac03549 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
/**
* An event indicating a display window has been deactivated.
- *
+ *
* @author Curtis Rueden
*/
public class WinDeactivatedEvent extends WinEvent {
diff --git a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
index 770c05f30..fd4e47f4a 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
/**
* An event indicating a display window was deiconified.
- *
+ *
* @author Curtis Rueden
*/
public class WinDeiconifiedEvent extends WinEvent {
diff --git a/src/main/java/org/scijava/display/event/window/WinEvent.java b/src/main/java/org/scijava/display/event/window/WinEvent.java
index b691b0a71..08d8a7215 100644
--- a/src/main/java/org/scijava/display/event/window/WinEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,7 +38,7 @@
* It is named {@code WinEvent} rather than {@code WindowEvent} to avoid name
* clashes with the {@link java.awt.event.WindowEvent} hierarchy.
*
- *
+ *
* @author Curtis Rueden
*/
public abstract class WinEvent extends DisplayEvent {
diff --git a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
index 4486a5630..5695b5f03 100644
--- a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
/**
* An event indicating a display window was iconified.
- *
+ *
* @author Curtis Rueden
*/
public class WinIconifiedEvent extends WinEvent {
diff --git a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
index e34298e6c..780d54c72 100644
--- a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
/**
* An event indicating a display window has been opened.
- *
+ *
* @author Curtis Rueden
*/
public class WinOpenedEvent extends WinEvent {
diff --git a/src/main/java/org/scijava/download/DefaultDownloadService.java b/src/main/java/org/scijava/download/DefaultDownloadService.java
index da91dc3e8..b4e877c4d 100644
--- a/src/main/java/org/scijava/download/DefaultDownloadService.java
+++ b/src/main/java/org/scijava/download/DefaultDownloadService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -91,11 +91,12 @@ public Download download(final Location source, final Location destination,
final Task task = taskService.createTask("Download");
return new DefaultDownload(source, destination, task, () -> {
final Location cached = cache.cachedLocation(source);
- try (
- final DataHandle sourceHandle = dataHandleService.create(source);
- final DataHandle cachedHandle = dataHandleService.create(cached);
- final DataHandle destHandle = dataHandleService.create(destination)
- )
+ try (final DataHandle sourceHandle = dataHandleService.create(
+ source);
+ final DataHandle cachedHandle = dataHandleService.create(
+ cached);
+ final DataHandle destHandle = dataHandleService.create(
+ destination))
{
if (isCachedHandleValid(source, cache, sourceHandle, cachedHandle)) {
// The data is cached; download from the cached source instead.
diff --git a/src/main/java/org/scijava/download/DiskLocationCache.java b/src/main/java/org/scijava/download/DiskLocationCache.java
index 73471ebed..0f42de331 100644
--- a/src/main/java/org/scijava/download/DiskLocationCache.java
+++ b/src/main/java/org/scijava/download/DiskLocationCache.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/download/Download.java b/src/main/java/org/scijava/download/Download.java
index 56d00f71f..800ea7a22 100644
--- a/src/main/java/org/scijava/download/Download.java
+++ b/src/main/java/org/scijava/download/Download.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -26,6 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
* #L%
*/
+
package org.scijava.download;
import org.scijava.io.location.Location;
@@ -40,6 +41,8 @@
public interface Download {
Location source();
+
Location destination();
+
Task task();
}
diff --git a/src/main/java/org/scijava/download/DownloadService.java b/src/main/java/org/scijava/download/DownloadService.java
index abc4c8294..3545da027 100644
--- a/src/main/java/org/scijava/download/DownloadService.java
+++ b/src/main/java/org/scijava/download/DownloadService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/download/LocationCache.java b/src/main/java/org/scijava/download/LocationCache.java
index ee49eed26..d568a76c7 100644
--- a/src/main/java/org/scijava/download/LocationCache.java
+++ b/src/main/java/org/scijava/download/LocationCache.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/main/java/org/scijava/download/MultiWriteHandle.java b/src/main/java/org/scijava/download/MultiWriteHandle.java
index 4c7d5ef3a..9213002a2 100644
--- a/src/main/java/org/scijava/download/MultiWriteHandle.java
+++ b/src/main/java/org/scijava/download/MultiWriteHandle.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -26,6 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
* #L%
*/
+
package org.scijava.download;
import java.io.IOException;
@@ -40,7 +41,7 @@
/**
* {@link DataHandle} plugin for writing to multiple {@link DataHandle}s.
- *
+ *
* @author Curtis Rueden
*/
public class MultiWriteHandle extends AbstractDataHandle {
diff --git a/src/main/java/org/scijava/event/ContextCreatedEvent.java b/src/main/java/org/scijava/event/ContextCreatedEvent.java
index 2f43d2105..9d984cbcd 100644
--- a/src/main/java/org/scijava/event/ContextCreatedEvent.java
+++ b/src/main/java/org/scijava/event/ContextCreatedEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -30,9 +30,9 @@
package org.scijava.event;
/**
- * Event to be published immediately after a context has been fully created
- * with all services initialized.
- *
+ * Event to be published immediately after a context has been fully created with
+ * all services initialized.
+ *
* @author Curtis Rueden
*/
-public class ContextCreatedEvent extends SciJavaEvent { }
+public class ContextCreatedEvent extends SciJavaEvent {}
diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index 472c6b03e..7beb5a1f1 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,7 +31,7 @@
/**
* Event to be published just before disposing a context.
- *
+ *
* @author Johannes Schindelin
*/
-public class ContextDisposingEvent extends SciJavaEvent { }
+public class ContextDisposingEvent extends SciJavaEvent {}
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 72e269077..9d51e7761 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -47,7 +47,7 @@
* {@code org.scijava.event.bushe.EventService} but rather a SciJava
* {@link Service} implementation.
*
- *
+ *
* @author Curtis Rueden
*/
public class DefaultEventBus extends ThreadSafeEventService {
@@ -132,8 +132,7 @@ public void publish(final String topicName, final Object eventObj) {
@Override
protected void publish(final Object event, final String topic,
- final Object eventObj,
- @SuppressWarnings("rawtypes") final List subscribers,
+ final Object eventObj, @SuppressWarnings("rawtypes") final List subscribers,
@SuppressWarnings("rawtypes") final List vetoSubscribers,
final StackTraceElement[] callingStack)
{
@@ -144,8 +143,7 @@ protected void publish(final Object event, final String topic,
// -- Helper methods --
private void publishNow(final Object event, final String topic,
- final Object eventObj,
- @SuppressWarnings("rawtypes") final List subscribers,
+ final Object eventObj, @SuppressWarnings("rawtypes") final List subscribers,
@SuppressWarnings("rawtypes") final List vetoSubscribers,
final StackTraceElement[] callingStack)
{
@@ -171,8 +169,7 @@ public void run() {
}
private void publishLater(final Object event, final String topic,
- final Object eventObj,
- @SuppressWarnings("rawtypes") final List subscribers,
+ final Object eventObj, @SuppressWarnings("rawtypes") final List subscribers,
@SuppressWarnings("rawtypes") final List vetoSubscribers,
final StackTraceElement[] callingStack)
{
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index c0d397cb1..7ab22b687 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -39,7 +39,7 @@
/**
* Default service for keeping a history of SciJava events.
- *
+ *
* @author Curtis Rueden
*/
@Plugin(type = Service.class)
@@ -53,8 +53,7 @@ public class DefaultEventHistory extends AbstractService implements
/** Event details that have been recorded. */
private ArrayList history = new ArrayList<>();
- private ArrayList listeners =
- new ArrayList<>();
+ private ArrayList listeners = new ArrayList<>();
private boolean active;
@@ -86,8 +85,8 @@ public String toHTML(final Set> filtered,
// skip filtered event type
continue;
}
- final boolean bold =
- highlighted != null && highlighted.contains(eventType);
+ final boolean bold = highlighted != null && highlighted.contains(
+ eventType);
sb.append(details.toHTML(bold));
}
return sb.toString();
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index d627ce668..f45e279c1 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -6,13 +6,13 @@
* %%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -53,7 +53,7 @@
/**
* Default service for publishing and subscribing to SciJava events.
- *
+ *
* @author Curtis Rueden
* @author Grant Harris
*/
@@ -110,8 +110,8 @@ public void publishLater(final E e) {
@Override
public List> subscribe(final Object o) {
- final List eventHandlers =
- ClassUtils.getAnnotatedMethods(o.getClass(), EventHandler.class);
+ final List eventHandlers = ClassUtils.getAnnotatedMethods(o
+ .getClass(), EventHandler.class);
if (eventHandlers.isEmpty()) return Collections.emptyList();
final ArrayList> subscribers = new ArrayList<>();
@@ -216,7 +216,8 @@ private Class extends SciJavaEvent> getEventClass(final Method m) {
if (eventClass == null) {
final Class>[] c = m.getParameterTypes();
if (c == null || c.length != 1) return null; // wrong number of args
- if (!SciJavaEvent.class.isAssignableFrom(c[0])) return null; // wrong class
+ if (!SciJavaEvent.class.isAssignableFrom(c[0])) return null; // wrong
+ // class
// Cache the eventClass
eventClass = c[0];
@@ -225,7 +226,7 @@ private Class extends SciJavaEvent> getEventClass(final Method m) {
@SuppressWarnings("unchecked")
final Class extends SciJavaEvent> typedClass =
- (Class extends SciJavaEvent>) eventClass;
+ (Class extends SciJavaEvent>) eventClass;
return typedClass;
}
@@ -233,7 +234,7 @@ private Class extends SciJavaEvent> getEventClass(final Method m) {
// -- Event handlers garbage collection preventer --
private WeakHashMap