From ae76a7935cb7850fb77bdd8032418d148534b872 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 29 Apr 2013 13:15:17 +0100
Subject: [PATCH] Moved a couple of annotations from API to core.

---
 .../src/net/sf/briar}/reliability/ReliabilityExecutor.java    | 4 ++--
 .../net/sf/briar/reliability/ReliabilityLayerFactoryImpl.java | 1 -
 .../src/net/sf/briar/reliability/ReliabilityModule.java       | 1 -
 .../src/net/sf/briar/transport/ConnectionDispatcherImpl.java  | 1 -
 .../net/sf/briar}/transport/IncomingConnectionExecutor.java   | 4 ++--
 briar-core/src/net/sf/briar/transport/TransportModule.java    | 1 -
 6 files changed, 4 insertions(+), 8 deletions(-)
 rename {briar-api/src/net/sf/briar/api => briar-core/src/net/sf/briar}/reliability/ReliabilityExecutor.java (82%)
 rename {briar-api/src/net/sf/briar/api => briar-core/src/net/sf/briar}/transport/IncomingConnectionExecutor.java (82%)

diff --git a/briar-api/src/net/sf/briar/api/reliability/ReliabilityExecutor.java b/briar-core/src/net/sf/briar/reliability/ReliabilityExecutor.java
similarity index 82%
rename from briar-api/src/net/sf/briar/api/reliability/ReliabilityExecutor.java
rename to briar-core/src/net/sf/briar/reliability/ReliabilityExecutor.java
index a7ca755f3d..d5ce360475 100644
--- a/briar-api/src/net/sf/briar/api/reliability/ReliabilityExecutor.java
+++ b/briar-core/src/net/sf/briar/reliability/ReliabilityExecutor.java
@@ -1,4 +1,4 @@
-package net.sf.briar.api.reliability;
+package net.sf.briar.reliability;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -12,4 +12,4 @@ import com.google.inject.BindingAnnotation;
 @BindingAnnotation
 @Target({ PARAMETER })
 @Retention(RUNTIME)
-public @interface ReliabilityExecutor {}
\ No newline at end of file
+@interface ReliabilityExecutor {}
\ No newline at end of file
diff --git a/briar-core/src/net/sf/briar/reliability/ReliabilityLayerFactoryImpl.java b/briar-core/src/net/sf/briar/reliability/ReliabilityLayerFactoryImpl.java
index 411f817b07..4b207b1cda 100644
--- a/briar-core/src/net/sf/briar/reliability/ReliabilityLayerFactoryImpl.java
+++ b/briar-core/src/net/sf/briar/reliability/ReliabilityLayerFactoryImpl.java
@@ -4,7 +4,6 @@ import java.util.concurrent.Executor;
 
 import net.sf.briar.api.clock.Clock;
 import net.sf.briar.api.clock.SystemClock;
-import net.sf.briar.api.reliability.ReliabilityExecutor;
 import net.sf.briar.api.reliability.ReliabilityLayer;
 import net.sf.briar.api.reliability.ReliabilityLayerFactory;
 import net.sf.briar.api.reliability.WriteHandler;
diff --git a/briar-core/src/net/sf/briar/reliability/ReliabilityModule.java b/briar-core/src/net/sf/briar/reliability/ReliabilityModule.java
index c28d2c2b70..a30ae78d79 100644
--- a/briar-core/src/net/sf/briar/reliability/ReliabilityModule.java
+++ b/briar-core/src/net/sf/briar/reliability/ReliabilityModule.java
@@ -3,7 +3,6 @@ package net.sf.briar.reliability;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
-import net.sf.briar.api.reliability.ReliabilityExecutor;
 import net.sf.briar.api.reliability.ReliabilityLayerFactory;
 
 import com.google.inject.AbstractModule;
diff --git a/briar-core/src/net/sf/briar/transport/ConnectionDispatcherImpl.java b/briar-core/src/net/sf/briar/transport/ConnectionDispatcherImpl.java
index ecd57aa2b7..ddb612ba03 100644
--- a/briar-core/src/net/sf/briar/transport/ConnectionDispatcherImpl.java
+++ b/briar-core/src/net/sf/briar/transport/ConnectionDispatcherImpl.java
@@ -20,7 +20,6 @@ import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
 import net.sf.briar.api.transport.ConnectionContext;
 import net.sf.briar.api.transport.ConnectionDispatcher;
 import net.sf.briar.api.transport.ConnectionRecogniser;
-import net.sf.briar.api.transport.IncomingConnectionExecutor;
 
 import com.google.inject.Inject;
 
diff --git a/briar-api/src/net/sf/briar/api/transport/IncomingConnectionExecutor.java b/briar-core/src/net/sf/briar/transport/IncomingConnectionExecutor.java
similarity index 82%
rename from briar-api/src/net/sf/briar/api/transport/IncomingConnectionExecutor.java
rename to briar-core/src/net/sf/briar/transport/IncomingConnectionExecutor.java
index e3048a1eb5..6bad0c126c 100644
--- a/briar-api/src/net/sf/briar/api/transport/IncomingConnectionExecutor.java
+++ b/briar-core/src/net/sf/briar/transport/IncomingConnectionExecutor.java
@@ -1,4 +1,4 @@
-package net.sf.briar.api.transport;
+package net.sf.briar.transport;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -14,4 +14,4 @@ import com.google.inject.BindingAnnotation;
 @BindingAnnotation
 @Target({ PARAMETER })
 @Retention(RUNTIME)
-public @interface IncomingConnectionExecutor {}
\ No newline at end of file
+@interface IncomingConnectionExecutor {}
\ No newline at end of file
diff --git a/briar-core/src/net/sf/briar/transport/TransportModule.java b/briar-core/src/net/sf/briar/transport/TransportModule.java
index 3bd2fa4ade..0cd57082f9 100644
--- a/briar-core/src/net/sf/briar/transport/TransportModule.java
+++ b/briar-core/src/net/sf/briar/transport/TransportModule.java
@@ -9,7 +9,6 @@ import net.sf.briar.api.transport.ConnectionReaderFactory;
 import net.sf.briar.api.transport.ConnectionRecogniser;
 import net.sf.briar.api.transport.ConnectionRegistry;
 import net.sf.briar.api.transport.ConnectionWriterFactory;
-import net.sf.briar.api.transport.IncomingConnectionExecutor;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Singleton;
-- 
GitLab