Skip to content

Commit 66c98fd

Browse files
ctruedenctrueden
committed
Move all org.bushe:eventbus code into one package
So that we can more easily decrease the visibility of these classes.
1 parent 98a7b73 commit 66c98fd

File tree

67 files changed

+563
-654
lines changed

Some content is hidden

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

67 files changed

+563
-654
lines changed

‎src/main/java/org/scijava/event/DefaultEventService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
import java.util.Map;
4141
import java.util.WeakHashMap;
4242

43-
import org.scijava.event.bushe.annotation.AbstractProxySubscriber;
44-
import org.scijava.event.bushe.annotation.BaseProxySubscriber;
45-
import org.scijava.event.bushe.annotation.ReferenceStrength;
4643
import org.scijava.Priority;
44+
import org.scijava.event.bushe.AbstractProxySubscriber;
45+
import org.scijava.event.bushe.BaseProxySubscriber;
46+
import org.scijava.event.bushe.ReferenceStrength;
4747
import org.scijava.log.LogService;
4848
import org.scijava.plugin.Parameter;
4949
import org.scijava.plugin.Plugin;
@@ -263,7 +263,7 @@ private synchronized void keepIt(final Object o, final ProxySubscriber<?> subscr
263263
* Helper class used by {@link #subscribe(Object)}.
264264
* <p>
265265
* Recapitulates some logic from {@link BaseProxySubscriber}, because that
266-
* class implements {@link org.scijava.event.bushe.EventSubscriber} as a raw
266+
* class implements {@link org.scijava.event.bushe.IEventSubscriber} as a raw
267267
* type, which is incompatible with this class implementing SciJava's
268268
* {@link EventSubscriber} as a typed interface; it becomes impossible to
269269
* implement both {@code onEvent(Object)} and {@code onEvent(E)}.

‎src/main/java/org/scijava/event/EventHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* handling methods and annotating each with @{@link EventHandler}.
4141
* <p>
4242
* Note to developers: This annotation serves exactly the same purpose as
43-
* EventBus's {@link org.scijava.event.bushe.annotation.EventSubscriber}
43+
* EventBus's {@link org.scijava.event.bushe.EventSubscriber}
4444
* annotation, recapitulating a subset of the same functionality. We do this to
4545
* avoid third party code depending directly on EventBus. That is, we do not
4646
* wish to require SciJava developers to {@code import org.scijava.event.bushe.*}

‎src/main/java/org/scijava/event/EventSubscriber.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
* @param <E> Type of event for which to listen
4545
*/
4646
public interface EventSubscriber<E extends SciJavaEvent> extends
47-
org.scijava.event.bushe.EventSubscriber<E>
47+
org.scijava.event.bushe.IEventSubscriber<E>
4848
{
4949

5050
@Override

src/main/java/org/scijava/event/bushe/annotation/AbstractProxySubscriber.java renamed to src/main/java/org/scijava/event/bushe/AbstractProxySubscriber.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
package org.scijava.event.bushe.annotation;
1+
package org.scijava.event.bushe;
22

33
import java.lang.ref.WeakReference;
44
import java.lang.reflect.Method;
55
import java.lang.reflect.AccessibleObject;
66
import java.lang.reflect.InvocationTargetException;
77

8-
import org.scijava.event.bushe.EventService;
9-
import org.scijava.event.bushe.ProxySubscriber;
10-
import org.scijava.event.bushe.Prioritized;
11-
128
/**
139
* Common base class for EventService Proxies.
1410
* <p>

src/main/java/org/scijava/event/bushe/annotation/AnnotationProcessor.java renamed to src/main/java/org/scijava/event/bushe/AnnotationProcessor.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
package org.scijava.event.bushe.annotation;
1+
package org.scijava.event.bushe;
22

33
import java.lang.annotation.Annotation;
44
import java.lang.reflect.InvocationTargetException;
55
import java.lang.reflect.Method;
66
import java.util.regex.Pattern;
77
import java.util.Arrays;
88

9-
import org.scijava.event.bushe.EventService;
10-
import org.scijava.event.bushe.EventServiceExistsException;
11-
import org.scijava.event.bushe.EventServiceLocator;
12-
import org.scijava.event.bushe.Logger;
13-
149
/**
1510
* Enhances classes that use EventService Annotations.
1611
* <p/>

src/main/java/org/scijava/event/bushe/annotation/BaseProxySubscriber.java renamed to src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
package org.scijava.event.bushe.annotation;
1+
package org.scijava.event.bushe;
22

33
import java.lang.reflect.InvocationTargetException;
44
import java.lang.reflect.Method;
55

6-
import org.scijava.event.bushe.EventService;
7-
import org.scijava.event.bushe.VetoEventListener;
8-
96
/** A class is subscribed to an EventService on behalf of another object. */
107
public class BaseProxySubscriber extends AbstractProxySubscriber
11-
implements org.scijava.event.bushe.EventSubscriber, VetoEventListener {
8+
implements org.scijava.event.bushe.IEventSubscriber, VetoEventListener {
129
private Class subscriptionClass;
1310

1411
/**

‎src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
*/
3838
public class ContainerEventServiceRegistrar {
3939
private JComponent jComp;
40-
private EventSubscriber eventSubscriber;
40+
private IEventSubscriber eventSubscriber;
4141
private VetoEventListener vetoSubscriber;
4242
private Class[] eventClasses;
43-
private EventTopicSubscriber eventTopicSubscriber;
43+
private IEventTopicSubscriber eventTopicSubscriber;
4444
private VetoTopicEventListener vetoTopicSubscriber;
4545
private String[] topics;
4646
private EventService containerEventService;
@@ -63,7 +63,7 @@ public ContainerEventServiceRegistrar(JComponent jComp) {
6363
* @param eventSubscriber the subscriber to register to the Container EventServer
6464
* @param eventClasses the class(es) to register for
6565
*/
66-
public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSubscriber, Class... eventClasses) {
66+
public ContainerEventServiceRegistrar(JComponent jComp, IEventSubscriber eventSubscriber, Class... eventClasses) {
6767
this(jComp, eventSubscriber, null, eventClasses, null, null, null);
6868
}
6969

@@ -75,7 +75,7 @@ public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSub
7575
* @param eventTopicSubscriber the topic subscriber to register to the Container EventServer
7676
* @param topics the event topic name to register for
7777
*/
78-
public ContainerEventServiceRegistrar(JComponent jComp, EventTopicSubscriber eventTopicSubscriber, String... topics) {
78+
public ContainerEventServiceRegistrar(JComponent jComp, IEventTopicSubscriber eventTopicSubscriber, String... topics) {
7979
this(jComp, null, null, null, eventTopicSubscriber, null, topics);
8080
}
8181

@@ -113,8 +113,8 @@ public ContainerEventServiceRegistrar(JComponent jComp, VetoTopicEventListener v
113113
* @param eventTopicSubscriber the topic subscriber to keep registered to the topic(s)
114114
* @param topics the event topic names to register for
115115
*/
116-
public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSubscriber, Class[] eventClasses,
117-
EventTopicSubscriber eventTopicSubscriber, String[] topics) {
116+
public ContainerEventServiceRegistrar(JComponent jComp, IEventSubscriber eventSubscriber, Class[] eventClasses,
117+
IEventTopicSubscriber eventTopicSubscriber, String[] topics) {
118118
this(jComp, eventSubscriber, null, eventClasses, eventTopicSubscriber, null, topics);
119119
}
120120

@@ -130,8 +130,8 @@ public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSub
130130
* @param vetoTopicSubscriber a veto subscriber for the topics
131131
* @param topics the event topic names to register for
132132
*/
133-
public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSubscriber, VetoEventListener vetoSubscriber,
134-
Class[] eventClasses, EventTopicSubscriber eventTopicSubscriber, VetoTopicEventListener vetoTopicSubscriber,
133+
public ContainerEventServiceRegistrar(JComponent jComp, IEventSubscriber eventSubscriber, VetoEventListener vetoSubscriber,
134+
Class[] eventClasses, IEventTopicSubscriber eventTopicSubscriber, VetoTopicEventListener vetoTopicSubscriber,
135135
String[] topics) {
136136
this.jComp = jComp;
137137
this.eventSubscriber = eventSubscriber;

‎src/main/java/org/scijava/event/bushe/EventBus.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -74,68 +74,68 @@ public static void publish(Type genericType, Object o) {
7474
}
7575

7676

77-
/** @see EventService#subscribe(Class,EventSubscriber) */
78-
public static boolean subscribe(Class eventClass, EventSubscriber subscriber) {
77+
/** @see EventService#subscribe(Class,IEventSubscriber) */
78+
public static boolean subscribe(Class eventClass, IEventSubscriber subscriber) {
7979
return EventServiceLocator.getEventBusService().subscribe(eventClass, subscriber);
8080
}
8181

82-
/** @see EventService#subscribe(java.lang.reflect.Type, EventSubscriber) */
83-
public static boolean subscribe(Type genericType, EventSubscriber subscriber) {
82+
/** @see EventService#subscribe(java.lang.reflect.Type, IEventSubscriber) */
83+
public static boolean subscribe(Type genericType, IEventSubscriber subscriber) {
8484
return EventServiceLocator.getEventBusService().subscribe(genericType, subscriber);
8585
}
8686

87-
/** @see EventService#subscribeExactly(Class,EventSubscriber) */
88-
public static boolean subscribeExactly(Class eventClass, EventSubscriber subscriber) {
87+
/** @see EventService#subscribeExactly(Class,IEventSubscriber) */
88+
public static boolean subscribeExactly(Class eventClass, IEventSubscriber subscriber) {
8989
return EventServiceLocator.getEventBusService().subscribeExactly(eventClass, subscriber);
9090
}
9191

92-
/** @see EventService#subscribe(String,EventTopicSubscriber) */
93-
public static boolean subscribe(String topic, EventTopicSubscriber subscriber) {
92+
/** @see EventService#subscribe(String,IEventTopicSubscriber) */
93+
public static boolean subscribe(String topic, IEventTopicSubscriber subscriber) {
9494
return EventServiceLocator.getEventBusService().subscribe(topic, subscriber);
9595
}
9696

97-
/** @see EventService#subscribe(Pattern,EventTopicSubscriber) */
98-
public static boolean subscribe(Pattern topicPattern, EventTopicSubscriber subscriber) {
97+
/** @see EventService#subscribe(Pattern,IEventTopicSubscriber) */
98+
public static boolean subscribe(Pattern topicPattern, IEventTopicSubscriber subscriber) {
9999
return EventServiceLocator.getEventBusService().subscribe(topicPattern, subscriber);
100100
}
101101

102-
/** @see EventService#subscribeStrongly(Class,EventSubscriber) */
103-
public static boolean subscribeStrongly(Class eventClass, EventSubscriber subscriber) {
102+
/** @see EventService#subscribeStrongly(Class,IEventSubscriber) */
103+
public static boolean subscribeStrongly(Class eventClass, IEventSubscriber subscriber) {
104104
return EventServiceLocator.getEventBusService().subscribeStrongly(eventClass, subscriber);
105105
}
106106

107-
/** @see EventService#subscribeExactlyStrongly(Class,EventSubscriber) */
108-
public static boolean subscribeExactlyStrongly(Class eventClass, EventSubscriber subscriber) {
107+
/** @see EventService#subscribeExactlyStrongly(Class,IEventSubscriber) */
108+
public static boolean subscribeExactlyStrongly(Class eventClass, IEventSubscriber subscriber) {
109109
return EventServiceLocator.getEventBusService().subscribeExactlyStrongly(eventClass, subscriber);
110110
}
111111

112-
/** @see EventService#subscribeStrongly(String,EventTopicSubscriber) */
113-
public static boolean subscribeStrongly(String topic, EventTopicSubscriber subscriber) {
112+
/** @see EventService#subscribeStrongly(String,IEventTopicSubscriber) */
113+
public static boolean subscribeStrongly(String topic, IEventTopicSubscriber subscriber) {
114114
return EventServiceLocator.getEventBusService().subscribeStrongly(topic, subscriber);
115115
}
116116

117-
/** @see EventService#subscribeStrongly(Pattern,EventTopicSubscriber) */
118-
public static boolean subscribeStrongly(Pattern topicPattern, EventTopicSubscriber subscriber) {
117+
/** @see EventService#subscribeStrongly(Pattern,IEventTopicSubscriber) */
118+
public static boolean subscribeStrongly(Pattern topicPattern, IEventTopicSubscriber subscriber) {
119119
return EventServiceLocator.getEventBusService().subscribeStrongly(topicPattern, subscriber);
120120
}
121121

122-
/** @see EventService#unsubscribe(Class,EventSubscriber) */
123-
public static boolean unsubscribe(Class eventClass, EventSubscriber subscriber) {
122+
/** @see EventService#unsubscribe(Class,IEventSubscriber) */
123+
public static boolean unsubscribe(Class eventClass, IEventSubscriber subscriber) {
124124
return EventServiceLocator.getEventBusService().unsubscribe(eventClass, subscriber);
125125
}
126126

127-
/** @see EventService#unsubscribeExactly(Class,EventSubscriber) */
128-
public static boolean unsubscribeExactly(Class eventClass, EventSubscriber subscriber) {
127+
/** @see EventService#unsubscribeExactly(Class,IEventSubscriber) */
128+
public static boolean unsubscribeExactly(Class eventClass, IEventSubscriber subscriber) {
129129
return EventServiceLocator.getEventBusService().unsubscribeExactly(eventClass, subscriber);
130130
}
131131

132-
/** @see EventService#unsubscribe(String,EventTopicSubscriber) */
133-
public static boolean unsubscribe(String topic, EventTopicSubscriber subscriber) {
132+
/** @see EventService#unsubscribe(String,IEventTopicSubscriber) */
133+
public static boolean unsubscribe(String topic, IEventTopicSubscriber subscriber) {
134134
return EventServiceLocator.getEventBusService().unsubscribe(topic, subscriber);
135135
}
136136

137-
/** @see EventService#unsubscribe(Pattern,EventTopicSubscriber) */
138-
public static boolean unsubscribe(Pattern topicPattern, EventTopicSubscriber subscriber) {
137+
/** @see EventService#unsubscribe(Pattern,IEventTopicSubscriber) */
138+
public static boolean unsubscribe(Pattern topicPattern, IEventTopicSubscriber subscriber) {
139139
return EventServiceLocator.getEventBusService().unsubscribe(topicPattern, subscriber);
140140
}
141141

0 commit comments

Comments
 (0)