[Actionstep-commits] actionstep/src/org/actionstep ASStringFormatter.as,1.3,1.4

[Scott H. <sco...@us...>]

Update of /cvsroot/actionstep/actionstep/src/org/actionstep
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv773/src/org/actionstep

Modified Files:
	ASStringFormatter.as 
Log Message:
Added some new handlers, as well as some new type letters.

Index: ASStringFormatter.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/ASStringFormatter.as,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ASStringFormatter.as	29 Jun 2005 08:16:11 -0000	1.3
--- ASStringFormatter.as	25 Jul 2005 00:19:20 -0000	1.4
***************
*** 178,181 ****
--- 178,184 ----
  
  
+ 	/**
+ 	 * Returns whether a character should be handled by one of the handlers or not.
+ 	 */
  	private static function isTypeCharacter(char:String):Boolean
  	{		
***************
*** 193,196 ****
--- 196,202 ----
  	//******************************************************
  	
+ 	/**
+ 	 * Returns an integer.
+ 	 */
  	private static function handleInteger(flags:Array, width:Number, zeroPad:Boolean, precision:Number, arg:Object):String
  	{
***************
*** 225,228 ****
--- 231,237 ----
  
  	
+ 	/**
+ 	 * Returns a float.
+ 	 */
  	private static function handleFloat(flags:Array, width:Number, zeroPad:Boolean, precision:Number, arg:Object):String
  	{
***************
*** 281,291 ****
  	}
  
! 
  	private static function handleScientificNotation(flags:Array, width:Number, zeroPad:Boolean, precision:Number, arg:Object):String
  	{
  		return arg.toString();
  	}
  	
  	
  	private static function handleOctal(flags:Array, width:Number, zeroPad:Boolean, precision:Number, arg:Object):String
  	{
--- 290,307 ----
  	}
  
! 	
! 	/**
! 	 * Returns a number in scientific notation.
! 	 */
  	private static function handleScientificNotation(flags:Array, width:Number, zeroPad:Boolean, precision:Number, arg:Object):String
  	{
+ 		//! implement
  		return arg.toString();
  	}
  	
  	
+ 	/**
+ 	 * Returns an octal (base-8) number.
+ 	 */
  	private static function handleOctal(flags:Array, width:Number, zeroPad:Boolean, precision:Number, arg:Object):String
  	{
***************
*** 349,352 ****
--- 365,371 ----
  	
  	
+ 	/**
+ 	 * Returns a string.
+ 	 */
  	private static function handleString(flags:Array, width:Number, zeroPad:Boolean, precision:Number, arg:Object):String
  	{
***************
*** 376,379 ****
--- 395,401 ----
  	
  	
+ 	/**
+ 	 * Returns a hexidecimal number (0x11abcd).
+ 	 */
  	private static function handleHex(flags:Array, width:Number, zeroPad:Boolean, precision:Number, arg:Object, upperCase:Boolean):String
  	{
***************
*** 420,434 ****
  	
  
! 	private static function handleHexUpperCase(flags:Array, width:Number, zeroPad:Boolean, precision:Number, arg:Object):String
  	{
  		return handleHex(flags, width, zeroPad, precision, arg, true);		
  	}
  	
! 	
  	private static function handleObject(flags:Array, width:Number, zeroPad:Boolean, precision:Number, arg:Object):String
  	{		
  		return arg.toString();
  	}
  	
  	//******************************************************															 
  	//*               Static Constructor
--- 442,474 ----
  	
  
! 	/**
! 	 * Returns a hexidecimal number with upper case letters.
! 	 */
! 	private static function handleHexUpperCase(flags:Array, width:Number, 
! 		zeroPad:Boolean, precision:Number, arg:Object):String
  	{
  		return handleHex(flags, width, zeroPad, precision, arg, true);		
  	}
  	
! 
! 	/**
! 	 * Returns a toString() of the object.
! 	 */
  	private static function handleObject(flags:Array, width:Number, zeroPad:Boolean, precision:Number, arg:Object):String
  	{		
  		return arg.toString();
  	}
+ 
+ 
+ 	/**
+ 	 * Returns a percent sign.
+ 	 */
+ 	private static function handlePercent(flags:Array, width:Number, 
+ 		zeroPad:Boolean, precision:Number, arg:Object):String
+ 	{
+ 		return "%";
+ 	}
  	
+ 		
  	//******************************************************															 
  	//*               Static Constructor
***************
*** 447,451 ****
  		//
  		g_types = new Object();
! 		g_types["d"] = g_types["i"] = handleInteger;
  		g_types["f"] = handleFloat;
  		g_types["o"] = handleOctal;
--- 487,499 ----
  		//
  		g_types = new Object();
! 		g_types["d"] = 
! 		g_types["i"] = 
! 		g_types["D"] = 
! 		g_types["u"] = 
! 		g_types["U"] = 
! 		g_types["hi"] = 
! 		g_types["hu"] = 
! 		g_types["qi"] = 
! 		g_types["qu"] = handleInteger;
  		g_types["f"] = handleFloat;
  		g_types["o"] = handleOctal;
***************
*** 453,456 ****
--- 501,505 ----
  		g_types["x"] = handleHex;
  		g_types["X"] = handleHexUpperCase;
+ 		g_types["%"] = handlePercent;
  		g_types["@"] = handleObject;