[Javanetsim-cvs] javaNetSim/textUI TextUI.java,1.5,1.6

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	TextUI.java 
Log Message:
Refactoring of Simulation.

Index: TextUI.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/textUI/TextUI.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TextUI.java	19 Oct 2007 17:40:33 -0000	1.5
--- TextUI.java	21 Oct 2008 11:50:25 -0000	1.6
***************
*** 2155,2159 ****
  		}else{

! 			try {

  				sim.setIPAddress(args[1],args[2],args[3]);	
--- 2155,2159 ----
  		}else{

! 			/*try {

  				sim.setIPAddress(args[1],args[2],args[3]);	
***************
*** 2185,2189 ****
  				System.out.println("IP Address's cant be set on '"+args[1]+"'. This isn't a network layer device.\n");

! 			}						

  		}
--- 2185,2189 ----
  				System.out.println("IP Address's cant be set on '"+args[1]+"'. This isn't a network layer device.\n");

! 			}	*/					

  		}
***************
*** 2273,2277 ****
  		}else{

! 			try{

  				sim.setDefaultGateway(args[1],args[2]);
--- 2273,2277 ----
  		}else{

! 			/*try{

  				sim.setDefaultGateway(args[1],args[2]);
***************
*** 2293,2297 ****
  				System.out.println("Invalid Default Gateway");

! 			}

  		}
--- 2293,2297 ----
  				System.out.println("Invalid Default Gateway");

! 			}*/

  		}
***************
*** 2425,2445 ****
  			try	{

! 				String[] arpTableEntries = sim.getARPTable(args[1]);
! 
! 				for(int i = 0;i<arpTableEntries.length;i++){

  					System.out.println(arpTableEntries[i]);
! 
! 			}
! 
! 			}catch(InvalidNodeNameException e)
! 
! 			{
! 
! 				System.out.println("'"+args[1]+"' does not exist within Simulation.\n");				
! 
! 			}catch(InvalidNetworkLayerDeviceException e)
! 
! 			{

  				System.out.println("'"+args[1]+"' is not a network device.\n");
--- 2425,2434 ----
  			try	{

! 				String[] arpTableEntries = ((core.NetworkLayerDevice)sim.getNode(args[1])).getFormattedARPTable();

+ 				for(int i = 0;i<arpTableEntries.length;i++)
  					System.out.println(arpTableEntries[i]);
! 				
! 			}catch(ClassCastException e){

  				System.out.println("'"+args[1]+"' is not a network device.\n");
***************
*** 2485,2495 ****
  			try {

! 				System.out.println("GW: "+ sim.getDefaultGateway(args[1]));	
! 
! 			}catch (InvalidNodeNameException e){
! 
! 				System.out.println("Node with the name: '" + args[1] + "' does not exsist.");				

! 			}catch (InvalidNetworkLayerDeviceException e){

  				System.out.println("Default Gateway cannot be set on '"+ args[1]+ "'. This isn't a network layer device.\n");
--- 2474,2480 ----
  			try {

! 				System.out.println("GW: "+ ((core.NetworkLayerDevice)sim.getNode(args[1])).getDefaultGateway());	

! 			}catch (ClassCastException e){

  				System.out.println("Default Gateway cannot be set on '"+ args[1]+ "'. This isn't a network layer device.\n");
***************
*** 2533,2539 ****
  		}else{

! 			try {

! 				sim.setCustomSubnetMask(args[1],args[2],args[3]);

  				System.out.println("Node '" + args[1] + "' has been set with a subnet mask.\n");
--- 2518,2524 ----
  		}else{

! 			/*try {

! 				//sim.setCustomSubnetMask(args[1],args[2],args[3]);

  				System.out.println("Node '" + args[1] + "' has been set with a subnet mask.\n");
***************
*** 2556,2561 ****

  				System.out.println("SubnetMask '" + args[3] + "' is not a valid subnet mask for this node");
! 
! 			}	

  	    }
--- 2541,2546 ----

  				System.out.println("SubnetMask '" + args[3] + "' is not a valid subnet mask for this node");
! 			
! 			}*/	

  	    }
***************
*** 2593,2603 ****
  			try {

! 				System.out.println("SubnetMask: "+ sim.getSubnetMask(args[1],args[2]));				
! 
! 			}catch (InvalidNodeNameException e){
! 
! 				System.out.println("Node with the name: '" + args[1] + "' does not exsist.");				

! 			}catch (InvalidNetworkLayerDeviceException e){

  				System.out.println("Node '"+ args[1]+ "'. is not a network layer device.\n");
--- 2578,2584 ----
  			try {

! 				System.out.println("SubnetMask: "+ ((NetworkLayerDevice)sim.getNode(args[1])).getSubnetMask(args[2]));				

! 			}catch (ClassCastException e){

  				System.out.println("Node '"+ args[1]+ "'. is not a network layer device.\n");
***************
*** 2687,2693 ****
  				sim.addEthernetLink("link1", "pc1", "eth0", "pc2", "eth0");

! 				sim.setIPAddress("pc1","eth0","192.168.0.1");

! 				sim.setIPAddress("pc2","eth0","192.168.0.2");

  				//as a temp fix for the bug in ARP if you reset the 
--- 2668,2674 ----
  				sim.addEthernetLink("link1", "pc1", "eth0", "pc2", "eth0");

! 				//sim.setIPAddress("pc1","eth0","192.168.0.1");

! 				//sim.setIPAddress("pc2","eth0","192.168.0.2");

  				//as a temp fix for the bug in ARP if you reset the 
***************
*** 2697,2703 ****
  				// is local and set the ARP entry				

! 				sim.setIPAddress("pc1","eth0","192.168.0.1");

! 				sim.setIPAddress("pc2","eth0","192.168.0.2");

--- 2678,2684 ----
  				// is local and set the ARP entry				

! 				//sim.setIPAddress("pc1","eth0","192.168.0.1");

! 				//sim.setIPAddress("pc2","eth0","192.168.0.2");

***************
*** 2741,2745 ****
  			try {

! 				sim.addPC("pc1", true);

  				sim.addRouter("router1", true);
--- 2722,2726 ----
  			try {

! 				/*sim.addPC("pc1", true);

  				sim.addRouter("router1", true);
***************
*** 2769,2773 ****
  				sim.addEthernetLink("link2", "pc2" , "eth0", "router1", "eth1");

! 				

  				isDirty = true;
--- 2750,2754 ----
  				sim.addEthernetLink("link2", "pc2" , "eth0", "router1", "eth1");

! 				*/

  				isDirty = true;
***************
*** 2809,2813 ****
  			try {

! 				sim.addPC("pc1", true);

  				sim.addRouter("router1", true);
--- 2790,2794 ----
  			try {

! 				/*sim.addPC("pc1", true);

  				sim.addRouter("router1", true);
***************
*** 2847,2851 ****
  				sim.addEthernetLink("link3", "router1" , "eth1", "router2", "eth1");

! 				

  				isDirty = true;
--- 2828,2832 ----
  				sim.addEthernetLink("link3", "router1" , "eth1", "router2", "eth1");

! 				*/

  				isDirty = true;
***************
*** 2901,2905 ****

! 				sim.setIPAddress("pc1","eth0","192.168.0.1");

  				sim.setIPAddress("pc2","eth0","192.168.0.2");
--- 2882,2886 ----

! 				/*sim.setIPAddress("pc1","eth0","192.168.0.1");

  				sim.setIPAddress("pc2","eth0","192.168.0.2");
***************
*** 2908,2912 ****

  				sim.setIPAddress("pc4","eth0","192.168.0.4");
! 

--- 2889,2893 ----

  				sim.setIPAddress("pc4","eth0","192.168.0.4");
! 				*/

***************
*** 2967,2971 ****
  	    try {

! 			sim.addPC("pc1", true);

  			sim.addPC("pc2", true);
--- 2948,2952 ----
  	    try {

! 			/*sim.addPC("pc1", true);

  			sim.addPC("pc2", true);
***************
*** 3035,3039 ****
  			sim.addEthernetLink("link8", "hub2", "eth3", "pc6", "eth0");

! 			

  			isDirty = true;
--- 3016,3020 ----
  			sim.addEthernetLink("link8", "hub2", "eth3", "pc6", "eth0");

! 			*/

  			isDirty = true;