graxml-commit Mailing List for GraXML (Page 14)
Brought to you by:
hrivnac
Menu
▾
▴
graxml-commit — CVS commit notifications of GraXML
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
(5) |
May
(6) |
Jun
(2) |
Jul
|
Aug
(12) |
Sep
(32) |
Oct
(41) |
Nov
(16) |
Dec
(21) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(10) |
Feb
(10) |
Mar
(3) |
Apr
(3) |
May
(10) |
Jun
(12) |
Jul
|
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(169) |
Feb
(17) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(100) |
Nov
(14) |
Dec
(10) |
| 2008 |
Jan
(37) |
Feb
(4) |
Mar
(10) |
Apr
(73) |
May
(22) |
Jun
(8) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julius H. <hr...@us...> - 2007-01-25 17:10:58
|
Update of /cvsroot/graxml/DetDescr/GDML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4077 Modified Files: build.xml generator.xml Log Message: migrated to JAXB 2.0, except Booleans Index: generator.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/ant/generator.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** generator.xml 30 Mar 2005 13:51:11 -0000 1.1 --- generator.xml 25 Jan 2007 17:10:56 -0000 1.2 *************** *** 9,13 **** <target name="generate0"> <exec dir="${dir}" ! executable="${JAXB.sh}" os="Linux"> <arg value="-extension"/> --- 9,13 ---- <target name="generate0"> <exec dir="${dir}" ! executable="${JAXB-2.0.sh}" os="Linux"> <arg value="-extension"/> Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/ant/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** build.xml 14 Jan 2007 17:12:09 -0000 1.8 --- build.xml 25 Jan 2007 17:10:56 -0000 1.9 *************** *** 24,32 **** <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> ! <pathelement path="${JAXP.api}"/> ! <pathelement path="${JAXB.api}"/> ! <pathelement path="${JAXB.libs}"/> ! <pathelement path="${JAXB.impl}"/> ! <pathelement path="${JAXB.xjc}"/> <pathelement path="${JWSDP.relax}"/> <pathelement path="${JWSDP.xsd}"/> --- 24,32 ---- <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> ! <pathelement path="${JAXP-2.0.api}"/> ! <pathelement path="${JAXB-2.0.api}"/> ! <pathelement path="${JAXB-2.0.libs}"/> ! <pathelement path="${JAXB-2.0.impl}"/> ! <pathelement path="${JAXB-2.0.xjc}"/> <pathelement path="${JWSDP.relax}"/> <pathelement path="${JWSDP.xsd}"/> *************** *** 72,80 **** <fileset file="${Java3D.vecmath}"/> <fileset dir="${Java3D.libdir}"/> ! <fileset file="${JAXP.api}"/> ! <fileset file="${JAXB.api}"/> ! <fileset file="${JAXB.libs}"/> ! <fileset file="${JAXB.impl}"/> ! <fileset file="${JAXB.xjc}"/> <fileset file="${JWSDP.relax}"/> <fileset file="${JWSDP.xsd}"/> --- 72,80 ---- <fileset file="${Java3D.vecmath}"/> <fileset dir="${Java3D.libdir}"/> ! <fileset file="${JAXP-2.0.api}"/> ! <fileset file="${JAXB-2.0.api}"/> ! <fileset file="${JAXB-2.0.libs}"/> ! <fileset file="${JAXB-2.0.impl}"/> ! <fileset file="${JAXB-2.0.xjc}"/> <fileset file="${JWSDP.relax}"/> <fileset file="${JWSDP.xsd}"/> |
|
From: Julius H. <hr...@us...> - 2007-01-25 17:10:31
|
Update of /cvsroot/graxml/DetDescr/GDML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3571 Modified Files: index.html Log Message: migrated to JAXB 2.0, except Booleans Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/index.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** index.html 14 Jan 2007 17:12:09 -0000 1.7 --- index.html 25 Jan 2007 17:09:54 -0000 1.8 *************** *** 48,52 **** <li>Requests: <ul> ! <li>Migrate to JAXB 2.0.</li> </ul> </li> --- 48,52 ---- <li>Requests: <ul> ! <li>...</li> </ul> </li> *************** *** 138,141 **** --- 138,142 ---- <ul> <li>Demo files exported to GraXML.</li> + <li>Migrated to JAXB 2.0.</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2007-01-25 17:10:31
|
Update of /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3571/net/hep/geant4/GDML/GeometricModel Modified Files: Boolean.java Solid.java Log Message: migrated to JAXB 2.0, except Booleans Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Solid.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Solid.java 11 Jan 2007 14:23:21 -0000 1.2 --- Solid.java 25 Jan 2007 17:09:54 -0000 1.3 *************** *** 18,24 **** import javax.media.j3d.Shape3D; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 18,21 ---- *************** *** 30,33 **** --- 27,33 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 17:09:54 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.2 2007/01/11 14:23:21 hrivnac * version 0.5.3 *************** *** 81,85 **** public abstract class Solid implements GraXMLJAXBRep { ! public abstract void traverse(MasterBuilder builder, Element element, Group tg, String parent); /** Verify that {@link MasterBuilder} type is {@link GDMLBuilder} and --- 81,85 ---- public abstract class Solid implements GraXMLJAXBRep { ! public abstract void traverse(MasterBuilder builder, Object element, Group tg, String parent); /** Verify that {@link MasterBuilder} type is {@link GDMLBuilder} and Index: Boolean.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Boolean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Boolean.java 30 Mar 2005 13:51:16 -0000 1.1 --- Boolean.java 25 Jan 2007 17:09:54 -0000 1.2 *************** *** 8,14 **** import net.hep.geant4.GDML.JAXB.ReferenceType; import net.hep.geant4.GDML.JAXB.PositionType; - import net.hep.geant4.GDML.JAXB.impl.PositionTypeImpl; import net.hep.geant4.GDML.JAXB.RotationType; - import net.hep.geant4.GDML.JAXB.impl.RotationTypeImpl; // GraXML --- 8,12 ---- *************** *** 28,34 **** import javax.vecmath.Matrix3d; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 26,29 ---- *************** *** 40,43 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:54 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 82,86 **** public abstract class Boolean extends Solid { ! public abstract void traverse(MasterBuilder builder, Element element, Group tg, String parent); /** Perform boolean operation. --- 80,84 ---- public abstract class Boolean extends Solid { ! public abstract void traverse(MasterBuilder builder, Object element, Group tg, String parent); /** Perform boolean operation. *************** *** 116,120 **** ref = bool.getPositionref(); if (ref == null) { ! position = new PositionTypeImpl(); ((PositionType)position).setX("0"); ((PositionType)position).setY("0"); --- 114,118 ---- ref = bool.getPositionref(); if (ref == null) { ! position = new PositionType(); ((PositionType)position).setX("0"); ((PositionType)position).setY("0"); *************** *** 140,144 **** ref = bool.getRotationref(); if (ref == null) { ! rotation = new RotationTypeImpl(); ((RotationType)rotation).setX("0"); ((RotationType)rotation).setY("0"); --- 138,142 ---- ref = bool.getRotationref(); if (ref == null) { ! rotation = new RotationType(); ((RotationType)rotation).setX("0"); ((RotationType)rotation).setY("0"); *************** *** 160,179 **** TransformGroup tr = builder().transform(tg); // - First ! Object firstRef = bool.getFirst().getRef(); ! if (firstRef instanceof Element) { ! builder().traverse((Element)firstRef, tr, parent); ! } ! else { ! log.error(firstRef + " can't be processed as javax.xml.bind.Element"); ! } Shape3D firstShape = Solid.registeredShape3D(); // - Second ! Object secondRef = bool.getSecond().getRef(); ! if (secondRef instanceof Element) { ! builder().traverse((Element)secondRef, tr, parent); ! } ! else { ! log.error(secondRef + " can't be processed as javax.xml.bind.Element"); ! } Shape3D secondShape = Solid.registeredShape3D(); --- 158,165 ---- TransformGroup tr = builder().transform(tg); // - First ! builder().traverse(bool.getFirst().getRef(), tr, parent); Shape3D firstShape = Solid.registeredShape3D(); // - Second ! builder().traverse(bool.getSecond().getRef(), tr, parent); Shape3D secondShape = Solid.registeredShape3D(); |
Update of /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3571/net/hep/geant4/GDML/GeometricModel/Reps Modified Files: Box.java Cone.java Eltube.java Gdml.java Hype.java Orb.java Para.java ParametrisedPlacement.java Polycone.java Polyhedra.java Position.java ReplicaPlacement.java Rotation.java Setup.java SinglePlacement.java Sphere.java Torus.java Trap.java Trd.java Tube.java Volume.java Added Files: BooleanSolid.java Removed Files: Intersection.java Subtraction.java Union.java Log Message: migrated to JAXB 2.0, except Booleans Index: Trd.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Trd.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Trd.java 1 Mar 2006 11:06:48 -0000 1.2 --- Trd.java 25 Jan 2007 17:09:58 -0000 1.3 *************** *** 16,22 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 16,19 ---- *************** *** 28,31 **** --- 25,31 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 17:09:58 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.2 2006/03/01 11:06:48 hrivnac * dimensions interpreted as in Geant4 *************** *** 82,86 **** public final class Trd extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 82,86 ---- public final class Trd extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type Index: Sphere.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Sphere.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Sphere.java 30 Mar 2005 13:51:16 -0000 1.1 --- Sphere.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 17,23 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.PI; --- 17,20 ---- *************** *** 32,35 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 83,87 **** public final class Sphere extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 83,87 ---- public final class Sphere extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type --- Union.java DELETED --- Index: Orb.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Orb.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Orb.java 30 Mar 2005 13:51:16 -0000 1.1 --- Orb.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 17,23 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 17,20 ---- *************** *** 29,32 **** --- 26,32 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 53,57 **** public final class Orb extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 53,57 ---- public final class Orb extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type Index: ParametrisedPlacement.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/ParametrisedPlacement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ParametrisedPlacement.java 30 Mar 2005 13:51:16 -0000 1.1 --- ParametrisedPlacement.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 6,11 **** // Generic Model import net.hep.geant4.GDML.JAXB.SinglePlacementType; - import net.hep.geant4.GDML.JAXB.impl.SinglePlacementTypeImpl; - import net.hep.geant4.GDML.JAXB.impl.RotationTypeImpl; import net.hep.geant4.GDML.JAXB.ParameterisedPlacementType; import net.hep.geant4.GDML.JAXB.ParameterisationAlgorithmType; --- 6,9 ---- *************** *** 13,16 **** --- 11,15 ---- import net.hep.geant4.GDML.JAXB.ParametersType; import net.hep.geant4.GDML.JAXB.PositionType; + import net.hep.geant4.GDML.JAXB.RotationType; import net.hep.geant4.GDML.JAXB.DimensionsType; import net.hep.geant4.GDML.JAXB.ReferenceType; *************** *** 26,32 **** import javax.media.j3d.Transform3D; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 25,28 ---- *************** *** 41,44 **** --- 37,43 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 69,78 **** ReferenceType volumeRef = placement.getVolumeref(); // Apply replication algorithm ! ParameterisationAlgorithmType algorithm = placement.getParameterisationAlgorithm(); // PositionSize parametriation if (algorithm instanceof PositionSizeParameterisationAlgorithmType) { PositionSizeParameterisationAlgorithmType possizeAlg = (PositionSizeParameterisationAlgorithmType)algorithm; ! SinglePlacementType splacement = new SinglePlacementTypeImpl(); ! splacement.setRotation(new RotationTypeImpl()); Evaluator evaluator = builder.evaluator(); List parameters = possizeAlg.getParameters(); --- 68,77 ---- ReferenceType volumeRef = placement.getVolumeref(); // Apply replication algorithm ! ParameterisationAlgorithmType algorithm = placement.getParameterisationAlgorithm().getValue(); // PositionSize parametriation if (algorithm instanceof PositionSizeParameterisationAlgorithmType) { PositionSizeParameterisationAlgorithmType possizeAlg = (PositionSizeParameterisationAlgorithmType)algorithm; ! SinglePlacementType splacement = new SinglePlacementType(); ! splacement.setRotation(new RotationType()); Evaluator evaluator = builder.evaluator(); List parameters = possizeAlg.getParameters(); *************** *** 88,92 **** i = parameter.getNumber().intValue(); pos = parameter.getPosition(); ! dim = parameter.getDimensions(); // - Box if (volumeRef.getRef() instanceof BoxType && --- 87,91 ---- i = parameter.getNumber().intValue(); pos = parameter.getPosition(); ! dim = parameter.getDimensions().getValue(); // - Box if (volumeRef.getRef() instanceof BoxType && *************** *** 94,100 **** BoxType box = (BoxType) volumeRef.getRef(); BoxDimensionsType boxDim = (BoxDimensionsType)dim; ! box.setX(evaluator.valueOf(boxDim.getX(), "1")); ! box.setY(evaluator.valueOf(boxDim.getY(), "1")); ! box.setZ(evaluator.valueOf(boxDim.getZ(), "1")); } // - Tube --- 93,99 ---- BoxType box = (BoxType) volumeRef.getRef(); BoxDimensionsType boxDim = (BoxDimensionsType)dim; ! box.setX(new Float(evaluator.valueOf(boxDim.getX(), "1")).toString()); ! box.setY(new Float(evaluator.valueOf(boxDim.getY(), "1")).toString()); ! box.setZ(new Float(evaluator.valueOf(boxDim.getZ(), "1")).toString()); } // - Tube *************** *** 103,111 **** TubeType tube = (TubeType) volumeRef.getRef(); TubeDimensionsType tubeDim = (TubeDimensionsType)dim; ! tube.setRmin( evaluator.valueOf(tubeDim.getInR(), "1")); ! tube.setRmax( evaluator.valueOf(tubeDim.getOutR(), "1")); ! tube.setZ( evaluator.valueOf(tubeDim.getHz(), "1")); ! tube.setStartphi(evaluator.valueOf(tubeDim.getStartPhi(), "1")); ! tube.setDeltaphi(evaluator.valueOf(tubeDim.getDeltaPhi(), "1")); } else { --- 102,110 ---- TubeType tube = (TubeType) volumeRef.getRef(); TubeDimensionsType tubeDim = (TubeDimensionsType)dim; ! tube.setRmin( new Float(evaluator.valueOf(tubeDim.getInR(), "1")).toString()); ! tube.setRmax( new Float(evaluator.valueOf(tubeDim.getOutR(), "1")).toString()); ! tube.setZ( new Float(evaluator.valueOf(tubeDim.getHz(), "1")).toString()); ! tube.setStartphi(new Float(evaluator.valueOf(tubeDim.getStartPhi(), "1")).toString()); ! tube.setDeltaphi(new Float(evaluator.valueOf(tubeDim.getDeltaPhi(), "1")).toString()); } else { Index: ReplicaPlacement.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/ReplicaPlacement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReplicaPlacement.java 30 Mar 2005 13:51:16 -0000 1.1 --- ReplicaPlacement.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 6,10 **** // Generic Model import net.hep.geant4.GDML.JAXB.SinglePlacementType; - import net.hep.geant4.GDML.JAXB.impl.SinglePlacementTypeImpl; import net.hep.geant4.GDML.JAXB.ReplicaPlacementType; import net.hep.geant4.GDML.JAXB.ReplicationAlgorithmType; --- 6,9 ---- *************** *** 22,28 **** import javax.media.j3d.Transform3D; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.sqrt; --- 21,24 ---- *************** *** 37,40 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 67,71 **** ReferenceType volumeRef = placement.getVolumeref(); // Apply replication algorithm ! ReplicationAlgorithmType algorithm = placement.getReplicationAlgorithm(); // Axis replication if (algorithm instanceof AxisReplicationAlgorithmType) { --- 66,70 ---- ReferenceType volumeRef = placement.getVolumeref(); // Apply replication algorithm ! ReplicationAlgorithmType algorithm = placement.getReplicationAlgorithm().getValue(); // Axis replication if (algorithm instanceof AxisReplicationAlgorithmType) { *************** *** 99,103 **** // Compute parameters Evaluator evaluator = builder.evaluator(); ! SinglePlacementType splacement = new SinglePlacementTypeImpl(); PositionType p = (PositionType )position; DirectionType d = (DirectionType)direction; --- 98,102 ---- // Compute parameters Evaluator evaluator = builder.evaluator(); ! SinglePlacementType splacement = new SinglePlacementType(); PositionType p = (PositionType )position; DirectionType d = (DirectionType)direction; *************** *** 128,134 **** // Loop over instances for (int i = start; i < start + n * step; i += step) { ! p.setX(x0 + i * dx); ! p.setY(y0 + i * dy); ! p.setZ(z0 + i * dz); splacement.setPosition(p); super.traverse(builder, splacement, tg, parent); --- 127,133 ---- // Loop over instances for (int i = start; i < start + n * step; i += step) { ! p.setX(new Double(x0 + i * dx).toString()); ! p.setY(new Double(y0 + i * dy).toString()); ! p.setZ(new Double(z0 + i * dz).toString()); splacement.setPosition(p); super.traverse(builder, splacement, tg, parent); Index: SinglePlacement.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/SinglePlacement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SinglePlacement.java 30 Mar 2005 13:51:16 -0000 1.1 --- SinglePlacement.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 14,20 **** import javax.media.j3d.Transform3D; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 14,17 ---- *************** *** 26,29 **** --- 23,29 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 103,113 **** TransformGroup tr = builder.transform(tg); // - Volumeref ! Object volumeRef = placement.getVolumeref().getRef(); ! if (volumeRef instanceof Element) { ! builder.traverse((Element)volumeRef, tr, parent); ! } ! else { ! log.error(volumeRef + " can't be processed as Element"); ! } } --- 103,107 ---- TransformGroup tr = builder.transform(tg); // - Volumeref ! builder.traverse(placement.getVolumeref().getRef(), tr, parent); } Index: Box.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Box.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Box.java 1 Mar 2006 11:06:48 -0000 1.2 --- Box.java 25 Jan 2007 17:09:55 -0000 1.3 *************** *** 16,22 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 16,19 ---- *************** *** 28,31 **** --- 25,31 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.2 2006/03/01 11:06:48 hrivnac * dimensions interpreted as in Geant4 *************** *** 100,104 **** public final class Box extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 100,104 ---- public final class Box extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type Index: Position.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Position.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Position.java 30 Mar 2005 13:51:16 -0000 1.1 --- Position.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 15,21 **** import javax.vecmath.Vector3d; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 15,18 ---- *************** *** 27,30 **** --- 24,30 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 102,103 **** --- 102,104 ---- } + Index: Trap.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Trap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Trap.java 1 Mar 2006 11:06:48 -0000 1.2 --- Trap.java 25 Jan 2007 17:09:58 -0000 1.3 *************** *** 16,22 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.sin; --- 16,19 ---- *************** *** 34,37 **** --- 31,37 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 17:09:58 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.2 2006/03/01 11:06:48 hrivnac * dimensions interpreted as in Geant4 *************** *** 91,95 **** public final class Trap extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 91,95 ---- public final class Trap extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type Index: Hype.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Hype.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Hype.java 30 Mar 2005 13:51:16 -0000 1.1 --- Hype.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 17,23 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.PI; --- 17,20 ---- *************** *** 34,37 **** --- 31,37 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 61,65 **** public final class Hype extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 61,65 ---- public final class Hype extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type Index: Tube.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Tube.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Tube.java 1 Mar 2006 11:06:48 -0000 1.2 --- Tube.java 25 Jan 2007 17:09:58 -0000 1.3 *************** *** 17,23 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 17,20 ---- *************** *** 29,32 **** --- 26,32 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 17:09:58 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.2 2006/03/01 11:06:48 hrivnac * dimensions interpreted as in Geant4 *************** *** 74,78 **** public final class Tube extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 74,78 ---- public final class Tube extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type Index: Setup.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Setup.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Setup.java 30 Mar 2005 13:51:16 -0000 1.1 --- Setup.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 13,19 **** import javax.media.j3d.BranchGroup; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 13,16 ---- *************** *** 25,28 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 64,74 **** BranchGroup branch = new BranchGroup(); // - World ! Object ref = setup.getWorld().getRef(); ! if (ref instanceof Element) { ! builder.traverse((Element)ref, branch, name); ! } ! else { ! log.error(ref + " can't be processed as Element"); ! } // Register BranchGroup into Connections database --- 64,68 ---- BranchGroup branch = new BranchGroup(); // - World ! builder.traverse(setup.getWorld().getRef(), branch, name); // Register BranchGroup into Connections database Index: Gdml.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Gdml.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Gdml.java 30 Mar 2005 13:51:16 -0000 1.1 --- Gdml.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 14,20 **** import javax.media.j3d.BranchGroup; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 14,17 ---- *************** *** 29,32 **** --- 26,32 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 83,87 **** public final class Gdml implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify element type --- 83,87 ---- public final class Gdml implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify element type *************** *** 104,110 **** List defines = gdml.getDefine().getConstantOrQuantityOrExpression(); for (Object o : defines) { ! if (o instanceof Element) { ! builder.traverse((Element)o, branch, name); ! } } // - Setup --- 104,108 ---- List defines = gdml.getDefine().getConstantOrQuantityOrExpression(); for (Object o : defines) { ! builder.traverse(o, branch, name); } // - Setup Index: Polycone.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Polycone.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Polycone.java 30 Mar 2005 13:51:16 -0000 1.1 --- Polycone.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 18,24 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 18,21 ---- *************** *** 33,36 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 60,64 **** public final class Polycone extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 60,64 ---- public final class Polycone extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type Index: Para.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Para.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Para.java 1 Mar 2006 11:06:48 -0000 1.2 --- Para.java 25 Jan 2007 17:09:55 -0000 1.3 *************** *** 16,22 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.sin; --- 16,19 ---- *************** *** 34,37 **** --- 31,37 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.2 2006/03/01 11:06:48 hrivnac * dimensions interpreted as in Geant4 *************** *** 88,92 **** public final class Para extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 88,92 ---- public final class Para extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type --- Intersection.java DELETED --- Index: Cone.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Cone.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Cone.java 1 Mar 2006 11:06:48 -0000 1.2 --- Cone.java 25 Jan 2007 17:09:55 -0000 1.3 *************** *** 17,23 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 17,20 ---- *************** *** 29,32 **** --- 26,32 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.2 2006/03/01 11:06:48 hrivnac * dimensions interpreted as in Geant4 *************** *** 80,84 **** public final class Cone extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 80,84 ---- public final class Cone extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type Index: Polyhedra.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Polyhedra.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Polyhedra.java 30 Mar 2005 13:51:16 -0000 1.1 --- Polyhedra.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 17,23 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 17,20 ---- *************** *** 32,35 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 59,63 **** public final class Polyhedra extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 59,63 ---- public final class Polyhedra extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type --- NEW FILE: BooleanSolid.java --- package net.hep.geant4.GDML.GeometricModel.Reps; import net.hep.geant4.GDML.GeometricModel.Boolean; // Generic Model import net.hep.geant4.GDML.JAXB.BooleanSolidType; // GraXML import net.hep.graphics.GraXML.MasterBuilder; // FreeHEP import org.freehep.j3d.BooleanOperation; import static org.freehep.j3d.BooleanOperation.Intersection; import static org.freehep.j3d.BooleanOperation.Difference; import static org.freehep.j3d.BooleanOperation.Union; // Java3D import javax.media.j3d.Group; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link net.hep.graphics.GraXML.GraXMLJAXBRep} * of <code>subtraction</code>, <code>intersections</code> and <code>union</code> GDML elements * connected via JAXB {@link net.hep.geant4.GDML.JAXB.Subtraction} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: BooleanSolid.java,v $ * Revision 1.1 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added * * Revision 1.6 2004/11/12 10:17:28 hrivnac * small improvements * * Revision 1.5 2004/05/22 15:49:50 hrivnac * class id reformated * * Revision 1.4 2004/04/13 09:03:41 hrivnac * prepared for 0.5.0 * * Revision 1.3 2004/03/17 14:36:20 hrivnac * documentation improved * * Revision 1.2 2004/03/17 13:59:39 hrivnac * imports cleaned * * Revision 1.1 2004/03/17 00:55:10 hrivnac * Boolean Solids implemented * * </pre> * </font></p> * @version $Id: BooleanSolid.java,v 1.1 2007/01/25 17:09:55 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class BooleanSolid extends Boolean { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify element type if (! (element instanceof BooleanSolidType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Assemble composed boolean solid BooleanSolidType booleanSolid = (BooleanSolidType)element; String booleanSolidKind = booleanSolid.getName(); BooleanOperation operation = null; if (booleanSolidKind.equals("intersection")) { operation = Intersection; } else if (booleanSolidKind.equals("subtraction")) { operation = Difference; } else if (booleanSolidKind.equals("union")) { operation = Union; } else { log.error(booleanSolidKind + " boolean operation is not defined"); } compose(builder, booleanSolid, Union, parent, tg); } /** Logging . */ private static Logger log = Logger.getLogger(BooleanSolid.class); } Index: Torus.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Torus.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Torus.java 30 Mar 2005 13:51:16 -0000 1.1 --- Torus.java 25 Jan 2007 17:09:58 -0000 1.2 *************** *** 17,23 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 17,20 ---- *************** *** 29,32 **** --- 26,32 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:58 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 53,57 **** public final class Torus extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 53,57 ---- public final class Torus extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type Index: Rotation.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Rotation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Rotation.java 30 Mar 2005 13:51:16 -0000 1.1 --- Rotation.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 16,22 **** import javax.vecmath.Matrix3d; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 16,19 ---- *************** *** 28,31 **** --- 25,31 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added --- Subtraction.java DELETED --- Index: Eltube.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Eltube.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Eltube.java 30 Mar 2005 13:51:16 -0000 1.1 --- Eltube.java 25 Jan 2007 17:09:55 -0000 1.2 *************** *** 17,23 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.PI; --- 17,20 ---- *************** *** 32,35 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:55 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 56,60 **** public final class Eltube extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 56,60 ---- public final class Eltube extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type Index: Volume.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Volume.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Volume.java 30 Mar 2005 13:51:16 -0000 1.1 --- Volume.java 25 Jan 2007 17:09:58 -0000 1.2 *************** *** 22,28 **** import javax.media.j3d.Link; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 22,25 ---- *************** *** 37,40 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:58 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 94,98 **** public final class Volume implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Element element, Group tg, String parent) { // Check/Substruct Limit --- 94,98 ---- public final class Volume implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Object element, Group tg, String parent) { // Check/Substruct Limit *************** *** 131,141 **** } // - Solidref ! Object ref = volume.getSolidref().getRef(); ! if (ref instanceof Element) { ! builder.traverse((Element)ref, branch, name); ! } ! else { ! log.error(ref + " can't be processed as Element"); ! } // - Physvol List physvols = volume.getPhysvol(); --- 131,135 ---- } // - Solidref ! builder.traverse(volume.getSolidref().getRef(), branch, name); // - Physvol List physvols = volume.getPhysvol(); *************** *** 146,150 **** } else { ! log.error(ref + " can't be processed as SinglePlacementType"); } } --- 140,144 ---- } else { ! log.error(o + " can't be processed as SinglePlacementType"); } } |
|
From: Julius H. <hr...@us...> - 2007-01-25 17:10:07
|
Update of /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/Test In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3571/net/hep/geant4/GDML/Test Modified Files: GeometricModel.java JAXB.java Log Message: migrated to JAXB 2.0, except Booleans Index: JAXB.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/Test/JAXB.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JAXB.java 30 Mar 2005 13:51:16 -0000 1.1 --- JAXB.java 25 Jan 2007 17:09:58 -0000 1.2 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:58 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 49,53 **** JAXBContext jc = JAXBContext.newInstance("net.hep.geant4.GDML.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! u.setValidating(true); log.info("Opening " + args[0]); // Get top --- 52,56 ---- JAXBContext jc = JAXBContext.newInstance("net.hep.geant4.GDML.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! //u.setValidating(true); TBD log.info("Opening " + args[0]); // Get top Index: GeometricModel.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/Test/GeometricModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GeometricModel.java 30 Mar 2005 13:51:16 -0000 1.1 --- GeometricModel.java 25 Jan 2007 17:09:58 -0000 1.2 *************** *** 18,21 **** --- 18,24 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 17:09:58 hrivnac + * migrated to JAXB 2.0, except Booleans + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 45,49 **** JAXBContext jc = JAXBContext.newInstance("net.hep.geant4.GDML.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! u.setValidating(true); log.info("Opening " + args[0]); log.info(u.unmarshal(new FileInputStream(args[0]))); --- 48,52 ---- JAXBContext jc = JAXBContext.newInstance("net.hep.geant4.GDML.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! //u.setValidating(true); TBD log.info("Opening " + args[0]); log.info(u.unmarshal(new FileInputStream(args[0]))); |
|
From: Julius H. <hr...@us...> - 2007-01-25 17:10:02
|
Update of /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/JAXB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3571/net/hep/geant4/GDML/JAXB Modified Files: GDML.xjs Log Message: migrated to JAXB 2.0, except Booleans Index: GDML.xjs =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/JAXB/GDML.xjs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GDML.xjs 30 Mar 2005 13:51:16 -0000 1.1 --- GDML.xjs 25 Jan 2007 17:09:58 -0000 1.2 *************** *** 7,10 **** --- 7,13 ---- <!-- $Log$ + Revision 1.2 2007/01/25 17:09:58 hrivnac + migrated to JAXB 2.0, except Booleans + Revision 1.1 2005/03/30 13:51:16 hrivnac GDML added *************** *** 35,45 **** <jaxb:bindings schemaLocation="../Schema/gdml.xsd" node="/xs:schema"> <jaxb:schemaBindings> ! <!-- <jaxb:nameXmlTransform> ! <jaxb:elementName suffix="Rep"/> ! <jaxb:typeName suffix="Rep"/> ! <jaxb:modelGroupName suffix="Rep"/> ! </jaxb:nameXmlTransform> ! --> </jaxb:schemaBindings> </jaxb:bindings> --- 38,48 ---- <jaxb:bindings schemaLocation="../Schema/gdml.xsd" node="/xs:schema"> <jaxb:schemaBindings> ! <jaxb:package name="net.hep.geant4.GDML.JAXB"/> <jaxb:nameXmlTransform> ! <!--jaxb:typeName suffix="Type"/--> ! <jaxb:anonymousTypeName suffix="Type"/> ! <jaxb:elementName suffix="Type"/> ! <jaxb:modelGroupName suffix="Type"/> ! </jaxb:nameXmlTransform> </jaxb:schemaBindings> </jaxb:bindings> |
|
From: Julius H. <hr...@us...> - 2007-01-24 22:08:56
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16676/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: AGeometry.java Log Message: migrated to JAXB 2.0 Index: AGeometry.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGeometry.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** AGeometry.java 24 Jan 2007 17:00:42 -0000 1.7 --- AGeometry.java 24 Jan 2007 22:08:52 -0000 1.8 *************** *** 34,37 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.8 2007/01/24 22:08:52 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.7 2007/01/24 17:00:42 hrivnac * migrated to JAXB 2.0, simplified *************** *** 89,92 **** --- 92,96 ---- // Traverse all children and add their representations into branch + BranchGroup branch = new BranchGroup(); for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { builder.traverse(o, branch, name); |
|
From: Julius H. <hr...@us...> - 2007-01-24 22:08:54
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16676 Modified Files: index.html Log Message: migrated to JAXB 2.0 Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.html 16 Jan 2007 14:44:34 -0000 1.2 --- index.html 24 Jan 2007 22:08:52 -0000 1.3 *************** *** 31,34 **** --- 31,35 ---- <ul> <li>Initial (uncomplete) release.</li> + <li>Migrated to JSAXB 2.0.</li> </ul> </li> *************** *** 44,48 **** <li>Requests: <ul> ! <li>Migrate to JAXB 2.0.</li> </ul> </li> --- 45,49 ---- <li>Requests: <ul> ! <li>...</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2007-01-24 22:08:32
|
Update of /cvsroot/graxml/Graphics/JiveEvent/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16657 Modified Files: build.xml generator.xml Log Message: migrated to JAXB 2.0 Index: generator.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/ant/generator.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** generator.xml 30 Mar 2005 13:10:20 -0000 1.1 --- generator.xml 24 Jan 2007 22:08:30 -0000 1.2 *************** *** 9,13 **** <target name="generate0"> <exec dir="${dir}" ! executable="${JAXB.sh}" os="Linux"> <arg value="-extension"/> --- 9,13 ---- <target name="generate0"> <exec dir="${dir}" ! executable="${JAXB-2.0.sh}" os="Linux"> <arg value="-extension"/> Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/ant/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** build.xml 14 Jan 2007 17:10:41 -0000 1.8 --- build.xml 24 Jan 2007 22:08:30 -0000 1.9 *************** *** 23,31 **** <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> ! <pathelement path="${JAXP.api}"/> ! <pathelement path="${JAXB.api}"/> ! <pathelement path="${JAXB.libs}"/> ! <pathelement path="${JAXB.impl}"/> ! <pathelement path="${JAXB.xjc}"/> <pathelement path="${JWSDP.relax}"/> <pathelement path="${JWSDP.xsd}"/> --- 23,31 ---- <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> ! <pathelement path="${JAXP-2.0.api}"/> ! <pathelement path="${JAXB-2.0.api}"/> ! <pathelement path="${JAXB-2.0.libs}"/> ! <pathelement path="${JAXB-2.0.impl}"/> ! <pathelement path="${JAXB-2.0.xjc}"/> <pathelement path="${JWSDP.relax}"/> <pathelement path="${JWSDP.xsd}"/> *************** *** 70,78 **** <fileset file="${Java3D.vecmath}"/> <fileset dir="${Java3D.libdir}"/> ! <fileset file="${JAXP.api}"/> ! <fileset file="${JAXB.api}"/> ! <fileset file="${JAXB.libs}"/> ! <fileset file="${JAXB.impl}"/> ! <fileset file="${JAXB.xjc}"/> <fileset file="${JWSDP.relax}"/> <fileset file="${JWSDP.xsd}"/> --- 70,78 ---- <fileset file="${Java3D.vecmath}"/> <fileset dir="${Java3D.libdir}"/> ! <fileset file="${JAXP-2.0.api}"/> ! <fileset file="${JAXB-2.0.api}"/> ! <fileset file="${JAXB-2.0.libs}"/> ! <fileset file="${JAXB-2.0.impl}"/> ! <fileset file="${JAXB-2.0.xjc}"/> <fileset file="${JWSDP.relax}"/> <fileset file="${JWSDP.xsd}"/> |
|
From: Julius H. <hr...@us...> - 2007-01-24 22:08:19
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16592/net/hep/atlas/graphics/JiveEvent/Schema Modified Files: event.dtd event.xsd Log Message: migrated to JAXB 2.0 Index: event.xsd =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Schema/event.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** event.xsd 30 Mar 2005 13:10:23 -0000 1.1 --- event.xsd 24 Jan 2007 22:08:17 -0000 1.2 *************** *** 1,618 **** ! <?xml version="1.0"?> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="Event"> <xs:complexType> ! <xs:all> ! <xs:element minOccurs="0" ref="S3D" /> ! <xs:element minOccurs="0" ref="TrigS3D" /> ! <xs:element minOccurs="0" ref="SiHit" /> ! <xs:element minOccurs="0" ref="STC" /> [...7706 lines suppressed...] ! <xs:attribute name="multiple" type="xs:string" default="1" /> ! <xs:attribute name="unit" default="NONE"> ! <xs:simpleType> ! <xs:restriction base="xs:string"> ! <xs:enumeration value="NONE" /> ! <xs:enumeration value="CM" /> ! <xs:enumeration value="RAD" /> ! <xs:enumeration value="GEV" /> ! </xs:restriction> ! </xs:simpleType> ! </xs:attribute> ! </xs:extension> </xs:simpleContent> </xs:complexType> *************** *** 2272,2274 **** </xs:schema> - --- 5518,5519 ---- Index: event.dtd =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Schema/event.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** event.dtd 30 Mar 2005 13:10:23 -0000 1.1 --- event.dtd 24 Jan 2007 22:08:17 -0000 1.2 *************** *** 1,174 **** <!ELEMENT Event ! (S3D?, TrigS3D?, SiHit?, STC?,TRT?, LAr?, HEC?, FCAL?, FastCal?, Jet?, JetRecJet?, ROI?, Particle?, TILE?, MDT?, RPC?, TGC?, CSC?, STr?, iPat?,IDScan?,xKal?,SMTr?,RMTr?,STr2?,LArCluster?,CSCC?)> ! <!ENTITY % attributes 'count CDATA ""' > ! <!ELEMENT S3D (x,y,z,kine?,barcode?,cluster)> ! <!ATTLIST S3D %attributes;> ! <!ELEMENT TrigS3D (x,y,z,id?,cluster?,layer?,r?,dr?,phi?,dphi?,dz?,eta?)> ! <!ATTLIST TrigS3D %attributes;> ! <!ELEMENT SiHit (x, y, z, trackid, energyloss)> ! <!ATTLIST SiHit %attributes;> ! <!ELEMENT STC (id,width,x0,y0,z0,x1,y1,z1)> ! <!ATTLIST STC %attributes;> ! <!ELEMENT TRT (id,rhoz,phi,driftR,threshold?,kine?,barcode?)> ! <!ATTLIST TRT %attributes;> ! <!ELEMENT LAr (id,energy,phi,eta,cluster?)> ! <!ATTLIST LAr %attributes;> ! <!ELEMENT Cluster (id,energy,phi,eta,numCells,cells)> ! <!ATTLIST Cluster %attributes;> ! <!ELEMENT HEC (id,energy,phi,eta,cluster?)> ! <!ATTLIST HEC %attributes;> ! <!ELEMENT FCAL (id,energy,x, y, dx, dy, cluster?)> ! <!ATTLIST FCAL %attributes;> ! <!ELEMENT TILE (id,energy,phi,eta,cluster)> ! <!ATTLIST TILE %attributes;> ! <!ELEMENT FastCal (energy, phi, eta, cluster?, sub, layer)> ! <!ATTLIST FastCal %attributes;> ! <!ELEMENT Jet (et?,pt?, phi, eta, cluster?,cells?, numCells?, id?)> ! <!ATTLIST Jet %attributes;> ! <!ELEMENT EGam (iPat,xKal,cluster)> ! <!ATTLIST EGam %attributes;> ! <!ELEMENT Particle (pt, phi, eta, isolated?, code?, kine?,barcode?)> ! <!ATTLIST Particle %attributes;> ! <!-- for MDT would like the sub info --> ! <!ELEMENT MDT (id,x,y,z,length,driftR,kine?,barcode?,identifier?)> ! <!ATTLIST MDT %attributes;> ! <!ELEMENT RPC (id,x,y,z,length,width,kine?,barcode?,identifier?)> ! <!ATTLIST RPC %attributes;> ! <!ELEMENT TGC (id,x,y,z,length,swidth,lwidth,kine?,barcode?,identifier?)> ! <!ATTLIST TGC %attributes;> ! <!ELEMENT CSCD (id,x,y,z,length?,charge,kine?,barcode?,identifier?)> ! <!ATTLIST CSCD %attributes;> ! <!ELEMENT CSC (id,x,y,z,length?,sigma,kine?,barcode?,identifier?,numHits,hitsFull)> ! <!ATTLIST CSC %attributes;> ! <!ELEMENT STr (pt,phi,eta,rhoVertex,phiVertex,zVertex,code,id)> ! <!ATTLIST STr %attributes;> ! <!ELEMENT STr2 (px,py,pz,code,id)> ! <!ATTLIST STr2 %attributes;> ! <!ELEMENT RTr (d0,z0,phi0,cotTheta,pt,chi2?,covMatrix?,kine?,barcode?)> ! <!ATTLIST RTr %attributes;> ! <!ELEMENT RTr2 (d0,z0,phi0,cotTheta,pt,chi2?,covMatrix?,kine?,barcode?,hits?,polylineX?,polylineY?,polylineZ?)> ! <!ATTLIST RTr2 %attributes;> ! <!ELEMENT RTr3 (d0,z0,phi0,cotTheta,pt,chi2?,covMatrix?,kine?,barcode?)> ! <!ATTLIST RTr3 %attributes;> ! <!ELEMENT RTr3 (d0,z0,phi0,cotTheta,pt,chi2?,covMatrix?,kine?,barcode?)> ! <!ATTLIST RTr3 %attributes;> ! <!ELEMENT SMTr (cotTheta, id, kine, phi0, pt, x, y, z)> ! <!ATTLIST SMTr %attributes;> ! <!ELEMENT RMTr (cotTheta, id, phi0, pt, x, y, z,hits?,hitsFull?,polylineX?,polylineY?,polylineZ?)> ! <!ATTLIST RMTr %attributes;> ! <!ENTITY % type 'type (FLOAT|INT|STRING) #FIXED'> ! <!ENTITY % unit 'unit (NONE | CM | RAD | GEV)'> ! <!ENTITY % integer ! ' %type; "INT" ! multiple CDATA "1" ! %unit; "NONE" '> ! <!ENTITY % float ! ' %type; "FLOAT" ! multiple CDATA "1" ! %unit; "NONE" '> ! <!ENTITY % string ! ' %type; "STRING" ! multiple CDATA "1" ! %unit; "NONE" '> ! <!ELEMENT iPat (#PCDATA)> <!ATTLIST iPat %integer;> ! <!ELEMENT xKal (#PCDATA)> <!ATTLIST xKal %integer;> ! <!ELEMENT cluster (#PCDATA)> <!ATTLIST cluster %integer;> ! <!ELEMENT et (#PCDATA)> <!ATTLIST et %float;> ! <!ELEMENT cells (#PCDATA)> <!ATTLIST cells %integer;> ! <!ELEMENT numCells (#PCDATA)> <!ATTLIST numCells %integer;> ! <!ELEMENT clusters (#PCDATA)> <!ATTLIST clusters %integer;> ! <!ELEMENT swidth (#PCDATA)> <!ATTLIST swidth %float; > ! <!ELEMENT lwidth (#PCDATA)> <!ATTLIST lwidth %float; > ! <!ELEMENT z (#PCDATA)> <!ATTLIST z %float; > ! <!ELEMENT rho (#PCDATA)> <!ATTLIST rho %float;> ! <!ELEMENT phi (#PCDATA)> <!ATTLIST phi %float;> ! <!ELEMENT phi0 (#PCDATA)> <!ATTLIST phi0 %float;> ! <!ELEMENT kine (#PCDATA)> <!ATTLIST kine %integer;> ! <!ELEMENT barcode (#PCDATA)> <!ATTLIST barcode %integer;> ! <!ELEMENT id (#PCDATA)> <!ATTLIST id %integer;> ! <!ELEMENT type (#PCDATA)> <!ATTLIST type %integer;> ! <!ELEMENT isolated (#PCDATA)> <!ATTLIST isolated %integer;> ! <!ELEMENT hits (#PCDATA)> <!ATTLIST hits %integer;> ! <!ELEMENT sub (#PCDATA)> <!ATTLIST sub %integer;> ! <!ELEMENT threshold (#PCDATA)> <!ATTLIST threshold %integer;> ! <!ELEMENT rhoz (#PCDATA)> <!ATTLIST rhoz %float;> ! <!ELEMENT energy (#PCDATA)> <!ATTLIST energy %float;> ! <!ELEMENT charge (#PCDATA)> <!ATTLIST charge %float;> ! <!ELEMENT eta (#PCDATA)> <!ATTLIST eta %float;> ! <!ELEMENT cluster (#PCDATA)> <!ATTLIST cluster %integer;> ! <!ELEMENT layer (#PCDATA)> <!ATTLIST layer %integer;> ! <!ELEMENT x (#PCDATA)> <!ATTLIST x %float;> ! <!ELEMENT y (#PCDATA)> <!ATTLIST y %float;> ! <!ELEMENT dx (#PCDATA)> <!ATTLIST dx %float;> ! <!ELEMENT dy (#PCDATA)> <!ATTLIST dy %float;> ! <!ELEMENT dphi (#PCDATA)> <!ATTLIST dphi %float;> ! <!ELEMENT deta (#PCDATA)> <!ATTLIST deta %float;> ! <!ELEMENT polylineX (#PCDATA)> <!ATTLIST polylineX %float;> ! <!ELEMENT polylineY (#PCDATA)> <!ATTLIST polylineY %float;> ! <!ELEMENT polylineZ (#PCDATA)> <!ATTLIST polylineZ %float;> ! <!ELEMENT driftR (#PCDATA)> <!ATTLIST driftR %float;> ! <!ELEMENT length (#PCDATA)> <!ATTLIST length %float;> ! <!ELEMENT width (#PCDATA)> <!ATTLIST width %float;> ! <!ELEMENT pt (#PCDATA)> <!ATTLIST pt %float;> ! <!ELEMENT px (#PCDATA)> <!ATTLIST px %float;> ! <!ELEMENT py (#PCDATA)> <!ATTLIST py %float;> ! <!ELEMENT pz (#PCDATA)> <!ATTLIST pz %float;> ! <!ELEMENT rhoVertex (#PCDATA)> <!ATTLIST rhoVertex %float;> ! <!ELEMENT phiVertex (#PCDATA)> <!ATTLIST phiVertex %float;> ! <!ELEMENT zVertex (#PCDATA)> <!ATTLIST zVertex %float;> ! <!ELEMENT sigma (#PCDATA)> <!ATTLIST sigma %float;> ! <!ELEMENT code (#PCDATA)> <!ATTLIST code %integer;> ! <!ELEMENT d0 (#PCDATA)> <!ATTLIST d0 %float;> ! <!ELEMENT cotTheta (#PCDATA)> <!ATTLIST cotTheta %float;> ! <!ELEMENT z0 (#PCDATA)> <!ATTLIST z0 %float;> ! <!ELEMENT chi2 (#PCDATA)> <!ATTLIST chi2 %float;> ! <!ELEMENT covMatrix (#PCDATA)> <!ATTLIST covMatrix %float;> ! <!ELEMENT numHits (#PCDATA)> <!ATTLIST numHits %integer;> ! <!ELEMENT numCells (#PCDATA)> <!ATTLIST numCells %integer;> ! <!ELEMENT cells (#PCDATA)> <!ATTLIST cells %integer;> ! <!ELEMENT numPolyline (#PCDATA)> <!ATTLIST numPolyline %integer;> ! <!ELEMENT identifier (#PCDATA)> <!ATTLIST identifier %string;> ! <!ELEMENT hitsFull (#PCDATA)> <!ATTLIST hitsFull %string;> ! <!ELEMENT x0 (#PCDATA)> <!ATTLIST x0 %float;> ! <!ELEMENT y0 (#PCDATA)> <!ATTLIST y0 %float;> ! <!ELEMENT x1 (#PCDATA)> <!ATTLIST x1 %float;> ! <!ELEMENT y1 (#PCDATA)> <!ATTLIST y1 %float;> ! <!ELEMENT z1 (#PCDATA)> <!ATTLIST z1 %float;> ! <!ELEMENT r (#PCDATA)> <!ATTLIST r %float;> ! <!ELEMENT dr (#PCDATA)> <!ATTLIST dr %float;> ! <!ELEMENT dz (#PCDATA)> <!ATTLIST dz %float;> ! <!ELEMENT energyloss (#PCDATA)> <!ATTLIST energyloss %float;> ! <!ELEMENT trackid (#PCDATA)> <!ATTLIST trackid %integer;> \ No newline at end of file --- 1,394 ---- + <!-- -kine element is alias to barcode resp. to new-style truth association + using barcodes + numBarcodes (1 hits - to more tracks) at hits + (2006/08), kine should be removed completely on turn 2006/2007 + --> + + <!ENTITY % string.Type "CDATA"> + + <!ENTITY % eventAttributes + "version %string.Type; #IMPLIED + runNumber %string.Type; #IMPLIED + eventNumber %string.Type; #IMPLIED + dateTime %string.Type; #IMPLIED"> + <!ELEMENT Event ! (BJet|CaloETMis|CaloTB|Cluster|CSC|CSCD|Electron|EmTauROI|ETMis|FastCal| ! FCAL|HEC|IDScan|iPat|Jet|JetROI|LAr|LVL1JetElement|LVL1Result| ! LVL1TriggerTower|MDT|MSeg|Muon|MuonETMis|MuonROI|Particles|ParticleJet| ! Photon|PixelRDO|RMTr|RPC|RTr|RVx|S3D|SCTRDO|Segment|SiHit|SMTr|STC|STr| ! TauJet|TGC|TILE|Track|TrigS3D|TRT|xKal)+> ! <!ATTLIST Event %eventAttributes;> ! <!ENTITY % attributes 'count CDATA "" storeGateKey CDATA ""'> ! <!ENTITY % type 'type (FLOAT|INT|STRING) #FIXED'> ! <!ENTITY % unit 'unit (NONE | CM | RAD | GEV)'> ! <!ENTITY % integer ! ' %type; "INT" ! multiple CDATA "1" ! %unit; "NONE" '> ! <!ENTITY % float ! ' %type; "FLOAT" ! multiple CDATA "1" ! %unit; "NONE" '> ! <!ENTITY % string ! ' %type; "STRING" ! multiple CDATA "1" ! %unit; "NONE" '> ! <!ELEMENT BJet (charge|energy|eta|lhSig|phi|pt|secVtxCount| ! secVtxFitProb|secVtxMass|secVtxMult|secVtxRPhiDist| ! secVtxTagLh|secVtxTagLhErr|weight)+> ! <!ATTLIST BJet %attributes;> ! <!ELEMENT CaloETMis (et|etx|ety)+> ! <!ATTLIST CaloETMis %attributes;> ! <!ELEMENT CaloTB (phiRot|xRot|xTrans|yRot|yTrans|zRot|zTrans)+> ! <!ATTLIST CaloTB %attributes;> ! <!ELEMENT Cluster (cells|et|eta|id|numCells|phi|energy)+> ! <!ATTLIST Cluster %attributes;> ! <!ELEMENT CSC (kine|barcode|hitsFull|id|identifier|numHits|sigma| ! x|y|z|length)+> ! <!ATTLIST CSC %attributes;> ! <!ELEMENT CSCD (kine|barcode|charge|id|identifier|x|y|z|length)+> ! <!ATTLIST CSCD %attributes;> ! <!ELEMENT Electron (author|clusterIndex|clusterKey|dataType|emWeight| ! eOverp|et37|eta|etCone|etCone20|etHad1|f1|fracs1| ! hasTrack|hitsBLayer|hitsHighThresTRT|hitsPixel|hitsSCT| ! hitsTRT|isEM|pdgId|phi|pionWeight|pt|trackIndex| ! trackKey)+> ! <!ATTLIST Electron %attributes;> ! <!ELEMENT EmTauROI (energy|eta|phi|roiWord|thrPattern)+> ! <!ATTLIST EmTauROI %attributes;> ! <!ELEMENT ETMis (et|etx|ety)+> ! <!ATTLIST ETMis %attributes;> ! <!ELEMENT FastCal (energy|et|phi|eta|id|cluster|sub|layer)+> ! <!ATTLIST FastCal %attributes;> ! <!ELEMENT FCAL (dx|dy|energy|id|layer|sub|x|y|cluster)+> ! <!ATTLIST FCAL %attributes;> ! <!ELEMENT HEC (energy|eta|id|layer|phi|sub|cluster)+> ! <!ATTLIST HEC %attributes;> ! <!ELEMENT IDScan (barcode|chi2|cotTheta|covMatrix|d0|hits|numHits| ! phi0|pt|z0|id)+> ! <!ATTLIST IDScan %attributes;> ! <!ELEMENT InDetSegment (x|y|z|phi|theta|hits|numHits)+> ! <!ATTLIST InDetSegment %attributes;> ! <!ELEMENT InDetTrack (kine|barcode|chi2|cotTheta|covMatrix|d0|hits| ! id|numHits|numPolyline|phi0|polylineX|polylineY| ! polylineZ|pt|z0)+> ! <!ATTLIST InDetTrack %attributes;> ! <!ELEMENT iPat (kine|barcode|chi2|cotTheta|covMatrix|d0|hits| ! id|numHits|numPolyline|phi0|polylineX|polylineY| ! polylineZ|pt|z0)+> ! <!ATTLIST iPat %attributes;> ! <!-- cluster should be an array of calo Cluster IDs, but it's not provided in ! the event files nor any processing exists in the Jet handling code --> ! <!ELEMENT Jet (cells|et|eta|numCells|phi|pt|cluster|id)+> ! <!ATTLIST Jet %attributes;> ! <!ELEMENT JetROI (energy|eta|phi)+> ! <!ATTLIST JetROI %attributes;> ! <!ELEMENT LAr (energy|eta|id|layer|phi|sub|cluster|adcCounts)+> ! <!ATTLIST LAr %attributes;> ! <!ELEMENT LVL1JetElement (energy|eta|phi)+> ! <!ATTLIST LVL1JetElement %attributes;> ! <!ELEMENT LVL1Result (ctpItemList|ctpWord0|ctpWord1|ctpWord2| ! energyEtMiss|energyEx|energyEy|energySumEt| ! itemListEF|itemListL2|passedEF|passedL1|passedL2| ! passedTrigger)+> ! <!ATTLIST LVL1Result %attributes;> ! <!ELEMENT LVL1TriggerTower (emEnergy|hadEnergy|sumEnergy|eta|phi)+> ! <!ATTLIST LVL1TriggerTower %attributes;> ! <!ELEMENT MDT (kine|barcode|driftR|id|identifier|length|x|y|z)+> ! <!ATTLIST MDT %attributes;> ! <!ELEMENT MSeg (cotTheta|hits|numHits|phi0|x|y|z)+> ! <!ATTLIST MSeg %attributes;> ! <!ELEMENT Muon (author|chi2|dataType|eta|etConeIsol|pdgId|phi|pt| ! trackIndex|trackKey)+> ! <!ATTLIST Muon %attributes;> ! <!ELEMENT MuonETMis (et|etx|ety)+> ! <!ATTLIST MuonETMis %attributes;> ! <!ELEMENT MuonROI (energy|eta|phi|roiWord|thrName|thrNumber|thrValue)+> ! <!ATTLIST MuonROI %attributes;> ! <!ELEMENT MuonSegment (x|y|z|phi|theta|hits|numHits)+> ! <!ATTLIST MuonSegment %attributes;> ! <!ELEMENT MuonTrack (kine|barcode|chi2|cotTheta|covMatrix|d0|hits| ! id|numHits|numPolyline|phi0|polylineX|polylineY| ! polylineZ|pt|z0)+> ! <!ATTLIST MuonTrack %attributes;> ! <!ELEMENT Particles (pt|phi|eta|isolated|code|kine|barcode)+> ! <!ATTLIST Particles %attributes;> ! <!ELEMENT ParticleJet (cells|et|eta|numCells|phi|pt|cluster|id)+> ! <!ATTLIST ParticleJet %attributes;> ! ! <!ELEMENT Photon (clusterIndex|clusterKey|emWeight|et37|eta|etCone| ! etHad1|f1|fracs1|isEM|phi|pionWeight|pt)+> ! <!ATTLIST Photon %attributes;> ! ! <!-- PixelRDO - object derived from S3D --> ! <!ELEMENT PixelRDO (id|x|y|z|etaModule|phiModule)+> ! <!ATTLIST PixelRDO %attributes;> ! ! <!ELEMENT RMTr (kine|barcode|cotTheta|hits|hitsFull|numHits| ! numPolyline|phi0|polylineX|polylineY|polylineZ|pt| ! x|y|z|id)+> ! <!ATTLIST RMTr %attributes;> ! ! <!ELEMENT RPC (kine|barcode|id|identifier|length|width|x|y|z)+> ! <!ATTLIST RPC %attributes;> ! ! <!ELEMENT RTr (d0|z0|phi0|cotTheta|pt|chi2|covMatrix|kine|barcode)+> ! <!ATTLIST RTr %attributes;> ! ! <!ELEMENT RVx (chi2|covMatrix|x|y|z|numTracks|sgkey|tracks)+> ! <!ATTLIST RVx %attributes;> ! ! <!ELEMENT S3D (kine|barcode|clusters|x|y|z|phi|rho|etaModule| ! phiModule|barcodes|numBarcodes)+> ! <!ATTLIST S3D %attributes;> ! ! <!-- SCTRDO - object derived from STC (SiCluster) --> ! <!ELEMENT SCTRDO (x0|x1|y0|y1|z0|z1|phiModule|etaModule|id|BCIDError| ! firstHitError|formatterError|lvl1Error|preambleError| ! secondHitError|syncError|timeBin)+> ! <!ATTLIST SCTRDO %attributes;> ! ! <!ELEMENT Segment (x|y|z|phi|theta|hits|numHits)+> ! <!ATTLIST Segment %attributes;> ! ! <!ELEMENT SiHit (energyloss|trackid|x|y|z)+> ! <!ATTLIST SiHit %attributes;> ! ! <!ELEMENT SMTr (kine|barcode|cotTheta|id|phi0|pt|x|y|z)+> ! <!ATTLIST SMTr %attributes;> ! ! <!ELEMENT STC (kine|barcode|id|width|x0|x1|y0|y1|z0|z1|side| ! etaModule|phiModule|barcodes|numBarcodes)+> ! <!ATTLIST STC %attributes;> ! ! <!ELEMENT STr (barcode|code|eta|id|phi|phiVertex|pt| ! rhoVertex|zVertex)+> ! <!ATTLIST STr %attributes;> ! ! <!ELEMENT TauJet (author|charge|clusterIndex|clusterKey|emRadius|eta| ! etEMCalib|etHadCalib|isolFrac|logLhRatio|numTracks| ! phi|pt|stripWidth)+> ! <!ATTLIST TauJet %attributes;> ! ! <!ELEMENT TGC (kine|barcode|id|identifier|length|lwidth|swidth| ! x|y|z)+> ! <!ATTLIST TGC %attributes;> ! ! <!ELEMENT TILE (energy|eta|id|layer|phi|sub|cluster|pmt1Energy| ! pmt2Energy|pmt1Chi2|pmt2Chi2|pmt1Time|pmt2Time| ! adcCounts1|adcCounts2|pmt1Gain|pmt2Gain)+> ! <!ATTLIST TILE %attributes;> ! ! <!ELEMENT Track (kine|barcode|chi2|cotTheta|covMatrix|d0|hits| ! id|numHits|numPolyline|phi0|polylineX|polylineY| ! polylineZ|pt|z0)+> ! <!ATTLIST Track %attributes;> ! ! <!ELEMENT TrigS3D (x|y|z|id|cluster|layer|r|dr|phi|dphi|dz|eta| ! barcodes|numBarcodes)+> ! <!ATTLIST TrigS3D %attributes;> ! ! <!ELEMENT TRT (kine|barcode|driftR|sub|id|phi|rhoz|threshold| ! barcodes|numBarcodes)+> ! <!ATTLIST TRT %attributes;> ! ! <!ELEMENT xKal (barcode|chi2|cotTheta|covMatrix|d0|hits| ! id|numHits|numPolyline|phi0|polylineX|polylineY| ! polylineZ|pt|z0)+> ! <!ATTLIST xKal %attributes;> ! ! <!ELEMENT et (#PCDATA)> <!ATTLIST et %float;> ! <!ELEMENT numCells (#PCDATA)> <!ATTLIST numCells %integer;> ! <!ELEMENT swidth (#PCDATA)> <!ATTLIST swidth %float; > ! <!ELEMENT lwidth (#PCDATA)> <!ATTLIST lwidth %float; > ! <!ELEMENT rho (#PCDATA)> <!ATTLIST rho %float;> ! <!ELEMENT theta (#PCDATA)> <!ATTLIST theta %float;> ! <!ELEMENT phi (#PCDATA)> <!ATTLIST phi %float;> ! <!ELEMENT phi0 (#PCDATA)> <!ATTLIST phi0 %float;> ! <!ELEMENT kine (#PCDATA)> <!ATTLIST kine %integer;> ! <!ELEMENT barcode (#PCDATA)> <!ATTLIST barcode %integer;> ! <!ELEMENT barcodes (#PCDATA)> <!ATTLIST barcodes %integer;> ! <!ELEMENT numBarcodes (#PCDATA)> <!ATTLIST numBarcodes %integer;> ! <!ELEMENT id (#PCDATA)> <!ATTLIST id %integer;> ! <!ELEMENT type (#PCDATA)> <!ATTLIST type %integer;> ! <!ELEMENT isolated (#PCDATA)> <!ATTLIST isolated %integer;> ! <!ELEMENT hits (#PCDATA)> <!ATTLIST hits %integer;> ! <!ELEMENT sub (#PCDATA)> <!ATTLIST sub %integer;> ! <!ELEMENT threshold (#PCDATA)> <!ATTLIST threshold %integer;> ! <!ELEMENT rhoz (#PCDATA)> <!ATTLIST rhoz %float;> ! <!ELEMENT energy (#PCDATA)> <!ATTLIST energy %float;> ! <!ELEMENT emEnergy (#PCDATA)> <!ATTLIST emEnergy %float;> ! <!ELEMENT hadEnergy (#PCDATA)> <!ATTLIST hadEnergy %float;> ! <!ELEMENT sumEnergy (#PCDATA)> <!ATTLIST sumEnergy %float;> ! <!ELEMENT pmt1Energy (#PCDATA)> <!ATTLIST pmt1Energy %float;> ! <!ELEMENT pmt2Energy (#PCDATA)> <!ATTLIST pmt2Energy %float;> ! <!ELEMENT pmt1Chi2 (#PCDATA)> <!ATTLIST pmt1Chi2 %float;> ! <!ELEMENT pmt2Chi2 (#PCDATA)> <!ATTLIST pmt2Chi2 %float;> ! <!ELEMENT pmt1Time (#PCDATA)> <!ATTLIST pmt1Time %float;> ! <!ELEMENT pmt2Time (#PCDATA)> <!ATTLIST pmt2Time %float;> ! <!ELEMENT pmt1Gain (#PCDATA)> <!ATTLIST pmt1Gain %integer;> ! <!ELEMENT pmt2Gain (#PCDATA)> <!ATTLIST pmt2Gain %integer;> ! <!ELEMENT adcCounts (#PCDATA)> <!ATTLIST adcCounts %integer;> ! <!ELEMENT adcCounts1 (#PCDATA)> <!ATTLIST adcCounts1 %integer;> ! <!ELEMENT adcCounts2 (#PCDATA)> <!ATTLIST adcCounts2 %integer;> ! <!ELEMENT charge (#PCDATA)> <!ATTLIST charge %float;> ! <!ELEMENT eta (#PCDATA)> <!ATTLIST eta %float;> ! <!ELEMENT cluster (#PCDATA)> <!ATTLIST cluster %integer;> ! <!ELEMENT clusters (#PCDATA)> <!ATTLIST clusters %integer;> ! <!ELEMENT layer (#PCDATA)> <!ATTLIST layer %integer;> ! <!ELEMENT x (#PCDATA)> <!ATTLIST x %float;> ! <!ELEMENT y (#PCDATA)> <!ATTLIST y %float;> ! <!ELEMENT z (#PCDATA)> <!ATTLIST z %float; > ! <!ELEMENT dx (#PCDATA)> <!ATTLIST dx %float;> ! <!ELEMENT dy (#PCDATA)> <!ATTLIST dy %float;> ! <!ELEMENT dphi (#PCDATA)> <!ATTLIST dphi %float;> ! <!ELEMENT deta (#PCDATA)> <!ATTLIST deta %float;> ! <!ELEMENT polylineX (#PCDATA)> <!ATTLIST polylineX %float;> ! <!ELEMENT polylineY (#PCDATA)> <!ATTLIST polylineY %float;> ! <!ELEMENT polylineZ (#PCDATA)> <!ATTLIST polylineZ %float;> ! <!ELEMENT driftR (#PCDATA)> <!ATTLIST driftR %float;> ! <!ELEMENT length (#PCDATA)> <!ATTLIST length %float;> ! <!ELEMENT width (#PCDATA)> <!ATTLIST width %float;> ! <!ELEMENT pt (#PCDATA)> <!ATTLIST pt %float;> ! <!ELEMENT px (#PCDATA)> <!ATTLIST px %float;> ! <!ELEMENT py (#PCDATA)> <!ATTLIST py %float;> ! <!ELEMENT pz (#PCDATA)> <!ATTLIST pz %float;> ! <!ELEMENT rhoVertex (#PCDATA)> <!ATTLIST rhoVertex %float;> ! <!ELEMENT phiVertex (#PCDATA)> <!ATTLIST phiVertex %float;> ! <!ELEMENT zVertex (#PCDATA)> <!ATTLIST zVertex %float;> ! <!ELEMENT sigma (#PCDATA)> <!ATTLIST sigma %float;> ! <!ELEMENT code (#PCDATA)> <!ATTLIST code %integer;> ! <!ELEMENT d0 (#PCDATA)> <!ATTLIST d0 %float;> ! <!ELEMENT cotTheta (#PCDATA)> <!ATTLIST cotTheta %float;> ! <!ELEMENT z0 (#PCDATA)> <!ATTLIST z0 %float;> ! <!ELEMENT chi2 (#PCDATA)> <!ATTLIST chi2 %float;> ! <!ELEMENT covMatrix (#PCDATA)> <!ATTLIST covMatrix %float;> ! <!ELEMENT numHits (#PCDATA)> <!ATTLIST numHits %integer;> ! <!ELEMENT cells (#PCDATA)> <!ATTLIST cells %integer;> ! <!ELEMENT numPolyline (#PCDATA)> <!ATTLIST numPolyline %integer;> ! <!ELEMENT identifier (#PCDATA)> <!ATTLIST identifier %string;> ! <!ELEMENT hitsFull (#PCDATA)> <!ATTLIST hitsFull %string;> ! <!ELEMENT x0 (#PCDATA)> <!ATTLIST x0 %float;> ! <!ELEMENT y0 (#PCDATA)> <!ATTLIST y0 %float;> ! <!ELEMENT x1 (#PCDATA)> <!ATTLIST x1 %float;> ! <!ELEMENT y1 (#PCDATA)> <!ATTLIST y1 %float;> ! <!ELEMENT z1 (#PCDATA)> <!ATTLIST z1 %float;> ! <!ELEMENT r (#PCDATA)> <!ATTLIST r %float;> ! <!ELEMENT dr (#PCDATA)> <!ATTLIST dr %float;> ! <!ELEMENT dz (#PCDATA)> <!ATTLIST dz %float;> ! <!ELEMENT energyloss (#PCDATA)> <!ATTLIST energyloss %float;> ! <!ELEMENT trackid (#PCDATA)> <!ATTLIST trackid %integer;> ! <!ELEMENT phiRot (#PCDATA)> <!ATTLIST phiRot %float;> ! <!ELEMENT xRot (#PCDATA)> <!ATTLIST xRot %float;> ! <!ELEMENT xTrans (#PCDATA)> <!ATTLIST xTrans %float;> ! <!ELEMENT yRot (#PCDATA)> <!ATTLIST yRot %float;> ! <!ELEMENT yTrans (#PCDATA)> <!ATTLIST yTrans %float;> ! <!ELEMENT zRot (#PCDATA)> <!ATTLIST zRot %float;> ! <!ELEMENT zTrans (#PCDATA)> <!ATTLIST zTrans %float;> ! <!ELEMENT etx (#PCDATA)> <!ATTLIST etx %float;> ! <!ELEMENT ety (#PCDATA)> <!ATTLIST ety %float;> ! <!ELEMENT numTracks (#PCDATA)> <!ATTLIST numTracks %integer;> ! <!ELEMENT tracks (#PCDATA)> <!ATTLIST tracks %integer;> ! <!ELEMENT etaModule (#PCDATA)> <!ATTLIST etaModule %integer;> ! <!ELEMENT phiModule (#PCDATA)> <!ATTLIST phiModule %integer;> ! <!ELEMENT BCIDError (#PCDATA)> <!ATTLIST BCIDError %integer;> ! <!ELEMENT firstHitError (#PCDATA)> <!ATTLIST firstHitError %integer;> ! <!ELEMENT formatterError (#PCDATA)> <!ATTLIST formatterError %integer;> ! <!ELEMENT lvl1Error (#PCDATA)> <!ATTLIST lvl1Error %integer;> ! <!ELEMENT preambleError (#PCDATA)> <!ATTLIST preambleError %integer;> ! <!ELEMENT secondHitError (#PCDATA)> <!ATTLIST secondHitError %integer;> ! <!ELEMENT syncError (#PCDATA)> <!ATTLIST syncError %integer;> ! <!ELEMENT timeBin (#PCDATA)> <!ATTLIST timeBin %integer;> ! <!ELEMENT side (#PCDATA)> <!ATTLIST side %integer;> ! <!ELEMENT eOverp (#PCDATA)> <!ATTLIST eOverp %float;> ! <!ELEMENT hitsBLayer (#PCDATA)> <!ATTLIST hitsBLayer %integer;> ! <!ELEMENT hitsHighThresTRT (#PCDATA)> <!ATTLIST hitsHighThresTRT %integer;> ! <!ELEMENT hitsPixel (#PCDATA)> <!ATTLIST hitsPixel %integer;> ! <!ELEMENT hitsSCT (#PCDATA)> <!ATTLIST hitsSCT %integer;> ! <!ELEMENT hitsTRT (#PCDATA)> <!ATTLIST hitsTRT %integer;> ! <!ELEMENT isEM (#PCDATA)> <!ATTLIST isEM %integer;> ! <!ELEMENT lhSig (#PCDATA)> <!ATTLIST lhSig %float;> ! <!ELEMENT secVtxCount (#PCDATA)> <!ATTLIST secVtxCount %float;> ! <!ELEMENT secVtxFitProb (#PCDATA)> <!ATTLIST secVtxFitProb %float;> ! <!ELEMENT secVtxMass (#PCDATA)> <!ATTLIST secVtxMass %float;> ! <!ELEMENT secVtxMult (#PCDATA)> <!ATTLIST secVtxMult %integer;> ! <!ELEMENT secVtxRPhiDist (#PCDATA)> <!ATTLIST secVtxRPhiDist %float;> ! <!ELEMENT secVtxTagLh (#PCDATA)> <!ATTLIST secVtxTagLh %float;> ! <!ELEMENT secVtxTagLhErr (#PCDATA)> <!ATTLIST secVtxTagLhErr %float;> ! <!ELEMENT weight (#PCDATA)> <!ATTLIST weight %float;> ! <!ELEMENT etHad1 (#PCDATA)> <!ATTLIST etHad1 %float;> ! <!ELEMENT fracs1 (#PCDATA)> <!ATTLIST fracs1 %float;> ! <!ELEMENT f1 (#PCDATA)> <!ATTLIST f1 %float;> ! <!ELEMENT etCone (#PCDATA)> <!ATTLIST etCone %float;> ! <!ELEMENT etCone20 (#PCDATA)> <!ATTLIST etCone20 %float;> ! <!ELEMENT et37 (#PCDATA)> <!ATTLIST et37 %float;> ! <!ELEMENT emWeight (#PCDATA)> <!ATTLIST emWeight %float;> ! <!ELEMENT pionWeight (#PCDATA)> <!ATTLIST pionWeight %float;> ! <!ELEMENT etEMCalib (#PCDATA)> <!ATTLIST etEMCalib %float;> ! <!ELEMENT etHadCalib (#PCDATA)> <!ATTLIST etHadCalib %float;> ! <!ELEMENT emRadius (#PCDATA)> <!ATTLIST emRadius %float;> ! <!ELEMENT isolFrac (#PCDATA)> <!ATTLIST isolFrac %float;> ! <!ELEMENT logLhRatio (#PCDATA)> <!ATTLIST logLhRatio %float;> ! <!ELEMENT stripWidth (#PCDATA)> <!ATTLIST stripWidth %float;> ! <!ELEMENT sgkey (#PCDATA)> <!ATTLIST sgkey %string;> ! <!ELEMENT thrName (#PCDATA)> <!ATTLIST thrName %string;> ! <!ELEMENT thrNumber (#PCDATA)> <!ATTLIST thrNumber %float;> ! <!ELEMENT thrValue (#PCDATA)> <!ATTLIST thrValue %float;> ! <!ELEMENT roiWord (#PCDATA)> <!ATTLIST roiWord %float;> ! <!ELEMENT thrPattern (#PCDATA)> <!ATTLIST thrPattern %float;> ! <!ELEMENT dataType (#PCDATA)> <!ATTLIST dataType %integer;> ! <!ELEMENT hasTrack (#PCDATA)> <!ATTLIST hasTrack %integer;> ! <!ELEMENT pdgId (#PCDATA)> <!ATTLIST pdgId %integer;> ! <!ELEMENT etConeIsol (#PCDATA)> <!ATTLIST etConeIsol %float;> ! <!ELEMENT ctpItemList (#PCDATA)> <!ATTLIST ctpItemList %string;> ! <!ELEMENT ctpWord0 (#PCDATA)> <!ATTLIST ctpWord0 %integer;> ! <!ELEMENT ctpWord1 (#PCDATA)> <!ATTLIST ctpWord1 %integer;> ! <!ELEMENT ctpWord2 (#PCDATA)> <!ATTLIST ctpWord2 %integer;> ! <!ELEMENT energyEtMiss (#PCDATA)> <!ATTLIST energyEtMiss %float;> ! <!ELEMENT energyEx (#PCDATA)> <!ATTLIST energyEx %float;> ! <!ELEMENT energyEy (#PCDATA)> <!ATTLIST energyEy %float;> ! <!ELEMENT energySumEt (#PCDATA)> <!ATTLIST energySumEt %float;> ! <!ELEMENT passedEF (#PCDATA)> <!ATTLIST passedEF %integer;> ! <!ELEMENT passedL1 (#PCDATA)> <!ATTLIST passedL1 %integer;> ! <!ELEMENT passedL2 (#PCDATA)> <!ATTLIST passedL2 %integer;> ! <!ELEMENT passedTrigger (#PCDATA)> <!ATTLIST passedTrigger %integer;> ! <!ELEMENT author (#PCDATA)> <!ATTLIST author %string;> ! <!ELEMENT clusterKey (#PCDATA)> <!ATTLIST clusterKey %string;> ! <!ELEMENT clusterIndex (#PCDATA)> <!ATTLIST clusterIndex %integer;> ! <!ELEMENT trackKey (#PCDATA)> <!ATTLIST trackKey %string;> ! <!ELEMENT trackIndex (#PCDATA)> <!ATTLIST trackIndex %integer;> ! <!ELEMENT itemListEF (#PCDATA)> <!ATTLIST itemListEF %string;> ! <!ELEMENT itemListL2 (#PCDATA)> <!ATTLIST itemListL2 %string;> |
|
From: Julius H. <hr...@us...> - 2007-01-24 22:08:18
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Test In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16592/net/hep/atlas/graphics/JiveEvent/Test Modified Files: GeometricModel.java JAXB.java Log Message: migrated to JAXB 2.0 Index: JAXB.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Test/JAXB.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JAXB.java 16 Jan 2007 14:46:34 -0000 1.2 --- JAXB.java 24 Jan 2007 22:08:17 -0000 1.3 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/24 22:08:17 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2007/01/16 14:46:34 hrivnac * cosmetical changes due to JiveGeometry *************** *** 49,60 **** JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveEvent.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! u.setValidating(true); log.info("Opening " + args[0]); // Get event EventType event = (EventType)u.unmarshal(new FileInputStream(args[0])); // Get Jet ! JetType jet = event.getJet(); ! EtaType eta = jet.getEta(); ! log.info("\tJet.eta: " + eta.getValue()); } --- 52,67 ---- JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveEvent.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! // TBD u.setValidating(true); log.info("Opening " + args[0]); // Get event EventType event = (EventType)u.unmarshal(new FileInputStream(args[0])); // Get Jet ! for (Object o : event.getBJetOrCaloETMisOrCaloTB()) { ! if (o instanceof JetType) { ! JetType jet = (JetType)o; ! EtaType eta = jet.getEta(); ! log.info("\tJet.eta: " + eta.getValue()); ! } ! } } Index: GeometricModel.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Test/GeometricModel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GeometricModel.java 16 Jan 2007 14:46:34 -0000 1.2 --- GeometricModel.java 24 Jan 2007 22:08:17 -0000 1.3 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/24 22:08:17 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2007/01/16 14:46:34 hrivnac * cosmetical changes due to JiveGeometry *************** *** 49,53 **** JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveEvent.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! u.setValidating(true); log.info("Opening " + args[0]); // Get event --- 52,56 ---- JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveEvent.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! //TBD u.setValidating(true); log.info("Opening " + args[0]); // Get event |
|
From: Julius H. <hr...@us...> - 2007-01-24 22:08:18
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16592/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps Modified Files: Event.java Jet.java STr.java Added Files: LAr.java Log Message: migrated to JAXB 2.0 Index: STr.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/STr.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** STr.java 11 Jan 2007 14:08:22 -0000 1.2 --- STr.java 24 Jan 2007 22:08:16 -0000 1.3 *************** *** 36,42 **** import hep.graphics.j3d.Helix; - // JAXB - import javax.xml.bind.Element; - // Java // import static java.lang.Math.signum; // TBD: 1.5 --- 36,39 ---- *************** *** 47,55 **** /** GraXML representation of <code>STrType</code> ! * JiveEvent element connected via JAXB * {@link net.hep.atlas.graphics.JiveEvent.JAXB.STrType} generic JAXB interface. * <p><font color="#880088"> * <pre> * $Log$ * Revision 1.2 2007/01/11 14:08:22 hrivnac * version 0.1.3 --- 44,55 ---- /** GraXML representation of <code>STrType</code> ! * JiveEvent Type connected via JAXB * {@link net.hep.atlas.graphics.JiveEvent.JAXB.STrType} generic JAXB interface. * <p><font color="#880088"> * <pre> * $Log$ + * Revision 1.3 2007/01/24 22:08:16 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2007/01/11 14:08:22 hrivnac * version 0.1.3 *************** *** 85,94 **** public final class STr extends JiveRep { ! public final void traverse(JiveEventBuilder builder, STrType str, Group tg, String parent) { // Set values set(builder, tg, parent); ! // Get element properties EtaType eta = str.getEta(); PhiType phi = str.getPhi(); --- 85,101 ---- public final class STr extends JiveRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); ! // Verify element type ! if (! (element instanceof STrType)) { ! log.error(element + " can't be traversed using " + getClass().getName() + " representation"); ! return; ! } ! ! // Get Type properties ! STrType str = (STrType)element; EtaType eta = str.getEta(); PhiType phi = str.getPhi(); *************** *** 241,245 **** private static boolean _text = true; ! private static double _textSizeFactor = 20.0f; /** Logging . */ --- 248,252 ---- private static boolean _text = true; ! private static double _textSizeFactor = 10.0f; /** Logging . */ Index: Event.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Event.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Event.java 30 Mar 2005 13:10:21 -0000 1.1 --- Event.java 24 Jan 2007 22:08:16 -0000 1.2 *************** *** 2,5 **** --- 2,6 ---- import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveEventBuilder; + import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveRep; // Generic Model *************** *** 18,28 **** import javax.media.j3d.BranchGroup; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; ! /** GraXML representation {@link GraXMLJAXBRep} of <code>Event</code> JiveEvent element * connected via JAXB {@link net.hep.atlas.graphics.JiveEvent.JAXB.EventType} generic JAXB * interface. --- 19,26 ---- import javax.media.j3d.BranchGroup; // Log4J import org.apache.log4j.Logger; ! /** GraXML representation {@link GraXMLJAXBRep} of <code>Event</code> JiveEvent Type * connected via JAXB {@link net.hep.atlas.graphics.JiveEvent.JAXB.EventType} generic JAXB * interface. *************** *** 30,33 **** --- 28,34 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/24 22:08:16 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2005/03/30 13:10:21 hrivnac * JiveEvent introduced *************** *** 49,65 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public final class Event implements GraXMLJAXBRep { ! ! // TBD: remove, obsolete ! public final void traverse(MasterBuilder builder, org.w3c.dom.Node node, Group tg, String parent) {} ! public final void traverse(MasterBuilder builder0, Element element, Group tg, String parent) { ! // Verify builder type ! if (! (builder0 instanceof JiveEventBuilder)) { ! log.error(element + " can't be traversed using " + builder0 + " builder"); ! return; ! } ! JiveEventBuilder builder = (JiveEventBuilder)builder0; // Verify element type --- 50,59 ---- * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public final class Event extends JiveRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { ! // Set values ! set(builder, tg, parent); // Verify element type *************** *** 69,89 **** } ! // Get element properties EventType event = (EventType)element; String version = event.getVersion(); ! String name = _name; if (version != null && !version.equals("")) { ! name += "(" + version + ")"; } // Traverse all children and add their representations into branch BranchGroup branch = new BranchGroup(); ! // - Jets ! JetType jets = event.getJet(); ! (new Jet()).traverse(builder, jets, branch, name); ! STrType strs = event.getSTr(); ! (new STr()).traverse(builder, strs, branch, name); ! // - ... ! // TBD: others // Register BranchGroup into Connections database --- 63,84 ---- } ! // Get Type properties EventType event = (EventType)element; String version = event.getVersion(); ! String name = _name; ! if (_ord > 0) { ! name += "." + _ord; ! } ! _ord++; ! String info = name; if (version != null && !version.equals("")) { ! info += "(" + version + ")"; } // Traverse all children and add their representations into branch BranchGroup branch = new BranchGroup(); ! for (Object o : event.getBJetOrCaloETMisOrCaloTB()) { ! builder.traverse(o, branch, name); ! } // Register BranchGroup into Connections database *************** *** 92,96 **** tg, branch, ! null)); } --- 87,92 ---- tg, branch, ! null, ! info)); } *************** *** 101,103 **** --- 97,101 ---- private static String _name = "Event"; + private static short _ord = 0; + } Index: Jet.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Jet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jet.java 30 Mar 2005 13:10:21 -0000 1.1 --- Jet.java 24 Jan 2007 22:08:16 -0000 1.2 *************** *** 12,16 **** import net.hep.atlas.graphics.JiveEvent.JAXB.IdType; import net.hep.atlas.graphics.JiveEvent.JAXB.CellsType; ! import net.hep.atlas.graphics.JiveEvent.JAXB.ClusterType; // GraXML --- 12,16 ---- import net.hep.atlas.graphics.JiveEvent.JAXB.IdType; import net.hep.atlas.graphics.JiveEvent.JAXB.CellsType; ! import net.hep.atlas.graphics.JiveEvent.JAXB.CaloClusterType; // GraXML *************** *** 37,43 **** import org.freehep.j3d.ConeSegment; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.sin; --- 37,40 ---- *************** *** 51,59 **** /** GraXML representation of <code>JetType</code> ! * JiveEvent element connected via JAXB * {@link net.hep.atlas.graphics.JiveEvent.JAXB.JetType} generic JAXB interface. * <p><font color="#880088"> * <pre> * $Log$ * Revision 1.1 2005/03/30 13:10:21 hrivnac * JiveEvent introduced --- 48,59 ---- /** GraXML representation of <code>JetType</code> ! * JiveEvent Type connected via JAXB * {@link net.hep.atlas.graphics.JiveEvent.JAXB.JetType} generic JAXB interface. * <p><font color="#880088"> * <pre> * $Log$ + * Revision 1.2 2007/01/24 22:08:16 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2005/03/30 13:10:21 hrivnac * JiveEvent introduced *************** *** 98,107 **** public final class Jet extends JiveRep { ! public final void traverse(JiveEventBuilder builder, JetType jet, Group tg, String parent) { // Set values set(builder, tg, parent); ! // Get element properties EtaType eta = jet.getEta(); PhiType phi = jet.getPhi(); --- 98,114 ---- public final class Jet extends JiveRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); ! // Verify element type ! if (! (element instanceof JetType)) { ! log.error(element + " can't be traversed using " + getClass().getName() + " representation"); ! return; ! } ! ! // Get Type properties ! JetType jet = (JetType)element; EtaType eta = jet.getEta(); PhiType phi = jet.getPhi(); *************** *** 110,114 **** IdType id = jet.getId(); // not used: CellsType cels = jet.getCells(); ! ClusterType cluster = jet.getCluster(); float[] etas = floats(eta.getValue()); float[] phis = floats(phi.getValue()); --- 117,121 ---- IdType id = jet.getId(); // not used: CellsType cels = jet.getCells(); ! CaloClusterType cluster = jet.getCluster(); float[] etas = floats(eta.getValue()); float[] phis = floats(phi.getValue()); --- NEW FILE: LAr.java --- package net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps; import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveEventBuilder; import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveEvent.JAXB.LArType; // GraXML import net.hep.graphics.GraXML.BuildOptions; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Java3DExtensions.Interactivity.Interacter; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; // Java3D import javax.media.j3d.Shape3D; import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.media.j3d.TransformGroup; import javax.media.j3d.Transform3D; import javax.media.j3d.LineArray; import javax.media.j3d.GeometryArray; import javax.media.j3d.Appearance; import javax.vecmath.Matrix3d; import javax.vecmath.Vector3d; import javax.vecmath.Vector3f; import javax.vecmath.Point3f; // FreeHEP import org.freehep.j3d.ConeSegment; // Java import static java.lang.Math.sin; import static java.lang.Math.cos; import static java.lang.Math.sqrt; import static java.lang.Math.exp; import static java.lang.Math.PI; // Log4J import org.apache.log4j.Logger; /** GraXML representation of <code>LArType</code> * JiveEvent Type connected via JAXB * {@link net.hep.atlas.graphics.JiveEvent.JAXB.LArType} generic JAXB interface. * <p><font color="#880088"> * <pre> * $Log: LAr.java,v $ * Revision 1.1 2007/01/24 22:08:16 hrivnac * migrated to JAXB 2.0 * * </pre> * </font></p> * @version $Id: LAr.java,v 1.1 2007/01/24 22:08:16 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class LAr extends JiveRep { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) {} /** Logging . */ private static Logger log = Logger.getLogger(LAr.class); } |
|
From: Julius H. <hr...@us...> - 2007-01-24 22:08:18
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/JAXB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16592/net/hep/atlas/graphics/JiveEvent/JAXB Modified Files: JiveEvent.xjs Log Message: migrated to JAXB 2.0 Index: JiveEvent.xjs =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/JAXB/JiveEvent.xjs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JiveEvent.xjs 30 Mar 2005 13:10:22 -0000 1.1 --- JiveEvent.xjs 24 Jan 2007 22:08:16 -0000 1.2 *************** *** 7,10 **** --- 7,13 ---- <!-- $Log$ + Revision 1.2 2007/01/24 22:08:16 hrivnac + migrated to JAXB 2.0 + Revision 1.1 2005/03/30 13:10:22 hrivnac JiveEvent introduced *************** *** 23,34 **** <jaxb:bindings schemaLocation="../Schema/event.xsd" node="/xs:schema"> <jaxb:schemaBindings> ! <!-- <jaxb:nameXmlTransform> ! <jaxb:elementName suffix="Rep"/> ! <jaxb:typeName suffix="Rep"/> ! <jaxb:modelGroupName suffix="Rep"/> ! </jaxb:nameXmlTransform> ! --> ! </jaxb:schemaBindings> </jaxb:bindings> --- 26,40 ---- <jaxb:bindings schemaLocation="../Schema/event.xsd" node="/xs:schema"> <jaxb:schemaBindings> ! <jaxb:package name="net.hep.atlas.graphics.JiveEvent.JAXB"/> <jaxb:nameXmlTransform> ! <!--jaxb:typeName suffix="Type"/--> ! <jaxb:anonymousTypeName suffix="Type"/> ! <jaxb:elementName suffix="Type"/> ! <jaxb:modelGroupName suffix="Group"/> ! </jaxb:nameXmlTransform> ! </jaxb:schemaBindings> ! <jaxb:bindings node="./xs:element[@name='cluster']"> ! <jaxb:class name="CaloClusterType"/> ! </jaxb:bindings> </jaxb:bindings> |
|
From: Julius H. <hr...@us...> - 2007-01-24 22:08:17
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16592/net/hep/atlas/graphics/JiveEvent/GeometricModel Modified Files: JiveEventBuilder.java JiveRep.java Log Message: migrated to JAXB 2.0 Index: JiveEventBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/JiveEventBuilder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JiveEventBuilder.java 14 Jan 2007 17:10:42 -0000 1.5 --- JiveEventBuilder.java 24 Jan 2007 22:08:16 -0000 1.6 *************** *** 2,6 **** // GraXML ! import net.hep.graphics.GraXML.MasterBuilder; // Java3D --- 2,7 ---- // GraXML ! import net.hep.graphics.GraXML.MasterBuilder; ! import net.hep.graphics.GraXML.Java3DExtensions.SelectedColor; // Java3D *************** *** 21,24 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.6 2007/01/24 22:08:16 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.5 2007/01/14 17:10:42 hrivnac * embedded demos included *************** *** 57,60 **** --- 61,65 ---- public void configure() { _pdg = new PDG(); + SelectedColor.setPalette(SelectedColor.ATLANTIS); } Index: JiveRep.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/JiveRep.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JiveRep.java 16 Jan 2007 14:46:34 -0000 1.2 --- JiveRep.java 24 Jan 2007 22:08:16 -0000 1.3 *************** *** 2,5 **** --- 2,6 ---- // GraXML + import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Java3DExtensions.Interactivity.Interacter; *************** *** 29,32 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/24 22:08:16 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2007/01/16 14:46:34 hrivnac * cosmetical changes due to JiveGeometry *************** *** 63,67 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public abstract class JiveRep { /** Use Java3D {@link Node} as a GraXML building block: --- 67,71 ---- * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public abstract class JiveRep implements GraXMLJAXBRep { /** Use Java3D {@link Node} as a GraXML building block: *************** *** 138,146 **** /** Set general references. ! * @param builder The managing {@link JiveEventBuilder}. * @param tg The {@link Group} to put this representation in. * @param parent The parent element (connection). */ ! protected void set(JiveEventBuilder builder, Group tg, String parent) { ! _builder = builder; _tg = tg; _parent = parent; --- 142,154 ---- /** Set general references. ! * @param builder The managing {@link MasterBuilder}. * @param tg The {@link Group} to put this representation in. * @param parent The parent element (connection). */ ! protected void set(MasterBuilder builder, Group tg, String parent) { ! if (! (builder instanceof JiveEventBuilder)) { ! log.error("Can't be traversed using " + builder + " builder"); ! return; ! } ! _builder = (JiveEventBuilder)builder; _tg = tg; _parent = parent; |
|
From: Julius H. <hr...@us...> - 2007-01-24 22:08:17
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16592 Modified Files: index.html Log Message: migrated to JAXB 2.0 Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/index.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** index.html 14 Jan 2007 17:10:42 -0000 1.6 --- index.html 24 Jan 2007 22:08:16 -0000 1.7 *************** *** 76,79 **** --- 76,80 ---- <ul> <li>Demo files exported to GraXML.</li> + <li>Migrated to JAXB 2.0.</li> </ul> </li> *************** *** 89,93 **** <li>Requests: <ul> ! <li>Migrate to JAXB 2.0.</li> </ul> </li> --- 90,94 ---- <li>Requests: <ul> ! <li>...</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2007-01-24 17:01:34
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25929 Modified Files: build.xml generator.xml Log Message: migrated to JAXB 2.0, simplified Index: generator.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/ant/generator.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** generator.xml 14 Jan 2007 21:41:16 -0000 1.1 --- generator.xml 24 Jan 2007 17:01:25 -0000 1.2 *************** *** 9,13 **** <target name="generate0"> <exec dir="${dir}" ! executable="${JAXB.sh}" os="Linux"> <arg value="-extension"/> --- 9,13 ---- <target name="generate0"> <exec dir="${dir}" ! executable="${JAXB-2.0.sh}" os="Linux"> <arg value="-extension"/> Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/ant/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 16 Jan 2007 14:44:34 -0000 1.2 --- build.xml 24 Jan 2007 17:01:25 -0000 1.3 *************** *** 23,31 **** <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> ! <pathelement path="${JAXP.api}"/> ! <pathelement path="${JAXB.api}"/> ! <pathelement path="${JAXB.libs}"/> ! <pathelement path="${JAXB.impl}"/> ! <pathelement path="${JAXB.xjc}"/> <pathelement path="${JWSDP.relax}"/> <pathelement path="${JWSDP.xsd}"/> --- 23,31 ---- <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> ! <pathelement path="${JAXP-2.0.api}"/> ! <pathelement path="${JAXB-2.0.api}"/> ! <pathelement path="${JAXB-2.0.libs}"/> ! <pathelement path="${JAXB-2.0.impl}"/> ! <pathelement path="${JAXB-2.0.xjc}"/> <pathelement path="${JWSDP.relax}"/> <pathelement path="${JWSDP.xsd}"/> *************** *** 70,78 **** <fileset file="${Java3D.vecmath}"/> <fileset dir="${Java3D.libdir}"/> ! <fileset file="${JAXP.api}"/> ! <fileset file="${JAXB.api}"/> ! <fileset file="${JAXB.libs}"/> ! <fileset file="${JAXB.impl}"/> ! <fileset file="${JAXB.xjc}"/> <fileset file="${JWSDP.relax}"/> <fileset file="${JWSDP.xsd}"/> --- 70,78 ---- <fileset file="${Java3D.vecmath}"/> <fileset dir="${Java3D.libdir}"/> ! <fileset file="${JAXP-2.0.api}"/> ! <fileset file="${JAXB-2.0.api}"/> ! <fileset file="${JAXB-2.0.libs}"/> ! <fileset file="${JAXB-2.0.impl}"/> ! <fileset file="${JAXB-2.0.xjc}"/> <fileset file="${JWSDP.relax}"/> <fileset file="${JWSDP.xsd}"/> |
|
From: Julius H. <hr...@us...> - 2007-01-24 17:01:23
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25491/net/hep/atlas/graphics/JiveGeometry/GeometricModel Modified Files: JiveRep.java Log Message: migrated to JAXB 2.0, simplified Index: JiveRep.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveRep.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JiveRep.java 23 Jan 2007 17:00:13 -0000 1.4 --- JiveRep.java 24 Jan 2007 17:00:41 -0000 1.5 *************** *** 2,5 **** --- 2,6 ---- // GraXML + import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Java3DExtensions.Interactivity.Interacter; *************** *** 36,39 **** --- 37,43 ---- * <pre> * $Log$ + * Revision 1.5 2007/01/24 17:00:41 hrivnac + * migrated to JAXB 2.0, simplified + * * Revision 1.4 2007/01/23 17:00:13 hrivnac * TRT and Silicons added *************** *** 52,56 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public abstract class JiveRep { /** Use Java3D {@link Node} as a GraXML building block: --- 56,60 ---- * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public abstract class JiveRep implements GraXMLJAXBRep { /** Use Java3D {@link Node} as a GraXML building block: *************** *** 169,177 **** /** Set general references. ! * @param builder The managing {@link JiveGeometryBuilder}. * @param tg The {@link Group} to put this representation in. * @param parent The parent element (connection). */ ! protected void set(JiveGeometryBuilder builder, Group tg, String parent) { ! _builder = builder; _tg = tg; _parent = parent; --- 173,186 ---- /** Set general references. ! * Verify that {@link MasterBuilder} type is {@link JiveGeometryBuilder}. ! * @param builder The managing {@link MasterBuilder}. * @param tg The {@link Group} to put this representation in. * @param parent The parent element (connection). */ ! protected void set(MasterBuilder builder, Group tg, String parent) { ! if (! (builder instanceof JiveGeometryBuilder)) { ! log.error("Can't be traversed using " + builder + " builder"); ! return; ! } ! _builder = (JiveGeometryBuilder)builder; _tg = tg; _parent = parent; |
|
From: Julius H. <hr...@us...> - 2007-01-24 17:00:52
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25491/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: ABarrelCalorimeter.java ABarrelSiliconDetector.java ABarrelTRTDetector.java AEndcapCalorimeter.java AEndcapSiliconDetector.java AEndcapTRTDetector.java AGapCalorimeter.java AGeometry.java Log Message: migrated to JAXB 2.0, simplified Index: ABarrelTRTDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelTRTDetector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ABarrelTRTDetector.java 23 Jan 2007 17:00:14 -0000 1.1 --- ABarrelTRTDetector.java 24 Jan 2007 17:00:42 -0000 1.2 *************** *** 19,25 **** import javax.media.j3d.Appearance; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.PI; --- 19,22 ---- *************** *** 36,39 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/24 17:00:42 hrivnac + * migrated to JAXB 2.0, simplified + * * Revision 1.1 2007/01/23 17:00:14 hrivnac * TRT and Silicons added *************** *** 45,64 **** public final class ABarrelTRTDetector extends JiveRep { ! public final void traverse(JiveGeometryBuilder builder, ABarrelTRTDetectorType ABarrelTRTDetector, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties ! String color = ABarrelTRTDetector.getC(); ! String name = ABarrelTRTDetector.getN(); ! int layer = ABarrelTRTDetector.getLayer(); ! double rMin = ABarrelTRTDetector.getRMin() / builder.norm(); ! double rMax = ABarrelTRTDetector.getRMax() / builder.norm(); ! double zMin = ABarrelTRTDetector.getZMin() / builder.norm(); ! double zMax = ABarrelTRTDetector.getZMax() / builder.norm(); ! double phiIn = toRadians(ABarrelTRTDetector.getPhiIn()); ! double phiOut = toRadians(ABarrelTRTDetector.getPhiOut()); ! int nPhi = ABarrelTRTDetector.getNphi(); double dPhi = 2.0 * PI / nPhi; --- 45,71 ---- public final class ABarrelTRTDetector extends JiveRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); + // Verify element type + if (! (element instanceof ABarrelTRTDetectorType)) { + log.error(element + " can't be traversed using " + getClass().getName() + " representation"); + return; + } + // Get element properties ! ABarrelTRTDetectorType aBarrelTRTDetector = (ABarrelTRTDetectorType)element; ! String color = aBarrelTRTDetector.getC(); ! String name = aBarrelTRTDetector.getN(); ! int layer = aBarrelTRTDetector.getLayer(); ! double rMin = aBarrelTRTDetector.getRMin() / builder().norm(); ! double rMax = aBarrelTRTDetector.getRMax() / builder().norm(); ! double zMin = aBarrelTRTDetector.getZMin() / builder().norm(); ! double zMax = aBarrelTRTDetector.getZMax() / builder().norm(); ! double phiIn = toRadians(aBarrelTRTDetector.getPhiIn()); ! double phiOut = toRadians(aBarrelTRTDetector.getPhiOut()); ! int nPhi = aBarrelTRTDetector.getNphi(); double dPhi = 2.0 * PI / nPhi; Index: ABarrelSiliconDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelSiliconDetector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ABarrelSiliconDetector.java 23 Jan 2007 17:00:14 -0000 1.1 --- ABarrelSiliconDetector.java 24 Jan 2007 17:00:42 -0000 1.2 *************** *** 19,25 **** import javax.media.j3d.Appearance; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.PI; --- 19,22 ---- *************** *** 39,42 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/24 17:00:42 hrivnac + * migrated to JAXB 2.0, simplified + * * Revision 1.1 2007/01/23 17:00:14 hrivnac * TRT and Silicons added *************** *** 48,70 **** public final class ABarrelSiliconDetector extends JiveRep { ! public final void traverse(JiveGeometryBuilder builder, ABarrelSiliconDetectorType ABarrelSiliconDetector, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties ! String color = ABarrelSiliconDetector.getC(); ! String name = ABarrelSiliconDetector.getN(); ! int layer = ABarrelSiliconDetector.getLayer(); ! double length = ABarrelSiliconDetector.getLength() / builder.norm(); ! double width = ABarrelSiliconDetector.getWidth() / builder.norm(); ! double thickness = ABarrelSiliconDetector.getThickness() / builder.norm(); ! double tilt = ABarrelSiliconDetector.getTilt() / builder.norm(); ! double r0 = ABarrelSiliconDetector.getR0() / builder.norm(); ! double phi0 = ABarrelSiliconDetector.getPhi0() / builder.norm(); ! double zMin = ABarrelSiliconDetector.getZMin() / builder.norm(); ! double zMax = ABarrelSiliconDetector.getZMax() / builder.norm(); ! int nZ = ABarrelSiliconDetector.getNz(); ! int nPhi = ABarrelSiliconDetector.getNphi(); double dZ = (zMax - zMin) / nZ; double dPhi = 2.0 * PI / nPhi; --- 48,77 ---- public final class ABarrelSiliconDetector extends JiveRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); + // Verify element type + if (! (element instanceof ABarrelSiliconDetectorType)) { + log.error(element + " can't be traversed using " + getClass().getName() + " representation"); + return; + } + // Get element properties ! ABarrelSiliconDetectorType aBarrelSiliconDetector = (ABarrelSiliconDetectorType)element; ! String color = aBarrelSiliconDetector.getC(); ! String name = aBarrelSiliconDetector.getN(); ! int layer = aBarrelSiliconDetector.getLayer(); ! double length = aBarrelSiliconDetector.getLength() / builder().norm(); ! double width = aBarrelSiliconDetector.getWidth() / builder().norm(); ! double thickness = aBarrelSiliconDetector.getThickness() / builder().norm(); ! double tilt = aBarrelSiliconDetector.getTilt() / builder().norm(); ! double r0 = aBarrelSiliconDetector.getR0() / builder().norm(); ! double phi0 = aBarrelSiliconDetector.getPhi0() / builder().norm(); ! double zMin = aBarrelSiliconDetector.getZMin() / builder().norm(); ! double zMax = aBarrelSiliconDetector.getZMax() / builder().norm(); ! int nZ = aBarrelSiliconDetector.getNz(); ! int nPhi = aBarrelSiliconDetector.getNphi(); double dZ = (zMax - zMin) / nZ; double dPhi = 2.0 * PI / nPhi; Index: AEndcapTRTDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapTRTDetector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AEndcapTRTDetector.java 23 Jan 2007 17:00:14 -0000 1.1 --- AEndcapTRTDetector.java 24 Jan 2007 17:00:42 -0000 1.2 *************** *** 19,25 **** import javax.media.j3d.Appearance; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.PI; --- 19,22 ---- *************** *** 36,39 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/24 17:00:42 hrivnac + * migrated to JAXB 2.0, simplified + * * Revision 1.1 2007/01/23 17:00:14 hrivnac * TRT and Silicons added *************** *** 45,63 **** public final class AEndcapTRTDetector extends JiveRep { ! public final void traverse(JiveGeometryBuilder builder, AEndcapTRTDetectorType AEndcapTRTDetector, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties ! String color = AEndcapTRTDetector.getC(); ! String name = AEndcapTRTDetector.getN(); ! int layer = AEndcapTRTDetector.getLayer(); ! double rMin = AEndcapTRTDetector.getRMin() / builder.norm(); ! double rMax = AEndcapTRTDetector.getRMax() / builder.norm(); ! double zMin = AEndcapTRTDetector.getZMin() / builder.norm(); ! double zMax = AEndcapTRTDetector.getZMax() / builder.norm(); ! double phi0 = toRadians(AEndcapTRTDetector.getPhi0()); ! int nPhi = AEndcapTRTDetector.getNphi(); double dPhi = 2.0 * PI / nPhi; --- 45,70 ---- public final class AEndcapTRTDetector extends JiveRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); + // Verify element type + if (! (element instanceof AEndcapTRTDetectorType)) { + log.error(element + " can't be traversed using " + getClass().getName() + " representation"); + return; + } + // Get element properties ! AEndcapTRTDetectorType aEndcapTRTDetector = (AEndcapTRTDetectorType)element; ! String color = aEndcapTRTDetector.getC(); ! String name = aEndcapTRTDetector.getN(); ! int layer = aEndcapTRTDetector.getLayer(); ! double rMin = aEndcapTRTDetector.getRMin() / builder().norm(); ! double rMax = aEndcapTRTDetector.getRMax() / builder().norm(); ! double zMin = aEndcapTRTDetector.getZMin() / builder().norm(); ! double zMax = aEndcapTRTDetector.getZMax() / builder().norm(); ! double phi0 = toRadians(aEndcapTRTDetector.getPhi0()); ! int nPhi = aEndcapTRTDetector.getNphi(); double dPhi = 2.0 * PI / nPhi; Index: AGeometry.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGeometry.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AGeometry.java 24 Jan 2007 14:00:35 -0000 1.6 --- AGeometry.java 24 Jan 2007 17:00:42 -0000 1.7 *************** *** 25,31 **** import javax.media.j3d.BranchGroup; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 25,28 ---- *************** *** 37,40 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.7 2007/01/24 17:00:42 hrivnac + * migrated to JAXB 2.0, simplified + * * Revision 1.6 2007/01/24 14:00:35 hrivnac * new geom files added *************** *** 62,88 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public final class AGeometry implements GraXMLJAXBRep { ! ! // TBD: remove, obsolete ! public final void traverse(MasterBuilder builder, org.w3c.dom.Node node, Group tg, String parent) {} ! ! public final void traverse(MasterBuilder builder0, Element element, Group tg, String parent) { ! ! // Verify builder type ! if (! (builder0 instanceof JiveGeometryBuilder)) { ! log.error(element + " can't be traversed using " + builder0 + " builder"); ! return; ! } ! JiveGeometryBuilder builder = (JiveGeometryBuilder)builder0; ! // Verify element type ! if (! (element instanceof AGeometryType)) { ! log.error(element + " can't be traversed using " + getClass().getName() + " representation"); ! return; ! } // Set options Interacter.setOutlined(false); // Get element properties AGeometryType aGeometry = (AGeometryType)element; --- 62,81 ---- * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public final class AGeometry extends JiveRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set options Interacter.setOutlined(false); + // Set values + set(builder, tg, parent); + + // Verify element type + if (! (element instanceof AGeometryType)) { + log.error(element + " can't be traversed using " + getClass().getName() + " representation"); + return; + } + // Get element properties AGeometryType aGeometry = (AGeometryType)element; *************** *** 96,146 **** // Traverse all children and add their representations into branch - // TBD: simplify - BranchGroup branch = new BranchGroup();; - ABarrelCalorimeterType aBarrelCalorimeter; - AEndcapCalorimeterType aEndcapCalorimeter; - AGapCalorimeterType aGapCalorimeter; - ABarrelTRTDetectorType aBarrelTRTDetector; - AEndcapTRTDetectorType aEndcapTRTDetector; - ABarrelSiliconDetectorType aBarrelSiliconDetector; - AEndcapSiliconDetectorType aEndcapSiliconDetector; for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { ! // - AGeneralPath, ADisc, ARectangle ! // - ABarrelCalorimeter ! if (o instanceof ABarrelCalorimeterType) { ! aBarrelCalorimeter = (ABarrelCalorimeterType)o; ! (new ABarrelCalorimeter()).traverse(builder, aBarrelCalorimeter, branch, name); ! } ! // - AEndcapCalorimeter ! else if (o instanceof AEndcapCalorimeterType) { ! aEndcapCalorimeter = (AEndcapCalorimeterType)o; ! (new AEndcapCalorimeter()).traverse(builder, aEndcapCalorimeter, branch, name); ! } ! // - AGapCalorimeter ! else if (o instanceof AGapCalorimeterType) { ! aGapCalorimeter = (AGapCalorimeterType)o; ! (new AGapCalorimeter()).traverse(builder, aGapCalorimeter, branch, name); ! } ! // - ABarrelTRTDetector ! else if (o instanceof ABarrelTRTDetectorType) { ! aBarrelTRTDetector = (ABarrelTRTDetectorType)o; ! (new ABarrelTRTDetector()).traverse(builder, aBarrelTRTDetector, branch, name); ! } ! // - AEndcapTRTDetector ! else if (o instanceof AEndcapTRTDetectorType) { ! aEndcapTRTDetector = (AEndcapTRTDetectorType)o; ! (new AEndcapTRTDetector()).traverse(builder, aEndcapTRTDetector, branch, name); ! } ! // - ABarrelSiliconDetector ! else if (o instanceof ABarrelSiliconDetectorType) { ! aBarrelSiliconDetector = (ABarrelSiliconDetectorType)o; ! (new ABarrelSiliconDetector()).traverse(builder, aBarrelSiliconDetector, branch, name); ! } ! // - AEndcapSiliconDetector ! else if (o instanceof AEndcapSiliconDetectorType) { ! aEndcapSiliconDetector = (AEndcapSiliconDetectorType)o; ! (new AEndcapSiliconDetector()).traverse(builder, aEndcapSiliconDetector, branch, name); ! } ! // TBD } --- 89,94 ---- // Traverse all children and add their representations into branch for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { ! builder.traverse(o, branch, name); } Index: ABarrelCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelCalorimeter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ABarrelCalorimeter.java 23 Jan 2007 17:00:14 -0000 1.4 --- ABarrelCalorimeter.java 24 Jan 2007 17:00:41 -0000 1.5 *************** *** 19,25 **** import javax.media.j3d.Appearance; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.PI; --- 19,22 ---- *************** *** 36,39 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.5 2007/01/24 17:00:41 hrivnac + * migrated to JAXB 2.0, simplified + * * Revision 1.4 2007/01/23 17:00:14 hrivnac * TRT and Silicons added *************** *** 54,71 **** public final class ABarrelCalorimeter extends JiveRep { ! public final void traverse(JiveGeometryBuilder builder, ABarrelCalorimeterType aBarrelCalorimeter, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties String color = aBarrelCalorimeter.getC(); String name = aBarrelCalorimeter.getN(); int sampling = aBarrelCalorimeter.getSampling(); int region = aBarrelCalorimeter.getRegion(); ! double rMin = aBarrelCalorimeter.getRMin() / builder.norm(); ! double rMax = aBarrelCalorimeter.getRMax() / builder.norm(); ! double zMin = aBarrelCalorimeter.getZMin() / builder.norm(); ! double zMax = aBarrelCalorimeter.getZMax() / builder.norm(); double phi0 = toRadians(aBarrelCalorimeter.getPhi0()); int nPhi = aBarrelCalorimeter.getNphi(); --- 54,78 ---- public final class ABarrelCalorimeter extends JiveRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); + // Verify element type + if (! (element instanceof ABarrelCalorimeterType)) { + log.error(element + " can't be traversed using " + getClass().getName() + " representation"); + return; + } + // Get element properties + ABarrelCalorimeterType aBarrelCalorimeter = (ABarrelCalorimeterType)element; String color = aBarrelCalorimeter.getC(); String name = aBarrelCalorimeter.getN(); int sampling = aBarrelCalorimeter.getSampling(); int region = aBarrelCalorimeter.getRegion(); ! double rMin = aBarrelCalorimeter.getRMin() / builder().norm(); ! double rMax = aBarrelCalorimeter.getRMax() / builder().norm(); ! double zMin = aBarrelCalorimeter.getZMin() / builder().norm(); ! double zMax = aBarrelCalorimeter.getZMax() / builder().norm(); double phi0 = toRadians(aBarrelCalorimeter.getPhi0()); int nPhi = aBarrelCalorimeter.getNphi(); Index: AEndcapCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapCalorimeter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AEndcapCalorimeter.java 23 Jan 2007 17:00:14 -0000 1.3 --- AEndcapCalorimeter.java 24 Jan 2007 17:00:42 -0000 1.4 *************** *** 19,25 **** import javax.media.j3d.Appearance; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.PI; --- 19,22 ---- *************** *** 36,39 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/24 17:00:42 hrivnac + * migrated to JAXB 2.0, simplified + * * Revision 1.3 2007/01/23 17:00:14 hrivnac * TRT and Silicons added *************** *** 51,68 **** public final class AEndcapCalorimeter extends JiveRep { ! public final void traverse(JiveGeometryBuilder builder, AEndcapCalorimeterType aEndcapCalorimeter, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties String color = aEndcapCalorimeter.getC(); String name = aEndcapCalorimeter.getN(); int sampling = aEndcapCalorimeter.getSampling(); int region = aEndcapCalorimeter.getRegion(); ! double rMin = aEndcapCalorimeter.getRMin() / builder.norm(); ! double rMax = aEndcapCalorimeter.getRMax() / builder.norm(); ! double zMin = aEndcapCalorimeter.getZMin() / builder.norm(); ! double zMax = aEndcapCalorimeter.getZMax() / builder.norm(); double phi0 = toRadians(aEndcapCalorimeter.getPhi0()); int nPhi = aEndcapCalorimeter.getNphi(); --- 51,75 ---- public final class AEndcapCalorimeter extends JiveRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); + + // Verify element type + if (! (element instanceof AEndcapCalorimeterType)) { + log.error(element + " can't be traversed using " + getClass().getName() + " representation"); + return; + } // Get element properties + AEndcapCalorimeterType aEndcapCalorimeter = (AEndcapCalorimeterType)element; String color = aEndcapCalorimeter.getC(); String name = aEndcapCalorimeter.getN(); int sampling = aEndcapCalorimeter.getSampling(); int region = aEndcapCalorimeter.getRegion(); ! double rMin = aEndcapCalorimeter.getRMin() / builder().norm(); ! double rMax = aEndcapCalorimeter.getRMax() / builder().norm(); ! double zMin = aEndcapCalorimeter.getZMin() / builder().norm(); ! double zMax = aEndcapCalorimeter.getZMax() / builder().norm(); double phi0 = toRadians(aEndcapCalorimeter.getPhi0()); int nPhi = aEndcapCalorimeter.getNphi(); Index: AGapCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGapCalorimeter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AGapCalorimeter.java 23 Jan 2007 17:00:14 -0000 1.2 --- AGapCalorimeter.java 24 Jan 2007 17:00:42 -0000 1.3 *************** *** 19,25 **** import javax.media.j3d.Appearance; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.PI; --- 19,22 ---- *************** *** 36,39 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/24 17:00:42 hrivnac + * migrated to JAXB 2.0, simplified + * * Revision 1.2 2007/01/23 17:00:14 hrivnac * TRT and Silicons added *************** *** 48,65 **** public final class AGapCalorimeter extends JiveRep { ! public final void traverse(JiveGeometryBuilder builder, AGapCalorimeterType aGapCalorimeter, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties String color = aGapCalorimeter.getC(); String name = aGapCalorimeter.getN(); int sampling = aGapCalorimeter.getSampling(); int region = aGapCalorimeter.getRegion(); ! double rMin = aGapCalorimeter.getRMin() / builder.norm(); ! double rMax = aGapCalorimeter.getRMax() / builder.norm(); ! double zMin = aGapCalorimeter.getZMin() / builder.norm(); ! double zMax = aGapCalorimeter.getZMax() / builder.norm(); double phi0 = toRadians(aGapCalorimeter.getPhi0()); int nPhi = aGapCalorimeter.getNphi(); --- 48,72 ---- public final class AGapCalorimeter extends JiveRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); + // Verify element type + if (! (element instanceof AGapCalorimeterType)) { + log.error(element + " can't be traversed using " + getClass().getName() + " representation"); + return; + } + // Get element properties + AGapCalorimeterType aGapCalorimeter = (AGapCalorimeterType)element; String color = aGapCalorimeter.getC(); String name = aGapCalorimeter.getN(); int sampling = aGapCalorimeter.getSampling(); int region = aGapCalorimeter.getRegion(); ! double rMin = aGapCalorimeter.getRMin() / builder().norm(); ! double rMax = aGapCalorimeter.getRMax() / builder().norm(); ! double zMin = aGapCalorimeter.getZMin() / builder().norm(); ! double zMax = aGapCalorimeter.getZMax() / builder().norm(); double phi0 = toRadians(aGapCalorimeter.getPhi0()); int nPhi = aGapCalorimeter.getNphi(); Index: AEndcapSiliconDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapSiliconDetector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AEndcapSiliconDetector.java 23 Jan 2007 17:00:14 -0000 1.1 --- AEndcapSiliconDetector.java 24 Jan 2007 17:00:42 -0000 1.2 *************** *** 19,25 **** import javax.media.j3d.Appearance; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.PI; --- 19,22 ---- *************** *** 39,42 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/24 17:00:42 hrivnac + * migrated to JAXB 2.0, simplified + * * Revision 1.1 2007/01/23 17:00:14 hrivnac * TRT and Silicons added *************** *** 48,70 **** public final class AEndcapSiliconDetector extends JiveRep { ! public final void traverse(JiveGeometryBuilder builder, AEndcapSiliconDetectorType AEndcapSiliconDetector, Group tg, String parent) { // Set values set(builder, tg, parent); ! // Get element properties ! String color = AEndcapSiliconDetector.getC(); ! String name = AEndcapSiliconDetector.getN(); ! int layer = AEndcapSiliconDetector.getLayer(); ! double length = AEndcapSiliconDetector.getLength() / builder.norm(); ! double width = AEndcapSiliconDetector.getWidth() / builder.norm(); ! double thickness = AEndcapSiliconDetector.getThickness() / builder.norm(); ! double rMin = AEndcapSiliconDetector.getRMin() / builder.norm(); ! double rMax = AEndcapSiliconDetector.getRMax() / builder.norm(); ! double phi0 = AEndcapSiliconDetector.getPhi0() / builder.norm(); ! double zMin = AEndcapSiliconDetector.getZMin() / builder.norm(); ! double zMax = AEndcapSiliconDetector.getZMax() / builder.norm(); ! int nZ = AEndcapSiliconDetector.getNz(); ! int nPhi = AEndcapSiliconDetector.getNphi(); double dZ = (zMax - zMin) / nZ; double dPhi = 2.0 * PI / nPhi; --- 48,77 ---- public final class AEndcapSiliconDetector extends JiveRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); ! // Verify element type ! if (! (element instanceof AEndcapSiliconDetectorType)) { ! log.error(element + " can't be traversed using " + getClass().getName() + " representation"); ! return; ! } ! ! // Get element properties ! AEndcapSiliconDetectorType aEndcapSiliconDetector = (AEndcapSiliconDetectorType)element; ! String color = aEndcapSiliconDetector.getC(); ! String name = aEndcapSiliconDetector.getN(); ! int layer = aEndcapSiliconDetector.getLayer(); ! double length = aEndcapSiliconDetector.getLength() / builder().norm(); ! double width = aEndcapSiliconDetector.getWidth() / builder().norm(); ! double thickness = aEndcapSiliconDetector.getThickness() / builder().norm(); ! double rMin = aEndcapSiliconDetector.getRMin() / builder().norm(); ! double rMax = aEndcapSiliconDetector.getRMax() / builder().norm(); ! double phi0 = aEndcapSiliconDetector.getPhi0() / builder().norm(); ! double zMin = aEndcapSiliconDetector.getZMin() / builder().norm(); ! double zMax = aEndcapSiliconDetector.getZMax() / builder().norm(); ! int nZ = aEndcapSiliconDetector.getNz(); ! int nPhi = aEndcapSiliconDetector.getNphi(); double dZ = (zMax - zMin) / nZ; double dPhi = 2.0 * PI / nPhi; |
|
From: Julius H. <hr...@us...> - 2007-01-24 17:00:48
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25491/net/hep/atlas/graphics/JiveGeometry/Test/data Modified Files: AGeometry.xml Log Message: migrated to JAXB 2.0, simplified Index: AGeometry.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometry.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AGeometry.xml 24 Jan 2007 14:00:36 -0000 1.3 --- AGeometry.xml 24 Jan 2007 17:00:43 -0000 1.4 *************** *** 32,36 **** <ABarrelTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="86.9559" rMax="107.232" phiIn="-6.00171" phiOut="-10.9221" zMin="-70.975" zMax="70.975" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="84.425" zMax="97.125" /> ! <AEndcapTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="98.975" zMax="111.675" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="113.525" zMax="126.225" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="3" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="128.075" zMax="140.775" /> --- 32,36 ---- <ABarrelTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="86.9559" rMax="107.232" phiIn="-6.00171" phiOut="-10.9221" zMin="-70.975" zMax="70.975" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="84.425" zMax="97.125" /> ! <AEndcapTRTDetector c="TRTElement" n="TRT" layer="1" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="98.975" zMax="111.675" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="113.525" zMax="126.225" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="3" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="128.075" zMax="140.775" /> |
|
From: Julius H. <hr...@us...> - 2007-01-24 17:00:48
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25491/net/hep/atlas/graphics/JiveGeometry/Test Modified Files: GeometricModel.java JAXB.java Log Message: migrated to JAXB 2.0, simplified Index: JAXB.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/JAXB.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JAXB.java 16 Jan 2007 14:44:36 -0000 1.3 --- JAXB.java 24 Jan 2007 17:00:43 -0000 1.4 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/24 17:00:43 hrivnac + * migrated to JAXB 2.0, simplified + * * Revision 1.3 2007/01/16 14:44:36 hrivnac * better xsd, AGeneralPath visible *************** *** 43,47 **** JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveGeometry.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! u.setValidating(true); log.info("Opening " + args[0]); // Get geometry --- 46,50 ---- JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveGeometry.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! //u.setValidating(true); TBD log.info("Opening " + args[0]); // Get geometry Index: GeometricModel.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/GeometricModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GeometricModel.java 16 Jan 2007 14:44:36 -0000 1.3 --- GeometricModel.java 24 Jan 2007 17:00:43 -0000 1.4 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/24 17:00:43 hrivnac + * migrated to JAXB 2.0, simplified + * * Revision 1.3 2007/01/16 14:44:36 hrivnac * better xsd, AGeneralPath visible *************** *** 43,47 **** JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveGeometry.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! u.setValidating(true); log.info("Opening " + args[0]); // Get geometry --- 46,50 ---- JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveGeometry.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! //u.setValidating(true); TBD log.info("Opening " + args[0]); // Get geometry |
|
From: Julius H. <hr...@us...> - 2007-01-24 17:00:45
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/JAXB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25491/net/hep/atlas/graphics/JiveGeometry/JAXB Modified Files: JiveGeometry.xjs Log Message: migrated to JAXB 2.0, simplified Index: JiveGeometry.xjs =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/JAXB/JiveGeometry.xjs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JiveGeometry.xjs 16 Jan 2007 14:44:35 -0000 1.2 --- JiveGeometry.xjs 24 Jan 2007 17:00:42 -0000 1.3 *************** *** 7,10 **** --- 7,13 ---- <!-- $Log$ + Revision 1.3 2007/01/24 17:00:42 hrivnac + migrated to JAXB 2.0, simplified + Revision 1.2 2007/01/16 14:44:35 hrivnac better xsd, AGeneralPath visible *************** *** 23,33 **** <jaxb:bindings schemaLocation="../Schema/AGeometry.xsd" node="/xs:schema"> <jaxb:schemaBindings> ! <!-- <jaxb:nameXmlTransform> ! <jaxb:elementName suffix="Rep"/> ! <jaxb:typeName suffix="Rep"/> ! <jaxb:modelGroupName suffix="Rep"/> ! </jaxb:nameXmlTransform> ! --> </jaxb:schemaBindings> </jaxb:bindings> --- 26,36 ---- <jaxb:bindings schemaLocation="../Schema/AGeometry.xsd" node="/xs:schema"> <jaxb:schemaBindings> ! <jaxb:package name="net.hep.atlas.graphics.JiveGeometry.JAXB"/> <jaxb:nameXmlTransform> ! <!--jaxb:typeName suffix="Type"/--> ! <jaxb:anonymousTypeName suffix="Type"/> ! <jaxb:elementName suffix="Type"/> ! <jaxb:modelGroupName suffix="Group"/> ! </jaxb:nameXmlTransform> </jaxb:schemaBindings> </jaxb:bindings> |
|
From: Julius H. <hr...@us...> - 2007-01-24 16:59:49
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25046 Modified Files: build.xml Log Message: migrated to JAXB 2.0 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** build.xml 14 Jan 2007 21:47:06 -0000 1.12 --- build.xml 24 Jan 2007 16:59:44 -0000 1.13 *************** *** 32,43 **** <pathelement path="${JiveEvent.core}"/> <pathelement path="${JiveGeometry.core}"/> ! <pathelement path="${JAXP.api}"/> ! <pathelement path="${JAXB.api}"/> ! <pathelement path="${JAXB.libs}"/> ! <pathelement path="${JAXB.impl}"/> ! <pathelement path="${JAXB.xjc}"/> <pathelement path="${JWSDP.namespace}"/> <pathelement path="${JWSDP.relax}"/> <pathelement path="${JWSDP.qname}"/> <pathelement path="${JWSDP.xsd}"/> <pathelement path="${CLASSPATH}"/> --- 32,45 ---- <pathelement path="${JiveEvent.core}"/> <pathelement path="${JiveGeometry.core}"/> ! <pathelement path="${JAXP-2.0.api}"/> ! <pathelement path="${JAXB-2.0.api}"/> ! <pathelement path="${JAXB-2.0.libs}"/> ! <pathelement path="${JAXB-2.0.impl}"/> ! <pathelement path="${JAXB-2.0.xjc}"/> ! <pathelement path="${JWSDP.activation}"/> <pathelement path="${JWSDP.namespace}"/> <pathelement path="${JWSDP.relax}"/> <pathelement path="${JWSDP.qname}"/> + <pathelement path="${JWSDP.jsr173}"/> <pathelement path="${JWSDP.xsd}"/> <pathelement path="${CLASSPATH}"/> *************** *** 88,99 **** <fileset file="${JiveEvent.core}"/> <fileset file="${JiveGeometry.core}"/> ! <fileset file="${JAXP.api}"/> ! <fileset file="${JAXB.api}"/> ! <fileset file="${JAXB.libs}"/> ! <fileset file="${JAXB.impl}"/> ! <fileset file="${JAXB.xjc}"/> <fileset file="${JWSDP.namespace}"/> <fileset file="${JWSDP.relax}"/> <fileset file="${JWSDP.qname}"/> <fileset file="${JWSDP.xsd}"/> <fileset dir="${Java3D.libdir}"/> --- 90,103 ---- <fileset file="${JiveEvent.core}"/> <fileset file="${JiveGeometry.core}"/> ! <fileset file="${JAXP-2.0.api}"/> ! <fileset file="${JAXB-2.0.api}"/> ! <fileset file="${JAXB-2.0.libs}"/> ! <fileset file="${JAXB-2.0.impl}"/> ! <fileset file="${JAXB-2.0.xjc}"/> ! <fileset file="${JWSDP.activation}"/> <fileset file="${JWSDP.namespace}"/> <fileset file="${JWSDP.relax}"/> <fileset file="${JWSDP.qname}"/> + <fileset file="${JWSDP.jsr173}"/> <fileset file="${JWSDP.xsd}"/> <fileset dir="${Java3D.libdir}"/> |
|
From: Julius H. <hr...@us...> - 2007-01-24 16:59:33
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25011 Modified Files: GraXML.jnlp Log Message: migrated to JAXB 2.0 Index: GraXML.jnlp =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXML.jnlp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GraXML.jnlp 18 Jan 2007 15:29:21 -0000 1.4 --- GraXML.jnlp 24 Jan 2007 16:59:25 -0000 1.5 *************** *** 34,37 **** --- 34,39 ---- <jar href="xml-apis.jar"/> <jar href="xsdlib.jar"/> + <jar href="activation.jar"/> + <jar href="jsr173_api.jar"/> <extension href="http://download.java.net/media/java3d/webstart/release/java3d-1.3-latest.jnlp"/> <extension href="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML-JAXB.jnlp"/> |
|
From: Julius H. <hr...@us...> - 2007-01-24 16:59:30
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25011/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Log Message: migrated to JAXB 2.0 Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Guide.html 18 Jan 2007 16:05:00 -0000 1.18 --- Guide.html 24 Jan 2007 16:59:25 -0000 1.19 *************** *** 927,930 **** --- 927,931 ---- <li>Several files can be loaded into the same screen.</li> <li>Clean button added.</li> + <li>Migrated to JAXB 2.0.</li> </ul> <li>Bug fixes:</li> |
|
From: Julius H. <hr...@us...> - 2007-01-24 16:59:27
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25011/net/hep/graphics/GraXML Modified Files: GraXMLJAXBRep.java MasterBuilder.java Log Message: migrated to JAXB 2.0 Index: GraXMLJAXBRep.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GraXMLJAXBRep.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GraXMLJAXBRep.java 30 Mar 2005 20:35:43 -0000 1.2 --- GraXMLJAXBRep.java 24 Jan 2007 16:59:25 -0000 1.3 *************** *** 11,14 **** --- 11,17 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/24 16:59:25 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2005/03/30 20:35:43 hrivnac * custom exporters enabled *************** *** 39,48 **** * @param builder The {@link MasterBuilder} passed arround. It manages * common objects shared by several {@link GraXMLRep}s. ! * @param element The XML JAXB {@link Element} to be analysed. * @param tg The {@link Group} to which current reprsentation will be * attached. * @param parent The name of the parent representation. */ public void traverse(MasterBuilder builder, ! Element element, Group tg, String parent); --- 42,51 ---- * @param builder The {@link MasterBuilder} passed arround. It manages * common objects shared by several {@link GraXMLRep}s. ! * @param element The XML JAXB Element to be analysed. * @param tg The {@link Group} to which current reprsentation will be * attached. * @param parent The name of the parent representation. */ public void traverse(MasterBuilder builder, ! Object element, Group tg, String parent); Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MasterBuilder.java 16 Jan 2007 14:48:12 -0000 1.11 --- MasterBuilder.java 24 Jan 2007 16:59:25 -0000 1.12 *************** *** 61,64 **** --- 61,67 ---- * <pre> * $Log$ + * Revision 1.12 2007/01/24 16:59:25 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.11 2007/01/16 14:48:12 hrivnac * JiveGeometry added *************** *** 246,250 **** long time = System.currentTimeMillis(); if (jaxb() != null) { ! javax.xml.bind.Element element = null; try { // Get Parser Factory --- 249,253 ---- long time = System.currentTimeMillis(); if (jaxb() != null) { ! Object element = null; try { // Get Parser Factory *************** *** 272,276 **** Unmarshaller u = jc.createUnmarshaller(); u.setValidating(true); ! element = (javax.xml.bind.Element)(u.unmarshal(source)); } catch (SAXNotRecognizedException e) { --- 275,279 ---- Unmarshaller u = jc.createUnmarshaller(); u.setValidating(true); ! element = u.unmarshal(source); } catch (SAXNotRecognizedException e) { *************** *** 337,341 **** long time = System.currentTimeMillis(); if (jaxb() != null) { ! javax.xml.bind.Element element = null; try { // Get Parser Factory --- 340,344 ---- long time = System.currentTimeMillis(); if (jaxb() != null) { ! Object element = null; try { // Get Parser Factory *************** *** 363,368 **** JAXBContext jc = JAXBContext.newInstance(jaxb()); Unmarshaller u = jc.createUnmarshaller(); ! u.setValidating(true); ! element = (javax.xml.bind.Element)(u.unmarshal(source)); } catch (SAXNotRecognizedException e) { --- 366,371 ---- JAXBContext jc = JAXBContext.newInstance(jaxb()); Unmarshaller u = jc.createUnmarshaller(); ! //u.setValidating(true); TBD ! element = u.unmarshal(source); } catch (SAXNotRecognizedException e) { *************** *** 409,418 **** /** Dispatch traversing of JAXB Generic Model. ! * @param element The XML JAXB {@link Element} to be analysed. * @param tg The {@link Group} to which current reprsentation will be * attached. * @param parent The name of the parent representation. * @throws GraXMLException If element can't be traversed. */ ! public void traverse(javax.xml.bind.Element element, Group tg, String parent) { // Count --- 412,421 ---- /** Dispatch traversing of JAXB Generic Model. ! * @param element The XML JAXB Element to be analysed. * @param tg The {@link Group} to which current reprsentation will be * attached. * @param parent The name of the parent representation. * @throws GraXMLException If element can't be traversed. */ ! public void traverse(Object element, Group tg, String parent) { // Count *************** *** 427,431 **** // Get Element name String elementName = element.getClass().getName(); ! // <packageName>.<elementName>Impl -> <elementName> elementName = elementName.substring(elementName.lastIndexOf(".") + 1, elementName.length() - 4); // - Map nested classes into normal classes --- 430,434 ---- // Get Element name String elementName = element.getClass().getName(); ! // <packageName>.<elementName>Type -> <elementName> elementName = elementName.substring(elementName.lastIndexOf(".") + 1, elementName.length() - 4); // - Map nested classes into normal classes |
