better ui integration. Shall become an alpha in near future.

Author: thsc42

libs/ASAPJava.jar

@@ -101,7 +101,7 @@ public void run() {
                                     newConnection.getInputStream(), newConnection.getOutputStream(), this);
                 } else {
                     // another connector has connected
-                    hubConnectorSession = new SharedChannelConnectorHubSideImpl(
+                    hubConnectorSession = new SharedChannelConnectorHubSide(
                             newConnection.getInputStream(), newConnection.getOutputStream(), this);
                 }
                 (new ConnectorThread(hubConnectorSession, newConnection.getInputStream())).start();

src/main/java/net/sharksystem/hub/hubside/ASAPTCPHub.java

@@ -13,7 +13,7 @@
 import java.io.OutputStream;
 import java.net.ServerSocket;
 
-public class MultipleTCPChannelsConnectorHubSideImpl extends SharedChannelConnectorHubSideImpl
+public class MultipleTCPChannelsConnectorHubSideImpl extends SharedChannelConnectorHubSide
         implements NewConnectionCreatorListener {
 
     public MultipleTCPChannelsConnectorHubSideImpl(InputStream is, OutputStream os, HubInternal hub)

src/main/java/net/sharksystem/hub/hubside/MultipleTCPChannelsConnectorHubSideImpl.java

@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Set;
 
-public class SharedChannelConnectorHubSideImpl extends SharedChannelConnectorImpl
+public class SharedChannelConnectorHubSide extends SharedChannelConnectorImpl
         implements ConnectorInternal, AlarmClockListener, WrappedStreamPairListener {
 
     private String peerID = null; // represented and connected peer
@@ -34,7 +34,7 @@ public boolean isHubSide() {
         return true;
     }
 
-    public SharedChannelConnectorHubSideImpl(InputStream is, OutputStream os, HubInternal hub) throws ASAPException {
+    public SharedChannelConnectorHubSide(InputStream is, OutputStream os, HubInternal hub) throws ASAPException {
         super(is, os);
 
         if(hub == null) throw new ASAPHubException("hub must not be null");

…e/SharedChannelConnectorHubSideImpl.java …bside/SharedChannelConnectorHubSide.javasrc/main/java/net/sharksystem/hub/hubside/SharedChannelConnectorHubSideImpl.java renamed to src/main/java/net/sharksystem/hub/hubside/SharedChannelConnectorHubSide.java src/main/java/net/sharksystem/hub/hubside/SharedChannelConnectorHubSideImpl.java renamed to src/main/java/net/sharksystem/hub/hubside/SharedChannelConnectorHubSide.java

@@ -20,9 +20,13 @@ public interface ASAPHubManager {
     void setTimeOutInMillis(int millis);
 
     /**
-     * Callee provide a list of hub descriptions. This method tries to establish a connection.
-     * Such an attempt can fail (wrong description, hub gone, network error etc.). This method can also
-     * stop all connector which are no longer in the list
+     * Callee provides a list of hub descriptions. This method synchronizes existing connections with this list.
+     * A new connection if a hub description is in the list but no connection has been established.
+     * A connection is ended if a hub description is not in the list but a connection is established
+     * (only if the boolean parameter is set).
+     * Nothing happens if a connection exists and the hub is still in the list.
+     *
+     * Such an attempt can fail (wrong description, hub gone, network error etc.).
      *
      * @param descriptions
      * @param asapPeer

src/main/java/net/sharksystem/hub/peerside/ASAPHubManager.java

@@ -274,12 +274,13 @@ public void run() {
     @Override
     public void notifyConnectedAndOpen() {
         // ignore
+        Log.writeLog(this, this.toString(), "notifyConnectedAndOpen");
     }
 
     @Override
     public void notifySynced(Connector connector, boolean changed) {
         Log.writeLog(this, this.toString(), "synced (changed: " + changed + ")");
-//        Log.writeLog(this, this.toString(), ">>>>>>>>>>>>>>>>>>>TODO***TODO***TODO<<<<<<<<<<<<<<<<<<<<<");
+
         if(/*changed && */ connector instanceof HubConnector) { // maybe new message in ASAP peer... connect each round
             HubConnector hubConnector = (HubConnector) connector;
             try {