[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/javascript JavaScript.java,1.22,1.23

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript
In directory usw-pr-cvs1:/tmp/cvs-serv7509/src/com/meterware/httpunit/javascript

Modified Files:
	JavaScript.java 
Log Message:
Ignore full first line of HTML comment in Javascript

Index: JavaScript.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript/JavaScript.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JavaScript.java	13 Sep 2002 18:34:57 -0000	1.22
+++ JavaScript.java	26 Sep 2002 21:49:35 -0000	1.23
@@ -112,11 +112,24 @@
         public void executeScript( String script ) {
             try {
                 script = script.trim();
-                if (script.startsWith( "<!--" )) script = script.substring( 4 );
+                if (script.startsWith( "<!--" )) script = withoutFirstLine( script );
                 Context.getCurrentContext().evaluateString( this, script, "httpunit", 0, null );
             } catch (Exception e) {
                 handleScriptException( e, "Script '" + script + "'" );
             }
+        }
+
+
+        private String withoutFirstLine( String script ) {
+            for (int i=0; i < script.length(); i++) {
+                if (isLineTerminator( script.charAt(i) )) return script.substring( i ).trim();
+            }
+            return "";
+        }
+
+
+        private boolean isLineTerminator( char c ) {
+            return c == 0x0A || c == 0x0D;
         }