2 removed + 2 modified, total 4 files
GeomConverter/src/org/lcsim/geometry
diff -N CalorimeterIDDecoder.java
--- CalorimeterIDDecoder.java 2 Jul 2008 00:01:18 -0000 1.13
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-package org.lcsim.geometry;
-
-// FIXME: Lots of stuff uses this in org.lcsim but functionality has been pushed
-// up to the generic IDDecoder.
-@Deprecated
-public interface CalorimeterIDDecoder extends IDDecoder
-{}
GeomConverter/src/org/lcsim/geometry/compact
diff -u -r1.7 -r1.8
--- Segmentation.java 2 Jul 2008 00:02:35 -0000 1.7
+++ Segmentation.java 15 Sep 2009 23:22:45 -0000 1.8
@@ -1,13 +1,15 @@
package org.lcsim.geometry.compact;
import org.jdom.Element;
+import org.lcsim.geometry.IDDecoder;
+import org.lcsim.geometry.util.BaseIDDecoder;
/**
*
* @author tonyj
*/
public class Segmentation
-extends org.lcsim.geometry.util.CalorimeterIDDecoder
+extends BaseIDDecoder
{
protected Segmentation(Element segmentation)
{
GeomConverter/src/org/lcsim/geometry/util
diff -u -r1.14 -r1.15
--- BaseIDDecoder.java 9 Sep 2009 00:32:33 -0000 1.14
+++ BaseIDDecoder.java 15 Sep 2009 23:22:45 -0000 1.15
@@ -21,7 +21,7 @@
* @author jeremym
*/
public class BaseIDDecoder
- implements org.lcsim.geometry.IDDecoder
+implements org.lcsim.geometry.IDDecoder
{
protected org.lcsim.geometry.util.IDDecoder decoder;
protected IDDescriptor descriptor;
@@ -216,8 +216,8 @@
{
return 0;
}
-
- public Hep3Vector getPositionVector()
+
+ public final Hep3Vector getPositionVector()
{
return new BasicHep3Vector(getPosition());
}
GeomConverter/src/org/lcsim/geometry/util
diff -N CalorimeterIDDecoder.java
--- CalorimeterIDDecoder.java 15 Feb 2006 00:02:46 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-package org.lcsim.geometry.util;
-
-/**
- *
- * @author tonyj
- *
- */
-abstract public class CalorimeterIDDecoder
-extends org.lcsim.geometry.util.BaseIDDecoder
-implements org.lcsim.geometry.CalorimeterIDDecoder
-{}
\ No newline at end of file
CVSspam 0.2.8