GeomConverter/src/org/lcsim/detector
diff -u -r1.12 -r1.13
--- DetectorElementContainer.java 24 Jan 2008 02:07:04 -0000 1.12
+++ DetectorElementContainer.java 25 Mar 2009 00:30:16 -0000 1.13
@@ -62,25 +62,28 @@
/**
* Current implementation does not allow duplicate name, id, or object.
*/
- //public boolean add(IDetectorElement de)
- //{
- // if (de == null)
- // {
- // throw new IllegalArgumentException("The DetectorElement argument points to null!");
- // }
+ // FIXME: Good checks but very slow!!!
+ /*
+ public boolean add(IDetectorElement de)
+ {
+ if (de == null)
+ {
+ throw new IllegalArgumentException("The DetectorElement argument points to null!");
+ }
- //if (contains(de))
- //{
- // throw new IllegalArgumentException("The DetectorElement called <"+de.getName()+"> is already registered!");
- //}
+ if (contains(de))
+ {
+ throw new IllegalArgumentException("The DetectorElement called <"+de.getName()+"> has already been registered.");
+ }
- //if (find(de.getName()).size() > 0)
- //{
- // throw new IllegalArgumentException("Duplicate DetectorElement name <"+de.getName()+">.");
- //}
+ if (find(de.getName()).size() > 0)
+ {
+ throw new IllegalArgumentException("Duplicate DetectorElement name <"+de.getName()+">.");
+ }
- // return super.add(de);
- //}
+ return super.add(de);
+ }
+ */
public String toString()
{