- remove dependency jars (now handled by gradle)

- rename/import

2 files changed, 3 insertions, 30 deletions

diff --git a/src/main/java/org/gnunet/requests/SimpleRequest.java b/src/main/java/org/gnunet/requests/SimpleRequest.java
deleted file mode 100644
index 9b0c5d8..0000000
--- a/src/main/java/org/gnunet/requests/SimpleRequest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.gnunet.requests;
-
-import org.gnunet.mq.Envelope;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.MessageReceiver;
-
-/**
- * Very simple request that sends a pre-determined message
- * to the server and has a context.  When this request is restarted,
- * the message is simply sent again.
- */
-public class SimpleRequest<Ctx> extends RequestContainer.Request {
-    private GnunetMessage.Body message;
-    private Ctx ctx;
-
-    public SimpleRequest(GnunetMessage.Body message, Ctx ctx) {
-        this.message = message;
-        this.ctx = ctx;
-    }
-
-    @Override
-    public Envelope assembleRequest() {
-        return new Envelope(message);
-    }
-
-    public Ctx getContext() {
-        return ctx;
-    }
-}
diff --git a/src/main/java/org/gnunet/statistics/SetRequest.java b/src/main/java/org/gnunet/statistics/SetRequest.java
index 4aa4a82..c5fff66 100644
--- a/src/main/java/org/gnunet/statistics/SetRequest.java
+++ b/src/main/java/org/gnunet/statistics/SetRequest.java
@@ -2,11 +2,13 @@ package org.gnunet.statistics;
 
 import org.gnunet.mq.Envelope;
 import org.gnunet.mq.MessageQueue;
+import org.gnunet.requests.Request;
 import org.gnunet.requests.RequestContainer;
+import org.gnunet.statistics.messages.SetMessage;
 import org.gnunet.util.RelativeTime;
 
 
-public class SetRequest extends RequestContainer.Request {
+public class SetRequest extends Request {
     /**
      * Time after we give up on setting values in statistics
      */