[Javanetsim-cvs] javaNetSim/guiUI NetworkLayerDevice.java,1.7,1.8 RunCMD.java,1.1,1.2

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

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

Modified Files:
	NetworkLayerDevice.java RunCMD.java 
Log Message:


Index: NetworkLayerDevice.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/NetworkLayerDevice.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NetworkLayerDevice.java	27 Feb 2006 16:54:49 -0000	1.7
--- NetworkLayerDevice.java	28 Feb 2006 16:55:35 -0000	1.8
***************
*** 119,123 ****
          
  
!         private JMenuItem mnuRunCmd = new JMenuItem("Run low-level command...");
  
          private JMenuItem mnuPR = new JMenuItem("Print route table");
--- 119,123 ----
          
  
!         private JMenuItem mnuRunCmd = new JMenuItem("Console");
  
          private JMenuItem mnuPR = new JMenuItem("Print route table");

Index: RunCMD.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/RunCMD.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RunCMD.java	27 Feb 2006 16:54:49 -0000	1.1
--- RunCMD.java	28 Feb 2006 16:55:35 -0000	1.2
***************
*** 90,94 ****
      private JTextArea terminal;
      private JTextField cmdline;
!     private String text="";
      private KeyListener kl;
      private core.NetworkLayerDevice device;
--- 90,94 ----
      private JTextArea terminal;
      private JTextField cmdline;
!     private String text;
      private KeyListener kl;
      private core.NetworkLayerDevice device;
***************
*** 100,110 ****
      /** Creates a new instance of TelnetEmulator */
      public RunCMD(MainScreen parent, core.NetworkLayerDevice dev) {
!         super("Terminal");
          device = dev;
          this.parent = parent;
  
          panel = new JPanel();
          scrollpane = new JScrollPane();
!         terminal = new JTextArea();
          cmdline = new JTextField();
          this.setContentPane(panel);
--- 100,111 ----
      /** Creates a new instance of TelnetEmulator */
      public RunCMD(MainScreen parent, core.NetworkLayerDevice dev) {
!         super("Console: " + dev.NodeProtocolStack.getParentNodeName());
          device = dev;
          this.parent = parent;
  
+         text = runcmd("");
          panel = new JPanel();
          scrollpane = new JScrollPane();
!         terminal = new JTextArea(text);
          cmdline = new JTextField();
          this.setContentPane(panel);
***************
*** 115,119 ****
          scrollpane.setViewportView(terminal);
          terminal.setEnabled(false);
!         terminal.setEditable(true);
          terminal.setBackground(Color.BLACK);
          terminal.setForeground(Color.WHITE);
--- 116,120 ----
          scrollpane.setViewportView(terminal);
          terminal.setEnabled(false);
!         terminal.setEditable(false);
          terminal.setBackground(Color.BLACK);
          terminal.setForeground(Color.WHITE);
***************
*** 215,219 ****
              out += " counters\t show network counters\n";
              out += " quit    \t close terminal session\n";
!             out += " ?       \t show this screen\n";                    
          }
          else if(cmd.compareToIgnoreCase("quit")==0) {
--- 216,220 ----
              out += " counters\t show network counters\n";
              out += " quit    \t close terminal session\n";
!             out += " ? or help\tshow this screen\n";                    
          }
          else if(cmd.compareToIgnoreCase("quit")==0) {