[GraXML-commit] DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps AGDD.java, 1.1, 1.2 AGDDaddelement.ja
Brought to you by:
hrivnac
Menu
▾
▴
[GraXML-commit] DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps AGDD.java, 1.1, 1.2 AGDDaddelement.java, 1.1, 1.2 AGDDelement.java, 1.1, 1.2 AGDDmaterial.java, 1.1, 1.2 AGDDmedium.java, 1.2, 1.3 Array.java, 1.1, 1.2 Box.java, 1.3, 1.4 Composition.java, 1.2, 1.3 Cons.java, 1.1, 1.2 Foreach.java, 1.1, 1.2 MposPhi.java, 1.1, 1.2 MposR.java, 1.1, 1.2 MposWedge.java, 1.1, 1.2 MposX.java, 1.1, 1.2 MposY.java, 1.1, 1.2 MposZ.java, 1.1, 1.2 Para.java, 1.2, 1.3 Pcon.java, 1.2, 1.3 PosRPhiZ.java, 1.1, 1.2 PosXYZ.java, 1.1, 1.2 Section.java, 1.1, 1.2 Table.java, 1.1, 1.2 Trap.java, 1.2, 1.3 Trd.java, 1.2, 1.3 Tubs.java, 1.1, 1.2 Var.java, 1.1, 1.2
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6820/net/hep/AGDD/TGeoModel/Reps Modified Files: AGDD.java AGDDaddelement.java AGDDelement.java AGDDmaterial.java AGDDmedium.java Array.java Box.java Composition.java Cons.java Foreach.java MposPhi.java MposR.java MposWedge.java MposX.java MposY.java MposZ.java Para.java Pcon.java PosRPhiZ.java PosXYZ.java Section.java Table.java Trap.java Trd.java Tubs.java Var.java Log Message: migrated to JAXB 2.0 Index: Trd.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Trd.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Trd.java 9 Feb 2006 20:09:47 -0000 1.2 --- Trd.java 25 Jan 2007 18:40:14 -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 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2006/02/09 20:09:47 starxml * Updated the code for better structure. Para and Trap still not functional. *************** *** 47,51 **** public final class Trd extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { setBuilder(builder); // Verify and set builder type --- 47,51 ---- public final class Trd extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { setBuilder(builder); // Verify and set builder type *************** *** 61,66 **** // not used: trd.isSensitive(); ! String lUnit = trd.getUnitLength(); ! String aUnit = trd.getUnitAngle(); float[] xmpympz = evaluator.valueOf(trd.getXmpYmpZ(), lUnit); --- 61,66 ---- // not used: trd.isSensitive(); ! String lUnit = trd.getUnitLength().value(); ! String aUnit = trd.getUnitAngle().value(); float[] xmpympz = evaluator.valueOf(trd.getXmpYmpZ(), lUnit); Index: Section.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Section.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Section.java 8 Feb 2006 22:31:18 -0000 1.1 --- Section.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 18,24 **** import javax.media.j3d.BranchGroup; - // 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 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 65,69 **** private TGeoAGDDBuilder _builder; ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { setBuilder(builder); --- 65,69 ---- private TGeoAGDDBuilder _builder; ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { setBuilder(builder); *************** *** 96,116 **** List volumes0 = ((BuildingBlockType)o).getAbstractSolidOrAbstractStackOrAbstractBooleanVolume(); for (Object o0 : volumes0) { ! if (o0 instanceof Data && o0 instanceof Element) { ! builder.traverse((Element)o0, branch, name); } } } // -- directly ! else if (o instanceof Data && o instanceof Element) { ! builder.traverse((Element)o, branch, name); } } // - TopVolume ! Object top = section.getTopVolume(); ! ! if (top instanceof Element) { ! builder.traverse((Element)top, branch, name); ! } // Register BranchGroup into Connections database --- 96,112 ---- List volumes0 = ((BuildingBlockType)o).getAbstractSolidOrAbstractStackOrAbstractBooleanVolume(); for (Object o0 : volumes0) { ! if (o0 instanceof Data) { ! builder.traverse(o0, branch, name); } } } // -- directly ! else if (o instanceof Data) { ! builder.traverse(o, branch, name); } } // - TopVolume ! builder.traverse(section.getTopVolume(), branch, name); // Register BranchGroup into Connections database Index: Tubs.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Tubs.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Tubs.java 8 Feb 2006 22:31:18 -0000 1.1 --- Tubs.java 25 Jan 2007 18:40:14 -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 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 47,51 **** public final class Tubs extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 47,51 ---- public final class Tubs extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type *************** *** 63,68 **** TubsType tubs = (TubsType)element; // not used: tubs.isSensitive(); ! String lUnit = tubs.getUnitLength(); ! String aUnit = tubs.getUnitAngle(); float[] rioz = evaluator.valueOf(tubs.getRioZ(), lUnit); float[] profile = evaluator.valueOf(tubs.getProfile(),aUnit); --- 63,68 ---- TubsType tubs = (TubsType)element; // not used: tubs.isSensitive(); ! String lUnit = tubs.getUnitLength().value(); ! String aUnit = tubs.getUnitAngle().value(); float[] rioz = evaluator.valueOf(tubs.getRioZ(), lUnit); float[] profile = evaluator.valueOf(tubs.getProfile(),aUnit); Index: MposX.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/MposX.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MposX.java 8 Feb 2006 22:31:18 -0000 1.1 --- MposX.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 1,5 **** package net.hep.AGDD.TGeoModel.Reps; - import net.hep.AGDD.JAXB.impl.*; import net.hep.AGDD.TGeoModel.TGeoAGDDBuilder; --- 1,4 ---- *************** *** 26,32 **** import javax.vecmath.Matrix3d; - // 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 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 53,57 **** public final class MposX extends Positioner { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 52,56 ---- public final class MposX extends Positioner { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type *************** *** 67,72 **** Evaluator evaluator = (builder()).evaluator(); MposXType pos = (MposXType)element; ! String lUnit = pos.getUnitLength(); ! String aUnit = pos.getUnitAngle(); float[] x0 = evaluator.valueOf(pos.getX0(), lUnit); float[] dx = evaluator.valueOf(pos.getDX(), lUnit); --- 66,71 ---- Evaluator evaluator = (builder()).evaluator(); MposXType pos = (MposXType)element; ! String lUnit = pos.getUnitLength().value(); ! String aUnit = pos.getUnitAngle().value(); float[] x0 = evaluator.valueOf(pos.getX0(), lUnit); float[] dx = evaluator.valueOf(pos.getDX(), lUnit); Index: Array.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Array.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Array.java 8 Feb 2006 22:31:18 -0000 1.1 --- Array.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 14,20 **** import javax.media.j3d.Group; - // 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 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 38,42 **** public final class Array implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Element element, Group tg, String parent) { // Verify builder type --- 38,42 ---- public final class Array implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Object element, Group tg, String parent) { // Verify builder type Index: MposR.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/MposR.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MposR.java 9 Feb 2006 19:25:54 -0000 1.1 --- MposR.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 23,29 **** import javax.vecmath.Matrix3d; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 23,26 ---- *************** *** 40,43 **** --- 37,43 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/09 19:25:54 starxml * *** empty log message *** *************** *** 55,59 **** public final class MposR extends Positioner { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 55,59 ---- public final class MposR extends Positioner { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type *************** *** 69,74 **** Evaluator evaluator = (builder()).evaluator(); MposRType pos = (MposRType)element; ! String lUnit = pos.getUnitLength(); ! String aUnit = pos.getUnitAngle(); String[] units = new String[2]; --- 69,74 ---- Evaluator evaluator = (builder()).evaluator(); MposRType pos = (MposRType)element; ! String lUnit = pos.getUnitLength().value(); ! String aUnit = pos.getUnitAngle().value(); String[] units = new String[2]; Index: PosRPhiZ.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/PosRPhiZ.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PosRPhiZ.java 8 Feb 2006 22:31:18 -0000 1.1 --- PosRPhiZ.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 23,29 **** import javax.vecmath.Matrix3d; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 23,26 ---- *************** *** 40,43 **** --- 37,43 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 52,56 **** public final class PosRPhiZ extends Positioner { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 52,56 ---- public final class PosRPhiZ extends Positioner { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type *************** *** 66,71 **** Evaluator evaluator = (builder()).evaluator(); PosRPhiZType pos = (PosRPhiZType)element; ! String lUnit = pos.getUnitLength(); ! String aUnit = pos.getUnitAngle(); String[] units = new String[3]; units[0] = lUnit; --- 66,71 ---- Evaluator evaluator = (builder()).evaluator(); PosRPhiZType pos = (PosRPhiZType)element; ! String lUnit = pos.getUnitLength().value(); ! String aUnit = pos.getUnitAngle().value(); String[] units = new String[3]; units[0] = lUnit; Index: Box.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Box.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Box.java 19 Sep 2006 18:48:52 -0000 1.3 --- Box.java 25 Jan 2007 18:40:14 -0000 1.4 *************** *** 6,11 **** // Generic Model import net.hep.AGDD.JAXB.BoxType; ! import net.hep.AGDD.JAXB.Material; ! import net.hep.AGDD.JAXB.Medium; // GraXML --- 6,11 ---- // Generic Model import net.hep.AGDD.JAXB.BoxType; ! import net.hep.AGDD.JAXB.MaterialType; ! import net.hep.AGDD.JAXB.MediumType; // GraXML *************** *** 24,30 **** import javax.media.j3d.BranchGroup; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 24,27 ---- *************** *** 36,39 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.3 2006/09/19 18:48:52 starxml * Waypoint checkin *************** *** 48,52 **** public final class Box extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { setBuilder(builder); // Verify and set builder type --- 48,52 ---- public final class Box extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { setBuilder(builder); // Verify and set builder type *************** *** 64,68 **** // not used: box.isSensitive(); ! String lUnit = box.getUnitLength(); float[] xyz = evaluator.valueOf(box.getXYZ(), lUnit); --- 64,68 ---- // not used: box.isSensitive(); ! String lUnit = box.getUnitLength().value(); float[] xyz = evaluator.valueOf(box.getXYZ(), lUnit); Index: Trap.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Trap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Trap.java 9 Feb 2006 20:09:47 -0000 1.2 --- Trap.java 25 Jan 2007 18:40:14 -0000 1.3 *************** *** 6,11 **** // Generic Model import net.hep.AGDD.JAXB.TrapType; ! import net.hep.AGDD.JAXB.Material; ! import net.hep.AGDD.JAXB.Medium; // GraXML --- 6,11 ---- // Generic Model import net.hep.AGDD.JAXB.TrapType; ! import net.hep.AGDD.JAXB.MaterialType; ! import net.hep.AGDD.JAXB.MediumType; // GraXML *************** *** 19,25 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 19,22 ---- *************** *** 31,34 **** --- 28,34 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2006/02/09 20:09:47 starxml * Updated the code for better structure. Para and Trap still not functional. *************** *** 49,53 **** public final class Trap extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 49,53 ---- public final class Trap extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type *************** *** 63,72 **** Evaluator evaluator = builder().evaluator(); TrapType trap = (TrapType)element; ! Medium med = (Medium) trap.getMedium(); ! Material mat = (Material) med.getMaterial(); // not used: trap.isSensitive(); ! String lUnit = trap.getUnitLength(); ! String aUnit = trap.getUnitAngle(); float[] xmumdpupdympz = evaluator.valueOf(trap.getXmumdpupdYmpZ(), lUnit); float[] inclination = evaluator.valueOf(trap.getInclination(), lUnit); --- 63,72 ---- Evaluator evaluator = builder().evaluator(); TrapType trap = (TrapType)element; ! MediumType med = (MediumType) trap.getMedium(); ! MaterialType mat = (MaterialType) med.getMaterial(); // not used: trap.isSensitive(); ! String lUnit = trap.getUnitLength().value(); ! String aUnit = trap.getUnitAngle().value(); float[] xmumdpupdympz = evaluator.valueOf(trap.getXmumdpupdYmpZ(), lUnit); float[] inclination = evaluator.valueOf(trap.getInclination(), lUnit); Index: Cons.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Cons.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Cons.java 8 Feb 2006 22:31:18 -0000 1.1 --- Cons.java 25 Jan 2007 18:40:14 -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 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 47,51 **** public final class Cons extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { setBuilder(builder); // Verify and set builder type --- 47,51 ---- public final class Cons extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { setBuilder(builder); // Verify and set builder type *************** *** 61,66 **** // not used: cons.isSensitive(); ! String lUnit = cons.getUnitLength(); ! String aUnit = cons.getUnitAngle(); float[] rio1rio2z = evaluator.valueOf(cons.getRio1Rio2Z(), lUnit); float[] profile = evaluator.valueOf(cons.getProfile(), aUnit); --- 61,66 ---- // not used: cons.isSensitive(); ! String lUnit = cons.getUnitLength().value(); ! String aUnit = cons.getUnitAngle().value(); float[] rio1rio2z = evaluator.valueOf(cons.getRio1Rio2Z(), lUnit); float[] profile = evaluator.valueOf(cons.getProfile(), aUnit); Index: AGDD.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/AGDD.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGDD.java 8 Feb 2006 22:31:18 -0000 1.1 --- AGDD.java 25 Jan 2007 18:40:13 -0000 1.2 *************** *** 15,21 **** import javax.media.j3d.BranchGroup; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 15,18 ---- *************** *** 30,33 **** --- 27,33 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:13 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 45,49 **** public final class AGDD implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { System.out.println("----------------- AGDD traversal"); --- 45,49 ---- public final class AGDD implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { System.out.println("----------------- AGDD traversal"); *************** *** 68,74 **** List sections = agdd.getMediaOrMaterialsOrColormap(); for (Object o : sections) { ! if (o instanceof Element && ! o instanceof SectionType) { ! builder.traverse((Element)o, branch, _name); } } --- 68,73 ---- List sections = agdd.getMediaOrMaterialsOrColormap(); for (Object o : sections) { ! if (o instanceof SectionType) { ! builder.traverse(o, branch, _name); } } Index: MposWedge.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/MposWedge.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MposWedge.java 9 Feb 2006 19:25:54 -0000 1.1 --- MposWedge.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 23,29 **** import javax.vecmath.Matrix3d; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 23,26 ---- *************** *** 41,44 **** --- 38,44 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/09 19:25:54 starxml * *** empty log message *** *************** *** 56,60 **** public final class MposWedge extends Positioner { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 56,60 ---- public final class MposWedge extends Positioner { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type *************** *** 70,75 **** Evaluator evaluator = (builder()).evaluator(); MposWedgeType pos = (MposWedgeType)element; ! String lUnit = pos.getUnitLength(); ! String aUnit = pos.getUnitAngle(); float[] phi0 = evaluator.valueOf(pos.getPhi0(), aUnit); float[] rz = evaluator.valueOf(pos.getRZ(), lUnit); --- 70,75 ---- Evaluator evaluator = (builder()).evaluator(); MposWedgeType pos = (MposWedgeType)element; ! String lUnit = pos.getUnitLength().value(); ! String aUnit = pos.getUnitAngle().value(); float[] phi0 = evaluator.valueOf(pos.getPhi0(), aUnit); float[] rz = evaluator.valueOf(pos.getRZ(), lUnit); Index: MposPhi.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/MposPhi.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MposPhi.java 8 Feb 2006 22:31:18 -0000 1.1 --- MposPhi.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 24,30 **** import javax.vecmath.Matrix3d; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 24,27 ---- *************** *** 42,45 **** --- 39,45 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 57,61 **** public final class MposPhi extends Positioner { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 57,61 ---- public final class MposPhi extends Positioner { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type *************** *** 71,76 **** Evaluator evaluator = (builder()).evaluator(); MposPhiType pos = (MposPhiType)element; ! String lUnit = pos.getUnitLength(); ! String aUnit = pos.getUnitAngle(); float[] ncopy = evaluator.valueOf(pos.getNcopy(), "1"); float[] phi0 = evaluator.valueOf(pos.getPhi0(), aUnit); --- 71,76 ---- Evaluator evaluator = (builder()).evaluator(); MposPhiType pos = (MposPhiType)element; ! String lUnit = pos.getUnitLength().value(); ! String aUnit = pos.getUnitAngle().value(); float[] ncopy = evaluator.valueOf(pos.getNcopy(), "1"); float[] phi0 = evaluator.valueOf(pos.getPhi0(), aUnit); Index: Foreach.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Foreach.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Foreach.java 8 Feb 2006 22:31:18 -0000 1.1 --- Foreach.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 18,24 **** import javax.media.j3d.BranchGroup; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 18,21 ---- *************** *** 34,37 **** --- 31,37 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 49,53 **** public final class Foreach implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Element element, Group tg, String parent) { // Verify builder type --- 49,53 ---- public final class Foreach implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Object element, Group tg, String parent) { // Verify builder type *************** *** 95,105 **** name = builder.name(index + "=" + i); for (Object o : volumes) { ! if (o instanceof Data && o instanceof Element) { ! builder.traverse((Element)o, branch, name); variables.add(evaluator.lastVariable()); } ! else if (o instanceof Element) { // builder.cxx("2"); ! builder.traverse((Element)o, branch, name); } } --- 95,105 ---- name = builder.name(index + "=" + i); for (Object o : volumes) { ! if (o instanceof Data) { ! builder.traverse(o, branch, name); variables.add(evaluator.lastVariable()); } ! else { // builder.cxx("2"); ! builder.traverse(o, branch, name); } } Index: Pcon.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Pcon.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Pcon.java 19 Sep 2006 18:48:52 -0000 1.2 --- Pcon.java 25 Jan 2007 18:40:14 -0000 1.3 *************** *** 7,12 **** import net.hep.AGDD.JAXB.PconType; import net.hep.AGDD.JAXB.PolyplaneType; ! import net.hep.AGDD.JAXB.Material; ! import net.hep.AGDD.JAXB.Medium; // GraXML --- 7,12 ---- import net.hep.AGDD.JAXB.PconType; import net.hep.AGDD.JAXB.PolyplaneType; ! import net.hep.AGDD.JAXB.MaterialType; ! import net.hep.AGDD.JAXB.MediumType; // GraXML *************** *** 20,26 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 20,23 ---- *************** *** 35,38 **** --- 32,38 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2006/09/19 18:48:52 starxml * Waypoint checkin *************** *** 56,60 **** public final class Pcon extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 56,60 ---- public final class Pcon extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type *************** *** 71,76 **** PconType pcon = (PconType)element; // not used: pcon.isSensitive(); ! String lUnit = pcon.getUnitLength(); ! String aUnit = pcon.getUnitAngle(); float[] profile = evaluator.valueOf(pcon.getProfile(), aUnit); String name0 = pcon.getName(); --- 71,76 ---- PconType pcon = (PconType)element; // not used: pcon.isSensitive(); ! String lUnit = pcon.getUnitLength().value(); ! String aUnit = pcon.getUnitAngle().value(); float[] profile = evaluator.valueOf(pcon.getProfile(), aUnit); String name0 = pcon.getName(); Index: Para.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Para.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Para.java 9 Feb 2006 20:09:47 -0000 1.2 --- Para.java 25 Jan 2007 18:40:14 -0000 1.3 *************** *** 17,23 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Java import static java.lang.Math.atan; --- 17,20 ---- *************** *** 35,38 **** --- 32,38 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2006/02/09 20:09:47 starxml * Updated the code for better structure. Para and Trap still not functional. *************** *** 53,57 **** public final class Para extends Solid { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { setBuilder(builder); // Verify and set builder type --- 53,57 ---- public final class Para extends Solid { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { setBuilder(builder); // Verify and set builder type *************** *** 66,71 **** ParaType para = (ParaType)element; // not used: para.isSensitive(); ! String lUnit = para.getUnitLength(); ! String aUnit = para.getUnitAngle(); float[] xyz = evaluator.valueOf(para.getXYZ(), lUnit); --- 66,71 ---- ParaType para = (ParaType)element; // not used: para.isSensitive(); ! String lUnit = para.getUnitLength().value(); ! String aUnit = para.getUnitAngle().value(); float[] xyz = evaluator.valueOf(para.getXYZ(), lUnit); Index: Composition.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Composition.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Composition.java 19 Sep 2006 18:48:52 -0000 1.2 --- Composition.java 25 Jan 2007 18:40:14 -0000 1.3 *************** *** 18,24 **** import javax.media.j3d.BranchGroup; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 18,21 ---- *************** *** 34,37 **** --- 31,37 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2006/09/19 18:48:52 starxml * Waypoint checkin *************** *** 55,59 **** public final class Composition implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Element element, Group tg, String parent) { // Verify builder type --- 55,59 ---- public final class Composition implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Object element, Group tg, String parent) { // Verify builder type *************** *** 80,85 **** // - Envelope Object envelope = composition.getEnvelope(); ! if (envelope instanceof Element) { ! builder.traverse((Element)envelope, branch, name); // Capture the name: if (envelope instanceof net.hep.AGDD.JAXB.VolumeInstance) { --- 80,85 ---- // - Envelope Object envelope = composition.getEnvelope(); ! if (envelope != null) { ! builder.traverse(envelope, branch, name); // Capture the name: if (envelope instanceof net.hep.AGDD.JAXB.VolumeInstance) { *************** *** 99,108 **** for (Object o : volumes) { ! if (o instanceof Data && o instanceof Element) { ! builder.traverse((Element)o, branch, name); variables.add(evaluator.lastVariable()); } ! else if (o instanceof Element) { ! builder.traverse((Element)o, branch, name); } } --- 99,108 ---- for (Object o : volumes) { ! if (o instanceof Data) { ! builder.traverse(o, branch, name); variables.add(evaluator.lastVariable()); } ! else { ! builder.traverse(o, branch, name); } } Index: Table.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Table.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Table.java 8 Feb 2006 22:31:18 -0000 1.1 --- Table.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 15,21 **** import javax.media.j3d.Group; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 15,18 ---- *************** *** 30,33 **** --- 27,33 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 42,46 **** public final class Table implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Element element, Group tg, String parent) { // Verify builder type --- 42,46 ---- public final class Table implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Object element, Group tg, String parent) { // Verify builder type Index: AGDDmedium.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/AGDDmedium.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AGDDmedium.java 19 Sep 2006 18:48:52 -0000 1.2 --- AGDDmedium.java 25 Jan 2007 18:40:14 -0000 1.3 *************** *** 4,12 **** // Generic Model ! import net.hep.AGDD.JAXB.Material; ! import net.hep.AGDD.JAXB.Medium; ! ! // JAXB ! import javax.xml.bind.Element; // Log4J --- 4,9 ---- // Generic Model ! import net.hep.AGDD.JAXB.MaterialType; ! import net.hep.AGDD.JAXB.MediumType; // Log4J *************** *** 22,25 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2006/09/19 18:48:52 starxml * Waypoint checkin *************** *** 34,46 **** * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public final class AGDDmedium implements net.hep.AGDD.JAXB.Medium { public AGDDmedium() { } ! public AGDDmedium(Element e) { net.hep.AGDD.JAXB.Solid jaxbSolid = (net.hep.AGDD.JAXB.Solid)e; ! Medium medium = (net.hep.AGDD.JAXB.Medium) jaxbSolid.getMedium(); setName (medium.getName()); --- 34,46 ---- * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public final class AGDDmedium extends net.hep.AGDD.JAXB.MediumType { public AGDDmedium() { } ! public AGDDmedium(Object e) { net.hep.AGDD.JAXB.Solid jaxbSolid = (net.hep.AGDD.JAXB.Solid)e; ! MediumType medium = (net.hep.AGDD.JAXB.MediumType) jaxbSolid.getMedium(); setName (medium.getName()); Index: AGDDmaterial.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/AGDDmaterial.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGDDmaterial.java 8 Feb 2006 22:31:18 -0000 1.1 --- AGDDmaterial.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 4,15 **** // Generic Model ! import net.hep.AGDD.JAXB.Material; ! import net.hep.AGDD.JAXB.Medium; // import net.hep.AGDD.JAXB.Element; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 4,12 ---- // Generic Model ! import net.hep.AGDD.JAXB.MaterialType; ! import net.hep.AGDD.JAXB.MediumType; // import net.hep.AGDD.JAXB.Element; // Log4J import org.apache.log4j.Logger; *************** *** 27,30 **** --- 24,30 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 36,43 **** * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public final class AGDDmaterial implements net.hep.AGDD.JAXB.Material { public AGDDmaterial(AGDDmedium medium) { ! _material = (net.hep.AGDD.JAXB.Material) medium.getMaterial(); _name = _material.getName(); --- 36,43 ---- * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public final class AGDDmaterial extends net.hep.AGDD.JAXB.MaterialType { public AGDDmaterial(AGDDmedium medium) { ! _material = (net.hep.AGDD.JAXB.MaterialType) medium.getMaterial(); _name = _material.getName(); *************** *** 120,124 **** public void setState(java.lang.String value) {} ! public double getAweight() { return _aweight; } --- 120,124 ---- public void setState(java.lang.String value) {} ! public Double getAweight() { return _aweight; } *************** *** 128,132 **** } ! public double getLambda() { return _lambda; } --- 128,132 ---- } ! public Double getLambda() { return _lambda; } *************** *** 142,146 **** } ! public double getZeff() { return _zeff; } --- 142,146 ---- } ! public Double getZeff() { return _zeff; } *************** *** 150,154 **** } ! public double getX0() { return _x0; } --- 150,154 ---- } ! public Double getX0() { return _x0; } *************** *** 167,171 **** protected double _x0; ! protected net.hep.AGDD.JAXB.Material _material; protected String _ctorString; --- 167,171 ---- protected double _x0; ! protected net.hep.AGDD.JAXB.MaterialType _material; protected String _ctorString; Index: Var.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Var.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Var.java 8 Feb 2006 22:31:18 -0000 1.1 --- Var.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 26,29 **** --- 26,32 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 38,42 **** public final class Var implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Element element, Group tg, String parent) { // Verify builder type --- 41,45 ---- public final class Var implements GraXMLJAXBRep { ! public final void traverse(MasterBuilder builder0, Object element, Group tg, String parent) { // Verify builder type Index: PosXYZ.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/PosXYZ.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PosXYZ.java 8 Feb 2006 22:31:18 -0000 1.1 --- PosXYZ.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 1,6 **** package net.hep.AGDD.TGeoModel.Reps; - import net.hep.AGDD.JAXB.impl.*; - import net.hep.AGDD.TGeoModel.TGeoAGDDBuilder; import net.hep.AGDD.TGeoModel.Evaluator; --- 1,4 ---- *************** *** 26,32 **** import javax.vecmath.Matrix3d; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 24,27 ---- *************** *** 41,44 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 59,63 **** public final class PosXYZ extends Positioner { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 57,61 ---- public final class PosXYZ extends Positioner { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type *************** *** 75,80 **** Evaluator evaluator = (builder()).evaluator(); PosXYZType pos = (PosXYZType)element; ! String lUnit = pos.getUnitLength(); ! String aUnit = pos.getUnitAngle(); float[] xyz = evaluator.valueOf(pos.getXYZ(), lUnit); float[] rot = evaluator.valueOf(pos.getRot(), aUnit); --- 73,78 ---- Evaluator evaluator = (builder()).evaluator(); PosXYZType pos = (PosXYZType)element; ! String lUnit = pos.getUnitLength().value(); ! String aUnit = pos.getUnitAngle().value(); float[] xyz = evaluator.valueOf(pos.getXYZ(), lUnit); float[] rot = evaluator.valueOf(pos.getRot(), aUnit); Index: AGDDaddelement.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/AGDDaddelement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGDDaddelement.java 8 Feb 2006 22:31:18 -0000 1.1 --- AGDDaddelement.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 4,13 **** // Generic Model ! import net.hep.AGDD.JAXB.Material; ! import net.hep.AGDD.JAXB.Medium; ! import net.hep.AGDD.JAXB.Addelement; ! ! // JAXB ! import javax.xml.bind.Element; // Log4J --- 4,10 ---- // Generic Model ! import net.hep.AGDD.JAXB.MaterialType; ! import net.hep.AGDD.JAXB.MediumType; ! import net.hep.AGDD.JAXB.AddelementType; // Log4J *************** *** 23,26 **** --- 20,26 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 32,36 **** * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public final class AGDDaddelement implements net.hep.AGDD.JAXB.Addelement { public AGDDaddelement() { --- 32,36 ---- * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ ! public final class AGDDaddelement extends net.hep.AGDD.JAXB.AddelementType { public AGDDaddelement() { *************** *** 39,44 **** public AGDDaddelement(Object o) { _ctorString = ""; ! net.hep.AGDD.JAXB.Addelement ae = (net.hep.AGDD.JAXB.Addelement) o; ! net.hep.AGDD.JAXB.Element e = (net.hep.AGDD.JAXB.Element) ae.getName(); String symbol = e.getSymbol(); --- 39,44 ---- public AGDDaddelement(Object o) { _ctorString = ""; ! net.hep.AGDD.JAXB.AddelementType ae = (net.hep.AGDD.JAXB.AddelementType) o; ! net.hep.AGDD.JAXB.ElementType e = (net.hep.AGDD.JAXB.ElementType) ae.getName(); String symbol = e.getSymbol(); *************** *** 56,60 **** public void processAtoms(String symbol, List atoms) { for(Object o: atoms) { ! net.hep.AGDD.JAXB.Atom a = (net.hep.AGDD.JAXB.Atom) o; double aweight = a.getAweight(); double zeff = a.getZeff(); --- 56,60 ---- public void processAtoms(String symbol, List atoms) { for(Object o: atoms) { ! net.hep.AGDD.JAXB.AtomType a = (net.hep.AGDD.JAXB.AtomType) o; double aweight = a.getAweight(); double zeff = a.getZeff(); Index: MposY.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/MposY.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MposY.java 8 Feb 2006 22:31:18 -0000 1.1 --- MposY.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 23,29 **** import javax.vecmath.Matrix3d; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 23,26 ---- *************** *** 38,41 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 53,57 **** public final class MposY extends Positioner { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 53,57 ---- public final class MposY extends Positioner { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type *************** *** 67,72 **** Evaluator evaluator = (builder()).evaluator(); MposYType pos = (MposYType)element; ! String lUnit = pos.getUnitLength(); ! String aUnit = pos.getUnitAngle(); float[] y0 = evaluator.valueOf(pos.getY0(), lUnit); float[] dy = evaluator.valueOf(pos.getDY(), lUnit); --- 67,72 ---- Evaluator evaluator = (builder()).evaluator(); MposYType pos = (MposYType)element; ! String lUnit = pos.getUnitLength().value(); ! String aUnit = pos.getUnitAngle().value(); float[] y0 = evaluator.valueOf(pos.getY0(), lUnit); float[] dy = evaluator.valueOf(pos.getDY(), lUnit); Index: AGDDelement.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/AGDDelement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGDDelement.java 8 Feb 2006 22:31:18 -0000 1.1 --- AGDDelement.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 4,12 **** // Generic Model ! import net.hep.AGDD.JAXB.Material; ! import net.hep.AGDD.JAXB.Medium; ! ! // JAXB ! import javax.xml.bind.Element; // Log4J --- 4,9 ---- // Generic Model ! import net.hep.AGDD.JAXB.MaterialType; ! import net.hep.AGDD.JAXB.MediumType; // Log4J *************** *** 22,25 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 31,40 **** * @author <a href="mailto:pot...@bn...">M.Potekhin</a> */ ! public final class AGDDelement implements net.hep.AGDD.JAXB.Element { public AGDDelement() { } ! public AGDDelement(Element e) { // net.hep.AGDD.JAXB.Solid jaxbSolid = (net.hep.AGDD.JAXB.Solid)e; --- 31,40 ---- * @author <a href="mailto:pot...@bn...">M.Potekhin</a> */ ! public final class AGDDelement extends net.hep.AGDD.JAXB.ElementType { public AGDDelement() { } ! public AGDDelement(Object e) { // net.hep.AGDD.JAXB.Solid jaxbSolid = (net.hep.AGDD.JAXB.Solid)e; Index: MposZ.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/MposZ.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MposZ.java 8 Feb 2006 22:31:18 -0000 1.1 --- MposZ.java 25 Jan 2007 18:40:14 -0000 1.2 *************** *** 23,29 **** import javax.vecmath.Matrix3d; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 23,26 ---- *************** *** 40,43 **** --- 37,43 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/25 18:40:14 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 55,59 **** public final class MposZ extends Positioner { ! public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { // Verify and set builder type --- 55,59 ---- public final class MposZ extends Positioner { ! public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type *************** *** 69,74 **** Evaluator evaluator = (builder()).evaluator(); MposZType pos = (MposZType)element; ! String lUnit = pos.getUnitLength(); ! String aUnit = pos.getUnitAngle(); float[] z0 = evaluator.valueOf(pos.getZ0(), lUnit); float[] dz = evaluator.valueOf(pos.getDZ(), lUnit); --- 69,74 ---- Evaluator evaluator = (builder()).evaluator(); MposZType pos = (MposZType)element; ! String lUnit = pos.getUnitLength().value(); ! String aUnit = pos.getUnitAngle().value(); float[] z0 = evaluator.valueOf(pos.getZ0(), lUnit); float[] dz = evaluator.valueOf(pos.getDZ(), lUnit); |
