[Javanetsim-cvs] javaNetSim/guiUI MainScreen.java, 1.65, 1.66 TelnetEmulator.java, 1.10, 1.11

[QweR <qw...@us...>]

Update of /cvsroot/javanetsim/javaNetSim/guiUI
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21244/guiUI

Modified Files:
	MainScreen.java TelnetEmulator.java 
Log Message:
TCP again

Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** MainScreen.java	21 Sep 2007 22:42:32 -0000	1.65
--- MainScreen.java	29 Sep 2007 20:33:36 -0000	1.66
***************
*** 3764,3768 ****
                          telnet1.setPort(Integer.valueOf(port).intValue());
                          telnet1.setPassword(pass);
!                         telnet1.Listen(); 
                          printLayerInfo(true);
                       }catch(Exception e){
--- 3764,3768 ----
                          telnet1.setPort(Integer.valueOf(port).intValue());
                          telnet1.setPassword(pass);
!                         telnet1.Listen();
                          printLayerInfo(true);
                       }catch(Exception e){

Index: TelnetEmulator.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/TelnetEmulator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TelnetEmulator.java	18 Sep 2007 22:29:47 -0000	1.10
--- TelnetEmulator.java	29 Sep 2007 20:33:36 -0000	1.11
***************
*** 12,71 ****
  
  import javax.swing.JFrame;
- 
  import javax.swing.JPanel;
- 
- import java.awt.GridBagLayout;
- 
- import javax.swing.JDialog;
- 
- import javax.swing.JLabel;
- 
- import javax.swing.JTextField;
  import javax.swing.JScrollPane;
- 
  import javax.swing.JTextArea;
- 
- import java.awt.Insets;
- 
- import java.awt.GridBagConstraints;
- 
- import java.awt.BorderLayout;
- 
- import javax.swing.JButton;
- 
- import java.awt.Dimension;
- 
- import java.awt.event.ActionListener;
- 
- import java.awt.event.ActionEvent;
- 
- import javax.swing.JComboBox;
- 
- import core.Simulation;
- 
- import java.awt.event.MouseAdapter;
- 
- import java.awt.event.MouseEvent;
- 
  import java.awt.Color;
- 
- import java.awt.event.WindowAdapter;
- 
  import java.awt.event.WindowEvent;
- 
  import java.awt.event.KeyAdapter;
- 
  import java.awt.event.KeyEvent;
- 
- import java.awt.event.FocusAdapter;
- 
- import java.awt.event.FocusEvent;
- 
- import java.util.Arrays;
- 
- import java.awt.Component;
- 
- import javax.swing.SwingConstants;
- 
  import core.protocolsuite.tcp_ip.Telnet_client;  
  import core.CommunicationException;
--- 12,22 ----
***************
*** 73,77 ****
  import core.InvalidNetworkLayerDeviceException;
  import core.TransportLayerException;
- 
  import java.awt.Font;
  import java.awt.event.KeyListener;
--- 24,27 ----
***************
*** 88,91 ****
--- 38,42 ----
      private String text;
      private String Host;
+     private String cmdline;
      private int Port;
      private KeyListener kl;
***************
*** 99,102 ****
--- 50,54 ----
          this.Host = Host;
          this.Port = Port;
+         cmdline = "";
          
                 
***************
*** 121,124 ****
--- 73,81 ----
                      String s;
                      switch(c){
+                         case 0x4:{
+                             cmdline = "quit";
+                             s = "\r\n";
+                             break;
+                         }
                          case 0xD:
                          case 0xA:   {
***************
*** 129,133 ****
                      }
                      sendData(s);
-                     printInfo();
                  }
                  else {
--- 86,89 ----
***************
*** 143,147 ****
              public void windowClosing(WindowEvent winEvt) {
                  exitWindow();
-                 printInfo();
              }
          });
--- 99,102 ----
***************
*** 189,226 ****
      
      public void recvData(String Data){
!         if(Data.compareTo("\r\nQUIT")==0) {
!             this.removeKeyListener(kl);
!         }
!         else {
!             if(Data.compareTo("\b")==0) text = text.substring(0, text.length()-1);
!             else text += Data;
!             terminal.setText(text + "_");
!         }
      }
      
      public void sendData(String Data){
          try{
!             telnet.SendData(Data);              
!         }catch(Exception e){
!             System.out.println(e.toString());
          }
      }
      
-     public void printInfo(){
-         parent.printLayerInfo(false);
-         //!!!!!: add more headers here
-     }
-     
      public void exitWindow(){
  //        this.dispose();
          try {
              telnet.Disconnect();
          }
!         catch(TransportLayerException e) {
!             telnet.printInfo("Client: can not disconnected: transport problem");
!         }
!         catch(LowLinkException e) {
!             telnet.printInfo("Client: can not disconnected: low link problem");
!         }
      }
  }
--- 144,202 ----
      
      public void recvData(String Data){
! //        if(Data.compareTo("\r\nQUIT")==0) {
! //            this.removeKeyListener(kl);
! //        }
!         if(Data.compareTo("\b")==0) text = text.substring(0, text.length()-1);
!         else text += Data;
!         terminal.setText(text + "_");
      }
      
      public void sendData(String Data){
          try{
!             if(Data.length()>0){
!                 if(Data.compareTo("\r\n")==0) {
!                     if(cmdline.compareToIgnoreCase("quit")==0){
!                         this.removeKeyListener(kl);
!                         telnet.Disconnect();
!                         recvData("\r\n Telnet client was closed");
!                         Data = "";
!                     }
!                     else{
!                         cmdline = "";
!                     }
!                 }
!                 else if(Data.compareTo("\b")==0){
!                     cmdline = cmdline.substring(0, cmdline.length()-1);
!                 }
!                 else{
!                     cmdline += Data;
!                 }
!                 telnet.SendData(Data);
!             }
!         }catch(LowLinkException e){
!             printLayerInfo(e.toString());
!         }catch(TransportLayerException e){
!             printLayerInfo(e.toString());
!         }catch(CommunicationException e){
!             printLayerInfo(e.toString());
          }
      }
      
      public void exitWindow(){
  //        this.dispose();
          try {
+             this.removeKeyListener(kl);
              telnet.Disconnect();
+         }catch(LowLinkException e){
+             printLayerInfo(e.toString());
+         }catch(TransportLayerException e){
+             printLayerInfo(e.toString());
+         }catch(CommunicationException e){
+             printLayerInfo(e.toString());
          }
!     }
!     
!     protected void printLayerInfo(String s) {
!         telnet.printLayerInfo(s);
      }
  }