Make most of the bushe classes package-private

ctrueden · ctrueden · commit bd41c8ace85a · 2023-05-17T12:26:20.000-05:00
The goal is not to add new SciJava Common API, but merely
to vendor the org.bushe:eventbus code for internal use.

Unfortunately, we don't have JPMS yet, and cannot
fully hide the package. But we can get pretty close.
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -41,11 +41,11 @@
 import org.scijava.thread.ThreadService;
 
 /**
- * An {@link org.scijava.event.bushe.EventService} implementation for SciJava.
+ * An {@code org.scijava.event.bushe.EventService} implementation for SciJava.
  * <p>
  * It is called "DefaultEventBus" rather than "DefaultEventService" to avoid a
  * name clash with {@link DefaultEventService}, which is not an
- * {@link org.scijava.event.bushe.EventService} but rather a SciJava
+ * {@code org.scijava.event.bushe.EventService} but rather a SciJava
  * {@link Service} implementation.
  * </p>
  * 
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -42,7 +42,6 @@
 
 import org.scijava.Priority;
 import org.scijava.event.bushe.AbstractProxySubscriber;
-import org.scijava.event.bushe.BaseProxySubscriber;
 import org.scijava.event.bushe.ReferenceStrength;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
@@ -262,9 +261,10 @@ private synchronized void keepIt(final Object o, final ProxySubscriber<?> subscr
 	/**
 	 * Helper class used by {@link #subscribe(Object)}.
 	 * <p>
-	 * Recapitulates some logic from {@link BaseProxySubscriber}, because that
-	 * class implements {@link org.scijava.event.bushe.IEventSubscriber} as a raw
-	 * type, which is incompatible with this class implementing SciJava's
+	 * Recapitulates some logic from
+	 * {@code org.scijava.event.bushe.BaseProxySubscriber}, because that class
+	 * implements {@link org.scijava.event.bushe.IEventSubscriber} as a raw type,
+	 * which is incompatible with this class implementing SciJava's
 	 * {@link EventSubscriber} as a typed interface; it becomes impossible to
 	 * implement both {@code onEvent(Object)} and {@code onEvent(E)}.
 	 * </p>
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
@@ -40,15 +40,15 @@
  * handling methods and annotating each with @{@link EventHandler}.
  * <p>
  * Note to developers: This annotation serves exactly the same purpose as
- * EventBus's {@link org.scijava.event.bushe.EventSubscriber}
- * annotation, recapitulating a subset of the same functionality. We do this to
- * avoid third party code depending directly on EventBus. That is, we do not
- * wish to require SciJava developers to {@code import org.scijava.event.bushe.*}
- * or similar. In this way, EventBus is isolated as only a transitive dependency
- * of downstream code, rather than a direct dependency. Unfortunately, because
- * Java annotation interfaces cannot utilize inheritance, we have to
- * recapitulate the functionality rather than extend it (as we are able to do
- * with {@link EventSubscriber}).
+ * EventBus's {@code org.scijava.event.bushe.EventSubscriber} annotation,
+ * recapitulating a subset of the same functionality. We do this to avoid third
+ * party code depending directly on EventBus. That is, we do not wish to require
+ * SciJava developers to {@code import org.scijava.event.bushe.*} or similar. In
+ * this way, EventBus is isolated as only a transitive dependency of downstream
+ * code, rather than a direct dependency. Unfortunately, because Java annotation
+ * interfaces cannot utilize inheritance, we have to recapitulate the
+ * functionality rather than extend it (as we are able to do with
+ * {@link EventSubscriber}).
  * </p>
  * 
  * @author Curtis Rueden
diff --git a/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java b/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java
@@ -22,7 +22,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public abstract class AbstractEventServiceEvent implements EventServiceEvent, PublicationStatusTracker {
+abstract class AbstractEventServiceEvent implements EventServiceEvent, PublicationStatusTracker {
 
    private Object source = null;
    protected final Object stateLock = new Object();
diff --git a/src/main/java/org/scijava/event/bushe/AnnotationProcessor.java b/src/main/java/org/scijava/event/bushe/AnnotationProcessor.java
@@ -36,7 +36,7 @@
  * code. <li>In a Annotation Processing Tool plugin, when it becomes available. </ul> Support for these other methods
  * are not yet implemented.
  */
-public class AnnotationProcessor {
+class AnnotationProcessor {
 
    protected static final Logger LOG = Logger.getLogger(EventService.class.getName());
 
diff --git a/src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java b/src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java
@@ -4,7 +4,7 @@
 import java.lang.reflect.Method;
 
 /** A class is subscribed to an EventService on behalf of another object. */
-public class BaseProxySubscriber extends AbstractProxySubscriber
+class BaseProxySubscriber extends AbstractProxySubscriber
         implements org.scijava.event.bushe.IEventSubscriber, VetoEventListener {
    private Class subscriptionClass;
 
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java
@@ -39,7 +39,7 @@
  * @see EventServiceAction for further documentation
  * @see ContainerEventServiceFinder on how the service is found
  */
-public class ContainerEventServiceAction extends EventServiceAction {
+class ContainerEventServiceAction extends EventServiceAction {
    public ContainerEventServiceAction() {
    }
 
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java
@@ -38,7 +38,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public class ContainerEventServiceFinder {
+class ContainerEventServiceFinder {
    /** The client property used to put a new SwingEventService on top-level components. */
    public static final String CLIENT_PROPERTY_KEY_TOP_LEVEL_EVENT_SERVICE = "ContainerEventServiceFinder.createdService";
 
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
@@ -35,7 +35,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public class ContainerEventServiceRegistrar {
+class ContainerEventServiceRegistrar {
    private JComponent jComp;
    private IEventSubscriber eventSubscriber;
    private VetoEventListener vetoSubscriber;
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java
@@ -37,6 +37,6 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public interface ContainerEventServiceSupplier {
+interface ContainerEventServiceSupplier {
    public EventService getContainerEventService();
 }
diff --git a/src/main/java/org/scijava/event/bushe/EventBus.java b/src/main/java/org/scijava/event/bushe/EventBus.java
@@ -37,7 +37,7 @@
  * @see SwingEventService
  * @see ThreadSafeEventService See package JavaDoc for more information
  */
-public class EventBus {
+class EventBus {
 
   /**
     * The EventBus uses a global static EventService.  This method is not necessary in usual usage, use the other static
diff --git a/src/main/java/org/scijava/event/bushe/EventBusAction.java b/src/main/java/org/scijava/event/bushe/EventBusAction.java
@@ -25,7 +25,7 @@
  * @author Michael Bushe michael@bushe.com
  * @see EventServiceAction
  */
-public class EventBusAction extends EventServiceAction {
+class EventBusAction extends EventServiceAction {
    public EventBusAction() {
       this(null, null);
    }
diff --git a/src/main/java/org/scijava/event/bushe/EventService.java b/src/main/java/org/scijava/event/bushe/EventService.java
@@ -115,7 +115,7 @@
  * @see {@link org.scijava.event.bushe.IEventSubscriber} for subscription annotations
  * @see {@link org.scijava.event.bushe.IEventTopicSubscriber} for subscription annotations
  */
-public interface EventService {
+interface EventService {
 
    /**
     * Publishes an object so that subscribers will be notified if they subscribed to the object's class, one of its
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceAction.java b/src/main/java/org/scijava/event/bushe/EventServiceAction.java
@@ -40,7 +40,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public abstract class EventServiceAction extends AbstractAction {
+abstract class EventServiceAction extends AbstractAction {
    public static final String EVENT_SERVICE_TOPIC_NAME = "event-service-topic";
 
    private boolean throwsExceptionOnNullEventService = true;
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceEvent.java b/src/main/java/org/scijava/event/bushe/EventServiceEvent.java
@@ -24,7 +24,7 @@
  * @author Michael Bushe michael@bushe.com
  * @see AbstractEventServiceEvent for a simple base class
  */
-public interface EventServiceEvent {
+interface EventServiceEvent {
    /** @return The issuer of the event. */
    Object getSource();
 }
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java b/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java
@@ -1,7 +1,7 @@
 package org.scijava.event.bushe;
 
 /** Exception thrown by the EventServiceLocator when an EventService already is registered for a name. */
-public class EventServiceExistsException extends Exception {
+class EventServiceExistsException extends Exception {
    public EventServiceExistsException(String msg) {
       super(msg);
    }
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceLocator.java b/src/main/java/org/scijava/event/bushe/EventServiceLocator.java
@@ -51,7 +51,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public class EventServiceLocator {
+class EventServiceLocator {
    /** The name "EventBus" is reserved for the service that the EventBus wraps and is returned by {@link #getEventBusService}.*/
    public static final String SERVICE_NAME_EVENT_BUS = "EventBus";
    /** The name "SwingEventService" is reserved for the service that is returned by {@link #getSwingEventService}. */
diff --git a/src/main/java/org/scijava/event/bushe/EventSubscriber.java b/src/main/java/org/scijava/event/bushe/EventSubscriber.java
@@ -82,7 +82,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface EventSubscriber {
+@interface EventSubscriber {
    /** The class to subscribe to, if not specified, a subscription is created for the type of the method parameter. */
    Class eventClass() default UseTheClassOfTheAnnotatedMethodsParameter.class;
 
diff --git a/src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java
@@ -7,7 +7,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface EventTopicPatternSubscriber {
+@interface EventTopicPatternSubscriber {
    /** The Regular Expression to subscribe to. */
    String topicPattern();
 
diff --git a/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
@@ -83,7 +83,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface EventTopicSubscriber {
+@interface EventTopicSubscriber {
    /** The topic to subscribe to */
    String topic();
 
diff --git a/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java
@@ -20,7 +20,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public interface IEventTopicSubscriber<T> {
+interface IEventTopicSubscriber<T> {
 
    /**
     * Handle an event published on a topic.
diff --git a/src/main/java/org/scijava/event/bushe/Logger.java b/src/main/java/org/scijava/event/bushe/Logger.java
@@ -19,7 +19,7 @@
  * explicit.  There is also no explicit use of classes outside java.util,
  * anything else is used by reflection to avoid NoClassDefFound errors on class load.
  */
-public class Logger {
+class Logger {
    private java.util.logging.Logger utilLogger;
    private /*Untyped to avoid java.lang.NoClassDefFoundError
    org.apache.commons.logging.Log*/ Object commonsLogger;
diff --git a/src/main/java/org/scijava/event/bushe/ObjectEvent.java b/src/main/java/org/scijava/event/bushe/ObjectEvent.java
@@ -22,7 +22,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public class ObjectEvent extends AbstractEventServiceEvent {
+class ObjectEvent extends AbstractEventServiceEvent {
    private Object eventObject;
 
    /**
diff --git a/src/main/java/org/scijava/event/bushe/Prioritized.java b/src/main/java/org/scijava/event/bushe/Prioritized.java
@@ -9,6 +9,6 @@
  * from this interface is positive, then this subscriber will be called after non-Prioritized subscribers, the more
  * positive, the later it is called.
  */
-public interface Prioritized {
+interface Prioritized {
    int getPriority();
 }
diff --git a/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java b/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
@@ -4,5 +4,5 @@
  * This is a convenience interface, particularly for inner classes, that implements
  * {@link IEventSubscriber} and {@link Prioritized}.
  */
-public interface PrioritizedEventSubscriber extends IEventSubscriber, Prioritized {
+interface PrioritizedEventSubscriber extends IEventSubscriber, Prioritized {
 }
diff --git a/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
@@ -4,5 +4,5 @@
  * This is a convenience interface, particularly for inner classes, that implements
  * {@link org.scijava.event.bushe.IEventTopicSubscriber} and {@link org.scijava.event.bushe.Prioritized}.
  */
-public interface PrioritizedEventTopicSubscriber extends IEventTopicSubscriber, Prioritized {
+interface PrioritizedEventTopicSubscriber extends IEventTopicSubscriber, Prioritized {
 }
diff --git a/src/main/java/org/scijava/event/bushe/ProxySubscriber.java b/src/main/java/org/scijava/event/bushe/ProxySubscriber.java
@@ -25,7 +25,7 @@
  *
  * @author Michael Bushe
  */
-public interface ProxySubscriber {
+interface ProxySubscriber {
 
    /** @return the object this proxy is subscribed on behalf of */
    public Object getProxiedSubscriber();
diff --git a/src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java
@@ -6,7 +6,7 @@
 /**
  * A Proxy Subscriber for Annotations that use topic patterns
  */
-public class ProxyTopicPatternSubscriber extends ProxyTopicSubscriber {
+class ProxyTopicPatternSubscriber extends ProxyTopicSubscriber {
    private Pattern pattern;
 
    /**
diff --git a/src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java
@@ -8,7 +8,7 @@
  * {@link @org.scijava.event.bushe.annotation.EventTopicSubscriber}.  Advanced EventBus
  * users could use this class in Aspect-Oriented code.  Consider using the
  * {@link AnnotationProcessor} instead, it may suit your needs and be easier.*/
-public class ProxyTopicSubscriber extends AbstractProxySubscriber
+class ProxyTopicSubscriber extends AbstractProxySubscriber
         implements org.scijava.event.bushe.IEventTopicSubscriber, VetoTopicEventListener {
    private String topic;
 
diff --git a/src/main/java/org/scijava/event/bushe/PublicationStatus.java b/src/main/java/org/scijava/event/bushe/PublicationStatus.java
@@ -7,7 +7,7 @@
  * with the corresponding PublicationStatus as the event object is processed.  The EventService is not
  * required to set the Unpublished state.
  */
-public enum PublicationStatus {
+enum PublicationStatus {
    /** Recommended default.*/
    Unpublished,
    /** Set directly after publication on an EventService.*/
diff --git a/src/main/java/org/scijava/event/bushe/PublicationStatusTracker.java b/src/main/java/org/scijava/event/bushe/PublicationStatusTracker.java
@@ -7,7 +7,7 @@
  * EventService implementations must call setEventStatus(status) on event objects and
  * payloads that implement this interface.
  */
-public interface PublicationStatusTracker {
+interface PublicationStatusTracker {
 
    /**
     * Implementations of this method must be made thread safe.
diff --git a/src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java b/src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java
@@ -10,7 +10,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface RuntimeTopicEventSubscriber {
+@interface RuntimeTopicEventSubscriber {
     /**
      * @return name of a method (that must return a String) and whose return value will become the subscription topic.
      */
diff --git a/src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java b/src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java
@@ -7,7 +7,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface RuntimeTopicPatternEventSubscriber {
+@interface RuntimeTopicPatternEventSubscriber {
     /**
      * @return name of a method (which should return a String) and whose return value will become the subscription topic.
      */
diff --git a/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java b/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
@@ -22,7 +22,7 @@
  * @author Michael Bushe michael@bushe.com
  * @see ThreadSafeEventService
  */
-public class SubscriberTimingEvent extends AbstractEventServiceEvent {
+class SubscriberTimingEvent extends AbstractEventServiceEvent {
    private Long start;
    private Long end;
    private Long timeLimitMilliseconds;
diff --git a/src/main/java/org/scijava/event/bushe/SwingEventService.java b/src/main/java/org/scijava/event/bushe/SwingEventService.java
@@ -28,7 +28,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public class SwingEventService extends ThreadSafeEventService {
+class SwingEventService extends ThreadSafeEventService {
 
    /**
     * By default, the SwingEventService is constructed such that any listener that takes over 200 ms causes an
diff --git a/src/main/java/org/scijava/event/bushe/SwingException.java b/src/main/java/org/scijava/event/bushe/SwingException.java
@@ -38,7 +38,7 @@
  * @todo in SwingUtils, make an invokeLater() method that saves the calling stack and catches all exceptions from a
  * subsequent call to SwingUtilities.invokeLater(), then throws a Swing Exception so the calling stack is saved.
  */
-public class SwingException extends Exception {
+class SwingException extends Exception {
    protected StackTraceElement[] callingStackTrace;
 
    /** Default constructor */
diff --git a/src/main/java/org/scijava/event/bushe/TypeReference.java b/src/main/java/org/scijava/event/bushe/TypeReference.java
@@ -9,7 +9,7 @@
  * Courtesy of Neil Gafter's blog.
  * Thanks to Curt Cox for the pointer.
  */
-public abstract class TypeReference<T> {
+abstract class TypeReference<T> {
 
  private final Type type;
  private volatile Constructor<?> constructor;
diff --git a/src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java b/src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java
@@ -11,5 +11,5 @@
  * Object.class cannot be used, since it is legal to subscribe to Object. hence, this class was created which documents
  * the issue and provides decent feedback when using an IDE's parameter insight.
  */
-public final class UseTheClassOfTheAnnotatedMethodsParameter {
+final class UseTheClassOfTheAnnotatedMethodsParameter {
 }
diff --git a/src/main/java/org/scijava/event/bushe/VetoEventListener.java b/src/main/java/org/scijava/event/bushe/VetoEventListener.java
@@ -20,7 +20,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public interface VetoEventListener<T> {
+interface VetoEventListener<T> {
 
    /**
     * Determine whether an event should be vetoed or published.
diff --git a/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java
@@ -7,7 +7,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface VetoRuntimeTopicPatternSubscriber {
+@interface VetoRuntimeTopicPatternSubscriber {
     /**
      * @return name of a method (which should return a String) and whose return value will become the subscription topic.
      */
diff --git a/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java
@@ -10,7 +10,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface VetoRuntimeTopicSubscriber {
+@interface VetoRuntimeTopicSubscriber {
     /**
      * @return name of a method (that must return a String) and whose return value will become the subscription topic.
      */
diff --git a/src/main/java/org/scijava/event/bushe/VetoSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoSubscriber.java
diff --git a/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java b/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java
diff --git a/src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java
diff --git a/src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`* @author Michael Bushe michael@bushe.com`
`24`	`24`	`*/`
`25`		`-public abstract class AbstractEventServiceEvent implements EventServiceEvent, PublicationStatusTracker {`
	`25`	`+abstract class AbstractEventServiceEvent implements EventServiceEvent, PublicationStatusTracker {`
`26`	`26`
`27`	`27`	`private Object source = null;`
`28`	`28`	`protected final Object stateLock = new Object();`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`* @see EventServiceAction for further documentation`
`40`	`40`	`* @see ContainerEventServiceFinder on how the service is found`
`41`	`41`	`*/`
`42`		`-public class ContainerEventServiceAction extends EventServiceAction {`
	`42`	`+class ContainerEventServiceAction extends EventServiceAction {`
`43`	`43`	`public ContainerEventServiceAction() {`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`*`
`39`	`39`	`* @author Michael Bushe michael@bushe.com`
`40`	`40`	`*/`
`41`		`-public class ContainerEventServiceFinder {`
	`41`	`+class ContainerEventServiceFinder {`
`42`	`42`	`/** The client property used to put a new SwingEventService on top-level components. */`
`43`	`43`	`public static final String CLIENT_PROPERTY_KEY_TOP_LEVEL_EVENT_SERVICE = "ContainerEventServiceFinder.createdService";`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`*`
`36`	`36`	`* @author Michael Bushe michael@bushe.com`
`37`	`37`	`*/`
`38`		`-public class ContainerEventServiceRegistrar {`
	`38`	`+class ContainerEventServiceRegistrar {`
`39`	`39`	`private JComponent jComp;`
`40`	`40`	`private IEventSubscriber eventSubscriber;`
`41`	`41`	`private VetoEventListener vetoSubscriber;`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@`
`37`	`37`	`*`
`38`	`38`	`* @author Michael Bushe michael@bushe.com`
`39`	`39`	`*/`
`40`		`-public interface ContainerEventServiceSupplier {`
	`40`	`+interface ContainerEventServiceSupplier {`
`41`	`41`	`public EventService getContainerEventService();`
`42`	`42`	`}`