4 modified files
GeomConverter/src/org/lcsim/detector/solids
diff -u -r1.4 -r1.5
--- AbstractSolid.java 7 Aug 2007 22:47:54 -0000 1.4
+++ AbstractSolid.java 10 Oct 2007 22:44:10 -0000 1.5
@@ -1,16 +1,18 @@
package org.lcsim.detector.solids;
-import org.lcsim.detector.Named;
-
public abstract class AbstractSolid
-extends Named
implements ISolid
{
String name;
public AbstractSolid(String name)
{
- super(name);
+ this.name = name;
SolidStore.getInstance().add(this);
- }
+ }
+
+ public String getName()
+ {
+ return name;
+ }
}
\ No newline at end of file
GeomConverter/src/org/lcsim/detector/solids
diff -u -r1.2 -r1.3
--- ISolid.java 6 Aug 2007 19:09:32 -0000 1.2
+++ ISolid.java 10 Oct 2007 22:44:10 -0000 1.3
@@ -2,11 +2,9 @@
import hep.physics.vec.Hep3Vector;
-import org.lcsim.detector.INamed;
-
public interface ISolid
-extends INamed
{
+ public String getName();
public Inside inside(Hep3Vector position);
public double getCubicVolume();
}
\ No newline at end of file
GeomConverter/src/org/lcsim/detector/solids
diff -u -r1.1 -r1.2
--- Polycone.java 11 Sep 2007 20:34:14 -0000 1.1
+++ Polycone.java 10 Oct 2007 22:44:11 -0000 1.2
@@ -11,7 +11,8 @@
*
* @author Jeremy McCormick <[log in to unmask]>
*/
-public class Polycone extends AbstractSolid
+public class Polycone
+extends AbstractSolid
{
List<ZPlane> zplanes = new ArrayList<ZPlane>();
GeomConverter/src/org/lcsim/detector/solids
diff -u -r1.6 -r1.7
--- Tube.java 6 Aug 2007 19:09:32 -0000 1.6
+++ Tube.java 10 Oct 2007 22:44:11 -0000 1.7
@@ -2,8 +2,6 @@
import hep.physics.vec.Hep3Vector;
-import org.lcsim.detector.Named;
-
import static java.lang.Math.abs;
import static org.lcsim.detector.solids.Inside.INSIDE;
import static org.lcsim.detector.solids.Inside.OUTSIDE;
@@ -15,11 +13,10 @@
*
* @author Tim Nelson <[log in to unmask]>
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: Tube.java,v 1.6 2007/08/06 19:09:32 jeremy Exp $
+ * @version $Id: Tube.java,v 1.7 2007/10/10 22:44:11 jeremy Exp $
*/
public class Tube
-extends Named
-implements ISolid
+extends AbstractSolid
{
private double innerRadius, outerRadius, zHalfLength;
CVSspam 0.2.8
