[Javanetsim-cvs] javaNetSim/guiUI DataLinkLayerDevice.java, 1.4, 1.5 EthPortProperties.java, 1.5, 1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	DataLinkLayerDevice.java EthPortProperties.java 
	LinkProperties.java MainScreen.java RIPProperties.java 
	SetTCPIPPropertiesDialog.java 
Removed Files:
	EditRoutesDialog.java 
Log Message:
Refactoring of Simulation.

Index: LinkProperties.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/LinkProperties.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LinkProperties.java	13 Oct 2007 12:57:00 -0000	1.8
--- LinkProperties.java	21 Oct 2008 11:50:24 -0000	1.9
***************
*** 331,335 ****

  		try {
! 			Object nics[] = Sim.getAllInterfaces(NodeName);	//Get object array of interface names

  			//Sort the array
--- 331,335 ----

  		try {
! 			Object nics[] = Sim.getNode(NodeName).getAllInterfaces();	//Get object array of interface names

  			//Sort the array

Index: RIPProperties.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/RIPProperties.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RIPProperties.java	23 Sep 2008 15:22:18 -0000	1.2
--- RIPProperties.java	21 Oct 2008 11:50:25 -0000	1.3
***************
*** 142,146 ****
  	private void fillInterfaceCmb(String nodeName){
  		try {
! 			Object nics[] = Sim.getAllInterfaces(nodeName);	//Get object array of interface names

  			//Sort the array
--- 142,146 ----
  	private void fillInterfaceCmb(String nodeName){
  		try {
! 			Object nics[] = Sim.getNode(nodeName).getAllInterfaces();	//Get object array of interface names

  			//Sort the array

--- EditRoutesDialog.java DELETED ---

Index: SetTCPIPPropertiesDialog.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/SetTCPIPPropertiesDialog.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SetTCPIPPropertiesDialog.java	19 Oct 2007 15:57:01 -0000	1.10
--- SetTCPIPPropertiesDialog.java	21 Oct 2008 11:50:25 -0000	1.11
***************
*** 33,36 ****
--- 33,39 ----
  import core.InvalidNetworkLayerDeviceException;
  import core.InvalidNodeNameException;
+ import core.NetworkLayerDevice;
+ import core.Node;
+ import core.protocolsuite.tcp_ip.IPV4Address;
  import core.protocolsuite.tcp_ip.InvalidIPAddressException;
  import core.protocolsuite.tcp_ip.InvalidSubnetMaskException;
***************
*** 381,399 ****

  			if(NodeName != null && Interface != null && IPAddress != null && !ErrorFlag){
! 				Sim.setIPAddress(NodeName,Interface,IPAddress);				
  				controller.addToConsole(NodeName +"'s IP Address has been set to " + IPAddress + " on interface "+Interface+"\n");

- 				//if(SubnetMask != null ){
- 				Sim.setCustomSubnetMask(NodeName,Interface,SubnetMask);
  				controller.addToConsole(NodeName +"'s Subnet Address has been set to " + SubnetMask + " on interface "+Interface+"\n");

! 							
!                             if(NodeName != null && DefaultGWAddress!=null){
! 					Sim.setDefaultGateway(NodeName,DefaultGWAddress);
! 					controller.addToConsole(NodeName +"'s Default Gateway Address has been set to " + DefaultGWAddress +"\n");
!                             }		
!                              
!                             this.dispose();
!                         }
  		} catch (Exception e) {
  			e.printStackTrace();
--- 384,400 ----

  			if(NodeName != null && Interface != null && IPAddress != null && !ErrorFlag){
! 				Node temp = Sim.getNode(NodeName);
! 				NetworkLayerDevice nld = (NetworkLayerDevice)temp;
! 				
! 				nld.setTCPIPSettings(Interface, IPAddress, SubnetMask, DefaultGWAddress);
! 				
  				controller.addToConsole(NodeName +"'s IP Address has been set to " + IPAddress + " on interface "+Interface+"\n");

  				controller.addToConsole(NodeName +"'s Subnet Address has been set to " + SubnetMask + " on interface "+Interface+"\n");

! 				controller.addToConsole(NodeName +"'s Default Gateway Address has been set to " + DefaultGWAddress +"\n");
!             
! 				this.dispose();
!             }
  		} catch (Exception e) {
  			e.printStackTrace();
***************
*** 428,432 ****

  		try {
! 			Object nics[] = Sim.getAllInterfaces(NodeName);	//Get object array of interface names

  			//Sort the array
--- 429,433 ----

  		try {
! 			Object nics[] = Sim.getNode(NodeName).getAllInterfaces();	//Get object array of interface names

  			//Sort the array
***************
*** 439,443 ****
  			cmbInterface.setEnabled(true);

! 			DefaultGWAddress = Sim.getDefaultGateway(NodeName);
  			if(DefaultGWAddress != null){
  				txtDefaultGW.setText(DefaultGWAddress);
--- 440,444 ----
  			cmbInterface.setEnabled(true);

! 			DefaultGWAddress = ((core.NetworkLayerDevice)Sim.getNode(NodeName)).getDefaultGateway();
  			if(DefaultGWAddress != null){
  				txtDefaultGW.setText(DefaultGWAddress);
***************
*** 458,486 ****
  	 */
  	private void selectInterface(){
!             //save IP and mask current interface
!             if(!Interface.equals("")){
!                 try {
!                     if(IPAddress!=null) Sim.setIPAddress(NodeName, Interface, IPAddress);
!                 } catch (InvalidIPAddressException ex) {
! //                    ex.printStackTrace();
!                 } catch (InvalidNodeNameException ex) {
!                     ex.printStackTrace();
!                 } catch (InvalidNetworkInterfaceNameException ex) {
! //                    ex.printStackTrace();
!                 } catch (InvalidNetworkLayerDeviceException ex) {
! //                    ex.printStackTrace();
!                 }
!                 try {
!                     if(SubnetMask!=null) Sim.setCustomSubnetMask(NodeName, Interface, SubnetMask);
!                 } catch (InvalidSubnetMaskException ex) {
! //                    ex.printStackTrace();
!                 } catch (InvalidNodeNameException ex) {
!                     ex.printStackTrace();
!                 } catch (InvalidNetworkLayerDeviceException ex) {
!                     ex.printStackTrace();
!                 } catch (InvalidNetworkInterfaceNameException ex) {
! //                    ex.printStackTrace();
!                 }
!             }

              //read IP and mask for selected interface
--- 459,468 ----
  	 */
  	private void selectInterface(){
!         //save IP and mask current interface
!         if(!Interface.equals("")){
!             if(IPAddress!=null && SubnetMask!=null) 
!            	    ((NetworkLayerDevice)Sim.getNode(NodeName)).setTCPIPSettings(Interface, IPAddress, SubnetMask);
!                 
!         }

              //read IP and mask for selected interface
***************
*** 490,498 ****
  		if(Interface != null){
  			try {				
! 				IPAddress = Sim.getIpAddressForInterface(NodeName,Interface);

  				if(IPAddress != null){
  					txtIpAddress.setText(IPAddress);
! 					SubnetMask =Sim.getSubnetMask(NodeName,Interface);
                                          txtSubnetMask.setText(SubnetMask);
                                          txtSubnetMask.setEnabled(true);
--- 472,480 ----
  		if(Interface != null){
  			try {				
! 				IPAddress = ((NetworkLayerDevice)Sim.getNode(NodeName)).getIPAddress(Interface);

  				if(IPAddress != null){
  					txtIpAddress.setText(IPAddress);
! 					SubnetMask =((core.NetworkLayerDevice)Sim.getNode(NodeName)).getSubnetMask(Interface);
                                          txtSubnetMask.setText(SubnetMask);
                                          txtSubnetMask.setEnabled(true);
***************
*** 523,527 ****

  		if(!ip.equalsIgnoreCase("Enter IP Address")){
! 			if(!Simulation.validateDecIP(ip)){
  				lblError.setText("Invalid IP Address");
  				lblError.setForeground(Color.RED);
--- 505,509 ----

  		if(!ip.equalsIgnoreCase("Enter IP Address")){
! 			if(!IPV4Address.validateDecIP(ip)){
  				lblError.setText("Invalid IP Address");
  				lblError.setForeground(Color.RED);
***************
*** 533,537 ****
  				IPAddress = ip;
                                  if(txtSubnetMask.getText().equals("Enter Subnet Mask") || txtSubnetMask.getText() == null || txtSubnetMask.getText().equals("0.0.0.0")){
!                                     SubnetMask = Simulation.getDefaultSubnetMask(IPAddress);
                                      txtSubnetMask.setText(SubnetMask);
                                      txtSubnetMask.setEnabled(true);			
--- 515,519 ----
  				IPAddress = ip;
                                  if(txtSubnetMask.getText().equals("Enter Subnet Mask") || txtSubnetMask.getText() == null || txtSubnetMask.getText().equals("0.0.0.0")){
!                                     SubnetMask = IPV4Address.getDefaultSubnetMask(IPAddress);
                                      txtSubnetMask.setText(SubnetMask);
                                      txtSubnetMask.setEnabled(true);			
***************
*** 551,567 ****

  		String subMask = txtSubnetMask.getText();
! 		/*
!                 if(!Simulation.validateDecSubnetMask(IPAddress,subMask)){
! 			lblError.setText("Invalid SubnetMask Address");
! 			lblError.setForeground(Color.RED);
! 			lblError.setVisible(true);
! 			controller.shakeDiaLog(this);
! 			ErrorFlag = true;
! 		}else{*/
! 			lblError.setVisible(false);
! 			txtSubnetMask.setEnabled(true);
! 			SubnetMask = subMask;
! 			ErrorFlag = false;
! 		//}
  	}

--- 533,541 ----

  		String subMask = txtSubnetMask.getText();
! 
! 		lblError.setVisible(false);
! 		txtSubnetMask.setEnabled(true);
! 		SubnetMask = subMask;
! 		ErrorFlag = false;
  	}

***************
*** 576,580 ****
  		String GW = txtDefaultGW.getText();
                  if(!GW.equalsIgnoreCase("Enter Default Gateway")){
!                         if(!Simulation.validateDecIP(GW) && !GW.equals("")){
  				lblError.setText("Invalid Default Gateway Address");
  				lblError.setForeground(Color.RED);
--- 550,554 ----
  		String GW = txtDefaultGW.getText();
                  if(!GW.equalsIgnoreCase("Enter Default Gateway")){
!                         if(!IPV4Address.validateDecIP(GW) && !GW.equals("")){
  				lblError.setText("Invalid Default Gateway Address");
  				lblError.setForeground(Color.RED);
***************
*** 603,619 ****
  		String tempip = txtIpAddress.getText();

! 		//if(Simulation.validateDecIP(tempip)){
!                     if(txtSubnetMask.getText().equals("Enter Subnet Mask") || txtSubnetMask.getText() == null || txtSubnetMask.getText().equals("0.0.0.0")){
! 			String tempSubnet = Simulation.getDefaultSubnetMask(tempip);
  			txtSubnetMask.setText(tempSubnet);

  			txtSubnetMask.setEnabled(true);
!                     }
! 			btnOk.setEnabled(true);
!                 
! 		/*}else{
! 			txtSubnetMask.setText("Enter Subnet Mask");
! 			txtSubnetMask.setEnabled(false);			
! 		}*/
  	}

--- 577,589 ----
  		String tempip = txtIpAddress.getText();

! 		if(txtSubnetMask.getText().equals("Enter Subnet Mask") || txtSubnetMask.getText() == null || txtSubnetMask.getText().equals("0.0.0.0")){
! 			String tempSubnet = IPV4Address.getDefaultSubnetMask(tempip);
  			txtSubnetMask.setText(tempSubnet);

  			txtSubnetMask.setEnabled(true);
!         }
! 		
!         btnOk.setEnabled(true);
! 		
  	}

Index: DataLinkLayerDevice.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/DataLinkLayerDevice.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DataLinkLayerDevice.java	14 Sep 2007 11:14:50 -0000	1.4
--- DataLinkLayerDevice.java	21 Oct 2008 11:50:24 -0000	1.5
***************
*** 130,134 ****
  			public void actionPerformed(ActionEvent e){

! 				controller.ResetHub(lblNodeName.getText());

  			}
--- 130,134 ----
  			public void actionPerformed(ActionEvent e){

! 				controller.Reset(lblNodeName.getText());

  			}

Index: EthPortProperties.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/EthPortProperties.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EthPortProperties.java	14 Sep 2008 20:51:29 -0000	1.5
--- EthPortProperties.java	21 Oct 2008 11:50:24 -0000	1.6
***************
*** 85,89 ****
  	private MainScreen controller;
  	private Simulation Sim;
-         private SandBox SBox;

  	private String NodeName="";
--- 85,88 ----
***************
*** 92,96 ****
  	private boolean ErrorFlag = true;

! 	public EthPortProperties(JFrame frame, String inNodeName, String inNodeInt, Simulation Sim, SandBox SBox) {
  		super(frame);

--- 91,95 ----
  	private boolean ErrorFlag = true;

! 	public EthPortProperties(JFrame frame, String inNodeName, String inNodeInt, Simulation Sim) {
  		super(frame);

***************
*** 100,105 ****
  		setResizable(false);
  		controller = (MainScreen)frame;
- 		this.Sim = Sim;
-                 this.SBox = SBox;
  		setTitle("Ethernet Port Properties");
  		initGUI(inNodeName, inNodeInt);
--- 99,102 ----

Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** MainScreen.java	18 Oct 2008 19:55:31 -0000	1.95
--- MainScreen.java	21 Oct 2008 11:50:24 -0000	1.96
***************
*** 644,647 ****
--- 644,648 ----

  	public static void main(String args[]) {
+ 		

  		// Set Default look and feel (For setExtendedState bug)
***************
*** 894,900 ****
  		{

! 			strFirstNodeInter = Sim.getAvailableInterfaces(inNode1);

! 			strSecondNodeInter = Sim.getAvailableInterfaces(inNode2);

  			if (strFirstNodeInter.length == 0 || strSecondNodeInter.length == 0) {
--- 895,901 ----
  		{

! 			strFirstNodeInter = Sim.getNode(inNode1).getAvailableInterfaces();

! 			strSecondNodeInter = Sim.getNode(inNode1).getAvailableInterfaces();

  			if (strFirstNodeInter.length == 0 || strSecondNodeInter.length == 0) {
***************
*** 1445,1449 ****
  		try {

! 			strFirstNodeInter = Sim.getAvailableInterfaces(inFirstNodeName);

  			if (strFirstNodeInter.length == 0)
--- 1446,1450 ----
  		try {

! 			strFirstNodeInter = Sim.getNode(inFirstNodeName).getAvailableInterfaces();

  			if (strFirstNodeInter.length == 0)
***************
*** 1704,1708 ****
  					try {

! 						Object nics[] = Sim.getAllInterfaces(key);
  						Arrays.sort(nics);

--- 1705,1709 ----
  					try {

! 						Object nics[] = Sim.getNode(key).getAllInterfaces();
  						Arrays.sort(nics);

***************
*** 2621,2630 ****
  								if (!iface[2].contains("null")) {

! 									Sim.setIPAddress(strNodeName, iface[0],
! 											iface[2]);
! 
! 									Sim.setCustomSubnetMask(strNodeName,
! 											iface[0], iface[3]);
! 
  								}

--- 2622,2629 ----
  								if (!iface[2].contains("null")) {

! 									
! 									((core.NetworkLayerDevice)Sim.getNode(strNodeName))
! 										.setTCPIPSettings(iface[0], iface[2], iface[3]);
! 									
  								}

***************
*** 2642,2648 ****

  								if (!iface[4].contains("null"))
! 									Sim
! 											.setDefaultGateway(strNodeName,
! 													iface[4]);

  							} else if (deviceType == 1) {
--- 2641,2646 ----

  								if (!iface[4].contains("null"))
! 									((core.NetworkLayerDevice)Sim.getNode(strNodeName))
! 									.setTCPIPSettings(iface[4]);

  							} else if (deviceType == 1) {
***************
*** 2707,2718 ****
  								String rts[] = rs.split("\\|");

! 								r = new Route_entry(rts[0], rts[1], rts[2],
  										rts[4], Integer.valueOf(rts[3])
! 												.intValue());
! 								// System.out.println(rts[4]);
! 								Sim.addRoute(strNodeName, r);
  							}

! 							Sim.execCmd(strNodeName, "write mem");
  						} catch (Exception e) {

--- 2705,2717 ----
  								String rts[] = rs.split("\\|");

! 								/*r = new Route_entry(rts[0], rts[1], rts[2],
  										rts[4], Integer.valueOf(rts[3])
! 												.intValue());*/
! 								//((core.NetworkLayerDevice)Sim.getNode(strNodeName)).addRoute(r);
! 								((core.NetworkLayerDevice)Sim.getNode(strNodeName)).getConfig()
! 									.executeCommand("ip route " + rts[0] + " " + rts[2] + " " + rts[1] + " " + rts[4]);
  							}

! 							Sim.getNode(strNodeName).execCmd("write mem");
  						} catch (Exception e) {

***************
*** 2868,2877 ****
  	public void ShowHubState(String InNodeName) {

! 		int state = Sim.getState(InNodeName);

  		try {
  			if (Sim.getNode(InNodeName) instanceof core.Switch) {

! 				String cache = Sim.getCache(InNodeName);

  				if (state == -1) {
--- 2867,2876 ----
  	public void ShowHubState(String InNodeName) {

! 		int state = Sim.getNode(InNodeName).getState();

  		try {
  			if (Sim.getNode(InNodeName) instanceof core.Switch) {

! 				String cache = ((core.Switch)Sim.getNode(InNodeName)).getCache();

  				if (state == -1) {
***************
*** 2932,2940 ****
  	}

! 	public void ResetHub(String InNodeName) {
! 
! 		Sim.Reset(InNodeName);

  		insertInConsole(InNodeName, "(none)", "Hardware", "Device reseted.");
  	}

--- 2931,2940 ----
  	}

! 	public void Reset(String InNodeName) {

  		insertInConsole(InNodeName, "(none)", "Hardware", "Device reseted.");
+ 		
+ 		Sim.getNode(InNodeName).Reset();
+ 		
  	}

***************
*** 3667,3671 ****
  			String s = "";
  			s += "ARP entries for :" + inNodeName + "\n";
! 			String ArpTable[] = Sim.getARPTable(inNodeName);
  			for (int i = 0; i < ArpTable.length; i++) {
  				s += ArpTable[i] + "\n";
--- 3667,3671 ----
  			String s = "";
  			s += "ARP entries for :" + inNodeName + "\n";
! 			String ArpTable[] = ((core.NetworkLayerDevice)Sim.getNode(inNodeName)).getFormattedARPTable();
  			for (int i = 0; i < ArpTable.length; i++) {
  				s += ArpTable[i] + "\n";
***************
*** 3700,3704 ****
  			if (IP != null) {

! 				Sim.addStaticARP(IP, MAC, inNodeName);

  				this.addToConsole("Created new static ARP entry: " + inNodeName
--- 3700,3704 ----
  			if (IP != null) {

! 				((core.NetworkLayerDevice)Sim.getNode(inNodeName)).addStaticARP(IP, MAC);

  				this.addToConsole("Created new static ARP entry: " + inNodeName
***************
*** 3730,3734 ****
  		if (IP != null) {

! 			Sim.deleteARP(IP, inNodeName);

  			this.addToConsole("Removed ARP entry: on " + inNodeName
--- 3730,3734 ----
  		if (IP != null) {

! 			((core.NetworkLayerDevice)Sim.getNode(inNodeName)).deleteARPRecord(IP);

  			this.addToConsole("Removed ARP entry: on " + inNodeName
***************
*** 4141,4151 ****

  	public void PrintRouteTable(String inNodeName) {
! 		try {
! 			new InfoBox(this, "Route table", ((core.NetworkLayerDevice) Sim
! 					.getNode(inNodeName)).getFormattedRouteTable());
! 		} catch (InvalidNodeNameException e) {
! 			e.printStackTrace();
! 		}
! 
  	}

--- 4141,4146 ----

  	public void PrintRouteTable(String inNodeName) {
! 		new InfoBox(this, "Route table", ((core.NetworkLayerDevice) Sim
! 			.getNode(inNodeName)).getFormattedRouteTable());
  	}

***************
*** 4158,4163 ****

  	public void showCounters(String inNodeName) {
! 		core.protocolsuite.tcp_ip.ProtocolStack PS = Sim
! 				.getTCPProtocolStack(inNodeName);
  		int ARPCount = PS.getARPCount();
  		int inIPCount = PS.getinputIPCount();
--- 4153,4157 ----

  	public void showCounters(String inNodeName) {
! 		core.protocolsuite.tcp_ip.ProtocolStack PS = Sim.getNode(inNodeName).getProtocolStack();
  		int ARPCount = PS.getARPCount();
  		int inIPCount = PS.getinputIPCount();
***************
*** 4203,4208 ****

  	public void resetCounters(String inNodeName) {
! 		core.protocolsuite.tcp_ip.ProtocolStack PS = Sim
! 				.getTCPProtocolStack(inNodeName);
  		PS.resetCounters();
  		showCounters(inNodeName);
--- 4197,4202 ----

  	public void resetCounters(String inNodeName) {
! 		core.protocolsuite.tcp_ip.ProtocolStack PS = Sim.getNode(inNodeName)
! 				.getProtocolStack();
  		PS.resetCounters();
  		showCounters(inNodeName);
***************
*** 4286,4348 ****

  	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();
! 				r.setVisible(true);
! 			} else {
! 				JOptionPane.showMessageDialog(this,
! 						"Feature isn't supported by this device type!",
! 						"Error", JOptionPane.ERROR_MESSAGE);
! 			}
! 		} catch (InvalidNodeNameException e) {
! 			System.out
! 					.print(e.toString() + ": You change non-existent device!");
! 		}
! 		// String cmd = JOptionPane.showInputDialog(this, "Command (e.g. route
! 		// print):", "Run network configure command.",
! 		// JOptionPane.QUESTION_MESSAGE);
! 		// if(cmd!=null){
! 		// String tokens[]=cmd.split(" ");
! 		// if(tokens[0].contains("route")){
! 		// try{
! 		// if(tokens[1].contains("print")){
! 		// String routes[] = Sim.getRouteTableEntries(inNodeName);
! 		// this.addToConsole("IP routing table:\n" + "Destination" + "\t" +
! 		// "Gateway" + "\t" + "Genmask" + "\t" + "Type" + "\t" + "Iface\n");
! 		// for(int i=0; i<routes.length - 1; i++){
! 		// Route_entry r = Sim.getRouteEntry(inNodeName, routes[i]);
! 		// this.addToConsole(routes[i] + "\t" + r.gateway + "\t" + r.genMask +
! 		// "\t" + r.Type + "\t" + r.iFace + "\n");
! 		// }
! 		// }else if(tokens[1].contains("add")){
! 		// String gw = "";
! 		// if(tokens.length > 5) gw = tokens[5];
! 		// Route_entry r = new Route_entry(tokens[2], gw, tokens[4], tokens[3],
! 		// 0);
! 		// Sim.addRoute(inNodeName, r);
! 		// this.addToConsole("Route added.\n");
! 		// }else if(tokens[1].contains("del")){
! 		// Sim.removeRoute(inNodeName, tokens[2]);
! 		// this.addToConsole("Route to " + tokens[2] + "removed.\n");
! 		// }else{
! 		// this.addToConsole("Unknown route command. Usage:\n");
! 		// this.addToConsole("route add (host_ip|network_ip) target_interface
! 		// netmask (gateway|*) \n");
! 		// this.addToConsole("route del (host_ip|network_ip) \n");
! 		// this.addToConsole("route print \n");
! 		// }
! 		// }catch(ArrayIndexOutOfBoundsException e){
! 		// this.addToConsole("Unknown route command. Usage:\n");
! 		// this.addToConsole("route add (host_ip|network_ip) target_interface
! 		// netmask (gateway|*) \n");
! 		// this.addToConsole("route del (host_ip|network_ip) \n");
! 		// this.addToConsole("route print \n");
! 		// }
! 		// }else{
! 		// this.addToConsole("Unknown or invalid command.\n");
! 		// }
! 		// }
  	}

--- 4280,4293 ----

  	public void RunCmd(String inNodeName) {
! 		if (!(Sim.getNode(inNodeName) instanceof core.Printer)) {
! 			Terminal r = new Terminal(this, (core.NetworkLayerDevice) Sim
! 					.getNode(inNodeName));
! 			r.pack();
! 			r.setVisible(true);
! 		} else {
! 			JOptionPane.showMessageDialog(this,
! 					"Feature isn't supported by this device type!",
! 					"Error", JOptionPane.ERROR_MESSAGE);
! 		} 
  	}

***************
*** 4405,4409 ****
  	public Object[] getInterfaces(String NodeName)
  			throws InvalidNodeNameException {
! 		Object nics[] = Sim.getAllInterfaces(NodeName); // Get object array of
  														// interface names
  		Arrays.sort(nics);
--- 4350,4354 ----
  	public Object[] getInterfaces(String NodeName)
  			throws InvalidNodeNameException {
! 		Object nics[] = Sim.getNode(NodeName).getAllInterfaces(); // Get object array of
  														// interface names
  		Arrays.sort(nics);
***************
*** 4420,4424 ****
  			case core.NetworkInterface.Ethernet100FX:
  				if (temp.getNIC(IntName).isActive()) {
! 					new EthPortProperties(this, NodeName, IntName, Sim, Sandbox);
  				}
  				break;
--- 4365,4369 ----
  			case core.NetworkInterface.Ethernet100FX:
  				if (temp.getNIC(IntName).isActive()) {
! 					new EthPortProperties(this, NodeName, IntName, Sim);
  				}
  				break;

[Javanetsim-cvs] javaNetSim/guiUI DataLinkLayerDevice.java, 1.4, 1.5 EthPortProperties.java, 1.5, 1

[Javanetsim-cvs] javaNetSim/guiUI DataLinkLayerDevice.java, 1.4, 1.5 EthPortProperties.java, 1.5, 1.6 LinkProperties.java, 1.8, 1.9 MainScreen.java, 1.95, 1.96 RIPProperties.java, 1.2, 1.3 SetTCPIPPropertiesDialog.java, 1.10, 1.11 EditRoutesDialog.java, 1.3, NONE