Update of /cvsroot/javanetsim/javaNetSim/guiUI
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26945/guiUI
Modified Files:
MainScreen.java Terminal.java
Log Message:
Some console commands was corrected
Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** MainScreen.java 14 Oct 2007 17:19:07 -0000 1.69
--- MainScreen.java 14 Oct 2007 22:14:52 -0000 1.70
***************
*** 3643,3650 ****
try{
if(Sim.getNode(inNodeName).On == true){
! Sim.getNode(inNodeName).On = false;
return "Turn On";
}else{
! Sim.getNode(inNodeName).On = true;
return "Turn Off";
}
--- 3643,3650 ----
try{
if(Sim.getNode(inNodeName).On == true){
! Sim.getNode(inNodeName).turnOff();
return "Turn On";
}else{
! Sim.getNode(inNodeName).turnOn();
return "Turn Off";
}
Index: Terminal.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/Terminal.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Terminal.java 14 Oct 2007 00:22:14 -0000 1.2
--- Terminal.java 14 Oct 2007 22:14:52 -0000 1.3
***************
*** 261,268 ****
if((m=Pattern.compile(" +-a$").matcher(cmd)).find()) {
try{
! String ArpTable[] = device.NodeProtocolStack.getARPTable();
! for(int i=0;i<ArpTable.length;i++)
! {
! out += ArpTable[i] + "\n";
}
}
--- 261,274 ----
if((m=Pattern.compile(" +-a$").matcher(cmd)).find()) {
try{
! Vector<Vector<String>> ArpTable = device.NodeProtocolStack.getARPTable();
! if(ArpTable.size()>0){
! out += "Internet Address\tPhysical Address\t\tType\n";
! for(int i=0;i<ArpTable.size();i++)
! {
! out += ArpTable.get(i).get(0) + "\t\t" + ArpTable.get(i).get(1) + "\t\t" + ArpTable.get(i).get(2) + "\n";
! }
! }
! else{
! out += "No ARP Entries Found\n";
}
}
***************
*** 463,467 ****
device.getConfig().working_config = DeviceConfig.RUNNING_CONFIG;
current_mode = cmdproc.CONF_MODE;
! return "";
}
};
--- 469,473 ----
device.getConfig().working_config = DeviceConfig.RUNNING_CONFIG;
current_mode = cmdproc.CONF_MODE;
! return "Enter configuration commands, one per line. End with 'exit'";
}
};
***************
*** 470,474 ****
device.getConfig().working_config = DeviceConfig.RUNNING_CONFIG;
current_mode = cmdproc.CONF_MODE;
! return "Running-config was erased";
}
};
--- 476,480 ----
device.getConfig().working_config = DeviceConfig.RUNNING_CONFIG;
current_mode = cmdproc.CONF_MODE;
! return "Running-config was erased\nEnter configuration commands, one per line. End with 'exit'";
}
};
***************
*** 477,481 ****
device.getConfig().working_config = DeviceConfig.STARTUP_CONFIG;
current_mode = cmdproc.CONF_MODE;
! return "Starting-config editing";
}
};
--- 483,487 ----
device.getConfig().working_config = DeviceConfig.STARTUP_CONFIG;
current_mode = cmdproc.CONF_MODE;
! return "Starting-config editing\nEnter configuration commands, one per line. End with 'exit'";
}
};
|
