moved @subscribe into main package

greenrobot · greenrobot · commit daa7370c8fa8 · 2015-02-22T21:13:26.000+01:00
diff --git a/EventBus/src/de/greenrobot/event/Subscribe.java b/EventBus/src/de/greenrobot/event/Subscribe.java
@@ -1,4 +1,4 @@
-package de.greenrobot.event.annotations;
+package de.greenrobot.event;
 
 
 import java.lang.annotation.Documented;
diff --git a/EventBus/src/de/greenrobot/event/SubscriberMethodFinder.java b/EventBus/src/de/greenrobot/event/SubscriberMethodFinder.java
@@ -15,8 +15,6 @@
  */
 package de.greenrobot.event;
 
-import de.greenrobot.event.annotations.Subscribe;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
diff --git a/EventBusPerformance/src/de/greenrobot/eventperf/TestRunnerActivity.java b/EventBusPerformance/src/de/greenrobot/eventperf/TestRunnerActivity.java
@@ -1,7 +1,7 @@
 package de.greenrobot.eventperf;
 
 import de.greenrobot.event.ThreadMode;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/EventBusPerformance/src/de/greenrobot/eventperf/testsubject/PerfTestEventBus.java b/EventBusPerformance/src/de/greenrobot/eventperf/testsubject/PerfTestEventBus.java
@@ -7,7 +7,7 @@
 import android.content.Context;
 import de.greenrobot.event.EventBus;
 import de.greenrobot.event.ThreadMode;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 import de.greenrobot.eventperf.Test;
 import de.greenrobot.eventperf.TestEvent;
 import de.greenrobot.eventperf.TestParams;
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusBackgroundThreadTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusBackgroundThreadTest.java
@@ -17,7 +17,7 @@
 
 import android.os.Looper;
 import de.greenrobot.event.ThreadMode;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusBasicTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusBasicTest.java
@@ -18,7 +18,7 @@
 import android.app.Activity;
 import android.util.Log;
 import de.greenrobot.event.EventBus;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 import junit.framework.TestCase;
 
 import java.lang.ref.WeakReference;
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusBuilderTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusBuilderTest.java
@@ -20,7 +20,7 @@
 import de.greenrobot.event.EventBusException;
 import de.greenrobot.event.NoSubscriberEvent;
 import de.greenrobot.event.SubscriberExceptionEvent;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusCancelEventDeliveryTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusCancelEventDeliveryTest.java
@@ -20,7 +20,7 @@
 import android.test.UiThreadTest;
 import de.greenrobot.event.EventBusException;
 import de.greenrobot.event.ThreadMode;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusInheritanceTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusInheritanceTest.java
@@ -15,7 +15,7 @@
  */
 package de.greenrobot.event.test;
 
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 import junit.framework.TestCase;
 import de.greenrobot.event.EventBus;
 
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusMainThreadRacingTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusMainThreadRacingTest.java
@@ -21,7 +21,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import de.greenrobot.event.ThreadMode;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusMainThreadTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusMainThreadTest.java
@@ -20,7 +20,7 @@
 
 import android.os.Looper;
 import de.greenrobot.event.ThreadMode;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusMethodModifiersTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusMethodModifiersTest.java
@@ -19,7 +19,7 @@
 import de.greenrobot.event.EventBus;
 import de.greenrobot.event.EventBusException;
 import de.greenrobot.event.ThreadMode;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusMultithreadedTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusMultithreadedTest.java
@@ -24,7 +24,7 @@
 import android.util.Log;
 import de.greenrobot.event.EventBus;
 import de.greenrobot.event.ThreadMode;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusNoSubscriberEventTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusNoSubscriberEventTest.java
@@ -18,7 +18,7 @@
 import de.greenrobot.event.EventBus;
 import de.greenrobot.event.NoSubscriberEvent;
 import de.greenrobot.event.SubscriberExceptionEvent;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusOrderedSubscriptionsTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusOrderedSubscriptionsTest.java
@@ -21,7 +21,7 @@
 import de.greenrobot.event.EventBus;
 import android.util.Log;
 import de.greenrobot.event.ThreadMode;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusRegistrationRacingTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusRegistrationRacingTest.java
@@ -15,7 +15,7 @@
  */
 package de.greenrobot.event.test;
 
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusStickyEventTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusStickyEventTest.java
@@ -15,7 +15,7 @@
  */
 package de.greenrobot.event.test;
 
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusSubscriberExceptionTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusSubscriberExceptionTest.java
@@ -17,7 +17,7 @@
 
 import de.greenrobot.event.EventBus;
 import de.greenrobot.event.SubscriberExceptionEvent;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot
diff --git a/EventBusTest/src/de/greenrobot/event/test/EventBusSubscriberLegalTest.java b/EventBusTest/src/de/greenrobot/event/test/EventBusSubscriberLegalTest.java
@@ -16,7 +16,7 @@
 package de.greenrobot.event.test;
 
 import de.greenrobot.event.EventBusException;
-import de.greenrobot.event.annotations.Subscribe;
+import de.greenrobot.event.Subscribe;
 
 /**
  * @author Markus Junginger, greenrobot

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.greenrobot.event.annotations;`
	`1`	`+package de.greenrobot.event;`
`2`	`2`
`3`	`3`
`4`	`4`	`import java.lang.annotation.Documented;`