graxml-commit Mailing List for GraXML (Page 13)
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-02-12 15:57:12
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29360/net/hep/AGDD/Schema Modified Files: AGDD.xsd AGDD0.xsd Log Message: sphere and torus added Index: AGDD0.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD0.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGDD0.xsd 14 Jan 2007 17:15:22 -0000 1.1 --- AGDD0.xsd 12 Feb 2007 15:56:52 -0000 1.2 *************** *** 4,7 **** --- 4,10 ---- <!-- $Log$ + Revision 1.2 2007/02/12 15:56:52 hrivnac + sphere and torus added + Revision 1.1 2007/01/14 17:15:22 hrivnac embedded demos included *************** *** 885,888 **** --- 888,961 ---- </xs:complexType> </xs:element> + + <!-- sphere ................................................................... --> + <xs:element name="sphere" substitutionGroup="abstractSolid"> + <xs:annotation> + <xs:documentation> + A sphere is, in the general case, a Phi*Theta segment of a sphere, + with inner and outer radii. The Phi and Theta segment + is described by a starting angle, and the delta angle for + the shape. + <br></br> + Its dimensions are given by: + <ul> + <li><b>Rio="rMin; rMax"</b>.</li> + <li><b>profile="startPhi; deltaPhi"</b> (defaulted to "0; 360").</li> + <li><b>slice="startTheta; deltaTheta"</b> (defaulted to "0; 180").</li> + </ul> + with: + <ul> + <li><b>rMin</b>: Inside radius.</li> + <li><b>rMax</b>: Outside radius.</li> + <li><b>startPhi</b>: Starting angle phi.</li> + <li><b>deltaPhi</b>: Delta angle phi.</li> + <li><b>startTheta</b>: Starting angle phi.</li> + <li><b>deltaTheta</b>: Delta angle phi.</li> + </ul> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="solid"> + <xs:attribute name="Rio" type="vector2" use="required"/> + <xs:attribute name="profile" type="vector2" default="0; 360"/> + <xs:attribute name="slice" type="vector2" default="0; 180"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <!-- torus .................................................................... --> + <xs:element name="torus" substitutionGroup="abstractSolid"> + <xs:annotation> + <xs:documentation> + A totus is, in the general case, a segment of a torus, + with inner and outer radii and torus radius. The segment + is described by a starting angle. + <br></br> + Its dimensions are given by: + <ul> + <li><b>Rio_R="rMin; rMax, rTorus"</b>.</li> + <li><b>profile="startPhi; deltaPhi"</b> (defaulted to "0; 360").</li> + </ul> + with: + <ul> + <li><b>rMin</b>: Inside radius.</li> + <li><b>rMax</b>: Outside radius.</li> + <li><b>rTorus</b>: Torus radius.</li> + <li><b>startPhi</b>: Starting angle phi.</li> + <li><b>deltaPhi</b>: Delta angle phi.</li> + </ul> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="solid"> + <xs:attribute name="Rio_R" type="vector3" use="required"/> + <xs:attribute name="profile" type="vector2" default="0; 360"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> <!-- pcon ..................................................................... --> *************** *** 1397,1400 **** --- 1470,1486 ---- </xs:simpleType> + <!-- vector4 .................................................................. --> + <xs:simpleType name="vector4"> + <xs:annotation> + <xs:documentation> + A vector4 is a formula leading to four numbers. + Its parts are separated with ';'. + </xs:documentation> + </xs:annotation> + <xs:restriction base="formula"> + <xs:pattern value="([a-zA-Z0-9 \+\-\*/\(\)\[\],|=&<>_\.]+;){3}[a-zA-Z0-9 \+\-\*/\(\)\[\],|=&<>_\.]+"/> + </xs:restriction> + </xs:simpleType> + <!-- vector5 .................................................................. --> <xs:simpleType name="vector5"> Index: AGDD.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD.xsd,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** AGDD.xsd 14 Jan 2007 17:15:22 -0000 1.12 --- AGDD.xsd 12 Feb 2007 15:56:50 -0000 1.13 *************** *** 2,5 **** --- 2,8 ---- <!-- $Log$ + Revision 1.13 2007/02/12 15:56:50 hrivnac + sphere and torus added + Revision 1.12 2007/01/14 17:15:22 hrivnac embedded demos included *************** *** 884,887 **** --- 887,960 ---- </xs:element> + <!-- sphere ................................................................... --> + <xs:element name="sphere" substitutionGroup="abstractSolid"> + <xs:annotation> + <xs:documentation> + A sphere is, in the general case, a Phi*Theta segment of a sphere, + with inner and outer radii. The Phi and Theta segment + is described by a starting angle, and the delta angle for + the shape. + <br></br> + Its dimensions are given by: + <ul> + <li><b>Rio="rMin; rMax"</b>.</li> + <li><b>profile="startPhi; deltaPhi"</b> (defaulted to "0; 360").</li> + <li><b>slice="startTheta; deltaTheta"</b> (defaulted to "0; 180").</li> + </ul> + with: + <ul> + <li><b>rMin</b>: Inside radius.</li> + <li><b>rMax</b>: Outside radius.</li> + <li><b>startPhi</b>: Starting angle phi.</li> + <li><b>deltaPhi</b>: Delta angle phi.</li> + <li><b>startTheta</b>: Starting angle phi.</li> + <li><b>deltaTheta</b>: Delta angle phi.</li> + </ul> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="solid"> + <xs:attribute name="Rio" type="vector2" use="required"/> + <xs:attribute name="profile" type="vector2" default="0; 360"/> + <xs:attribute name="slice" type="vector2" default="0; 180"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <!-- torus .................................................................... --> + <xs:element name="torus" substitutionGroup="abstractSolid"> + <xs:annotation> + <xs:documentation> + A totus is, in the general case, a segment of a torus, + with inner and outer radii and torus radius. The segment + is described by a starting angle. + <br></br> + Its dimensions are given by: + <ul> + <li><b>Rio_R="rMin; rMax, rTorus"</b>.</li> + <li><b>profile="startPhi; deltaPhi"</b> (defaulted to "0; 360").</li> + </ul> + with: + <ul> + <li><b>rMin</b>: Inside radius.</li> + <li><b>rMax</b>: Outside radius.</li> + <li><b>rTorus</b>: Torus radius.</li> + <li><b>startPhi</b>: Starting angle phi.</li> + <li><b>deltaPhi</b>: Delta angle phi.</li> + </ul> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="solid"> + <xs:attribute name="Rio_R" type="vector3" use="required"/> + <xs:attribute name="profile" type="vector2" default="0; 360"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- pcon ..................................................................... --> <xs:element name="pcon" substitutionGroup="abstractSolid"> *************** *** 1395,1398 **** --- 1468,1484 ---- </xs:simpleType> + <!-- vector4 .................................................................. --> + <xs:simpleType name="vector4"> + <xs:annotation> + <xs:documentation> + A vector4 is a formula leading to four numbers. + Its parts are separated with ';'. + </xs:documentation> + </xs:annotation> + <xs:restriction base="formula"> + <xs:pattern value="([a-zA-Z0-9 \+\-\*/\(\)\[\],|=&<>_\.]+;){3}[a-zA-Z0-9 \+\-\*/\(\)\[\],|=&<>_\.]+"/> + </xs:restriction> + </xs:simpleType> + <!-- vector5 .................................................................. --> <xs:simpleType name="vector5"> |
|
From: Julius H. <hr...@us...> - 2007-02-12 15:56:59
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29360/net/hep/AGDD/GeometricModel/Reps Added Files: Sphere.java Torus.java Log Message: sphere and torus added --- NEW FILE: Sphere.java --- package net.hep.AGDD.GeometricModel.Reps; import net.hep.AGDD.GeometricModel.Evaluator; import net.hep.AGDD.GeometricModel.Solid; // Generic Model import net.hep.AGDD.JAXB.SphereType; // GraXML import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Java3DExtensions.Interactivity.Interacter; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; import net.hep.graphics.GraXML.BuildOptions; // FreeHEP import org.freehep.j3d.SphereSegment; // Java3D import javax.media.j3d.Group; import javax.media.j3d.Shape3D; import javax.media.j3d.Link; import javax.media.j3d.BranchGroup; // Log4J import org.apache.log4j.Logger; // Java import static java.lang.Math.PI; /** GraXML representation {@link net.hep.graphics.GraXML.GraXMLJAXBRep} of <code>sphere</code> AGDD element * connected via JAXB {@link SphereType} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: Sphere.java,v $ * Revision 1.1 2007/02/12 15:56:50 hrivnac * sphere and torus added * * </pre> * </font></p> * @version $Id: Sphere.java,v 1.1 2007/02/12 15:56:50 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class Sphere extends Solid { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type setBuilder(builder); // Verify element type if (! (element instanceof SphereType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Get element properties Evaluator evaluator = builder().evaluator(); SphereType sphere = (SphereType)element; // not used: sphere.isSensitive(); String lUnit = sphere.getUnitLength().value(); String aUnit = sphere.getUnitAngle().value(); float[] rio = evaluator.valueOf(sphere.getRio(), lUnit); float[] profile = evaluator.valueOf(sphere.getProfile(), aUnit); float[] slice = evaluator.valueOf(sphere.getSlice(), aUnit); String name0 = sphere.getName(); String name = builder().name(name0); setColor(sphere); // Verify reuse if (isLink(name0, name, parent, tg)) { return; } // Create Sphere and use it use(new SphereSegment(rio[0], rio[1], profile[0], profile[0] + profile[1], slice[0] - PI / 2.0, slice[0] - PI / 2.0 + slice[1], BuildOptions.granularity(), builder().appearance(name0, rgb(), transparency())), name, parent, tg); } /** Logging . */ private static Logger log = Logger.getLogger(Sphere.class); } --- NEW FILE: Torus.java --- package net.hep.AGDD.GeometricModel.Reps; import net.hep.AGDD.GeometricModel.Evaluator; import net.hep.AGDD.GeometricModel.Solid; // Generic Model import net.hep.AGDD.JAXB.TorusType; // GraXML import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Java3DExtensions.Interactivity.Interacter; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; import net.hep.graphics.GraXML.BuildOptions; // FreeHEP import org.freehep.j3d.TorusSegment; // Java3D import javax.media.j3d.Group; import javax.media.j3d.Shape3D; import javax.media.j3d.Link; import javax.media.j3d.BranchGroup; // Log4J import org.apache.log4j.Logger; // Java import static java.lang.Math.PI; /** GraXML representation {@link net.hep.graphics.GraXML.GraXMLJAXBRep} of <code>torus</code> AGDD element * connected via JAXB {@link TorusType} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: Torus.java,v $ * Revision 1.1 2007/02/12 15:56:50 hrivnac * sphere and torus added * * </pre> * </font></p> * @version $Id: Torus.java,v 1.1 2007/02/12 15:56:50 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class Torus extends Solid { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type setBuilder(builder); // Verify element type if (! (element instanceof TorusType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Get element properties Evaluator evaluator = builder().evaluator(); TorusType torus = (TorusType)element; // not used: torus.isSensitive(); String lUnit = torus.getUnitLength().value(); String aUnit = torus.getUnitAngle().value(); float[] rior = evaluator.valueOf(torus.getRioR(), lUnit); float[] profile = evaluator.valueOf(torus.getProfile(), aUnit); String name0 = torus.getName(); String name = builder().name(name0); setColor(torus); // Verify reuse if (isLink(name0, name, parent, tg)) { return; } // Create Torus and use it use(new TorusSegment(rior[0], rior[1], rior[2], profile[0], profile[0] + profile[1], BuildOptions.granularity(), builder().appearance(name0, rgb(), transparency())), name, parent, tg); } /** Logging . */ private static Logger log = Logger.getLogger(Torus.class); } |
|
From: Julius H. <hr...@us...> - 2007-01-26 19:33:23
|
Update of /cvsroot/graxml/DetDescr/AGDD/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28572 Modified Files: ToDo.txt build.xml Log Message: WebStart works with JAXB 2.0 Index: ToDo.txt =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/ToDo.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ToDo.txt 25 Jan 2007 23:36:45 -0000 1.7 --- ToDo.txt 26 Jan 2007 19:33:20 -0000 1.8 *************** *** 1,6 **** JAXB 2.0 problems: - - Including - ParametrisedColors - - solids Data directory ? --- 1,4 ---- Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/build.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** build.xml 25 Jan 2007 18:42:13 -0000 1.13 --- build.xml 26 Jan 2007 19:33:20 -0000 1.14 *************** *** 26,31 **** <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}"/> --- 26,31 ---- <pathelement path="${JAXP-2.0.api}"/> <pathelement path="${JAXB-2.0.api}"/> <pathelement path="${JAXB-2.0.impl}"/> + <pathelement path="${JAXB-2.0.impl1}"/> <pathelement path="${JAXB-2.0.xjc}"/> <pathelement path="${JWSDP.relax}"/> *************** *** 78,83 **** <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}"/> --- 78,83 ---- <fileset file="${JAXP-2.0.api}"/> <fileset file="${JAXB-2.0.api}"/> <fileset file="${JAXB-2.0.impl}"/> + <fileset file="${JAXB-2.0.impl1}"/> <fileset file="${JAXB-2.0.xjc}"/> <fileset file="${JWSDP.relax}"/> |
|
From: Julius H. <hr...@us...> - 2007-01-26 19:33:08
|
Update of /cvsroot/graxml/DetDescr/GDML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28208 Modified Files: build.xml Log Message: WebStart works with JAXB 2.0 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/ant/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** build.xml 25 Jan 2007 17:10:56 -0000 1.9 --- build.xml 26 Jan 2007 19:33:05 -0000 1.10 *************** *** 26,31 **** <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}"/> --- 26,31 ---- <pathelement path="${JAXP-2.0.api}"/> <pathelement path="${JAXB-2.0.api}"/> <pathelement path="${JAXB-2.0.impl}"/> + <pathelement path="${JAXB-2.0.impl1}"/> <pathelement path="${JAXB-2.0.xjc}"/> <pathelement path="${JWSDP.relax}"/> *************** *** 74,79 **** <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}"/> --- 74,79 ---- <fileset file="${JAXP-2.0.api}"/> <fileset file="${JAXB-2.0.api}"/> <fileset file="${JAXB-2.0.impl}"/> + <fileset file="${JAXB-2.0.impl1}"/> <fileset file="${JAXB-2.0.xjc}"/> <fileset file="${JWSDP.relax}"/> |
|
From: Julius H. <hr...@us...> - 2007-01-26 19:32:52
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28183 Modified Files: build.xml Log Message: WebStart works with JAXB 2.0 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/ant/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 24 Jan 2007 17:01:25 -0000 1.3 --- build.xml 26 Jan 2007 19:32:47 -0000 1.4 *************** *** 25,30 **** <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}"/> --- 25,30 ---- <pathelement path="${JAXP-2.0.api}"/> <pathelement path="${JAXB-2.0.api}"/> <pathelement path="${JAXB-2.0.impl}"/> + <pathelement path="${JAXB-2.0.impl1}"/> <pathelement path="${JAXB-2.0.xjc}"/> <pathelement path="${JWSDP.relax}"/> *************** *** 72,77 **** <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}"/> --- 72,77 ---- <fileset file="${JAXP-2.0.api}"/> <fileset file="${JAXB-2.0.api}"/> <fileset file="${JAXB-2.0.impl}"/> + <fileset file="${JAXB-2.0.impl1}"/> <fileset file="${JAXB-2.0.xjc}"/> <fileset file="${JWSDP.relax}"/> *************** *** 270,274 **** <ant antfile="${config.db}/standard.xml" target="standard.xsddoc" inheritRefs="true"> <property name="dir" value="net/hep/atlas/graphics/JiveGeometry/Schema"/> ! <property name="schema" value="geometry"/> </ant> </target> --- 270,274 ---- <ant antfile="${config.db}/standard.xml" target="standard.xsddoc" inheritRefs="true"> <property name="dir" value="net/hep/atlas/graphics/JiveGeometry/Schema"/> ! <property name="schema" value="AGeometry"/> </ant> </target> |
|
From: Julius H. <hr...@us...> - 2007-01-26 19:32:32
|
Update of /cvsroot/graxml/Graphics/JiveEvent/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28168 Modified Files: build.xml Log Message: WebStart works with JAXB 2.0 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/ant/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** build.xml 24 Jan 2007 22:08:30 -0000 1.9 --- build.xml 26 Jan 2007 19:32:28 -0000 1.10 *************** *** 25,30 **** <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}"/> --- 25,30 ---- <pathelement path="${JAXP-2.0.api}"/> <pathelement path="${JAXB-2.0.api}"/> <pathelement path="${JAXB-2.0.impl}"/> + <pathelement path="${JAXB-2.0.impl1}"/> <pathelement path="${JAXB-2.0.xjc}"/> <pathelement path="${JWSDP.relax}"/> *************** *** 72,77 **** <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}"/> --- 72,77 ---- <fileset file="${JAXP-2.0.api}"/> <fileset file="${JAXB-2.0.api}"/> <fileset file="${JAXB-2.0.impl}"/> + <fileset file="${JAXB-2.0.impl1}"/> <fileset file="${JAXB-2.0.xjc}"/> <fileset file="${JWSDP.relax}"/> |
|
From: Julius H. <hr...@us...> - 2007-01-26 19:32:15
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27946 Modified Files: build.xml Log Message: WebStart works with JAXB 2.0 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/build.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** build.xml 24 Jan 2007 16:59:44 -0000 1.13 --- build.xml 26 Jan 2007 19:32:07 -0000 1.14 *************** *** 34,39 **** <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}"/> --- 34,39 ---- <pathelement path="${JAXP-2.0.api}"/> <pathelement path="${JAXB-2.0.api}"/> <pathelement path="${JAXB-2.0.impl}"/> + <pathelement path="${JAXB-2.0.impl1}"/> <pathelement path="${JAXB-2.0.xjc}"/> <pathelement path="${JWSDP.activation}"/> *************** *** 92,97 **** <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}"/> --- 92,97 ---- <fileset file="${JAXP-2.0.api}"/> <fileset file="${JAXB-2.0.api}"/> <fileset file="${JAXB-2.0.impl}"/> + <fileset file="${JAXB-2.0.impl1}"/> <fileset file="${JAXB-2.0.xjc}"/> <fileset file="${JWSDP.activation}"/> *************** *** 287,291 **** <target name="post" ! depends="init" description="Put on WWW" if="local"> --- 287,291 ---- <target name="post" ! depends="dist" description="Put on WWW" if="local"> |
|
From: Julius H. <hr...@us...> - 2007-01-26 19:31:31
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27782 Removed Files: GraXML-JAXB.jnlp Log Message: WebStart works with JAXB 2.0 --- GraXML-JAXB.jnlp DELETED --- |
|
From: Julius H. <hr...@us...> - 2007-01-26 19:30:22
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27234 Modified Files: GraXML.jnlp Log Message: WebStart works with JAXB 2.0 Index: GraXML.jnlp =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXML.jnlp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GraXML.jnlp 24 Jan 2007 16:59:25 -0000 1.5 --- GraXML.jnlp 26 Jan 2007 19:30:14 -0000 1.6 *************** *** 35,41 **** <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"/> </resources> <application-desc main-class="net.hep.graphics.GraXML.FrontEnd.GraXML"/> --- 35,53 ---- <jar href="xsdlib.jar"/> <jar href="activation.jar"/> + <jar href="jaxb-api.jar"/> + <jar href="jaxb-impl.jar"/> + <jar href="jaxb-impl.jar"/> + <jar href="jaxb1-impl.jar"/> + <jar href="jaxb-xjc.jar"/> + <jar href="jaxp-api.jar"/> + <jar href="jsr173_api.jar"/> + <jar href="jaxb-api.jar"/> + <jar href="jaxb-impl.jar"/> + <jar href="jaxb-impl.jar"/> + <jar href="jaxb1-impl.jar"/> + <jar href="jaxb-xjc.jar"/> + <jar href="jaxp-api.jar"/> <jar href="jsr173_api.jar"/> <extension href="http://download.java.net/media/java3d/webstart/release/java3d-1.3-latest.jnlp"/> </resources> <application-desc main-class="net.hep.graphics.GraXML.FrontEnd.GraXML"/> |
|
From: Julius H. <hr...@us...> - 2007-01-26 15:10:33
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21732/net/hep/AGDD/TGeoModel/Reps Modified Files: Section.java Log Message: fixed included files with JAXB 2.0 Index: Section.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Section.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Section.java 25 Jan 2007 23:36:28 -0000 1.3 --- Section.java 26 Jan 2007 15:10:22 -0000 1.4 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/26 15:10:22 hrivnac + * fixed included files with JAXB 2.0 + * * Revision 1.3 2007/01/25 23:36:28 hrivnac * fixes for JAXB 2.0 *************** *** 105,108 **** --- 108,114 ---- List volumes0 = ((BuildingBlockType)o).getAbstractSolidOrAbstractStackOrAbstractBooleanVolume(); for (Object o0 : volumes0) { + if (o0 instanceof JAXBElement) { + o0 = ((JAXBElement)o0).getValue(); + } if (o0 instanceof Data) { builder.traverse(o0, branch, name); |
|
From: Julius H. <hr...@us...> - 2007-01-26 15:10:33
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21732/net/hep/AGDD/GeometricModel/Reps Modified Files: Section.java Log Message: fixed included files with JAXB 2.0 Index: Section.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Section.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Section.java 25 Jan 2007 23:36:27 -0000 1.5 --- Section.java 26 Jan 2007 15:10:21 -0000 1.6 *************** *** 31,34 **** --- 31,37 ---- * <pre> * $Log$ + * Revision 1.6 2007/01/26 15:10:21 hrivnac + * fixed included files with JAXB 2.0 + * * Revision 1.5 2007/01/25 23:36:27 hrivnac * fixes for JAXB 2.0 *************** *** 90,93 **** --- 93,99 ---- List volumes0 = ((BuildingBlockType)o).getAbstractSolidOrAbstractStackOrAbstractBooleanVolume(); for (Object o0 : volumes0) { + if (o0 instanceof JAXBElement) { + o0 = ((JAXBElement)o0).getValue(); + } if (o0 instanceof Data) { builder.traverse(o0, branch, name); |
|
From: Julius H. <hr...@us...> - 2007-01-26 11:53:03
|
Update of /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9793/net/hep/geant4/GDML/GeometricModel/Reps Modified Files: BooleanSolid.java Gdml.java Log Message: Booleans types solved Index: BooleanSolid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/BooleanSolid.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BooleanSolid.java 25 Jan 2007 17:09:55 -0000 1.1 --- BooleanSolid.java 26 Jan 2007 11:52:58 -0000 1.2 *************** *** 18,21 **** --- 18,25 ---- import javax.media.j3d.Group; + // Java + import java.util.Map; + import java.util.TreeMap; + // Log4J import org.apache.log4j.Logger; *************** *** 28,31 **** --- 32,38 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/26 11:52:58 hrivnac + * Booleans types solved + * * Revision 1.1 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 68,89 **** // 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); --- 75,109 ---- // Assemble composed boolean solid BooleanSolidType booleanSolid = (BooleanSolidType)element; ! String name = booleanSolid.getName(); ! String type = _types.get(name); BooleanOperation operation = null; ! if (type.equals("intersection")) { operation = Intersection; } ! else if (type.equals("subtraction")) { operation = Difference; } ! else if (type.equals("union")) { operation = Union; } else { ! log.error(type + " boolean operation " + " of " + name + " element is not defined"); } ! compose(builder, booleanSolid, operation, parent, tg); } + /** Register boolean operation so that its type is available later. + * @param operation The operation name: + * <code>intersection</code>, + * <code>subtraction</code> or + * <code>union</code>. + * @param name The corresponding {@link BooleanSolid} name. */ + public static void register(String operation, String name) { + _types.put(name, operation); + } + + private static Map<String, String> _types = new TreeMap<String, String>(); + /** Logging . */ private static Logger log = Logger.getLogger(BooleanSolid.class); Index: Gdml.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Gdml.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Gdml.java 25 Jan 2007 17:09:55 -0000 1.2 --- Gdml.java 26 Jan 2007 11:52:58 -0000 1.3 *************** *** 3,6 **** --- 3,7 ---- // Generic Model import net.hep.geant4.GDML.JAXB.GdmlType; + import net.hep.geant4.GDML.JAXB.BooleanSolidType; // GraXML *************** *** 14,17 **** --- 15,21 ---- import javax.media.j3d.BranchGroup; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 26,29 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/26 11:52:58 hrivnac + * Booleans types solved + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 106,109 **** --- 113,129 ---- builder.traverse(o, branch, name); } + // - Solids - just register BooleanSolids + List solids = gdml.getSolids().getSolid(); + JAXBElement e; + BooleanSolidType booleanSolid; + for (Object o : solids) { + if (o instanceof JAXBElement) { // TBD: this should not be necessary to test, everywhere + e = (JAXBElement)o; + if (e.getDeclaredType() == BooleanSolidType.class) { + booleanSolid = (BooleanSolidType)e.getValue(); + BooleanSolid.register(e.getName().getLocalPart(), booleanSolid.getName()); + } + } + } // - Setup List setups = gdml.getSetup(); *************** *** 119,123 **** // - Materials - not traversed directly // - Structure - not traversed directly - // - Solids - not traversed directly // Register BranchGroup into Connections database --- 139,142 ---- |
|
From: Julius H. <hr...@us...> - 2007-01-25 23:36:46
|
Update of /cvsroot/graxml/DetDescr/AGDD/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26839 Modified Files: ToDo.txt Log Message: fixes for JAXB 2.0 Index: ToDo.txt =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/ToDo.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ToDo.txt 14 Jan 2007 17:15:22 -0000 1.6 --- ToDo.txt 25 Jan 2007 23:36:45 -0000 1.7 *************** *** 1,2 **** --- 1,7 ---- + JAXB 2.0 problems: + - Including + - ParametrisedColors + - solids + Data directory ? |
|
From: Julius H. <hr...@us...> - 2007-01-25 23:36:32
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26783/net/hep/AGDD/GeometricModel/Reps Modified Files: AGDD.java Composition.java Foreach.java Pcon.java Section.java Table.java Log Message: fixes for JAXB 2.0 Index: Foreach.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Foreach.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Foreach.java 25 Jan 2007 18:40:09 -0000 1.2 --- Foreach.java 25 Jan 2007 23:36:27 -0000 1.3 *************** *** 18,21 **** --- 18,24 ---- import javax.media.j3d.BranchGroup; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 31,34 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 23:36:27 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.2 2007/01/25 18:40:09 hrivnac * migrated to JAXB 2.0 *************** *** 88,91 **** --- 94,100 ---- name = builder.name(index + "=" + i); for (Object o : volumes) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } if (o instanceof Data) { builder.traverse(o, branch, name); Index: Pcon.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Pcon.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Pcon.java 25 Jan 2007 18:40:12 -0000 1.6 --- Pcon.java 25 Jan 2007 23:36:27 -0000 1.7 *************** *** 18,21 **** --- 18,24 ---- import javax.media.j3d.Group; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 30,33 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.7 2007/01/25 23:36:27 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.6 2007/01/25 18:40:12 hrivnac * migrated to JAXB 2.0 *************** *** 90,93 **** --- 96,102 ---- int i = 0; for (Object o : planes) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } if (o instanceof PolyplaneType) { rioz = evaluator.valueOf(((PolyplaneType)o).getRioZ(), lUnit); Index: Section.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Section.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Section.java 25 Jan 2007 18:40:12 -0000 1.4 --- Section.java 25 Jan 2007 23:36:27 -0000 1.5 *************** *** 16,19 **** --- 16,22 ---- import javax.media.j3d.BranchGroup; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 28,31 **** --- 31,37 ---- * <pre> * $Log$ + * Revision 1.5 2007/01/25 23:36:27 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.4 2007/01/25 18:40:12 hrivnac * migrated to JAXB 2.0 *************** *** 77,80 **** --- 83,89 ---- List volumes = section.getAbstractSolidOrAbstractStackOrAbstractBooleanVolume(); for (Object o : volumes) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } // -- via BuildingBlock if (o instanceof BuildingBlockType) { Index: Composition.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Composition.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Composition.java 25 Jan 2007 18:40:09 -0000 1.2 --- Composition.java 25 Jan 2007 23:36:27 -0000 1.3 *************** *** 18,21 **** --- 18,24 ---- import javax.media.j3d.BranchGroup; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 31,34 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 23:36:27 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.2 2007/01/25 18:40:09 hrivnac * migrated to JAXB 2.0 *************** *** 84,87 **** --- 90,96 ---- List volumes = composition.getAbstractDataOrForeachOrAbstractPosition(); for (Object o : volumes) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } if (o instanceof Data) { builder.traverse(o, branch, name); Index: Table.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Table.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Table.java 25 Jan 2007 18:40:12 -0000 1.2 --- Table.java 25 Jan 2007 23:36:27 -0000 1.3 *************** *** 15,18 **** --- 15,21 ---- import javax.media.j3d.Group; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 27,30 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 23:36:27 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.2 2007/01/25 18:40:12 hrivnac * migrated to JAXB 2.0 *************** *** 65,68 **** --- 71,77 ---- int i = 0; for (Object o : rows) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } if (o instanceof RowType) { values[i++] = ((RowType)o).getValues(); Index: AGDD.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/AGDD.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AGDD.java 25 Jan 2007 18:40:07 -0000 1.4 --- AGDD.java 25 Jan 2007 23:36:27 -0000 1.5 *************** *** 15,18 **** --- 15,21 ---- import javax.media.j3d.BranchGroup; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 27,30 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.5 2007/01/25 23:36:27 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.4 2007/01/25 18:40:07 hrivnac * migrated to JAXB 2.0 *************** *** 77,80 **** --- 83,89 ---- List sections = agdd.getMediaOrMaterialsOrColormap(); for (Object o : sections) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } if (o instanceof SectionType) { builder.traverse(o, branch, name); |
|
From: Julius H. <hr...@us...> - 2007-01-25 23:36:29
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26783/net/hep/AGDD/TGeoModel Modified Files: Evaluator.java Positioner.java Log Message: fixes for JAXB 2.0 Index: Positioner.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Positioner.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Positioner.java 25 Jan 2007 18:40:13 -0000 1.3 --- Positioner.java 25 Jan 2007 23:36:28 -0000 1.4 *************** *** 30,33 **** --- 30,36 ---- import javax.xml.bind.Element; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 44,47 **** --- 47,53 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/25 23:36:28 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.3 2007/01/25 18:40:13 hrivnac * migrated to JAXB 2.0 *************** *** 107,120 **** List<String> variables = new ArrayList<String>(); for (Object o : volumes) { ! if (o instanceof Data && o instanceof Element) { ! builder().traverse((Element)o, tr, parent); variables.add(evaluator.lastVariable()); } else if (o instanceof VolumeType) { VolumeType v = (VolumeType)o; ! Object vv = v.getName(); ! if (vv instanceof Element) { ! builder().traverse((Element)vv, tr, parent); ! } } } --- 113,126 ---- List<String> variables = new ArrayList<String>(); for (Object o : volumes) { ! if (o instanceof JAXBElement) { ! o = ((JAXBElement)o).getValue(); ! } ! if (o instanceof Data) { ! builder().traverse(o, tr, parent); variables.add(evaluator.lastVariable()); } else if (o instanceof VolumeType) { VolumeType v = (VolumeType)o; ! builder().traverse(v.getName(), tr, parent); } } Index: Evaluator.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Evaluator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Evaluator.java 19 Sep 2006 18:45:47 -0000 1.2 --- Evaluator.java 25 Jan 2007 23:36:27 -0000 1.3 *************** *** 39,42 **** --- 39,45 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 23:36:27 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.2 2006/09/19 18:45:47 starxml * Waypoint checkin *************** *** 78,82 **** * @param builder The related {@link MasterBuilder}. */ public Evaluator(MasterBuilder builder) { ! _format = new java.text.DecimalFormat("#,##0.0#######"); } --- 81,85 ---- * @param builder The related {@link MasterBuilder}. */ public Evaluator(MasterBuilder builder) { ! _format = new java.text.DecimalFormat("#,##0.0#######"); } |
|
From: Julius H. <hr...@us...> - 2007-01-25 23:36:29
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26783/net/hep/AGDD/TGeoModel/Reps Modified Files: AGDD.java Composition.java Foreach.java Pcon.java Section.java Table.java Log Message: fixes for JAXB 2.0 Index: Foreach.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Foreach.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Foreach.java 25 Jan 2007 18:40:14 -0000 1.2 --- Foreach.java 25 Jan 2007 23:36:28 -0000 1.3 *************** *** 18,21 **** --- 18,24 ---- import javax.media.j3d.BranchGroup; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 31,34 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 23:36:28 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.2 2007/01/25 18:40:14 hrivnac * migrated to JAXB 2.0 *************** *** 95,98 **** --- 101,107 ---- name = builder.name(index + "=" + i); for (Object o : volumes) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } if (o instanceof Data) { 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.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Pcon.java 25 Jan 2007 18:40:14 -0000 1.3 --- Pcon.java 25 Jan 2007 23:36:28 -0000 1.4 *************** *** 20,23 **** --- 20,26 ---- import javax.media.j3d.Group; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 32,35 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/25 23:36:28 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.3 2007/01/25 18:40:14 hrivnac * migrated to JAXB 2.0 *************** *** 94,97 **** --- 100,106 ---- int i = 0; for (Object o : planes) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } if (o instanceof PolyplaneType) { rioz = evaluator.valueOf(((PolyplaneType)o).getRioZ(), lUnit); Index: Section.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Section.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Section.java 25 Jan 2007 18:40:14 -0000 1.2 --- Section.java 25 Jan 2007 23:36:28 -0000 1.3 *************** *** 18,21 **** --- 18,24 ---- import javax.media.j3d.BranchGroup; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 30,33 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 23:36:28 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.2 2007/01/25 18:40:14 hrivnac * migrated to JAXB 2.0 *************** *** 92,95 **** --- 98,104 ---- List volumes = section.getAbstractSolidOrAbstractStackOrAbstractBooleanVolume(); for (Object o : volumes) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } // -- via BuildingBlock if (o instanceof BuildingBlockType) { Index: Composition.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Composition.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Composition.java 25 Jan 2007 18:40:14 -0000 1.3 --- Composition.java 25 Jan 2007 23:36:28 -0000 1.4 *************** *** 18,21 **** --- 18,24 ---- import javax.media.j3d.BranchGroup; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 31,34 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/25 23:36:28 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.3 2007/01/25 18:40:14 hrivnac * migrated to JAXB 2.0 *************** *** 99,102 **** --- 105,111 ---- for (Object o : volumes) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } if (o instanceof Data) { 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.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Table.java 25 Jan 2007 18:40:14 -0000 1.2 --- Table.java 25 Jan 2007 23:36:28 -0000 1.3 *************** *** 15,18 **** --- 15,21 ---- import javax.media.j3d.Group; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 27,30 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 23:36:28 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.2 2007/01/25 18:40:14 hrivnac * migrated to JAXB 2.0 *************** *** 65,68 **** --- 71,77 ---- int i = 0; for (Object o : rows) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } if (o instanceof RowType) { values[i++] = ((RowType)o).getValues(); Index: AGDD.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/AGDD.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AGDD.java 25 Jan 2007 18:40:13 -0000 1.2 --- AGDD.java 25 Jan 2007 23:36:28 -0000 1.3 *************** *** 15,18 **** --- 15,21 ---- import javax.media.j3d.BranchGroup; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 27,30 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 23:36:28 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.2 2007/01/25 18:40:13 hrivnac * migrated to JAXB 2.0 |
|
From: Julius H. <hr...@us...> - 2007-01-25 23:36:29
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26783/net/hep/AGDD/GeometricModel Modified Files: Positioner.java Solid.java Log Message: fixes for JAXB 2.0 Index: Positioner.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Positioner.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Positioner.java 25 Jan 2007 18:40:03 -0000 1.4 --- Positioner.java 25 Jan 2007 23:36:27 -0000 1.5 *************** *** 20,23 **** --- 20,26 ---- import javax.vecmath.Matrix3d; + // JAXB + import javax.xml.bind.JAXBElement; + // Java import java.util.List; *************** *** 35,38 **** --- 38,44 ---- * <pre> * $Log$ + * Revision 1.5 2007/01/25 23:36:27 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.4 2007/01/25 18:40:03 hrivnac * migrated to JAXB 2.0 *************** *** 103,106 **** --- 109,115 ---- // - Identifiers first for (Object o : volumes) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } if (o instanceof IdentifierType) { if (!_initialised) { *************** *** 113,116 **** --- 122,128 ---- // - Data and Volumes next for (Object o : volumes) { + if (o instanceof JAXBElement) { + o = ((JAXBElement)o).getValue(); + } if (o instanceof Data) { builder().traverse(o, tr, parent); Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Solid.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Solid.java 25 Jan 2007 18:40:03 -0000 1.7 --- Solid.java 25 Jan 2007 23:36:27 -0000 1.8 *************** *** 30,33 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.8 2007/01/25 23:36:27 hrivnac + * fixes for JAXB 2.0 + * * Revision 1.7 2007/01/25 18:40:03 hrivnac * migrated to JAXB 2.0 *************** *** 222,226 **** if (color == null) { MediumType medium = (MediumType)(s.getMedium()); ! color = (ColorType)(medium.getColor()); } if (color != null) { --- 225,231 ---- if (color == null) { MediumType medium = (MediumType)(s.getMedium()); ! if (medium != null) { ! color = (ColorType)(medium.getColor()); ! } } if (color != null) { *************** *** 232,237 **** float[] transparency = builder().evaluator().valueOf(color.getTransparency(), "1"); _transparency = transparency[0]; } - _visible = color.isVisible(); } --- 237,242 ---- float[] transparency = builder().evaluator().valueOf(color.getTransparency(), "1"); _transparency = transparency[0]; + _visible = color.isVisible(); } } |
|
From: Julius H. <hr...@us...> - 2007-01-25 18:45:04
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8880/net/hep/graphics/GraXML Modified Files: MasterBuilder.java Log Message: so that AGDD JAXB 2.0 works Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MasterBuilder.java 24 Jan 2007 16:59:25 -0000 1.12 --- MasterBuilder.java 25 Jan 2007 18:44:56 -0000 1.13 *************** *** 29,32 **** --- 29,33 ---- // JAXB + import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBContext; import javax.xml.bind.Unmarshaller; *************** *** 61,64 **** --- 62,68 ---- * <pre> * $Log$ + * Revision 1.13 2007/01/25 18:44:56 hrivnac + * so that AGDD JAXB 2.0 works + * * Revision 1.12 2007/01/24 16:59:25 hrivnac * migrated to JAXB 2.0 *************** *** 419,422 **** --- 423,432 ---- public void traverse(Object element, Group tg, String parent) { + // Dereference JAXBElement + if (element instanceof JAXBElement) { + traverse(((JAXBElement)element).getValue(), tg, parent); + return; + } + // Count System.out.print("."); |
|
From: Julius H. <hr...@us...> - 2007-01-25 18:42:15
|
Update of /cvsroot/graxml/DetDescr/AGDD/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8060 Modified Files: build.xml generator.xml Log Message: migrated to JAXB 2.0 Index: generator.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/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:42:55 -0000 1.1 --- generator.xml 25 Jan 2007 18:42:13 -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/AGDD/ant/build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** build.xml 14 Jan 2007 17:15:22 -0000 1.12 --- build.xml 25 Jan 2007 18:42:13 -0000 1.13 *************** *** 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}"/> *************** *** 76,84 **** <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}"/> --- 76,84 ---- <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 18:40:52
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6820/net/hep/AGDD/Test Modified Files: JAXB.java Log Message: migrated to JAXB 2.0 Index: JAXB.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/JAXB.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JAXB.java 23 Nov 2005 16:13:10 -0000 1.3 --- JAXB.java 25 Jan 2007 18:40:15 -0000 1.4 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/25 18:40:15 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.3 2005/11/23 16:13:10 hrivnac * media and colors added, buildingBlock added *************** *** 46,50 **** JAXBContext jc = JAXBContext.newInstance("net.hep.AGDD.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! u.setValidating(true); log.info("Opening " + args[0]); // Get top --- 49,53 ---- JAXBContext jc = JAXBContext.newInstance("net.hep.AGDD.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! //TBD u.setValidating(true); log.info("Opening " + args[0]); // Get top |
|
From: Julius H. <hr...@us...> - 2007-01-25 18:40:42
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6820/net/hep/AGDD/GeometricModel Modified Files: Positioner.java Solid.java Log Message: migrated to JAXB 2.0 Index: Positioner.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Positioner.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Positioner.java 20 Sep 2006 14:17:48 -0000 1.3 --- Positioner.java 25 Jan 2007 18:40:03 -0000 1.4 *************** *** 4,8 **** import net.hep.AGDD.JAXB.VolumeType; import net.hep.AGDD.JAXB.Data; ! import net.hep.AGDD.JAXB.Identifier; // GraXML --- 4,8 ---- import net.hep.AGDD.JAXB.VolumeType; import net.hep.AGDD.JAXB.Data; ! import net.hep.AGDD.JAXB.IdentifierType; // GraXML *************** *** 20,26 **** import javax.vecmath.Matrix3d; - // JAXB - import javax.xml.bind.Element; - // Java import java.util.List; --- 20,23 ---- *************** *** 38,41 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/25 18:40:03 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.3 2006/09/20 14:17:48 hrivnac * multiple identifiers per postioner possible *************** *** 71,75 **** public abstract class Positioner implements GraXMLJAXBRep { ! public abstract void traverse(MasterBuilder builder, Element element, Group tg, String parent); /** Position volumes. --- 71,75 ---- public abstract class Positioner implements GraXMLJAXBRep { ! public abstract void traverse(MasterBuilder builder, Object element, Group tg, String parent); /** Position volumes. *************** *** 103,111 **** // - Identifiers first for (Object o : volumes) { ! if (o instanceof Identifier) { if (!_initialised) { ! _identifiers.put(((Identifier)o).getField(), evaluator.valueOf(((Identifier)o).getValue(), "1")[0]); } ! _steps.put(((Identifier)o).getField(), evaluator.valueOf(((Identifier)o).getStep(), "1")[0]); } } --- 103,111 ---- // - Identifiers first for (Object o : volumes) { ! if (o instanceof IdentifierType) { if (!_initialised) { ! _identifiers.put(((IdentifierType)o).getField(), evaluator.valueOf(((IdentifierType)o).getValue(), "1")[0]); } ! _steps.put(((IdentifierType)o).getField(), evaluator.valueOf(((IdentifierType)o).getStep(), "1")[0]); } } *************** *** 113,131 **** // - Data and Volumes next for (Object o : volumes) { ! if (o instanceof Data && o instanceof Element) { ! builder().traverse((Element)o, tr, parent); variables.add(evaluator.lastVariable()); } else if (o instanceof VolumeType) { VolumeType v = (VolumeType)o; ! Object vv = v.getName(); ! if (vv instanceof Element) { ! builder().traverse((Element)vv, tr, parent); ! message = "Assigning Identifiers for " + builder().name() + ": "; ! for (String field : _identifiers.keySet()) { ! message += "\t" + field + "=" + _identifiers.get(field) + ", "; ! } ! log.debug(message); } } } --- 113,128 ---- // - Data and Volumes next for (Object o : volumes) { ! if (o instanceof Data) { ! builder().traverse(o, tr, parent); variables.add(evaluator.lastVariable()); } else if (o instanceof VolumeType) { VolumeType v = (VolumeType)o; ! builder().traverse(v.getName(), tr, parent); ! message = "Assigning Identifiers for " + builder().name() + ": "; ! for (String field : _identifiers.keySet()) { ! message += "\t" + field + "=" + _identifiers.get(field) + ", "; } + log.debug(message); } } Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Solid.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Solid.java 11 Jan 2007 14:15:28 -0000 1.6 --- Solid.java 25 Jan 2007 18:40:03 -0000 1.7 *************** *** 22,28 **** import javax.media.j3d.Shape3D; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 22,25 ---- *************** *** 33,36 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.7 2007/01/25 18:40:03 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.6 2007/01/11 14:15:28 hrivnac * version 0.7.0 *************** *** 66,70 **** public abstract class Solid implements GraXMLJAXBRep { ! public abstract void traverse(MasterBuilder builder, Element element, Group tg, String parent); /** Use Java3D {@link Node} as a GraXML building block: --- 66,70 ---- public abstract class Solid implements GraXMLJAXBRep { ! public abstract void traverse(MasterBuilder builder, Object element, Group tg, String parent); /** Use Java3D {@link Node} as a GraXML building block: |
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); |
|
From: Julius H. <hr...@us...> - 2007-01-25 18:40:35
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6820 Modified Files: index.html Log Message: migrated to JAXB 2.0 Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** index.html 14 Jan 2007 17:15:22 -0000 1.22 --- index.html 25 Jan 2007 18:40:02 -0000 1.23 *************** *** 66,70 **** <li>Requests: <ul> - <li>Migrate to JAXB 2.0.</li> <li>Global choice of units default.</li> </ul> --- 66,69 ---- *************** *** 147,150 **** --- 146,150 ---- <li>Supports AGDD v8.</li> <li>Demo files exported to GraXML.</li> + <li>Migrated to JAXB 2.0.</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2007-01-25 18:40:28
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/JAXB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6820/net/hep/AGDD/JAXB Modified Files: AGDD.xjs Log Message: migrated to JAXB 2.0 Index: AGDD.xjs =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/JAXB/AGDD.xjs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGDD.xjs 30 Mar 2005 13:42:56 -0000 1.1 --- AGDD.xjs 25 Jan 2007 18:40:13 -0000 1.2 *************** *** 7,10 **** --- 7,13 ---- <!-- $Log$ + Revision 1.2 2007/01/25 18:40:13 hrivnac + migrated to JAXB 2.0 + Revision 1.1 2005/03/30 13:42:56 hrivnac AGDD added *************** *** 23,34 **** <jaxb:bindings schemaLocation="../Schema/AGDD.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,37 ---- <jaxb:bindings schemaLocation="../Schema/AGDD.xsd" node="/xs:schema"> <jaxb:schemaBindings> ! <jaxb:package name="net.hep.AGDD.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-25 18:40:28
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6820/net/hep/AGDD/TGeoModel Modified Files: Positioner.java Solid.java TGeoAGDDBuilder.java Log Message: migrated to JAXB 2.0 Index: Positioner.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Positioner.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Positioner.java 19 Sep 2006 18:45:12 -0000 1.2 --- Positioner.java 25 Jan 2007 18:40:13 -0000 1.3 *************** *** 1,5 **** package net.hep.AGDD.TGeoModel; - import net.hep.AGDD.JAXB.impl.*; // Generic Model import net.hep.AGDD.JAXB.VolumeType; --- 1,4 ---- *************** *** 8,11 **** --- 7,16 ---- import net.hep.AGDD.JAXB.CompositionType; import net.hep.AGDD.JAXB.PolyplaneType; + import net.hep.AGDD.JAXB.BoxType; + import net.hep.AGDD.JAXB.ConsType; + import net.hep.AGDD.JAXB.PconType; + import net.hep.AGDD.JAXB.TubsType; + import net.hep.AGDD.JAXB.TrdType; + // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; *************** *** 39,42 **** --- 44,50 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 18:40:13 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2006/09/19 18:45:12 starxml * Waypoint checkin *************** *** 69,73 **** public abstract class Positioner implements GraXMLJAXBRep { ! public abstract void traverse(MasterBuilder builder, Element element, Group tg, String parent); /** Position volumes. --- 77,81 ---- public abstract class Positioner implements GraXMLJAXBRep { ! public abstract void traverse(MasterBuilder builder, Object element, Group tg, String parent); /** Position volumes. *************** *** 208,213 **** // -- try { ! BoxImpl bi = (BoxImpl) (v); ! String lUnit = bi.getUnitLength(); float[] x_y_z = evaluator.valueOf(bi.getXYZ(), lUnit); dim = evaluator.formattedScaled(x_y_z, 0.5f); // System.out.println("---- "+dim[0]+" "+dim[1]+" "+dim[2]); --- 216,221 ---- // -- try { ! BoxType bi = (BoxType) (v); ! String lUnit = bi.getUnitLength().value(); float[] x_y_z = evaluator.valueOf(bi.getXYZ(), lUnit); dim = evaluator.formattedScaled(x_y_z, 0.5f); // System.out.println("---- "+dim[0]+" "+dim[1]+" "+dim[2]); *************** *** 220,226 **** // -- try { ! TubsImpl ti = (TubsImpl) (v); ! String lUnit = ti.getUnitLength(); ! String aUnit = ti.getUnitAngle(); float[] rioz = evaluator.valueOf(ti.getRioZ(), lUnit); float[] profile = evaluator.valueOf(ti.getProfile(), aUnit); --- 228,234 ---- // -- try { ! TubsType ti = (TubsType) (v); ! String lUnit = ti.getUnitLength().value(); ! String aUnit = ti.getUnitAngle().value(); float[] rioz = evaluator.valueOf(ti.getRioZ(), lUnit); float[] profile = evaluator.valueOf(ti.getProfile(), aUnit); *************** *** 240,246 **** // -- try { ! ConsImpl ci = (ConsImpl) (v); ! String lUnit = ci.getUnitLength(); ! String aUnit = ci.getUnitAngle(); float[] rio1rio2z = evaluator.valueOf(ci.getRio1Rio2Z(), lUnit); --- 248,254 ---- // -- try { ! ConsType ci = (ConsType) (v); ! String lUnit = ci.getUnitLength().value(); ! String aUnit = ci.getUnitAngle().value(); float[] rio1rio2z = evaluator.valueOf(ci.getRio1Rio2Z(), lUnit); *************** *** 265,271 **** // -- try { ! TrdImpl trdi = (TrdImpl) (v); ! String lUnit = trdi.getUnitLength(); ! String aUnit = trdi.getUnitAngle(); float[] xmpympz = evaluator.valueOf(trdi.getXmpYmpZ(), lUnit); --- 273,279 ---- // -- try { ! TrdType trdi = (TrdType) (v); ! String lUnit = trdi.getUnitLength().value(); ! String aUnit = trdi.getUnitAngle().value(); float[] xmpympz = evaluator.valueOf(trdi.getXmpYmpZ(), lUnit); *************** *** 285,291 **** // -- try { ! PconImpl pci = (PconImpl) (v); ! String lUnit = pci.getUnitLength(); ! String aUnit = pci.getUnitAngle(); float[] profile = evaluator.valueOf(pci.getProfile(), aUnit); --- 293,299 ---- // -- try { ! PconType pci = (PconType) (v); ! String lUnit = pci.getUnitLength().value(); ! String aUnit = pci.getUnitAngle().value(); float[] profile = evaluator.valueOf(pci.getProfile(), aUnit); Index: TGeoAGDDBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/TGeoAGDDBuilder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TGeoAGDDBuilder.java 19 Sep 2006 18:42:31 -0000 1.3 --- TGeoAGDDBuilder.java 25 Jan 2007 18:40:13 -0000 1.4 *************** *** 20,24 **** import java.util.HashMap; - // Log4J import org.apache.log4j.Logger; --- 20,23 ---- *************** *** 29,32 **** --- 28,34 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/25 18:40:13 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.3 2006/09/19 18:42:31 starxml * Updated features *************** *** 78,81 **** --- 80,90 ---- } + /** Get list of (embedded) demostration files. + * @return The list of (embedded) demostration files. */ + public String[] demos() { + String[] demos = {}; + return demos; + } + /** Perform configuration. */ public void configure() { *************** *** 244,247 **** --- 253,262 ---- } + /** Get Embedded AGDD Schema file. + * @return The Embedded AGDD Schema file. */ + protected String schemaEmbedded() { + return _schemaEmbedded; + } + /** Get AGDD JAXB Generic Model package name. * @return The package name of the JAXB Generic Model of GDML. */ *************** *** 254,257 **** --- 269,274 ---- private static String _schema = "AGDD.xsd"; + private static String _schemaEmbedded = "net/hep/AGDD/Schema/AGDD0.xsd"; + /** Zero vector. */ public static final Vector3d UVECTOR = new Vector3d(0, 0, 0); Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Solid.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Solid.java 19 Sep 2006 18:47:07 -0000 1.2 --- Solid.java 25 Jan 2007 18:40:13 -0000 1.3 *************** *** 8,11 **** --- 8,12 ---- import net.hep.AGDD.JAXB.MediumType; import net.hep.AGDD.JAXB.ColorType; + import net.hep.AGDD.JAXB.ElementType; // GraXML *************** *** 20,24 **** // JAXB ! import net.hep.AGDD.JAXB.Material; // Java3D --- 21,25 ---- // JAXB ! import net.hep.AGDD.JAXB.MaterialType; // Java3D *************** *** 29,35 **** import javax.media.j3d.Shape3D; - // JAXB - import javax.xml.bind.Element; - // Log4J import org.apache.log4j.Logger; --- 30,33 ---- *************** *** 43,46 **** --- 41,47 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/25 18:40:13 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.2 2006/09/19 18:47:07 starxml * Waypoint checkin *************** *** 64,68 **** public abstract class Solid implements GraXMLJAXBRep { ! public abstract void traverse(MasterBuilder builder, Element element, Group tg, String parent); /** Use Java3D {@link Node} as a GraXML building block: --- 65,69 ---- public abstract class Solid implements GraXMLJAXBRep { ! public abstract void traverse(MasterBuilder builder, Object element, Group tg, String parent); /** Use Java3D {@link Node} as a GraXML building block: *************** *** 225,229 **** protected AGDDmaterial _agddMaterial; ! protected AGDDmedium getAGDDmedium(Element e) { _agddMedium = new AGDDmedium(e); return _agddMedium; --- 226,230 ---- protected AGDDmaterial _agddMaterial; ! protected AGDDmedium getAGDDmedium(Object e) { _agddMedium = new AGDDmedium(e); return _agddMedium; *************** *** 241,245 **** } ! protected void ProcessMediumAndMaterial(Element e) { AGDDmedium medium = getAGDDmedium(e); --- 242,246 ---- } ! protected void ProcessMediumAndMaterial(Object e) { AGDDmedium medium = getAGDDmedium(e); |
