[Javanetsim-cvs] javaNetSim/core Simulation.java, 1.10, 1.11 Switch.java, 1.3, 1.4

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

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

Modified Files:
	Simulation.java Switch.java 
Log Message:


Index: Switch.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/Switch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Switch.java	12 Oct 2006 17:26:26 -0000	1.3
--- Switch.java	12 Oct 2006 17:38:41 -0000	1.4
***************
*** 92,96 ****
          }
          
!         public String getSwitchCache(){
                Enumeration it, it2;                
                String nic = "";
--- 92,96 ----
          }
          
!         public String getCache(){
                Enumeration it, it2;                
                String nic = "";
***************
*** 148,152 ****
                              try{
  				tempInterface.sendPacket(copyPacket);
-                                 System.out.println("\n\n" + getSwitchCache() + "\n\n");
                              }catch(NullPointerException e){
                                  System.out.println("Switch.java: " + e.toString());
--- 148,151 ----
***************
*** 164,168 ****
                              try{
  				tempInterface.sendPacket(copyPacket);
-                                 System.out.println("\n\n" + getSwitchCache() + "\n\n");
                              }catch(NullPointerException e){
                                  System.out.println("Switch.java: " + e.toString());
--- 163,166 ----

Index: Simulation.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/Simulation.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Simulation.java	12 Oct 2006 16:14:14 -0000	1.10
--- Simulation.java	12 Oct 2006 17:38:41 -0000	1.11
***************
*** 727,730 ****
--- 727,737 ----
  	}
          
+         public String getCache(String inNodeName) {
+ 		if (nodeTable.containsKey(inNodeName)) {
+ 			      return ((Switch)((Node)nodeTable.get(inNodeName))).getCache();
+ 		}
+ 		return "";
+ 	}
+         
          public void Reset(String inNodeName) {
  		if (nodeTable.containsKey(inNodeName)) {