[Javanetsim-cvs] javaNetSim/guiUI GuiRouter.java, 1.3, 1.4 WANPortProperties.java, 1.3, 1.4

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

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

Modified Files:
	GuiRouter.java WANPortProperties.java 
Log Message:
Minor bugs in WAN interfaces fixed...

Index: WANPortProperties.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/WANPortProperties.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WANPortProperties.java	19 Nov 2007 15:10:28 -0000	1.3
--- WANPortProperties.java	20 Nov 2007 19:17:09 -0000	1.4
***************
*** 349,358 ****
                                  
                                  cmbRole = new JComboBox();
! 				/*cmbRole.addFocusListener(new FocusAdapter() {
! 					public void actionPerformed(ActionEvent e) {						
!                                             //lblError.setVisible(false);
! 					}
! 				});*/
!                                 
                                  cmbRole.setEnabled(true);
  				final GridBagConstraints gridBagConstraints_4 = new GridBagConstraints();
--- 349,353 ----
                                  
                                  cmbRole = new JComboBox();
! 				                                
                                  cmbRole.setEnabled(true);
  				final GridBagConstraints gridBagConstraints_4 = new GridBagConstraints();
***************
*** 450,453 ****
--- 445,455 ----
  					}
  				});
+                                 
+                                 cmbRole.addActionListener(new ActionListener() {
+ 					public void actionPerformed(ActionEvent e) {						
+                                             selectRole();
+                                             lblError.setVisible(false);
+ 					}
+ 				});
                                                                  
                                  selectWANType();
***************
*** 459,462 ****
--- 461,486 ----
  	}
  	
+         private void selectRole(){
+             switch(cmbType.getSelectedIndex() + 1){
+                 case WANNetworkInterface.RMI:
+                     if(cmbRole.getSelectedIndex() == 1){
+                         txtService.setText("");
+                         txtService.setEnabled(false);
+                         txtPort.setEnabled(false);   
+                         txtPort.setText("1099");
+                     }else{
+                         txtService.setEnabled(true);
+                         txtPort.setEnabled(true);                                        
+                     }
+                     break;
+                 case WANNetworkInterface.Corba:                    
+                     if(cmbRole.getSelectedIndex() == 1){
+                         txtService.setEnabled(false);
+                         txtService.setText("");
+                     }else
+                         txtService.setEnabled(true);
+                     break;    
+             }
+         }
          
          private void selectWANType(){
***************
*** 473,488 ****
                  case WANNetworkInterface.RMI:
                      cmbRole.setEnabled(true);
!                     txtHost.setEnabled(true);
!                     txtPort.setEnabled(false);
!                     txtPort.setText("");
!                     txtService.setEnabled(true);                    
!                     break;
!                     
                  case WANNetworkInterface.Corba:
                      cmbRole.setEnabled(true);
!                     txtHost.setEnabled(false);
!                     txtPort.setEnabled(false);
!                     txtPort.setText("");
!                     txtService.setEnabled(true);
                      break;    
              }
--- 497,520 ----
                  case WANNetworkInterface.RMI:
                      cmbRole.setEnabled(true);
!                     if(cmbRole.getSelectedIndex() == 1){
!                         txtService.setText("");
!                         txtService.setEnabled(false);
!                         txtPort.setEnabled(false);  
!                         txtPort.setText("1099");
!                     }else{
!                         txtService.setEnabled(true);
!                         txtPort.setEnabled(true);                                        
!                     }
!                     txtHost.setEnabled(true);                    
!                     break;    
                  case WANNetworkInterface.Corba:
                      cmbRole.setEnabled(true);
!                     if(cmbRole.getSelectedIndex() == 1){
!                         txtService.setText("");
!                         txtService.setEnabled(false);
!                     }else
!                         txtService.setEnabled(true);
!                     txtHost.setEnabled(true);
!                     txtPort.setEnabled(true);                                        
                      break;    
              }
***************
*** 496,519 ****
  	private void okButton(){
  		try {		                    
!                      switch(cmbType.getSelectedIndex() + 1){
!                         case WANNetworkInterface.SocketTCP:                    
!                         case WANNetworkInterface.SocketUDP:
!                             if(!txtPort.getText().matches("[0-9]+")){
!                                 JOptionPane.showMessageDialog(this,"Invalid Port", "Error!", JOptionPane.ERROR_MESSAGE);
!                                 return;
!                             }
!                             wan.setConnType(cmbType.getSelectedIndex() + 1);
!                             wan.setConnHost(txtHost.getText());
!                             wan.setConnPort(Integer.valueOf(txtPort.getText()));                            
!                             wan.setServer( cmbRole.getSelectedIndex() == 1 );
!                             break;     
!                     
!                         case WANNetworkInterface.RMI:
!                         case WANNetworkInterface.Corba:
!                             wan.setConnType(cmbType.getSelectedIndex() + 1);
!                             wan.setConnHost(txtHost.getText());
!                             wan.setConnService(txtService.getText());                            
!                             break;    
!                      }
                       
                       if(wan.isUP()) wan.DOWN();
--- 528,542 ----
  	private void okButton(){
  		try {		                    
!                     if(!txtPort.getText().matches("[0-9]+")){
!                         JOptionPane.showMessageDialog(this,"Invalid Port", "Error!", JOptionPane.ERROR_MESSAGE);
!                         return;
!                     }
!                     wan.setConnType(cmbType.getSelectedIndex() + 1);
!                     wan.setConnHost(txtHost.getText());
!                     wan.setConnPort(Integer.valueOf(txtPort.getText()));                            
!                     wan.setServer( cmbRole.getSelectedIndex() == 1 );
!                     wan.setConnType(cmbType.getSelectedIndex() + 1);
!                     wan.setConnHost(txtHost.getText());
!                     wan.setConnService(txtService.getText());                            
                       
                       if(wan.isUP()) wan.DOWN();

Index: GuiRouter.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/GuiRouter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GuiRouter.java	15 Oct 2007 18:25:54 -0000	1.3
--- GuiRouter.java	20 Nov 2007 19:17:09 -0000	1.4
***************
*** 89,93 ****
  	public GuiRouter(String inName, MainScreen inMainScreen){
  
! 		super(inName, inMainScreen,"images/simulation/Router.png");		 // router_large.gif
  
  	}
--- 89,93 ----
  	public GuiRouter(String inName, MainScreen inMainScreen){
  
! 		super(inName, inMainScreen,"images/simulation/router.png");		 // router_large.gif
  
  	}