[Javanetsim-cvs] javaNetSim/guiUI ApplicationLayerDevice.java,1.7,1.8 MainScreen.java,1.35,1.36 TelnetEmulator.java,1.5,1.6

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

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

Modified Files:
	ApplicationLayerDevice.java MainScreen.java 
	TelnetEmulator.java 
Log Message:


Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** MainScreen.java	25 Feb 2006 00:00:03 -0000	1.35
--- MainScreen.java	25 Feb 2006 22:48:34 -0000	1.36
***************
*** 3002,3033 ****
          }
          
!          public void TelnetListen(String inNodeName){
! 
               String port = JOptionPane.showInputDialog(this, "Port:", "Set Telnet Server listening on port.", JOptionPane.QUESTION_MESSAGE);
- 
               if(port!=null){
- 
                   try{
- 
-                  
- 
                      Telnet_server telnet1 = ((Telnet_server)((core.ApplicationLayerDevice)Sim.getNode(inNodeName)).getApp(23));
- 
                      telnet1.setPort(Integer.valueOf(port).intValue());
- 
                      telnet1.Listen(); 
-                     
                      printLayerInfo(true);
- 
                   }catch(Exception e){
- 
                       addToConsole(e.toString());
- 
                   }
- 
               }
- 
          }
! 
          /**
  
--- 3002,3028 ----
          }
          
!         public void TelnetListen(String inNodeName){
               String port = JOptionPane.showInputDialog(this, "Port:", "Set Telnet Server listening on port.", JOptionPane.QUESTION_MESSAGE);
               if(port!=null){
                   try{
                      Telnet_server telnet1 = ((Telnet_server)((core.ApplicationLayerDevice)Sim.getNode(inNodeName)).getApp(23));
                      telnet1.setPort(Integer.valueOf(port).intValue());
                      telnet1.Listen(); 
                      printLayerInfo(true);
                   }catch(Exception e){
                       addToConsole(e.toString());
                   }
               }
          }
!         public void TelnetNoListen(String inNodeName){
!             try{
!                 Telnet_server telnet1 = ((Telnet_server)((core.ApplicationLayerDevice)Sim.getNode(inNodeName)).getApp(23));
!                 telnet1.Close(); 
!             }catch(Exception e){
!                 addToConsole(e.toString());
!             }
!             printLayerInfo(true);
!         }
!          
          /**
  
***************
*** 3093,3096 ****
--- 3088,3101 ----
               }
          }
+         public void SNMPStopAgent(String inNodeName) {
+             try{
+                 SNMP snmpa = (SNMP)((core.ApplicationLayerDevice)Sim.getNode(inNodeName)).getApp(161);
+                 snmpa.Close();
+             }
+             catch(Exception e){
+                 addToConsole(e.toString());
+             }
+             printLayerInfo(true);
+         }
          
          public void SNMPSendMessage(String inNodeName) {

Index: TelnetEmulator.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/TelnetEmulator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TelnetEmulator.java	25 Feb 2006 00:00:03 -0000	1.5
--- TelnetEmulator.java	25 Feb 2006 22:48:34 -0000	1.6
***************
*** 117,143 ****
                      printInfo();
                  }
!                 else {
!                     String s = String.valueOf(e.getKeyCode()).toString();
!                     sendData(s);
!                     printInfo();
!                 }
              }
          });
-         
- //            public void keyTyped(KeyEvent e) {
- //                             
- //                char c = e.getKeyChar();  
- //               
- //                String s = String.valueOf(c).toString(); 
- //                sendData(s);
- //                printInfo();
- //            }           
- //        });
           
          
          this.addWindowListener( new java.awt.event.WindowAdapter() {
!          public void windowClosing(WindowEvent winEvt) {
!                printInfo();
!          }
          });
          
--- 117,134 ----
                      printInfo();
                  }
! //                else {
! //                    String s = String.valueOf(e.getKeyCode()).toString();
! //                    sendData(s);
! //                    printInfo();
! //                }
              }
          });
           
          
          this.addWindowListener( new java.awt.event.WindowAdapter() {
!             public void windowClosing(WindowEvent winEvt) {
!                 exitWindow();
!                 printInfo();
!             }
          });
          
***************
*** 185,189 ****
          if(Data.compareTo("\nQUIT")==0) {
              this.removeKeyListener(kl);
-             terminal.setText(text + "\nServer closed connection.");
          }
          else {            
--- 176,179 ----
***************
*** 208,212 ****
      
      public void exitWindow(){
!         this.dispose();
      }
  }
--- 198,211 ----
      
      public void exitWindow(){
! //        this.dispose();
!         try {
!             telnet.Disconnect();
!         }
!         catch(TransportLayerException e) {
!             
!         }
!         catch(LowLinkException e) {
!             
!         }
      }
  }

Index: ApplicationLayerDevice.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/ApplicationLayerDevice.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ApplicationLayerDevice.java	22 Feb 2006 16:29:30 -0000	1.7
--- ApplicationLayerDevice.java	25 Feb 2006 22:48:34 -0000	1.8
***************
*** 27,33 ****
      private JMenuItem mnuEchotcpSend = new JMenuItem("Send data via tcp echo client.");
      private JMenuItem mnuTelnetListen = new JMenuItem("Start telnet server to listen.");
      private JMenuItem mnuTelnetConnect = new JMenuItem("Telnet client.");
      private JMenu mnuAppLayer = new JMenu("Applications");
!     private JMenuItem mnuSNMPAgent = new JMenuItem("Start SNMP agent");
      private JMenuItem mnuSNMPManager = new JMenuItem("Send SNMP message");
      
--- 27,35 ----
      private JMenuItem mnuEchotcpSend = new JMenuItem("Send data via tcp echo client.");
      private JMenuItem mnuTelnetListen = new JMenuItem("Start telnet server to listen.");
+     private JMenuItem mnuTelnetNoListen = new JMenuItem("Stop telnet server.");
      private JMenuItem mnuTelnetConnect = new JMenuItem("Telnet client.");
      private JMenu mnuAppLayer = new JMenu("Applications");
!     private JMenuItem mnuSNMPStartAgent = new JMenuItem("Start SNMP agent");
!     private JMenuItem mnuSNMPStopAgent = new JMenuItem("Stop SNMP agent");
      private JMenuItem mnuSNMPManager = new JMenuItem("Send SNMP message");
      
***************
*** 71,80 ****
  		mnuAppLayer.add(mnuEchotcpSend);
                  
!                 mnuSNMPAgent.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){
                                  controller.SNMPStartAgent(lblNodeName.getText());
  			}
  		});
!                 
                  mnuSNMPManager.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){
--- 73,86 ----
  		mnuAppLayer.add(mnuEchotcpSend);
                  
!                 mnuSNMPStartAgent.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){
                                  controller.SNMPStartAgent(lblNodeName.getText());
  			}
  		});
!                 mnuSNMPStopAgent.addActionListener(new ActionListener(){
! 			public void actionPerformed(ActionEvent e){
!                                 controller.SNMPStopAgent(lblNodeName.getText());
! 			}
! 		});
                  mnuSNMPManager.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){
***************
*** 82,85 ****
--- 88,92 ----
  			}
  		});
+                 
                  mnuTelnetListen.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){
***************
*** 87,91 ****
  			}
  		});
!                 
                  mnuTelnetConnect.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){
--- 94,102 ----
  			}
  		});
!                 mnuTelnetNoListen.addActionListener(new ActionListener(){
! 			public void actionPerformed(ActionEvent e){
!                                 controller.TelnetNoListen(lblNodeName.getText());
! 			}
! 		});
                  mnuTelnetConnect.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){
***************
*** 94,101 ****
  		});
                  mnuAppLayer.addSeparator();
!                 mnuAppLayer.add(mnuSNMPAgent);
  		mnuAppLayer.add(mnuSNMPManager);
                  mnuAppLayer.addSeparator();
                  mnuAppLayer.add(mnuTelnetListen);
  		mnuAppLayer.add(mnuTelnetConnect);
      }
--- 105,114 ----
  		});
                  mnuAppLayer.addSeparator();
!                 mnuAppLayer.add(mnuSNMPStartAgent);
!                 mnuAppLayer.add(mnuSNMPStopAgent);
  		mnuAppLayer.add(mnuSNMPManager);
                  mnuAppLayer.addSeparator();
                  mnuAppLayer.add(mnuTelnetListen);
+                 mnuAppLayer.add(mnuTelnetNoListen);
  		mnuAppLayer.add(mnuTelnetConnect);
      }