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

diff -u -r1.25 -r1.26
--- LCDDDetector.java	11 Mar 2011 19:22:20 -0000	1.25
+++ LCDDDetector.java	25 Apr 2011 23:06:18 -0000	1.26
@@ -49,7 +49,6 @@

 class LCDDDetector extends org.lcsim.geometry.compact.Detector
 {
     // Reference to compact doc.

-    // FIXME Probably should not be here.

     private Element compact;
     
     // Checksum of LCDD file.

@@ -61,7 +60,6 @@

         this.compact = node;
     }
 

-    /* TODO: Refactor into a number of separate functions based on element name. */

     Document writeLCDD(String filename) throws IOException, JDOMException
     {
         LCDD lcdd = new LCDD();

@@ -201,6 +199,8 @@

                     }
                 }
             }

+            
+            //System.out.println("class:" + sub.getClass().getCanonicalName());

 
             if (sub instanceof LCDDSubdetector)
             {

@@ -291,18 +291,8 @@

 
     private void setupMaterials(LCDD lcdd) throws JDOMException
     {               

-        // Test of new way using refactored classes.

         LCDDMaterialHelper helper = new LCDDMaterialHelper(getXMLMaterialManager());

-        helper.copyToLCDD(compact, lcdd);
-        
-        // FIXME Combine next two coupled methods into a single public method
-        // copyToLCDD(compact, lcdd)
-        
-        // Adds references from compact file to the XMLMaterialManager.
-        //helper.addReferencesFromCompact(lccdd);
-        
-        // Copy materials used in compact to the LCDD file.
-        //helper.copyToLCDD(lcdd);

+        helper.copyToLCDD(compact, lcdd);        

     }
 
     public String getName()