[GNUnet-SVN] r32617 - in gnunet-java: lib src/main/java/org/gnunet/requests src/main/java/org/gnunet/statistics

[gnunet]

Author: dold
Date: 2014-03-11 02:32:52 +0100 (Tue, 11 Mar 2014)
New Revision: 32617

Removed:
   gnunet-java/lib/guava-14.0.1.jar
   gnunet-java/lib/junit-4.10.jar
   gnunet-java/lib/log4j-1.2.16.jar
   gnunet-java/lib/slf4j-api-1.6.4.jar
   gnunet-java/lib/slf4j-log4j12-1.6.4.jar
   gnunet-java/src/main/java/org/gnunet/requests/SimpleRequest.java
Modified:
   gnunet-java/src/main/java/org/gnunet/statistics/SetRequest.java
Log:
- remove dependency jars (now handled by gradle)
- rename/import


Deleted: gnunet-java/lib/guava-14.0.1.jar
===================================================================
(Binary files differ)

Deleted: gnunet-java/lib/junit-4.10.jar
===================================================================
(Binary files differ)

Deleted: gnunet-java/lib/log4j-1.2.16.jar
===================================================================
(Binary files differ)

Deleted: gnunet-java/lib/slf4j-api-1.6.4.jar
===================================================================
(Binary files differ)

Deleted: gnunet-java/lib/slf4j-log4j12-1.6.4.jar
===================================================================
(Binary files differ)

Deleted: gnunet-java/src/main/java/org/gnunet/requests/SimpleRequest.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/requests/SimpleRequest.java    
2014-03-11 01:27:30 UTC (rev 32616)
+++ gnunet-java/src/main/java/org/gnunet/requests/SimpleRequest.java    
2014-03-11 01:32:52 UTC (rev 32617)
@@ -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;
-    }
-}

Modified: gnunet-java/src/main/java/org/gnunet/statistics/SetRequest.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/SetRequest.java     
2014-03-11 01:27:30 UTC (rev 32616)
+++ gnunet-java/src/main/java/org/gnunet/statistics/SetRequest.java     
2014-03-11 01:32:52 UTC (rev 32617)
@@ -2,11 +2,13 @@
 
 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
      */