javanetsim-cvs

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

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

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


Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MainScreen.java	1 Dec 2005 14:54:37 -0000	1.14
--- MainScreen.java	1 Dec 2005 19:51:53 -0000	1.15
***************
*** 3057,3061 ****
                              this.addToConsole("Unknown route command. Usage:\n");
  
!                             this.addToConsole("route add (host_ip|network_ip) target_interface netmask [gateway] \n");
  
                              this.addToConsole("route del (host_ip|network_ip) \n");
--- 3057,3061 ----
                              this.addToConsole("Unknown route command. Usage:\n");
  
!                             this.addToConsole("route add (host_ip|network_ip) target_interface netmask (gateway|*) \n");
  
                              this.addToConsole("route del (host_ip|network_ip) \n");
***************
*** 3069,3073 ****
                              this.addToConsole("Unknown route command. Usage:\n");
  
!                             this.addToConsole("route add (host_ip|network_ip) target_interface netmask [gateway] \n");
  
                              this.addToConsole("route del (host_ip|network_ip) \n");
--- 3069,3073 ----
                              this.addToConsole("Unknown route command. Usage:\n");
  
!                             this.addToConsole("route add (host_ip|network_ip) target_interface netmask (gateway|*) \n");
  
                              this.addToConsole("route del (host_ip|network_ip) \n");

Index: ApplicationLayerDevice.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/ApplicationLayerDevice.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ApplicationLayerDevice.java	26 Nov 2005 16:48:25 -0000	1.4
--- ApplicationLayerDevice.java	1 Dec 2005 19:51:53 -0000	1.5
***************
*** 14,17 ****
--- 14,18 ----
  
  import javax.swing.JMenuItem;
+ import javax.swing.JMenu;
  
  /**
***************
*** 25,33 ****
      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 */
      public ApplicationLayerDevice(String inName, MainScreen inMainScreen, String imageLocation) {
  		super(inName, inMainScreen, imageLocation);
!                                
                  mnuEchoListen.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){
--- 26,37 ----
      private JMenuItem mnuEchotcpListen = new JMenuItem("Start tcp echo server to listen.");
      private JMenuItem mnuEchotcpSend = new JMenuItem("Send data via tcp echo client.");
+     private JMenu mnuAppLayer = new JMenu("Applications");
      
      /** Creates a new instance of ApplicationLayerDevice */
      public ApplicationLayerDevice(String inName, MainScreen inMainScreen, String imageLocation) {
  		super(inName, inMainScreen, imageLocation);
!                 
!                 
!                 
                  mnuEchoListen.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){
***************
*** 56,63 ****
  		});
                  
!                 GuiNodePopMenu.add(mnuEchoListen);
! 		GuiNodePopMenu.add(mnuEchoSend);
!                 GuiNodePopMenu.add(mnuEchotcpListen);
! 		GuiNodePopMenu.add(mnuEchotcpSend);
      }
  }
--- 60,69 ----
  		});
                  
!                 GuiNodePopMenu.add(mnuAppLayer);
!                 mnuAppLayer.add(mnuEchoListen);
! 		mnuAppLayer.add(mnuEchoSend);
!                 mnuAppLayer.addSeparator();
!                 mnuAppLayer.add(mnuEchotcpListen);
! 		mnuAppLayer.add(mnuEchotcpSend);
      }
  }