[Javanetsim-cvs] javaNetSim/guiUI ApplicationLayerDevice.java,1.3,1.4 MainScreen.java,1.12,1.13

[Alexander B. <da...@us...>]

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

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


Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MainScreen.java	21 Nov 2005 15:58:20 -0000	1.12
--- MainScreen.java	26 Nov 2005 16:48:25 -0000	1.13
***************
*** 118,121 ****
--- 118,122 ----
  
  import core.protocolsuite.tcp_ip.Echo;
+ import core.protocolsuite.tcp_ip.Echo_tcp;
  
  
***************
*** 2875,2878 ****
--- 2876,2906 ----
          }
  
+         public void EchotcpServerListen(String inNodeName){
+ 
+              String port = JOptionPane.showInputDialog(this, "Port:", "Set Echo Server listening on port.", JOptionPane.QUESTION_MESSAGE);
+ 
+              if(port!=null){
+ 
+                  try{
+ 
+                  
+ 
+                     Echo_tcp echo1 = ((Echo_tcp)((core.ApplicationLayerDevice)Sim.getNode(inNodeName)).getApp(17));
+ 
+                     echo1.setPort(Integer.valueOf(port).intValue());
+ 
+                     echo1.Listen(); 
+                     
+                     printLayerInfo();
+ 
+                  }catch(Exception e){
+ 
+                      addToConsole(e.toString());
+ 
+                  }
+ 
+              }
+ 
+         }
          
  
***************
*** 2919,2923 ****
          }
  
!         
  
          /**
--- 2947,2991 ----
          }
  
!         /**
! 
! 	 * Send echo message to server
! 
!          * @author Key
! 
! 	 * @param String inNodeName Name of node to server listen
! 
! 	 */
! 
! 
! 
!         public void EchotcpSend(String inNodeName){
! 
!              String ip = JOptionPane.showInputDialog(this, "Server IP:", "Send msg over Echo.", JOptionPane.QUESTION_MESSAGE);
! 
!              String port = JOptionPane.showInputDialog(this, "Server Port:", "Send msg over Echo.", JOptionPane.QUESTION_MESSAGE);
! 
!              String msg = JOptionPane.showInputDialog(this, "Message:", "Message.", JOptionPane.QUESTION_MESSAGE);
! 
!              if(port!=null && ip!=null && msg!=null){
! 
!                  try{
! 
!                     printNetworkStart(); 
! 
!                     ((Echo_tcp)((core.ApplicationLayerDevice)Sim.getNode(inNodeName)).getApp(30017)).SendEcho(msg, ip, Integer.valueOf(port).intValue());
! 
!                     this.addToConsole("Trying to send echo message '" + msg + "' from " + inNodeName + " to " + ip +  ":" + port + "\n");
! 
!                  }catch(Exception e){
! 
!                     addToConsole(e.toString());
! 
!                  }
! 
!                     printLayerInfo();
! 
!              }             
! 
!         }
  
          /**

Index: ApplicationLayerDevice.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/ApplicationLayerDevice.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ApplicationLayerDevice.java	19 Nov 2005 16:16:32 -0000	1.3
--- ApplicationLayerDevice.java	26 Nov 2005 16:48:25 -0000	1.4
***************
*** 21,26 ****
  public class ApplicationLayerDevice extends NetworkLayerDevice {
      
!     private JMenuItem mnuEchoListen = new JMenuItem("Start echo server to listen.");
!     private JMenuItem mnuEchoSend = new JMenuItem("Send data via echo client.");
      
      /** Creates a new instance of ApplicationLayerDevice */
--- 21,28 ----
  public class ApplicationLayerDevice extends NetworkLayerDevice {
      
!     private JMenuItem mnuEchoListen = new JMenuItem("Start udp echo server to listen.");
!     private JMenuItem mnuEchoSend = new JMenuItem("Send data via udp echo client.");
!     private JMenuItem mnuEchotcpListen = new JMenuItem("Start tcp echo server to listen.");
!     private JMenuItem mnuEchotcpSend = new JMenuItem("Send data via tcp echo client.");
      
      /** Creates a new instance of ApplicationLayerDevice */
***************
*** 41,47 ****
--- 43,63 ----
  		});
                  
+                 mnuEchotcpListen.addActionListener(new ActionListener(){
+ 			public void actionPerformed(ActionEvent e){
+ 				controller.EchotcpServerListen(lblNodeName.getText());
+ 				
+ 				
+ 			}
+ 		});
+ 		mnuEchotcpSend.addActionListener(new ActionListener(){
+ 			public void actionPerformed(ActionEvent e){
+                                 controller.EchotcpSend(lblNodeName.getText());
+ 			}
+ 		});
                  
                  GuiNodePopMenu.add(mnuEchoListen);
  		GuiNodePopMenu.add(mnuEchoSend);
+                 GuiNodePopMenu.add(mnuEchotcpListen);
+ 		GuiNodePopMenu.add(mnuEchotcpSend);
      }
  }