javanetsim-cvs

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

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

Modified Files:
	TextUI.java 
Log Message:
Refactoring && bugfixing


Index: TextUI.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/textUI/TextUI.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TextUI.java	21 Oct 2008 11:50:25 -0000	1.6
--- TextUI.java	24 Oct 2008 16:18:48 -0000	1.7
***************
*** 55,71 ****
  package textUI;
  
! import java.io.*;
! 
! 
! 
! //import com.sun.corba.se.internal.iiop.messages.IORAddressingInfo;
! 
! 
! 
! import core.*;
  
! import core.protocolsuite.tcp_ip.*;
  
! import java.util.*;
  
  
--- 55,82 ----
  package textUI;
  
! import java.io.BufferedReader;
! import java.io.File;
! import java.io.FileInputStream;
! import java.io.FileOutputStream;
! import java.io.IOException;
! import java.io.InputStreamReader;
! import java.io.ObjectInputStream;
! import java.io.ObjectOutputStream;
! import java.util.Iterator;
! import java.util.Vector;
  
! import org.omg.CORBA.DynAnyPackage.Invalid;
  
! import core.CommunicationException;
! import core.InvalidLinkConnectionException;
! import core.InvalidLinkNameException;
! import core.InvalidNetworkInterfaceNameException;
! import core.InvalidNetworkLayerDeviceException;
! import core.InvalidNodeNameException;
! import core.LowLinkException;
! import core.NetworkLayerDevice;
! import core.Simulation;
! import core.Version;
! import core.protocolsuite.tcp_ip.InvalidIPAddressException;
  
  
***************
*** 951,955 ****
  			System.out.println("Example:");
  
! 			System.out.println("		load drive:directory/filename."+PREFIX);
  
  			System.out.println();
--- 962,966 ----
  			System.out.println("Example:");
  
! 			System.out.println("		load drive:directory/filename."+TextUI.PREFIX);
  
  			System.out.println();
***************
*** 1021,1025 ****
  			System.out.println("If a file name has not been entered the simulation will saved under the default " +
  
! 					"file name Sim."+PREFIX);
  
  			System.out.println("Example:");
--- 1032,1036 ----
  			System.out.println("If a file name has not been entered the simulation will saved under the default " +
  
! 					"file name Sim."+TextUI.PREFIX);
  
  			System.out.println("Example:");
***************
*** 1815,1821 ****
  		            System.out.println("No file name provided using default");
  
! 		        }	 			if(!fileName.endsWith(PREFIX)){
  
! 	 				fileName = fileName + "."+ PREFIX;
  
  	 			}
--- 1826,1832 ----
  		            System.out.println("No file name provided using default");
  
! 		        }	 			if(!fileName.endsWith(TextUI.PREFIX)){
  
! 	 				fileName = fileName + "."+ TextUI.PREFIX;
  
  	 			}
***************
*** 1843,1849 ****
  	 	else{		//if it does exist check it is not empty	 							 	
  
! 	 	   	if(!args[1].endsWith(PREFIX)){
  
! 	 	   		fileName = args[1]+"."+PREFIX;
  
  	 	   	}else{
--- 1854,1860 ----
  	 	else{		//if it does exist check it is not empty	 							 	
  
! 	 	   	if(!args[1].endsWith(TextUI.PREFIX)){
  
! 	 	   		fileName = args[1]+"."+TextUI.PREFIX;
  
  	 	   	}else{
***************
*** 1987,1991 ****
  		try {
  
! 			if(!args[1].endsWith(PREFIX)){ args[1] = args[1] + "."+PREFIX;}		//Add PREFIX if not already added
  
  			
--- 1998,2002 ----
  		try {
  
! 			if(!args[1].endsWith(TextUI.PREFIX)){ args[1] = args[1] + "."+TextUI.PREFIX;}		//Add PREFIX if not already added
  
  			
***************
*** 2071,2075 ****
  			System.out.println("Insufficient Parameters.");
  
! 			System.out.println("Use: " + args[0]+ " <filename> including path eg c:/savedSimFile."+PREFIX+"\n");
  
  		} else { // create a new file object based on the args[1] parameter				
--- 2082,2086 ----
  			System.out.println("Insufficient Parameters.");
  
! 			System.out.println("Use: " + args[0]+ " <filename> including path eg c:/savedSimFile."+TextUI.PREFIX+"\n");
  
  		} else { // create a new file object based on the args[1] parameter