[Swixat-cvscommit] swixat/src/main/java/org/swixat/framework/action HandleScriptFunctionAction.java, 1.2.2.1, 1.2.2.2

[JP <j-...@us...>]

Update of /cvsroot/swixat/swixat/src/main/java/org/swixat/framework/action
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24862/src/main/java/org/swixat/framework/action

Modified Files:
      Tag: B0_6_0
	HandleScriptFunctionAction.java 
Log Message:
- Ran format code and optimize imports on the file (via IntelliJ IDE).
- Replaced some String concatenantion operators with StringBuffer.append() for better performance.

Index: HandleScriptFunctionAction.java
===================================================================
RCS file: /cvsroot/swixat/swixat/src/main/java/org/swixat/framework/action/HandleScriptFunctionAction.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** HandleScriptFunctionAction.java	21 Mar 2007 01:58:47 -0000	1.2.2.1
--- HandleScriptFunctionAction.java	21 Mar 2007 02:34:14 -0000	1.2.2.2
***************
*** 30,35 ****
  package org.swixat.framework.action;
  
  import org.swixat.SwiXAT;
- import org.swixat.util.SwiXUtil;
  import org.swixat.framework.AbstractFrame;
  import org.swixat.framework.XPathUtil;
--- 30,37 ----
  package org.swixat.framework.action;
  
+ import org.apache.commons.jxpath.JXPathContext;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
  import org.swixat.SwiXAT;
  import org.swixat.framework.AbstractFrame;
  import org.swixat.framework.XPathUtil;
***************
*** 37,52 ****
  import org.swixat.script.ScriptException;
  import org.swixat.script.Scripting;
! import org.apache.commons.logging.Log;
! import org.apache.commons.logging.LogFactory;
! import org.apache.commons.jxpath.JXPathContext;
  
- import java.util.regex.Pattern;
- import java.util.regex.Matcher;
  import java.util.Arrays;
  
  
  /**
   * @author poussin
-  *
   */
  
--- 39,51 ----
  import org.swixat.script.ScriptException;
  import org.swixat.script.Scripting;
! import org.swixat.util.SwiXUtil;
  
  import java.util.Arrays;
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
  
  
  /**
   * @author poussin
   */
  
***************
*** 79,93 ****
  
          Object retValue = null;
! 	     String functionName = null;
! 	     String[] args = new String[0];
!         String argList = "";
          JXPathContext engine = null;
  
          // parse out the function name and, if they exist, the arguments
          Matcher matcher = handleScriptFunctionPattern.matcher(command.trim());
! 	     if (matcher.matches()) {
              functionName = matcher.group(1);
              args = SwiXUtil.split(matcher.group(2), ",");
! 	     }
  
          try {
--- 78,92 ----
  
          Object retValue = null;
!         String functionName = null;
!         String[] args = new String[0];
!         StringBuffer argList = new StringBuffer("");
          JXPathContext engine = null;
  
          // parse out the function name and, if they exist, the arguments
          Matcher matcher = handleScriptFunctionPattern.matcher(command.trim());
!         if (matcher.matches()) {
              functionName = matcher.group(1);
              args = SwiXUtil.split(matcher.group(2), ",");
!         }
  
          try {
***************
*** 110,125 ****
  
              // process arguments
!             for (int a=0; a<args.length; a++) {
!                 if (a>0) {
!                     argList += ", ";
                  }
! 	             String fnArg = args[a].trim();
                  if (fnArg.startsWith("$")) {  // process arg as an xpath expression
                      Object result = XPathUtil.applyXPath(fnArg, null, engine, false);
                      String argname = "_fn_arg_" + a;
                      i.setVariable(argname, result);
!                     argList += argname;
                  } else {
!                     argList += fnArg;
                  }
              }
--- 109,124 ----
  
              // process arguments
!             for (int a = 0; a < args.length; a++) {
!                 if (a > 0) {
!                     argList.append(", ");
                  }
!                 String fnArg = args[a].trim();
                  if (fnArg.startsWith("$")) {  // process arg as an xpath expression
                      Object result = XPathUtil.applyXPath(fnArg, null, engine, false);
                      String argname = "_fn_arg_" + a;
                      i.setVariable(argname, result);
!                     argList.append(argname);
                  } else {
!                     argList.append(fnArg);
                  }
              }