[Javanetsim-cvs] javaNetSim/guiUI GuiNode.java, 1.5, 1.6 MainScreen.java, 1.79, 1.80 WANPortProperties.java, 1.1, 1.2

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

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

Modified Files:
	GuiNode.java MainScreen.java WANPortProperties.java 
Log Message:
Fixed critical section in LayerInfo, CORBA mechanisms templates...

Index: WANPortProperties.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/WANPortProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WANPortProperties.java	19 Oct 2007 19:38:07 -0000	1.1
--- WANPortProperties.java	10 Nov 2007 13:25:39 -0000	1.2
***************
*** 472,478 ****
                      
                  case WANNetworkInterface.RMI:
!                     cmbRole.setEnabled(false);
                      txtHost.setEnabled(true);
!                     txtPort.setEnabled(true);
                      txtPort.setText("");
                      txtService.setEnabled(true);                    
--- 472,478 ----
                      
                  case WANNetworkInterface.RMI:
!                     cmbRole.setEnabled(true);
                      txtHost.setEnabled(true);
!                     txtPort.setEnabled(false);
                      txtPort.setText("");
                      txtService.setEnabled(true);                    

Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** MainScreen.java	20 Oct 2007 22:54:40 -0000	1.79
--- MainScreen.java	10 Nov 2007 13:25:39 -0000	1.80
***************
*** 211,214 ****
--- 211,215 ----
          
          
+         public boolean LIlocked;
          
          String columnNames[] = { "English", "Japanese", "Boolean", "Date", "ImageIcon" };
***************
*** 417,420 ****
--- 418,423 ----
  		buildGUI();	
                  
+                 LIlocked = false;
+                 
                  Timer timer = null;
                  timer=new Timer();
***************
*** 1608,1612 ****
  
          public void printLayerInfo(boolean header){
! 
                          //if(header) pnlConsole.append("\n");
  
--- 1611,1617 ----
  
          public void printLayerInfo(boolean header){
!                         if(LIlocked) return;
!                         LIlocked = true;
!             
                          //if(header) pnlConsole.append("\n");
  
***************
*** 1657,1660 ****
--- 1662,1666 ----
  
  			}
+                         LIlocked = false;
  
          }
***************
*** 4032,4042 ****
          }
          
!         public String TurnDevice(String inNodeName){
            try{  
              if(Sim.getNode(inNodeName).On == true){
!                 Sim.getNode(inNodeName).turnOff();
!                 return "Turn On";
              }else{
                  Sim.getNode(inNodeName).turnOn();
                  return "Turn Off";    
              } 
--- 4038,4057 ----
          }
          
!         public void TurnDevice(String inNodeName){
            try{  
              if(Sim.getNode(inNodeName).On == true){
!                 Sim.getNode(inNodeName).turnOff();                
              }else{
                  Sim.getNode(inNodeName).turnOn();
+                 
+             } 
+           }catch(Exception e){ }
+         }
+         
+         public String DeviceState(String inNodeName){
+           try{  
+             if(Sim.getNode(inNodeName).On == true){
+                 return "Turn On";
+             }else{
                  return "Turn Off";    
              } 
***************
*** 4410,4414 ****
          public void RunCmd(String inNodeName){
              try{
!              if(/*!(Sim.getNode(inNodeName) instanceof core.NetworkLayerDevice) &&*/ !(Sim.getNode(inNodeName) instanceof core.Printer)){
                  Terminal r = new Terminal(this, (core.NetworkLayerDevice)Sim.getNode(inNodeName));
                  r.pack();
--- 4425,4429 ----
          public void RunCmd(String inNodeName){
              try{
!              if(!(Sim.getNode(inNodeName) instanceof core.Printer)){
                  Terminal r = new Terminal(this, (core.NetworkLayerDevice)Sim.getNode(inNodeName));
                  r.pack();

Index: GuiNode.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/GuiNode.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GuiNode.java	15 Oct 2007 18:25:54 -0000	1.5
--- GuiNode.java	10 Nov 2007 13:25:39 -0000	1.6
***************
*** 358,366 ****
                  GuiNodePopMenu.add(mnuInt);
                  
                  mnuTurn.addActionListener(new ActionListener(){
  
                      public void actionPerformed(ActionEvent e){
                          //controller.showLinkDialog(lblNodeName.getText());
!                         mnuTurn.setText(controller.TurnDevice(lblNodeName.getText()));
  
                      }                           
--- 358,368 ----
                  GuiNodePopMenu.add(mnuInt);
                  
+                 mnuTurn.setText(controller.DeviceState(lblNodeName.getText()));
                  mnuTurn.addActionListener(new ActionListener(){
  
                      public void actionPerformed(ActionEvent e){
                          //controller.showLinkDialog(lblNodeName.getText());
!                         controller.TurnDevice(lblNodeName.getText());
!                         mnuTurn.setText(controller.DeviceState(lblNodeName.getText()));
  
                      }