fix rename chaos caused be IntelliJ

24 files changed, 26 insertions, 176 deletions

diff --git a/src/main/java/org/gnunet/core/ConnectNotifyMessage.java b/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java
index 4eafe02..52e576a 100644
--- a/src/main/java/org/gnunet/core/ConnectNotifyMessage.java
+++ b/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.core;
+package org.gnunet.core.messages;
 
 import org.gnunet.construct.*;
 import org.gnunet.util.GnunetMessage;
diff --git a/src/main/java/org/gnunet/core/DisconnectNotifyMessage.java b/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java
index e4c3209..0c40b7e 100644
--- a/src/main/java/org/gnunet/core/DisconnectNotifyMessage.java
+++ b/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.core;
+package org.gnunet.core.messages;
 
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;
diff --git a/src/main/java/org/gnunet/core/InitMessage.java b/src/main/java/org/gnunet/core/messages/InitMessage.java
index 5546088..007d000 100644
--- a/src/main/java/org/gnunet/core/InitMessage.java
+++ b/src/main/java/org/gnunet/core/messages/InitMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.core;
+package org.gnunet.core.messages;
 
 import org.gnunet.construct.IntegerFill;
 import org.gnunet.construct.UInt32;
diff --git a/src/main/java/org/gnunet/core/InitReplyMessage.java b/src/main/java/org/gnunet/core/messages/InitReplyMessage.java
index 02e8eef..c1252f5 100644
--- a/src/main/java/org/gnunet/core/InitReplyMessage.java
+++ b/src/main/java/org/gnunet/core/messages/InitReplyMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.core;
+package org.gnunet.core.messages;
 
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;
diff --git a/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java b/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java
index b00bd49..a63c17a 100644
--- a/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java
+++ b/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.core;
+package org.gnunet.core.messages;
 
 import org.gnunet.construct.FillWith;
 import org.gnunet.construct.NestedMessage;
diff --git a/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java b/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java
index 379578a..b474a62 100644
--- a/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java
+++ b/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.core;
+package org.gnunet.core.messages;
 
 import org.gnunet.construct.*;
 import org.gnunet.util.ATSInformation;
diff --git a/src/main/java/org/gnunet/core/SendMessage.java b/src/main/java/org/gnunet/core/messages/SendMessage.java
index c3306ae..a62c422 100644
--- a/src/main/java/org/gnunet/core/SendMessage.java
+++ b/src/main/java/org/gnunet/core/messages/SendMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.core;
+package org.gnunet.core.messages;
 
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;
diff --git a/src/main/java/org/gnunet/core/SendMessageReady.java b/src/main/java/org/gnunet/core/messages/SendMessageReady.java
index ba28da8..fbedaec 100644
--- a/src/main/java/org/gnunet/core/SendMessageReady.java
+++ b/src/main/java/org/gnunet/core/messages/SendMessageReady.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.core;
+package org.gnunet.core.messages;
 
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt16;
diff --git a/src/main/java/org/gnunet/core/SendMessageRequest.java b/src/main/java/org/gnunet/core/messages/SendMessageRequest.java
index 7a95127..36fe004 100644
--- a/src/main/java/org/gnunet/core/SendMessageRequest.java
+++ b/src/main/java/org/gnunet/core/messages/SendMessageRequest.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.core;
+package org.gnunet.core.messages;
 
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt16;
diff --git a/src/main/java/org/gnunet/dht/ClientGetMessage.java b/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java
index 71f26bc..75745ae 100644
--- a/src/main/java/org/gnunet/dht/ClientGetMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.dht;
+package org.gnunet.dht.messages;
 
 import org.gnunet.construct.*;
 import org.gnunet.util.GnunetMessage;
diff --git a/src/main/java/org/gnunet/dht/ClientGetStopMessage.java b/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java
index 5aa5cc4..101905a 100644
--- a/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.dht;
+package org.gnunet.dht.messages;
 
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;
diff --git a/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java b/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java
index abf6051..91d1954 100644
--- a/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.dht;
+package org.gnunet.dht.messages;
 
 import org.gnunet.construct.UInt32;
 import org.gnunet.construct.UInt64;
diff --git a/src/main/java/org/gnunet/dht/ClientPutMessage.java b/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java
index 1d01be4..ac12aed 100644
--- a/src/main/java/org/gnunet/dht/ClientPutMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.dht;
+package org.gnunet.dht.messages;
 
 import org.gnunet.construct.*;
 import org.gnunet.util.AbsoluteTimeMessage;
diff --git a/src/main/java/org/gnunet/dht/ClientResultMessage.java b/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java
index 3a4ac96..c955f1b 100644
--- a/src/main/java/org/gnunet/dht/ClientResultMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.dht;
+package org.gnunet.dht.messages;
 
 import org.gnunet.construct.*;
 import org.gnunet.util.AbsoluteTimeMessage;
diff --git a/src/main/java/org/gnunet/dht/MonitorGetMessage.java b/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java
index ba9bf44..c8f6426 100644
--- a/src/main/java/org/gnunet/dht/MonitorGetMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.dht;
+package org.gnunet.dht.messages;
 
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;
diff --git a/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java b/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java
index c298328..9761e85 100644
--- a/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.dht;
+package org.gnunet.dht.messages;
 
 import org.gnunet.construct.*;
 import org.gnunet.util.AbsoluteTimeMessage;
@@ -35,19 +35,19 @@ public class MonitorGetRespMessage implements GnunetMessage.Body {
      * Content type.
      */
     @UInt32
-    int type;
+    public int type;
 
     /**
      * Length of the PUT path that follows (if tracked).
      */
     @UInt32
-    int putPathLength;
+    public int putPathLength;
 
     /**
      * Length of the GET path that follows (if tracked).
      */
     @UInt32
-    int getPathLength;
+    public int getPathLength;
 
     /**
      * When does the content expire?
diff --git a/src/main/java/org/gnunet/dht/MonitorPutMessage.java b/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java
index 7e242c7..84180fb 100644
--- a/src/main/java/org/gnunet/dht/MonitorPutMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.dht;
+package org.gnunet.dht.messages;
 
 import org.gnunet.construct.*;
 import org.gnunet.util.AbsoluteTimeMessage;
diff --git a/src/main/java/org/gnunet/dht/MonitorStartStop.java b/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java
index ffe5c9a..137f635 100644
--- a/src/main/java/org/gnunet/dht/MonitorStartStop.java
+++ b/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.dht;
+package org.gnunet.dht.messages;
 
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt16;
diff --git a/src/main/java/org/gnunet/gns/GNS.java b/src/main/java/org/gnunet/gns/GNS.java
deleted file mode 100644
index 63cd750..0000000
--- a/src/main/java/org/gnunet/gns/GNS.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
-
-  GNUnet is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published
-  by the Free Software Foundation; either version 3, or (at your
-  option) any later version.
-
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.gns;
-
-import org.gnunet.gns.messages.ClientLookupMessage;
-import org.gnunet.gns.messages.ClientLookupResultMessage;
-import org.gnunet.mq.Envelope;
-import org.gnunet.requests.MatchingRequestContainer;
-import org.gnunet.requests.Request;
-import org.gnunet.requests.RequestIdentifier;
-import org.gnunet.util.Cancelable;
-import org.gnunet.util.Client;
-import org.gnunet.util.Configuration;
-import org.gnunet.util.RunaboutMessageReceiver;
-import org.gnunet.util.crypto.EcdsaPrivateKey;
-import org.gnunet.util.crypto.EcdsaPublicKey;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * API to the GNUnet name system.
- */
-public class GNS {
-    private static final Logger logger = LoggerFactory
-            .getLogger(GNS.class);
-    /**
-     * All pending and active lookup requests.
-     */
-    private MatchingRequestContainer<Long, LookupRequest> lookupRequests;
-
-    private class LookupRequest extends Request {
-        long uid;
-        String name;
-        EcdsaPublicKey zone;
-        int type;
-        boolean onlyCached;
-        EcdsaPrivateKey shortenZoneKey;
-        LookupResultProcessor proc;
-
-        public LookupRequest(String name,
-                             EcdsaPublicKey zone,
-                             int type,
-                             boolean onlyCached,
-                             EcdsaPrivateKey shortenZoneKey,
-                             LookupResultProcessor proc) {
-            this.uid = nextUID++;
-            this.name = name;
-            this.zone = zone;
-            this.type = type;
-            this.onlyCached = onlyCached;
-            this.shortenZoneKey = shortenZoneKey;
-            this.proc = proc;
-        }
-
-        @Override
-        public Envelope assembleRequest() {
-            ClientLookupMessage m = new ClientLookupMessage();
-            if (null != shortenZoneKey) {
-                m.haveKey = 1;
-            } else {
-                m.shortenKey = shortenZoneKey;
-            }
-            m.id = uid;
-            m.name = name;
-            m.onlyCached = onlyCached ? 1 : 0;
-            m.type = type;
-            m.zone = zone;
-            return new Envelope(m);
-        }
-    }
-
-    public class GNSMessageReceiver extends RunaboutMessageReceiver {
-        public void visit(ClientLookupResultMessage m) {
-            RequestIdentifier<LookupRequest> r = lookupRequests.getRequestIdentifier(m.id);
-            if (null == r) {
-                logger.warn("no matching getRequestIdentifier for lookup result");
-                return;
-            }
-            r.getRequest().proc.process(m.records);
-            r.retire();
-        }
-
-        @Override
-        public void handleError() {
-        }
-    }
-
-    /**
-     * Request ID for lookup requests.
-     */
-    private long nextUID = 1;
-
-    /**
-     * Client connected to the GNS service.
-     */
-    private Client client;
-
-    /**
-     * Connect to the GNS service
-     *
-     * @param cfg configuration to use
-     */
-    public GNS(Configuration cfg) {
-        client = new Client("gns", cfg);
-        lookupRequests = new MatchingRequestContainer<Long, LookupRequest>(client);
-        client.installReceiver(new GNSMessageReceiver());
-    }
-
-    /**
-     * Perform an asynchronous lookup operation on the GNS.
-     *
-     * @param name the name to look up
-     * @param zone zone to look in
-     * @param type the GNS record type to look for
-     * @param onlyCached true to only check locally (not in the DHT)
-     * @param shortenZoneKey the private key of the shorten zone (can be NULL);
-     *                    specify to enable automatic shortening (given a PSEU
-     *                    record, if a given pseudonym is not yet used in the
-     *                    shorten zone, we automatically add the respective zone
-     *                    under that name)
-     * @param proc function to call on result
-     * @return handle to the queued getRequestIdentifier
-     */
-    public Cancelable lookup(String name,
-                             EcdsaPublicKey zone,
-                             int type, boolean onlyCached,
-                             EcdsaPrivateKey shortenZoneKey,
-                             LookupResultProcessor proc) {
-        LookupRequest r = new LookupRequest(name, zone, type, onlyCached, shortenZoneKey, proc);
-        return lookupRequests.addRequest(r.uid, r);
-    }
-}
diff --git a/src/main/java/org/gnunet/mesh/TunnelEndHandler.java b/src/main/java/org/gnunet/mesh/ChannelEndHandler.java
index 5b89a2f..a9622e1 100644
--- a/src/main/java/org/gnunet/mesh/TunnelEndHandler.java
+++ b/src/main/java/org/gnunet/mesh/ChannelEndHandler.java
@@ -5,7 +5,7 @@ package org.gnunet.mesh;
  *
  * @author Florian Dold
  */
-public interface TunnelEndHandler {
+public interface ChannelEndHandler {
     /**
      * Called once a channel has been destroyed.
      * The given channel can not be used anymore, and is only provided
diff --git a/src/main/java/org/gnunet/peerinfo/InfoEnd.java b/src/main/java/org/gnunet/peerinfo/messages/InfoEnd.java
index b59e194..43bb99b 100644
--- a/src/main/java/org/gnunet/peerinfo/InfoEnd.java
+++ b/src/main/java/org/gnunet/peerinfo/messages/InfoEnd.java
@@ -1,4 +1,4 @@
-package org.gnunet.peerinfo;
+package org.gnunet.peerinfo.messages;
 
 import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
diff --git a/src/main/java/org/gnunet/peerinfo/InfoMessage.java b/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java
index d8d7daa..1c3cddb 100644
--- a/src/main/java/org/gnunet/peerinfo/InfoMessage.java
+++ b/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.peerinfo;
+package org.gnunet.peerinfo.messages;
 
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;
diff --git a/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java b/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java
index f1cbd7e..10a2149 100644
--- a/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java
+++ b/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.peerinfo;
+package org.gnunet.peerinfo.messages;
 
 import org.gnunet.construct.UInt32;
 import org.gnunet.construct.UnionCase;
diff --git a/src/main/java/org/gnunet/peerinfo/ListPeerMessage.java b/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java
index 56e6b5d..8a158b9 100644
--- a/src/main/java/org/gnunet/peerinfo/ListPeerMessage.java
+++ b/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java
@@ -18,7 +18,7 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.peerinfo;
+package org.gnunet.peerinfo.messages;
 
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;