refactoring again

Author: thsc42

src/net/sharksystem/Utils.java

@@ -1,6 +1,6 @@
 package net.sharksystem;
 
-import net.sharksystem.asap.internals.ASAP;
+import net.sharksystem.asap.ASAP;
 
 import java.io.File;
 import java.util.ArrayList;

src/net/sharksystem/asap/internals/ASAP.java renamed to src/net/sharksystem/asap/ASAP.java

@@ -1,4 +1,4 @@
-package net.sharksystem.asap.internals;
+package net.sharksystem.asap;
 
 import java.util.Random;
 
@@ -32,7 +32,7 @@ public static String createUniqueID() {
         Moreover, we are already in the 21. century - could reduce bit even more. We ignore that obvious fact
         at first.
 
-        Calcuations: 2^64 = 1,8.. * 10^19; we take a..z and A..Z and 0..9 -> 62 digits
+        Calculations: 2^64 = 1,8.. * 10^19; we take a..z and A..Z and 0..9 -> 62 digits
         62^11 = 5,2.. * 10^19 we need 11 digits
          */
 

src/net/sharksystem/asap/internals/ASAPException.java renamed to src/net/sharksystem/asap/ASAPException.java

@@ -1,4 +1,4 @@
-package net.sharksystem.asap.internals;
+package net.sharksystem.asap;
 
 /**
  *

src/net/sharksystem/asap/ASAPInternalPeerWrapper.java

@@ -1,12 +1,12 @@
 package net.sharksystem.asap;
 
-import net.sharksystem.asap.internals.ASAPException;
 import net.sharksystem.asap.internals.ASAPInternalOnlinePeersChangedListener;
 import net.sharksystem.asap.internals.ASAPInternalPeer;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Set;
 
 public abstract class ASAPInternalPeerWrapper extends ASAPListenerManagingPeer
         implements ASAPInternalOnlinePeersChangedListener {
@@ -34,7 +34,20 @@ public void handleConnection(InputStream is, OutputStream os) throws IOException
     }
 
     @Override
-    public void onlinePeersChanged(ASAPInternalPeer peer) {
-        this.environmentChangesListenerManager.notifyListeners(peer.getOnlinePeers());
+    public void notifyOnlinePeersChanged(ASAPInternalPeer peer) {
+        this.notifyOnlinePeersChanged(peer.getOnlinePeers());
+    }
+
+    public void notifyOnlinePeersChanged(Set<CharSequence> peerList) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("#online peers: ");
+        sb.append(peerList.size());
+        for(CharSequence peerName : peerList) {
+            sb.append(" | ");
+            sb.append(peerName);
+        }
+
+        this.log(sb.toString());
+        this.environmentChangesListenerManager.notifyListeners(peerList);
     }
 }

src/net/sharksystem/asap/ASAPMessageSender.java

@@ -1,7 +1,5 @@
 package net.sharksystem.asap;
 
-import net.sharksystem.asap.internals.ASAPException;
-
 public interface ASAPMessageSender {
     /**
      * Send a message

src/net/sharksystem/asap/ASAPPeerService.java

@@ -1,7 +1,6 @@
 package net.sharksystem.asap;
 
 import net.sharksystem.asap.internals.ASAPChunkReceivedListener;
-import net.sharksystem.asap.internals.ASAPException;
 import net.sharksystem.asap.internals.ASAPInternalPeer;
 
 import java.io.IOException;

src/net/sharksystem/asap/internals/ASAPSecurityException.java renamed to src/net/sharksystem/asap/ASAPSecurityException.java

@@ -1,4 +1,4 @@
-package net.sharksystem.asap.internals;
+package net.sharksystem.asap;
 
 public class ASAPSecurityException extends ASAPException {
     public ASAPSecurityException() {

src/net/sharksystem/asap/apps/gossip/GossipUI.java

@@ -1,5 +1,6 @@
 package net.sharksystem.asap.apps.gossip;
 
+import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.internals.*;
 import net.sharksystem.asap.util.Helper;
 import net.sharksystem.cmdline.TCPStream;

src/net/sharksystem/asap/apps/testsupport/ASAPMessagesMock.java

@@ -1,6 +1,6 @@
 package net.sharksystem.asap.apps.testsupport;
 
-import net.sharksystem.asap.internals.ASAPException;
+import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.internals.ASAPMessages;
 import net.sharksystem.asap.internals.MessageIter;
 

src/net/sharksystem/asap/apps/testsupport/ASAPPeerWrapperMock.java

@@ -2,11 +2,10 @@
 
 import net.sharksystem.asap.ASAPListenerManagingPeer;
 import net.sharksystem.asap.ASAPPeerService;
-import net.sharksystem.asap.internals.ASAP;
+import net.sharksystem.asap.ASAP;
 import net.sharksystem.asap.internals.ASAPChunkReceivedListener;
-import net.sharksystem.asap.internals.ASAPException;
+import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.internals.ASAPMessages;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import java.io.IOException;
 import java.io.InputStream;