GeomConverter/src/org/lcsim/geometry/compact

diff -u -r1.4 -r1.5
--- ParameterSet.java	1 Feb 2006 01:33:16 -0000	1.4
+++ ParameterSet.java	1 Feb 2006 23:40:43 -0000	1.5
@@ -13,7 +13,7 @@

  * or String.
  * 
  * @author jeremym

- * @version $Id: ParameterSet.java,v 1.4 2006/02/01 01:33:16 jeremy Exp $

+ * @version $Id: ParameterSet.java,v 1.5 2006/02/01 23:40:43 jeremy Exp $

  */
 public class ParameterSet
 {

@@ -26,6 +26,10 @@

 		convertFromXML(node);
 	}
 

+	/** Constructor without Element argument. */
+	protected ParameterSet()
+	{}
+	

 	/** Convert <parameter> elements within <detector>. */
 	private void convertFromXML(Element node)
 	{

@@ -113,13 +117,8 @@

 		}
 	}
 

-	/** Constructor without Element argument. */
-	protected ParameterSet()
-	{
-	}
-

 	/** Add a parameter to the ParameterSet, checking that the type is valid. */

-	protected void addParameter(String name, Object object)

+	public void addParameter(String name, Object object)

 	{
 		if ( object instanceof Double || object instanceof Integer
 				|| object instanceof String )

GeomConverter/test/org/lcsim/geometry/compact

diff -u -r1.1 -r1.2
--- ParameterSet_XMLTest.java	17 Jan 2006 18:42:40 -0000	1.1
+++ ParameterSet_XMLTest.java	1 Feb 2006 23:40:43 -0000	1.2
@@ -26,15 +26,14 @@

         
     protected void setUp() throws Exception
     {

-        InputStream in = CompactReaderTest.class.getResourceAsStream("ParameterSetTest.xml");

+        InputStream in = ParameterSet_XMLTest.class.getResourceAsStream("ParameterSetTest.xml");

         CompactReader reader = new CompactReader();
         det = reader.read(in);
     }
            
     public void testParameterSet()
     {

-            Subdetector subdet = det.getSubdetector("ParameterSetTest");
-                                    

+            Subdetector subdet = det.getSubdetector("ParameterSetTest");                                    

             ParameterSet params = subdet.getParameters();
             
             assert(params.getString("p1").compareTo("ecal") == 0);