[Mrpostman-cvs] mrpostman/src/org/mrbook/mrpostman/pop PopServer.java,1.8,1.9 PopConnection.java,1.15,1.16

[<chr...@us...>]

Update of /cvsroot/mrpostman/mrpostman/src/org/mrbook/mrpostman/pop
In directory sc8-pr-cvs1:/tmp/cvs-serv13504/mrpostman/src/org/mrbook/mrpostman/pop

Modified Files:
	PopServer.java PopConnection.java 
Log Message:
Removed static dependency on MrPostman

Index: PopServer.java
===================================================================
RCS file: /cvsroot/mrpostman/mrpostman/src/org/mrbook/mrpostman/pop/PopServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PopServer.java	24 Apr 2003 22:30:36 -0000	1.8
--- PopServer.java	15 Jan 2004 10:34:42 -0000	1.9
***************
*** 57,67 ****
      protected ServerSocket listenSocket;
      private Executor executor;
! 
!     public PopServer(int port) throws IOException {
          if (port == 0) {
              port = DEFAULT_PORT;
          }
          this.port = port;
!         logger.info("Starting executor");
          
          executor = new PooledExecutor(new BoundedBuffer(DEFAULT_BUFFERLENGTH), DEFAULT_MAXIMUM_THREADS);
--- 57,69 ----
      protected ServerSocket listenSocket;
      private Executor executor;
! 	private MrPostman mpn = null;
! 	
!     public PopServer(MrPostman parent, int port) throws IOException {
          if (port == 0) {
              port = DEFAULT_PORT;
          }
          this.port = port;
!         mpn = parent;
!         logger.info("Starting PopServer on port " + port);
          
          executor = new PooledExecutor(new BoundedBuffer(DEFAULT_BUFFERLENGTH), DEFAULT_MAXIMUM_THREADS);
***************
*** 71,75 ****
          ((PooledExecutor) executor).createThreads(DEFAULT_MINIMUM_THREADS);
  
-         logger.info("Starting PopServer on port " + port);
          listenSocket = new ServerSocket(port);
          this.start();
--- 73,76 ----
***************
*** 97,101 ****
                      logger.info("Connection accepted for IP " + clientSocket.getInetAddress());
                      try {
!                         executor.execute(new PopConnection(clientSocket));
                      } catch (PooledExecutor.AbortException ex) {
                          logger.warning("Too many connections! refused for IP  " + clientSocket.getInetAddress());
--- 98,102 ----
                      logger.info("Connection accepted for IP " + clientSocket.getInetAddress());
                      try {
!                         executor.execute(new PopConnection(mpn, clientSocket));
                      } catch (PooledExecutor.AbortException ex) {
                          logger.warning("Too many connections! refused for IP  " + clientSocket.getInetAddress());
***************
*** 116,120 ****
  
      private boolean isSocketAllowed(Socket socket) {
!         boolean allowRemoteHosts = MrPostman.getMainInstance().userprefs.getBoolean("AllowOtherHosts", false);
          logger.info(socket.getLocalAddress() + " " + socket.getInetAddress());
  
--- 117,121 ----
  
      private boolean isSocketAllowed(Socket socket) {
!         boolean allowRemoteHosts = mpn.getUserprefs().getBoolean("AllowOtherHosts", false);
          logger.info(socket.getLocalAddress() + " " + socket.getInetAddress());
  

Index: PopConnection.java
===================================================================
RCS file: /cvsroot/mrpostman/mrpostman/src/org/mrbook/mrpostman/pop/PopConnection.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PopConnection.java	22 Nov 2003 14:58:10 -0000	1.15
--- PopConnection.java	15 Jan 2004 10:34:42 -0000	1.16
***************
*** 79,85 ****
      protected BufferedReader in;
      protected PrintWriter out;
! 
!     public PopConnection(Socket clientSocket) {
          setSocket(clientSocket);
      }
      public void setSocket(Socket clientSocket) {
--- 79,87 ----
      protected BufferedReader in;
      protected PrintWriter out;
! 	private MrPostman mpn = null;
! 	
!     public PopConnection(MrPostman parent, Socket clientSocket) {
          setSocket(clientSocket);
+         this.mpn = parent;
      }
      public void setSocket(Socket clientSocket) {
***************
*** 186,190 ****
              password = new String(matcher.group(1));
              //logger.info("Found extension: " + usernameExtension);
!             wms = MrPostman.getMainInstance().getModuleHandlerForExtension(usernameExtension);
  
              if (wms == null) {
--- 188,192 ----
              password = new String(matcher.group(1));
              //logger.info("Found extension: " + usernameExtension);
!             wms = mpn.getModuleHandlerForExtension(usernameExtension);
  
              if (wms == null) {
***************
*** 459,463 ****
              /* GUI */
          } else if (guiPat.matcher(line).find()) {
!             MrPostman.getMainInstance().showGui();
              sendOk("Showing the gui");
          } else {
--- 461,465 ----
              /* GUI */
          } else if (guiPat.matcher(line).find()) {
!             mpn.showGui();
              sendOk("Showing the gui");
          } else {