httpunit-commit Mailing List for httpunit (Page 42)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit
In directory sc8-pr-cvs1:/tmp/cvs-serv22673/src/com/meterware/httpunit

Modified Files:
	AppletStubImpl.java WebApplet.java 
Log Message:
Added support for applet parameters and archives

Index: AppletStubImpl.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/AppletStubImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- AppletStubImpl.java	15 Nov 2002 00:10:22 -0000	1.1
+++ AppletStubImpl.java	22 Nov 2002 17:19:35 -0000	1.2
@@ -94,7 +94,7 @@
      * or <tt>null</tt> if not set.
      */
     public String getParameter( String name ) {
-        return null;
+        return _webApplet.getParameter( name );
     }
 
 

Index: WebApplet.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebApplet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebApplet.java	15 Nov 2002 00:07:33 -0000	1.2
+++ WebApplet.java	22 Nov 2002 17:19:35 -0000	1.3
@@ -24,8 +24,15 @@
 import java.net.URLClassLoader;
 import java.applet.Applet;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.List;
 
 import org.w3c.dom.Node;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 
@@ -40,9 +47,12 @@
     private WebResponse _response;
     private Node        _node;
     private String      _baseTarget;
+
     private URL         _codeBase;
     private String      _className;
     private Applet      _applet;
+    private HashMap     _parameters;
+    private String[]    _parameterNames;
 
     final private String CLASS_EXTENSION = ".class";
 
@@ -57,14 +67,20 @@
     /**
      * Returns the URL of the codebase used to find the applet classes
      */
-    public URL getCodeBase() throws MalformedURLException {
+    public URL getCodeBaseURL() throws MalformedURLException {
         if (_codeBase == null) {
-            _codeBase = new URL( _response.getURL(), getAttribute( "codebase", "/" ) );
+            _codeBase = new URL( _response.getURL(), getCodeBase() );
         }
         return _codeBase;
     }
 
 
+    private String getCodeBase() {
+        final String codeBaseAttribute = getAttribute( "codebase", "/" );
+        return codeBaseAttribute.endsWith( "/" ) ? codeBaseAttribute : (codeBaseAttribute + "/");
+    }
+
+
     /**
      * Returns the name of the applet main class.
      */
@@ -114,9 +130,60 @@
     }
 
 
+    /**
+     * Returns the archive specification.
+     */
+    public String getArchiveSpecification() {
+        String specification = getParameter( "archive" );
+        if (specification == null) specification = getAttribute( "archive" );
+        return specification;
+    }
+
+
+    List getArchiveList() throws MalformedURLException {
+        ArrayList al = new ArrayList();
+        StringTokenizer st = new StringTokenizer( getArchiveSpecification(), "," );
+        while (st.hasMoreTokens()) al.add( new URL( _response.getURL(), st.nextToken() ) );
+        return al;
+    }
+
+
+    /**
+     * Returns an array containing the names of the parameters defined for the applet.
+     */
+    public String[] getParameterNames() {
+        if (_parameterNames == null) {
+            ArrayList al = new ArrayList( getParameterMap().keySet() );
+            _parameterNames = (String[]) al.toArray( new String[ al.size() ] );
+        }
+        return _parameterNames;
+    }
+
+
+    /**
+     * Returns the value of the specified applet parameter, or null if not defined.
+     */
+    public String getParameter( String name ) {
+        return (String) getParameterMap().get( name );
+    }
+
+
+    private Map getParameterMap() {
+        if (_parameters == null) {
+            _parameters = new HashMap();
+            NodeList nl = ((Element) _node).getElementsByTagName( "param" );
+            for (int i = 0; i < nl.getLength(); i++) {
+                Node n = nl.item(i);
+                _parameters.put( NodeUtils.getNodeAttribute( n, "name", "" ), NodeUtils.getNodeAttribute( n, "value", "" ) );
+            }
+        }
+        return _parameters;
+    }
+
+
     public Applet getApplet() throws MalformedURLException, ClassNotFoundException, InstantiationException, IllegalAccessException {
         if (_applet == null) {
-            ClassLoader cl = new URLClassLoader( getClassPath() );
+            ClassLoader cl = new URLClassLoader( getClassPath(), null );
             Object o = cl.loadClass( getMainClassName() ).newInstance();
             if (!(o instanceof Applet)) throw new RuntimeException( getMainClassName() + " is not an Applet" );
             _applet = (Applet) o;
@@ -127,7 +194,9 @@
 
 
     private URL[] getClassPath() throws MalformedURLException {
-        return new URL[] { getCodeBase() };
+        List classPath = getArchiveList();
+        classPath.add( getCodeBaseURL() );
+        return (URL[]) classPath.toArray( new URL[ classPath.size() ] );
     }
 
 
@@ -156,6 +225,5 @@
         } catch (SAXException e) {
         }
     }
-
 
 }





2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (5)	Sep (31)	Oct (39)	Nov (18)	Dec (6)
2001	Jan (8)	Feb (5)	Mar (8)	Apr (25)	May (20)	Jun (23)	Jul (28)	Aug (10)	Sep (3)	Oct (32)	Nov (61)	Dec (24)
2002	Jan (50)	Feb (34)	Mar (35)	Apr (3)	May (25)	Jun (25)	Jul (30)	Aug (146)	Sep (49)	Oct (156)	Nov (121)	Dec (54)
2003	Jan (12)	Feb (79)	Mar (88)	Apr (26)	May (67)	Jun (29)	Jul (8)	Aug (16)	Sep (20)	Oct (17)	Nov	Dec (5)
2004	Jan	Feb (40)	Mar (30)	Apr (5)	May	Jun (83)	Jul (34)	Aug (20)	Sep (44)	Oct (46)	Nov	Dec (14)
2005	Jan (4)	Feb	Mar (5)	Apr	May	Jun	Jul	Aug	Sep (4)	Oct	Nov	Dec (1)
2006	Jan	Feb	Mar (26)	Apr (8)	May (2)	Jun	Jul	Aug	Sep	Oct (5)	Nov	Dec
2008	Jan	Feb	Mar	Apr (36)	May (38)	Jun (1)	Jul (1)	Aug	Sep (4)	Oct	Nov (18)	Dec (4)
2009	Jan	Feb (2)	Mar (3)	Apr	May	Jun (2)	Jul	Aug (35)	Sep (1)	Oct	Nov	Dec (1)
2010	Jan	Feb	Mar	Apr	May (3)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan (9)	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2012	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (21)	Oct (18)	Nov (1)	Dec

httpunit-commit Mailing List for httpunit (Page 42)

httpunit-commit — CVS commit logs