GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd

diff -u -r1.12 -r1.13
--- LCDDSubdetector.java	29 Sep 2006 01:00:08 -0000	1.12
+++ LCDDSubdetector.java	22 Feb 2009 00:18:32 -0000	1.13
@@ -57,7 +57,7 @@

 	 * @param volume
 	 *            The volume corresponding to the DOM node
 	 */

-    public void setLimitSet(LCDD lcdd, Element node, Volume volume)

+    public final static void setLimitSet(LCDD lcdd, Element node, Volume volume)

     {
         if (node.getAttribute("limits") != null)
         {

@@ -87,7 +87,7 @@

 	 *            The volume corresponding to the DOM node
 	 * 
 	 */

-    public void setRegion(LCDD lcdd, Element node, Volume volume)

+    public final static void setRegion(LCDD lcdd, Element node, Volume volume)

     {
         if (node.getAttribute("region") != null)
         {

@@ -114,7 +114,7 @@

 	 * @param sens
 	 *            sensitive detector which should be of type Tracker
 	 */

-    public void setCombineHits(Element node, SensitiveDetector sens)

+    public final static void setCombineHits(Element node, SensitiveDetector sens)

     {
         if (node.getAttribute("combineHits") != null)
         {

@@ -140,7 +140,7 @@

         }
     }
     

-    public void setVisAttributes(LCDD lcdd, Element node, Volume volume)

+    public final static void setVisAttributes(LCDD lcdd, Element node, Volume volume)

     {
     	//System.out.println("vis --> " + node.getAttributeValue("name"));
     	//System.out.println("    --> " + volume.getAttributeValue("name"));

@@ -157,9 +157,15 @@

             }
             else
             {

-                throw new RuntimeException("vis " + visref
-                        + " does not exist");

+                throw new RuntimeException("vis " + visref + " does not exist");

             }
         }
     }

+    
+    public void setAttributes(LCDD lcdd, Element node, Volume volume)
+    {
+    	setRegion(lcdd, node, volume);
+    	setLimitSet(lcdd, node, volume);
+    	setVisAttributes(lcdd, node, volume);
+    }

 }

\ No newline at end of file