Get rid of empty NetCat constructor. NetCatListener is mandatory.

Author: reicru

netcat/src/main/java/com/github/dddpaul/netcat/NetCat.java

@@ -16,19 +16,11 @@ public class NetCat implements NetCater
     protected InputStream input;
     protected OutputStream output;
 
-    public NetCat() {}
-
     public NetCat( NetCatListener listener )
     {
         this.listener = listener;
     }
 
-    @Override
-    public void setListener( NetCatListener listener )
-    {
-        this.listener = listener;
-    }
-
     @Override
     public void setInput( InputStream input )
     {

netcat/src/main/java/com/github/dddpaul/netcat/NetCater.java

@@ -17,7 +17,6 @@ enum Proto { TCP, UDP }
     public void cancel();
     public void execute( String ... params );
     public void executeParallel( String ... params );
-    public void setListener( NetCatListener listener );
     public void setInput( InputStream input );
     public void createOutput();
     public void closeOutput();

netcat/src/main/java/com/github/dddpaul/netcat/TcpNetCat.java

@@ -25,11 +25,6 @@ public class TcpNetCat extends NetCat
     private ServerSocketChannel serverChannel;
     private Socket socket;
 
-    public TcpNetCat()
-    {
-        super();
-    }
-
     public TcpNetCat( NetCatListener listener )
     {
         super( listener );

netcat/src/main/java/com/github/dddpaul/netcat/UdpNetCat.java

@@ -23,11 +23,6 @@ public UdpNetCat( NetCatListener listener )
         super( listener );
     }
 
-    public UdpNetCat()
-    {
-        super();
-    }
-
     @Override
     public void cancel()
     {

netcat/src/main/java/com/github/dddpaul/netcat/ui/NetCatFragment.java

@@ -3,6 +3,7 @@
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 
+import com.github.dddpaul.netcat.NetCatListener;
 import com.github.dddpaul.netcat.NetCater;
 import com.github.dddpaul.netcat.TcpNetCat;
 import com.github.dddpaul.netcat.UdpNetCat;
@@ -34,19 +35,19 @@ public NetCater getNetCat()
         return netCat;
     }
 
-    public NetCater getOrCreateNetCat( Proto proto )
+    public NetCater getOrCreateNetCat( Proto proto, NetCatListener listener )
     {
         switch( proto ) {
             case TCP:
                 if( netCat != null && netCat instanceof TcpNetCat ) {
                     return netCat;
                 }
-                return new TcpNetCat();
+                return new TcpNetCat( listener );
             case UDP:
                 if( netCat != null && netCat instanceof UdpNetCat ) {
                     return netCat;
                 }
-                return new UdpNetCat();
+                return new UdpNetCat( listener );
         }
         return null;
     }

netcat/src/main/java/com/github/dddpaul/netcat/ui/ResultFragment.java

@@ -108,7 +108,6 @@ public void onResume()
         netCatFragment = (NetCatFragment) getFragmentManager().findFragmentByTag( NETCAT_FRAGMENT_TAG );
         if( netCatFragment != null ) {
             netCat = netCatFragment.getNetCat();
-            netCat.setListener( this );
         }
     }
 
@@ -203,8 +202,7 @@ public void connect( String connectTo )
             return;
         }
         String[] tokens = connectTo.split( ":" );
-        netCat = netCatFragment.getOrCreateNetCat( Proto.valueOf( tokens[0] ) );
-        netCat.setListener( this );
+        netCat = netCatFragment.getOrCreateNetCat( Proto.valueOf( tokens[0] ), this );
         netCat.execute( CONNECT.toString(), tokens[1], tokens[2] );
     }
 
@@ -219,8 +217,7 @@ public void listen( String listenOn )
             return;
         }
         String[] tokens = listenOn.split( ":" );
-        netCat = netCatFragment.getOrCreateNetCat( Proto.valueOf( tokens[0] ) );
-        netCat.setListener( this );
+        netCat = netCatFragment.getOrCreateNetCat( Proto.valueOf( tokens[0] ), this );
         netCat.execute( LISTEN.toString(), tokens[1] );
     }
 

netcat/src/test/java/com/github/dddpaul/netcat/ResultFragmentTest.java

@@ -20,7 +20,6 @@
 import static com.github.dddpaul.netcat.NetCater.*;
 import static com.github.dddpaul.netcat.NetCater.Op.CONNECT;
 import static com.github.dddpaul.netcat.NetCater.Op.LISTEN;
-import static com.github.dddpaul.netcat.NetCater.Proto.*;
 import static org.fest.assertions.api.ANDROID.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
@@ -52,7 +51,7 @@ public void setUp()
     {
         MockitoAnnotations.initMocks( this );
         when( netCatFragmentMock.getNetCat() ).thenReturn( netCatMock );
-        when( netCatFragmentMock.getOrCreateNetCat( any( Proto.class ) ) ).thenReturn( netCatMock );
+        when( netCatFragmentMock.getOrCreateNetCat( any( Proto.class ), any( NetCatListener.class) ) ).thenReturn( netCatMock );
         fragment = new ResultFragment();
     }