[Javanetsim-cvs] javaNetSim/guiUI MainScreen.java,1.97,1.98

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

Update of /cvsroot/javanetsim/javaNetSim/guiUI
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17503/guiUI

Modified Files:
	MainScreen.java 
Log Message:
Fixed bugs with ClassCasting, naming, dhcp re-leasing and VLANs.


Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** MainScreen.java	21 Oct 2008 20:28:19 -0000	1.97
--- MainScreen.java	22 Oct 2008 08:54:15 -0000	1.98
***************
*** 802,805 ****
--- 802,812 ----
  									+ "' all ready exist within Simulation",
  							"Invalid Switch name", JOptionPane.ERROR_MESSAGE);
+ 					
+ 
+ 					this.setAllHighlightsOff();
+ 
+ 					this.refreshNodeInformationTab();
+ 					
+ 					return;
  
  				} catch (Exception e) {
***************
*** 1805,1813 ****
  
  						if (Sim.getNode(key) instanceof core.NetworkLayerDevice) {
- 							// Iterator<String> cnf =
- 							// ((core.NetworkLayerDevice)Sim.getNode(key)).getConfig().getConfig(core.DeviceConfig.STARTUP_CONFIG).iterator();
- 							// while(cnf.hasNext()){
- 							// strSave += cnf.next() + "\n";
- 							// }
  							strSave += ((core.NetworkLayerDevice) Sim
  									.getNode(key)).getConfig().toString(
--- 1812,1815 ----
***************
*** 1819,1824 ****
  						strSave += "#data\n";
  						
! 						strSave += ((core.NetworkLayerDevice) Sim
  								.getNode(key)).getAllData();
  
  						strSave += "#enddata\n";
--- 1821,1828 ----
  						strSave += "#data\n";
  						
! 						if (Sim.getNode(key) instanceof core.NetworkLayerDevice) {
! 							strSave += ((core.NetworkLayerDevice) Sim
  								.getNode(key)).getAllData();
+ 						}
  
  						strSave += "#enddata\n";