graxml-commit Mailing List for GraXML (Page 9)
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-10-19 14:09:12
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5401/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Log Message: works in WebStart 1.5/1.6 Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Guide.html 12 Oct 2007 23:47:29 -0000 1.23 --- Guide.html 19 Oct 2007 14:09:13 -0000 1.24 *************** *** 919,923 **** </ul> </ul> ! <li>3.1.11:</li> <ul> <li>New features:</li> --- 919,923 ---- </ul> </ul> ! <li>*.*.*:</li> <ul> <li>New features:</li> |
|
From: Julius H. <hr...@us...> - 2007-10-17 13:23:07
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15546/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: ABarrelCalorimeter.java ABarrelSiliconDetector.java ABarrelTRTDetector.java AEndcapCalorimeter.java AEndcapSiliconDetector.java AEndcapTRTDetector.java AGapCalorimeter.java Log Message: subdetectors grouped Index: ABarrelTRTDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelTRTDetector.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ABarrelTRTDetector.java 24 Jan 2007 17:00:42 -0000 1.2 --- ABarrelTRTDetector.java 17 Oct 2007 13:22:47 -0000 1.3 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.3 2007/10/17 13:22:47 hrivnac + * subdetectors grouped + * * Revision 1.2 2007/01/24 17:00:42 hrivnac * migrated to JAXB 2.0, simplified *************** *** 56,59 **** --- 59,69 ---- } + // Create container + if (_g == null) { + _g = new BranchGroup(); + use(_g, "BarrelTRTDetector", "Barrel TRT Detector Container"); + } + set(builder, _g, "BarrelTRTDetector"); + // Get element properties ABarrelTRTDetectorType aBarrelTRTDetector = (ABarrelTRTDetectorType)element; *************** *** 84,87 **** --- 94,99 ---- private static int k = 0; + private static BranchGroup _g; + /** Logging . */ private static Logger log = Logger.getLogger(ABarrelTRTDetector.class); Index: ABarrelSiliconDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelSiliconDetector.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ABarrelSiliconDetector.java 24 Jan 2007 17:00:42 -0000 1.2 --- ABarrelSiliconDetector.java 17 Oct 2007 13:22:47 -0000 1.3 *************** *** 36,39 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.3 2007/10/17 13:22:47 hrivnac + * subdetectors grouped + * * Revision 1.2 2007/01/24 17:00:42 hrivnac * migrated to JAXB 2.0, simplified *************** *** 59,62 **** --- 62,72 ---- } + // Create container + if (_g == null) { + _g = new BranchGroup(); + use(_g, "BarrelSiliconDetector", "Barrel Silicon Detector Container"); + } + set(builder, _g, "BarrelSiliconDetector"); + // Get element properties ABarrelSiliconDetectorType aBarrelSiliconDetector = (ABarrelSiliconDetectorType)element; *************** *** 93,96 **** --- 103,108 ---- private static int k = 0; + private static BranchGroup _g; + /** Logging . */ private static Logger log = Logger.getLogger(ABarrelSiliconDetector.class); Index: AEndcapTRTDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapTRTDetector.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AEndcapTRTDetector.java 24 Jan 2007 17:00:42 -0000 1.2 --- AEndcapTRTDetector.java 17 Oct 2007 13:22:48 -0000 1.3 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.3 2007/10/17 13:22:48 hrivnac + * subdetectors grouped + * * Revision 1.2 2007/01/24 17:00:42 hrivnac * migrated to JAXB 2.0, simplified *************** *** 56,59 **** --- 59,69 ---- } + // Create container + if (_g == null) { + _g = new BranchGroup(); + use(_g, "EndcapTRTDetector", "Endcap TRT Detector Container"); + } + set(builder, _g, "EndcapTRTDetector"); + // Get element properties AEndcapTRTDetectorType aEndcapTRTDetector = (AEndcapTRTDetectorType)element; *************** *** 83,86 **** --- 93,98 ---- private static int k = 0; + private static BranchGroup _g; + /** Logging . */ private static Logger log = Logger.getLogger(AEndcapTRTDetector.class); Index: ABarrelCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelCalorimeter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ABarrelCalorimeter.java 15 Oct 2007 15:46:54 -0000 1.6 --- ABarrelCalorimeter.java 17 Oct 2007 13:22:47 -0000 1.7 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.7 2007/10/17 13:22:47 hrivnac + * subdetectors grouped + * * Revision 1.6 2007/10/15 15:46:54 hrivnac * cleaning *************** *** 68,71 **** --- 71,81 ---- } + // Create container + if (_g == null) { + _g = new BranchGroup(); + use(_g, "BarrelCalorimeter", "Barrel Calorimeter Container"); + } + set(builder, _g, "BarrelCalorimeter"); + // Get element properties ABarrelCalorimeterType aBarrelCalorimeter = (ABarrelCalorimeterType)element; *************** *** 120,123 **** --- 130,135 ---- private static int k = 0; + private static BranchGroup _g; + /** Logging . */ private static Logger log = Logger.getLogger(ABarrelCalorimeter.class); Index: AEndcapCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapCalorimeter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AEndcapCalorimeter.java 24 Jan 2007 17:00:42 -0000 1.4 --- AEndcapCalorimeter.java 17 Oct 2007 13:22:47 -0000 1.5 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.5 2007/10/17 13:22:47 hrivnac + * subdetectors grouped + * * Revision 1.4 2007/01/24 17:00:42 hrivnac * migrated to JAXB 2.0, simplified *************** *** 62,65 **** --- 65,75 ---- } + // Create container + if (_g == null) { + _g = new BranchGroup(); + use(_g, "EndcapCalorimeter", "Endcal Calorimeter Container"); + } + set(builder, _g, "EndcapCalorimeter"); + // Get element properties AEndcapCalorimeterType aEndcapCalorimeter = (AEndcapCalorimeterType)element; *************** *** 119,122 **** --- 129,134 ---- private static int k = 0; + private static BranchGroup _g; + /** Logging . */ private static Logger log = Logger.getLogger(AEndcapCalorimeter.class); Index: AGapCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGapCalorimeter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AGapCalorimeter.java 24 Jan 2007 17:00:42 -0000 1.3 --- AGapCalorimeter.java 17 Oct 2007 13:22:48 -0000 1.4 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.4 2007/10/17 13:22:48 hrivnac + * subdetectors grouped + * * Revision 1.3 2007/01/24 17:00:42 hrivnac * migrated to JAXB 2.0, simplified *************** *** 59,62 **** --- 62,72 ---- } + // Create container + if (_g == null) { + _g = new BranchGroup(); + use(_g, "GapCalorimeter", "Gap Calorimeter Container"); + } + set(builder, _g, "GapCalorimeter"); + // Get element properties AGapCalorimeterType aGapCalorimeter = (AGapCalorimeterType)element; *************** *** 88,91 **** --- 98,103 ---- private static int k = 0; + private static BranchGroup _g; + /** Logging . */ private static Logger log = Logger.getLogger(AGapCalorimeter.class); Index: AEndcapSiliconDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapSiliconDetector.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AEndcapSiliconDetector.java 24 Jan 2007 17:00:42 -0000 1.2 --- AEndcapSiliconDetector.java 17 Oct 2007 13:22:47 -0000 1.3 *************** *** 36,39 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.3 2007/10/17 13:22:47 hrivnac + * subdetectors grouped + * * Revision 1.2 2007/01/24 17:00:42 hrivnac * migrated to JAXB 2.0, simplified *************** *** 59,62 **** --- 62,72 ---- } + // Create container + if (_g == null) { + _g = new BranchGroup(); + use(_g, "EndcapSiliconDetector", "Endcap Silicon Detector Container"); + } + set(builder, _g, "EndcapSiliconDetector"); + // Get element properties AEndcapSiliconDetectorType aEndcapSiliconDetector = (AEndcapSiliconDetectorType)element; *************** *** 91,94 **** --- 101,106 ---- private static int k = 0; + private static BranchGroup _g; + /** Logging . */ private static Logger log = Logger.getLogger(AEndcapSiliconDetector.class); |
|
From: Julius H. <hr...@us...> - 2007-10-17 13:21:58
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15135/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps Modified Files: Track.java Log Message: using only Java 1.6; Tracks grouped Index: Track.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Track.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Track.java 16 Oct 2007 10:12:58 -0000 1.5 --- Track.java 17 Oct 2007 13:22:00 -0000 1.6 *************** *** 73,76 **** --- 73,79 ---- * <pre> * $Log$ + * Revision 1.6 2007/10/17 13:22:00 hrivnac + * using only Java 1.6; Tracks grouped + * * Revision 1.5 2007/10/16 10:12:58 hrivnac * usable with java 1.5 *************** *** 105,108 **** --- 108,116 ---- } + // Create container + BranchGroup g = new BranchGroup(); + use(g, "Tracks", "Track Container"); + set(builder, g, "Tracks"); + // Get Type properties TrackType track = (TrackType)element; |
|
From: Julius H. <hr...@us...> - 2007-10-17 13:21:16
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15071 Modified Files: GraXML.jnlp Log Message: using only Java 1.6 Index: GraXML.jnlp =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXML.jnlp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** GraXML.jnlp 16 Oct 2007 10:11:51 -0000 1.9 --- GraXML.jnlp 17 Oct 2007 13:21:17 -0000 1.10 *************** *** 1,12 **** <?xml version="1.0" encoding="utf-8"?> ! <jnlp spec="1.0+" codebase="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML" href="GraXML.jnlp" version="@VERSION@ [@BUILD@]"> <information> <title>GraXML - @VERSION@ [@BUILD@]</title> <vendor>J.Hrivnac</vendor> ! <homepage href="http://home.cern.ch/hrivnac/Activities/Packages/GraXML"/> <description kind="tooltip">Framework for manipulation and visualisation of geometrical objects in space.</description> <description kind="one-line">Framework for manipulation and visualisation of geometrical objects in space.</description> <description kind="short">Framework for manipulation and visualisation of geometrical objects in space.</description> ! <icon kind="default" href="GraXML.gif"/> <offline-allowed/> </information> --- 1,12 ---- <?xml version="1.0" encoding="utf-8"?> ! <jnlp spec="1.0+" codebase="http://cern.ch/hrivnac/Activities/Packages/WebStart/GraXML" href="GraXML.jnlp" version="@VERSION@ [@BUILD@]"> <information> <title>GraXML - @VERSION@ [@BUILD@]</title> <vendor>J.Hrivnac</vendor> ! <homepage href="http://cern.ch/hrivnac/Activities/Packages/GraXML"/> <description kind="tooltip">Framework for manipulation and visualisation of geometrical objects in space.</description> <description kind="one-line">Framework for manipulation and visualisation of geometrical objects in space.</description> <description kind="short">Framework for manipulation and visualisation of geometrical objects in space.</description> ! <icon kind="default" href="http://cern.ch/hrivnac/Activities/Packages/WebStart/GraXML.gif"/> <offline-allowed/> </information> *************** *** 31,48 **** <jar href="jars/log4j-1.2.8.jar"/> <jar href="jars/xercesImpl.jar"/> - <jar href="jars/xml-apis.jar"/> - <!-- Java 1.5 --> - <jar href="jaxb-api.jar"/> - <jar href="jaxb-impl.jar"/> - <jar href="jaxb-libs.jar"/> - <jar href="jaxb-xjc.jar"/> - <jar href="jaxp-api.jar"/> - <jar href="jax-qname.jar"/> - <jar href="activation.jar"/> - <jar href="jsr173_1.0_api.jar"/> - <jar href="namespace.jar"/> - <jar href="relaxngDatatype.jar"/> - <jar href="xsdlib.jar"/> - <!-- --> <extension href="http://download.java.net/media/java3d/webstart/release/java3d-1.5.1.jnlp"/> </resources> --- 31,34 ---- |
|
From: Julius H. <hr...@us...> - 2007-10-17 13:21:15
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15071/net/hep/graphics/GraXML/GUI Modified Files: RootWindow.java Log Message: using only Java 1.6 Index: RootWindow.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/RootWindow.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** RootWindow.java 12 Oct 2007 23:47:28 -0000 1.11 --- RootWindow.java 17 Oct 2007 13:21:17 -0000 1.12 *************** *** 79,82 **** --- 79,85 ---- * <pre> * $Log$ + * Revision 1.12 2007/10/17 13:21:17 hrivnac + * using only Java 1.6 + * * Revision 1.11 2007/10/12 23:47:28 hrivnac * monitoring (fps, mb) added *************** *** 293,297 **** --- 296,302 ---- public final void showEmbedded(String file) { try { + ViewerTreeFactory.connectionManager().hide("GraXML"); show(new SceneGroup(_demos.get(file))); + ViewerTreeFactory.connectionManager().show("GraXML"); } catch (GraXMLException e) { |
|
From: Julius H. <hr...@us...> - 2007-10-17 13:19:44
|
Update of /cvsroot/graxml/DetDescr/GDML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14209 Modified Files: build.xml Log Message: using only Java 1.6 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/ant/build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** build.xml 16 Oct 2007 10:15:27 -0000 1.12 --- build.xml 17 Oct 2007 13:19:43 -0000 1.13 *************** *** 17,21 **** <pathelement path="${GraXML.core}"/> <pathelement path="${BeanShell.core}"/> - <pathelement path="${Xerces.API}"/> <pathelement path="${Xerces.Impl}"/> <pathelement path="${FreeHEP.Hep3D}"/> --- 17,20 ---- *************** *** 24,41 **** <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> - <!-- Java 1.5 --> - <pathelement path="${JAXP-2.0.api}"/> - <pathelement path="${JAXB-2.0.api}"/> - <pathelement path="${JAXB-2.0.libs}"/> - <pathelement path="${JAXB-2.0.impl}"/> - <pathelement path="${JAXB-2.0.xjc}"/> - <pathelement path="${JWSDP.activation}"/> - <pathelement path="${JWSDP.namespace}"/> - <pathelement path="${JWSDP.relax}"/> - <pathelement path="${JWSDP.qname}"/> - <pathelement path="${JWSDP.jsr173}"/> - <pathelement path="${JWSDP.mail}"/> - <pathelement path="${JWSDP.xsd}"/> - <!-- --> <pathelement path="${Log4J.core}"/> <pathelement path="${CLASSPATH}"/> --- 23,26 ---- *************** *** 71,75 **** <fileset file="${GraXML.core}"/> <fileset file="${BeanShell.core}"/> - <fileset file="${Xerces.API}"/> <fileset file="${Xerces.Impl}"/> <fileset file="${FreeHEP.Hep3D}"/> --- 56,59 ---- *************** *** 78,95 **** <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> - <!-- Java 1.5 --> - <fileset file="${JAXP-2.0.api}"/> - <fileset file="${JAXB-2.0.api}"/> - <fileset file="${JAXB-2.0.libs}"/> - <fileset file="${JAXB-2.0.impl}"/> - <fileset file="${JAXB-2.0.xjc}"/> - <fileset file="${JWSDP.activation}"/> - <fileset file="${JWSDP.namespace}"/> - <fileset file="${JWSDP.relax}"/> - <fileset file="${JWSDP.qname}"/> - <fileset file="${JWSDP.jsr173}"/> - <fileset file="${JWSDP.mail}"/> - <fileset file="${JWSDP.xsd}"/> - <!-- --> <fileset file="${Log4J.core}"/> </copy> --- 62,65 ---- |
|
From: Julius H. <hr...@us...> - 2007-10-17 13:19:19
|
Update of /cvsroot/graxml/DetDescr/AGDD/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14183 Modified Files: build.xml Log Message: using only Java 1.6 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/build.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** build.xml 16 Oct 2007 10:15:11 -0000 1.16 --- build.xml 17 Oct 2007 13:19:17 -0000 1.17 *************** *** 17,21 **** <pathelement path="${GraXML.core}"/> <pathelement path="${BeanShell.core}"/> - <pathelement path="${Xerces.API}"/> <pathelement path="${Xerces.Impl}"/> <pathelement path="${FreeHEP.Hep3D}"/> --- 17,20 ---- *************** *** 24,41 **** <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> - <!-- Java 1.5 --> - <pathelement path="${JAXP-2.0.api}"/> - <pathelement path="${JAXB-2.0.api}"/> - <pathelement path="${JAXB-2.0.libs}"/> - <pathelement path="${JAXB-2.0.impl}"/> - <pathelement path="${JAXB-2.0.xjc}"/> - <pathelement path="${JWSDP.activation}"/> - <pathelement path="${JWSDP.namespace}"/> - <pathelement path="${JWSDP.relax}"/> - <pathelement path="${JWSDP.qname}"/> - <pathelement path="${JWSDP.jsr173}"/> - <pathelement path="${JWSDP.mail}"/> - <pathelement path="${JWSDP.xsd}"/> - <!-- --> <pathelement path="${Log4J.core}"/> <pathelement path="${CLASSPATH}"/> --- 23,26 ---- *************** *** 75,79 **** <fileset file="${GraXML.core}"/> <fileset file="${BeanShell.core}"/> - <fileset file="${Xerces.API}"/> <fileset file="${Xerces.Impl}"/> <fileset file="${FreeHEP.Hep3D}"/> --- 60,63 ---- *************** *** 82,99 **** <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> - <!-- Java 1.5 --> - <fileset file="${JAXP-2.0.api}"/> - <fileset file="${JAXB-2.0.api}"/> - <fileset file="${JAXB-2.0.libs}"/> - <fileset file="${JAXB-2.0.impl}"/> - <fileset file="${JAXB-2.0.xjc}"/> - <fileset file="${JWSDP.activation}"/> - <fileset file="${JWSDP.namespace}"/> - <fileset file="${JWSDP.relax}"/> - <fileset file="${JWSDP.qname}"/> - <fileset file="${JWSDP.jsr173}"/> - <fileset file="${JWSDP.mail}"/> - <fileset file="${JWSDP.xsd}"/> - <!-- --> <fileset file="${Log4J.core}"/> </copy> --- 66,69 ---- |
|
From: Julius H. <hr...@us...> - 2007-10-17 13:19:02
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13800 Modified Files: build.xml Log Message: using only Java 1.6 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/ant/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 16 Oct 2007 10:14:48 -0000 1.6 --- build.xml 17 Oct 2007 13:19:02 -0000 1.7 *************** *** 16,20 **** <path id="classpath.build"> <pathelement path="${GraXML.core}"/> - <pathelement path="${Xerces.API}"/> <pathelement path="${Xerces.Impl}"/> <pathelement path="${FreeHEP.Hep3D}"/> --- 16,19 ---- *************** *** 23,40 **** <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> - <!-- Java 1.5 --> - <pathelement path="${JAXP-2.0.api}"/> - <pathelement path="${JAXB-2.0.api}"/> - <pathelement path="${JAXB-2.0.libs}"/> - <pathelement path="${JAXB-2.0.impl}"/> - <pathelement path="${JAXB-2.0.xjc}"/> - <pathelement path="${JWSDP.activation}"/> - <pathelement path="${JWSDP.namespace}"/> - <pathelement path="${JWSDP.relax}"/> - <pathelement path="${JWSDP.qname}"/> - <pathelement path="${JWSDP.jsr173}"/> - <pathelement path="${JWSDP.mail}"/> - <pathelement path="${JWSDP.xsd}"/> - <!-- --> <pathelement path="${Log4J.core}"/> <pathelement path="${CLASSPATH}"/> --- 22,25 ---- *************** *** 69,73 **** <copy todir="${lib}"> <fileset file="${GraXML.core}"/> - <fileset file="${Xerces.API}"/> <fileset file="${Xerces.Impl}"/> <fileset file="${FreeHEP.Hep3D}"/> --- 54,57 ---- *************** *** 76,93 **** <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> - <!-- Java 1.5 --> - <fileset file="${JAXP-2.0.api}"/> - <fileset file="${JAXB-2.0.api}"/> - <fileset file="${JAXB-2.0.libs}"/> - <fileset file="${JAXB-2.0.impl}"/> - <fileset file="${JAXB-2.0.xjc}"/> - <fileset file="${JWSDP.activation}"/> - <fileset file="${JWSDP.namespace}"/> - <fileset file="${JWSDP.relax}"/> - <fileset file="${JWSDP.qname}"/> - <fileset file="${JWSDP.jsr173}"/> - <fileset file="${JWSDP.mail}"/> - <fileset file="${JWSDP.xsd}"/> - <!-- --> <fileset file="${Log4J.core}"/> </copy> --- 60,63 ---- |
|
From: Julius H. <hr...@us...> - 2007-10-17 13:18:44
|
Update of /cvsroot/graxml/Graphics/JiveEvent/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13760 Modified Files: build.xml Log Message: using only Java 1.6 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/ant/build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** build.xml 16 Oct 2007 10:13:15 -0000 1.12 --- build.xml 17 Oct 2007 13:18:41 -0000 1.13 *************** *** 17,21 **** <pathelement path="${GraXML.core}"/> <pathelement path="${JiveGeometry.core}"/> - <pathelement path="${Xerces.API}"/> <pathelement path="${Xerces.Impl}"/> <pathelement path="${FreeHEP.Hep3D}"/> --- 17,20 ---- *************** *** 24,41 **** <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> - <!-- Java 1.5 --> - <pathelement path="${JAXP-2.0.api}"/> - <pathelement path="${JAXB-2.0.api}"/> - <pathelement path="${JAXB-2.0.libs}"/> - <pathelement path="${JAXB-2.0.impl}"/> - <pathelement path="${JAXB-2.0.xjc}"/> - <pathelement path="${JWSDP.activation}"/> - <pathelement path="${JWSDP.namespace}"/> - <pathelement path="${JWSDP.relax}"/> - <pathelement path="${JWSDP.qname}"/> - <pathelement path="${JWSDP.jsr173}"/> - <pathelement path="${JWSDP.mail}"/> - <pathelement path="${JWSDP.xsd}"/> - <!-- --> <pathelement path="${Log4J.core}"/> <pathelement path="${CLASSPATH}"/> --- 23,26 ---- *************** *** 71,75 **** <fileset file="${GraXML.core}"/> <fileset file="${JiveGeometry.core}"/> - <fileset file="${Xerces.API}"/> <fileset file="${Xerces.Impl}"/> <fileset file="${FreeHEP.Hep3D}"/> --- 56,59 ---- *************** *** 78,95 **** <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> - <!-- Java 1.5 --> - <fileset file="${JAXP-2.0.api}"/> - <fileset file="${JAXB-2.0.api}"/> - <fileset file="${JAXB-2.0.libs}"/> - <fileset file="${JAXB-2.0.impl}"/> - <fileset file="${JAXB-2.0.xjc}"/> - <fileset file="${JWSDP.activation}"/> - <fileset file="${JWSDP.namespace}"/> - <fileset file="${JWSDP.relax}"/> - <fileset file="${JWSDP.qname}"/> - <fileset file="${JWSDP.jsr173}"/> - <fileset file="${JWSDP.mail}"/> - <fileset file="${JWSDP.xsd}"/> - <!-- --> <fileset file="${Log4J.core}"/> </copy> --- 62,65 ---- |
|
From: Julius H. <hr...@us...> - 2007-10-17 13:18:26
|
Update of /cvsroot/graxml/Graphics/HEP3D/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13736 Modified Files: build.xml Log Message: using only Java 1.6 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/ant/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** build.xml 16 Oct 2007 10:13:52 -0000 1.7 --- build.xml 17 Oct 2007 13:18:25 -0000 1.8 *************** *** 68,73 **** </target> ! <!-- JAR =========================================Shape3D can be outlined without clone creation.</li> ! <li>Shape3Ds are stripified for performance.=========================--> <target name="jar" --- 68,72 ---- </target> ! <!-- JAR ===================================================================--> <target name="jar" |
|
From: Julius H. <hr...@us...> - 2007-10-17 13:18:09
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13350 Modified Files: build.xml Log Message: using only Java 1.6 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/build.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** build.xml 16 Oct 2007 10:12:05 -0000 1.18 --- build.xml 17 Oct 2007 13:17:58 -0000 1.19 *************** *** 21,25 **** <pathelement path="${JLFGR.core}"/> <pathelement path="${BeanShell.core}"/> - <pathelement path="${Xerces.API}"/> <pathelement path="${Xerces.Impl}"/> <pathelement path="${Log4J.core}"/> --- 21,24 ---- *************** *** 30,47 **** <pathelement path="${Java3D.vecmath}"/> <pathelement path="${Java3D.bool}"/> - <!-- Java 1.5 --> - <pathelement path="${JAXP-2.0.api}"/> - <pathelement path="${JAXB-2.0.api}"/> - <pathelement path="${JAXB-2.0.libs}"/> - <pathelement path="${JAXB-2.0.impl}"/> - <pathelement path="${JAXB-2.0.xjc}"/> - <pathelement path="${JWSDP.activation}"/> - <pathelement path="${JWSDP.namespace}"/> - <pathelement path="${JWSDP.relax}"/> - <pathelement path="${JWSDP.qname}"/> - <pathelement path="${JWSDP.jsr173}"/> - <pathelement path="${JWSDP.mail}"/> - <pathelement path="${JWSDP.xsd}"/> - <!-- --> <pathelement path="${AGDD.core}"/> <pathelement path="${GDML.core}"/> --- 29,32 ---- *************** *** 82,86 **** <fileset file="${JLFGR.core}"/> <fileset file="${BeanShell.core}"/> - <fileset file="${Xerces.API}"/> <fileset file="${Xerces.Impl}"/> <fileset file="${Log4J.core}"/> --- 67,70 ---- *************** *** 91,108 **** <fileset file="${Java3D.vecmath}"/> <fileset file="${Java3D.bool}"/> - <!-- Java 1.5 --> - <fileset file="${JAXP-2.0.api}"/> - <fileset file="${JAXB-2.0.api}"/> - <fileset file="${JAXB-2.0.libs}"/> - <fileset file="${JAXB-2.0.impl}"/> - <fileset file="${JAXB-2.0.xjc}"/> - <fileset file="${JWSDP.activation}"/> - <fileset file="${JWSDP.namespace}"/> - <fileset file="${JWSDP.relax}"/> - <fileset file="${JWSDP.qname}"/> - <fileset file="${JWSDP.jsr173}"/> - <fileset file="${JWSDP.mail}"/> - <fileset file="${JWSDP.xsd}"/> - <!-- --> <fileset file="${AGDD.core}"/> <fileset file="${GDML.core}"/> --- 75,78 ---- *************** *** 238,255 **** log4j-1.2.8.jar vecmath.jar ! xercesImpl.jar ! xml-apis.jar"/> ! <!-- Java 1.5 --> ! <fileset dir="${lib}" includes="jaxb-api.jar ! jaxb-impl.jar ! jaxb-libs.jar ! jaxb-xjc.jar ! jaxp-api.jar ! jax-qname.jar ! activation.jar ! jsr173_1.0_api.jar ! namespace.jar ! relaxngDatatype.jar ! xsdlib.jar"/> </copy> <copy todir="${atlantis.lib}/i386"> --- 208,212 ---- log4j-1.2.8.jar vecmath.jar ! xercesImpl.jar"/> </copy> <copy todir="${atlantis.lib}/i386"> *************** *** 285,302 **** <include name="vecmath.jar"/> <include name="xercesImpl.jar"/> - <include name="xml-apis.jar"/> - <!-- Java 1.5 --> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-libs.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxp-api.jar"/> - <include name="jax-qname.jar"/> - <include name="activation.jar"/> - <include name="jsr173_1.0_api.jar"/> - <include name="namespace.jar"/> - <include name="relaxngDatatype.jar"/> - <include name="xsdlib.jar"/> - <!-- --> </tarfileset> <tarfileset dir="${lib}/i386" prefix="lib/i386"> --- 242,245 ---- |
|
From: Julius H. <hr...@us...> - 2007-10-16 10:15:27
|
Update of /cvsroot/graxml/DetDescr/GDML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13751 Modified Files: build.xml Log Message: usable with java 1.5 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/ant/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** build.xml 8 Oct 2007 12:35:27 -0000 1.11 --- build.xml 16 Oct 2007 10:15:27 -0000 1.12 *************** *** 24,27 **** --- 24,41 ---- <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> + <!-- Java 1.5 --> + <pathelement path="${JAXP-2.0.api}"/> + <pathelement path="${JAXB-2.0.api}"/> + <pathelement path="${JAXB-2.0.libs}"/> + <pathelement path="${JAXB-2.0.impl}"/> + <pathelement path="${JAXB-2.0.xjc}"/> + <pathelement path="${JWSDP.activation}"/> + <pathelement path="${JWSDP.namespace}"/> + <pathelement path="${JWSDP.relax}"/> + <pathelement path="${JWSDP.qname}"/> + <pathelement path="${JWSDP.jsr173}"/> + <pathelement path="${JWSDP.mail}"/> + <pathelement path="${JWSDP.xsd}"/> + <!-- --> <pathelement path="${Log4J.core}"/> <pathelement path="${CLASSPATH}"/> *************** *** 64,70 **** <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> ! <fileset dir="${Java3D.libdir}"/> <fileset file="${Log4J.core}"/> </copy> <copy todir="${etc}" flatten="true"> <fileset dir="${src}" includes="net/hep/geant4/GDML/Schema/*.xsd"/> --- 78,105 ---- <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> ! <!-- Java 1.5 --> ! <fileset file="${JAXP-2.0.api}"/> ! <fileset file="${JAXB-2.0.api}"/> ! <fileset file="${JAXB-2.0.libs}"/> ! <fileset file="${JAXB-2.0.impl}"/> ! <fileset file="${JAXB-2.0.xjc}"/> ! <fileset file="${JWSDP.activation}"/> ! <fileset file="${JWSDP.namespace}"/> ! <fileset file="${JWSDP.relax}"/> ! <fileset file="${JWSDP.qname}"/> ! <fileset file="${JWSDP.jsr173}"/> ! <fileset file="${JWSDP.mail}"/> ! <fileset file="${JWSDP.xsd}"/> ! <!-- --> <fileset file="${Log4J.core}"/> </copy> + <mkdir dir="${lib}/i386"/> + <copy todir="${lib}/i386"> + <fileset dir="${Java3D.i386}"/> + </copy> + <mkdir dir="${lib}/amd64"/> + <copy todir="${lib}/amd64"> + <fileset dir="${Java3D.amd64}"/> + </copy> <copy todir="${etc}" flatten="true"> <fileset dir="${src}" includes="net/hep/geant4/GDML/Schema/*.xsd"/> |
|
From: Julius H. <hr...@us...> - 2007-10-16 10:15:10
|
Update of /cvsroot/graxml/DetDescr/AGDD/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13612 Modified Files: build.xml Log Message: usable with java 1.5 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/build.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** build.xml 8 Oct 2007 12:31:13 -0000 1.15 --- build.xml 16 Oct 2007 10:15:11 -0000 1.16 *************** *** 24,27 **** --- 24,41 ---- <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> + <!-- Java 1.5 --> + <pathelement path="${JAXP-2.0.api}"/> + <pathelement path="${JAXB-2.0.api}"/> + <pathelement path="${JAXB-2.0.libs}"/> + <pathelement path="${JAXB-2.0.impl}"/> + <pathelement path="${JAXB-2.0.xjc}"/> + <pathelement path="${JWSDP.activation}"/> + <pathelement path="${JWSDP.namespace}"/> + <pathelement path="${JWSDP.relax}"/> + <pathelement path="${JWSDP.qname}"/> + <pathelement path="${JWSDP.jsr173}"/> + <pathelement path="${JWSDP.mail}"/> + <pathelement path="${JWSDP.xsd}"/> + <!-- --> <pathelement path="${Log4J.core}"/> <pathelement path="${CLASSPATH}"/> *************** *** 68,74 **** <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> ! <fileset dir="${Java3D.libdir}"/> <fileset file="${Log4J.core}"/> </copy> <copy todir="${etc}" flatten="true"> <fileset dir="${src}" includes="net/hep/AGDD/Schema/*.xsd"/> --- 82,109 ---- <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> ! <!-- Java 1.5 --> ! <fileset file="${JAXP-2.0.api}"/> ! <fileset file="${JAXB-2.0.api}"/> ! <fileset file="${JAXB-2.0.libs}"/> ! <fileset file="${JAXB-2.0.impl}"/> ! <fileset file="${JAXB-2.0.xjc}"/> ! <fileset file="${JWSDP.activation}"/> ! <fileset file="${JWSDP.namespace}"/> ! <fileset file="${JWSDP.relax}"/> ! <fileset file="${JWSDP.qname}"/> ! <fileset file="${JWSDP.jsr173}"/> ! <fileset file="${JWSDP.mail}"/> ! <fileset file="${JWSDP.xsd}"/> ! <!-- --> <fileset file="${Log4J.core}"/> </copy> + <mkdir dir="${lib}/i386"/> + <copy todir="${lib}/i386"> + <fileset dir="${Java3D.i386}"/> + </copy> + <mkdir dir="${lib}/amd64"/> + <copy todir="${lib}/amd64"> + <fileset dir="${Java3D.amd64}"/> + </copy> <copy todir="${etc}" flatten="true"> <fileset dir="${src}" includes="net/hep/AGDD/Schema/*.xsd"/> *************** *** 85,89 **** depends="init" description="Generate JAXB classes"> ! <ant antfile="${config.db}/standard.xml" target="standard.jaxb"> <property name="dir" value="${build}"/> <property name="schema" value="${src}/net/hep/AGDD/Schema/AGDD.xsd"/> --- 120,124 ---- depends="init" description="Generate JAXB classes"> ! <ant antfile="${config.db}/standard.xml" target="standard.jaxb" inheritRefs="true"> <property name="dir" value="${build}"/> <property name="schema" value="${src}/net/hep/AGDD/Schema/AGDD.xsd"/> |
|
From: Julius H. <hr...@us...> - 2007-10-16 10:14:46
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13330 Modified Files: build.xml Log Message: usable with java 1.5 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/ant/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 8 Oct 2007 12:41:14 -0000 1.5 --- build.xml 16 Oct 2007 10:14:48 -0000 1.6 *************** *** 23,26 **** --- 23,40 ---- <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> + <!-- Java 1.5 --> + <pathelement path="${JAXP-2.0.api}"/> + <pathelement path="${JAXB-2.0.api}"/> + <pathelement path="${JAXB-2.0.libs}"/> + <pathelement path="${JAXB-2.0.impl}"/> + <pathelement path="${JAXB-2.0.xjc}"/> + <pathelement path="${JWSDP.activation}"/> + <pathelement path="${JWSDP.namespace}"/> + <pathelement path="${JWSDP.relax}"/> + <pathelement path="${JWSDP.qname}"/> + <pathelement path="${JWSDP.jsr173}"/> + <pathelement path="${JWSDP.mail}"/> + <pathelement path="${JWSDP.xsd}"/> + <!-- --> <pathelement path="${Log4J.core}"/> <pathelement path="${CLASSPATH}"/> *************** *** 62,68 **** <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> ! <fileset dir="${Java3D.libdir}"/> <fileset file="${Log4J.core}"/> </copy> <copy todir="${etc}" flatten="true"> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Schema/*.dtd"/> --- 76,103 ---- <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> ! <!-- Java 1.5 --> ! <fileset file="${JAXP-2.0.api}"/> ! <fileset file="${JAXB-2.0.api}"/> ! <fileset file="${JAXB-2.0.libs}"/> ! <fileset file="${JAXB-2.0.impl}"/> ! <fileset file="${JAXB-2.0.xjc}"/> ! <fileset file="${JWSDP.activation}"/> ! <fileset file="${JWSDP.namespace}"/> ! <fileset file="${JWSDP.relax}"/> ! <fileset file="${JWSDP.qname}"/> ! <fileset file="${JWSDP.jsr173}"/> ! <fileset file="${JWSDP.mail}"/> ! <fileset file="${JWSDP.xsd}"/> ! <!-- --> <fileset file="${Log4J.core}"/> </copy> + <mkdir dir="${lib}/i386"/> + <copy todir="${lib}/i386"> + <fileset dir="${Java3D.i386}"/> + </copy> + <mkdir dir="${lib}/amd64"/> + <copy todir="${lib}/amd64"> + <fileset dir="${Java3D.amd64}"/> + </copy> <copy todir="${etc}" flatten="true"> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Schema/*.dtd"/> |
|
From: Julius H. <hr...@us...> - 2007-10-16 10:13:51
|
Update of /cvsroot/graxml/Graphics/HEP3D/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12910 Modified Files: build.xml Log Message: usable with java 1.5 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/ant/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 16 Jan 2007 14:56:25 -0000 1.6 --- build.xml 16 Oct 2007 10:13:52 -0000 1.7 *************** *** 49,53 **** <fileset file="${Java3D.vecmath}"/> <fileset file="${Java3D.bool}"/> ! <fileset dir="${Java3D.libdir}"/> </copy> </target> --- 49,60 ---- <fileset file="${Java3D.vecmath}"/> <fileset file="${Java3D.bool}"/> ! </copy> ! <mkdir dir="${lib}/i386"/> ! <copy todir="${lib}/i386"> ! <fileset dir="${Java3D.i386}"/> ! </copy> ! <mkdir dir="${lib}/amd64"/> ! <copy todir="${lib}/amd64"> ! <fileset dir="${Java3D.amd64}"/> </copy> </target> *************** *** 173,177 **** <group title="freehep-hep3d" packages="hep.graphics.j3d"/> <group title="freehep-hep3d/geant4" packages="hep.graphics.j3d.geant4"/> ! <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> <link href="http://java.sun.com/products/java-media/3D/forDevelopers/J3D_1_3_API/j3dapi"/> <classpath> --- 180,184 ---- <group title="freehep-hep3d" packages="hep.graphics.j3d"/> <group title="freehep-hep3d/geant4" packages="hep.graphics.j3d.geant4"/> ! <link href="http://java.sun.com/j2se/1.6.0/docs/api"/> <link href="http://java.sun.com/products/java-media/3D/forDevelopers/J3D_1_3_API/j3dapi"/> <classpath> |
|
From: Julius H. <hr...@us...> - 2007-10-16 10:13:16
|
Update of /cvsroot/graxml/Graphics/JiveEvent/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12859 Modified Files: build.xml Log Message: usable with java 1.5 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/ant/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** build.xml 8 Oct 2007 12:38:50 -0000 1.11 --- build.xml 16 Oct 2007 10:13:15 -0000 1.12 *************** *** 24,27 **** --- 24,41 ---- <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> + <!-- Java 1.5 --> + <pathelement path="${JAXP-2.0.api}"/> + <pathelement path="${JAXB-2.0.api}"/> + <pathelement path="${JAXB-2.0.libs}"/> + <pathelement path="${JAXB-2.0.impl}"/> + <pathelement path="${JAXB-2.0.xjc}"/> + <pathelement path="${JWSDP.activation}"/> + <pathelement path="${JWSDP.namespace}"/> + <pathelement path="${JWSDP.relax}"/> + <pathelement path="${JWSDP.qname}"/> + <pathelement path="${JWSDP.jsr173}"/> + <pathelement path="${JWSDP.mail}"/> + <pathelement path="${JWSDP.xsd}"/> + <!-- --> <pathelement path="${Log4J.core}"/> <pathelement path="${CLASSPATH}"/> *************** *** 64,69 **** <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> ! <fileset dir="${Java3D.libdir}"/> ! <fileset file="${Log4J.core}"/> </copy> <copy todir="${etc}" flatten="true"> --- 78,104 ---- <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> ! <!-- Java 1.5 --> ! <fileset file="${JAXP-2.0.api}"/> ! <fileset file="${JAXB-2.0.api}"/> ! <fileset file="${JAXB-2.0.libs}"/> ! <fileset file="${JAXB-2.0.impl}"/> ! <fileset file="${JAXB-2.0.xjc}"/> ! <fileset file="${JWSDP.activation}"/> ! <fileset file="${JWSDP.namespace}"/> ! <fileset file="${JWSDP.relax}"/> ! <fileset file="${JWSDP.qname}"/> ! <fileset file="${JWSDP.jsr173}"/> ! <fileset file="${JWSDP.mail}"/> ! <fileset file="${JWSDP.xsd}"/> ! <!-- --> ! <fileset file="${Log4J.core}"/> ! </copy> ! <mkdir dir="${lib}/i386"/> ! <copy todir="${lib}/i386"> ! <fileset dir="${Java3D.i386}"/> ! </copy> ! <mkdir dir="${lib}/amd64"/> ! <copy todir="${lib}/amd64"> ! <fileset dir="${Java3D.amd64}"/> </copy> <copy todir="${etc}" flatten="true"> *************** *** 114,118 **** <fileset dir="${build}" includes="**/*.properties"/> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveEvent/Schema/event.xsd"/> ! <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveEvent/Test/data/ttbar_t1_full_01.xml"/> </jar> </target> --- 149,153 ---- <fileset dir="${build}" includes="**/*.properties"/> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveEvent/Schema/event.xsd"/> ! <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveEvent/Test/data/JiveXML_5200_01388.xml"/> </jar> </target> |
|
From: Julius H. <hr...@us...> - 2007-10-16 10:12:58
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12496/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps Modified Files: S3D.java STC.java STr.java Track.java Log Message: usable with java 1.5 Index: S3D.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/S3D.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** S3D.java 15 Oct 2007 15:45:42 -0000 1.5 --- S3D.java 16 Oct 2007 10:12:58 -0000 1.6 *************** *** 3,7 **** import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveEventBuilder; import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveRep; - import static net.hep.atlas.graphics.JiveEvent.GeometricModel.Evaluator.SCALE; // Generic Model --- 3,6 ---- *************** *** 57,60 **** --- 56,62 ---- * <pre> * $Log$ + * Revision 1.6 2007/10/16 10:12:58 hrivnac + * usable with java 1.5 + * * Revision 1.5 2007/10/15 15:45:42 hrivnac * cleaning Index: STr.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/STr.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** STr.java 8 Oct 2007 19:42:38 -0000 1.5 --- STr.java 16 Oct 2007 10:12:58 -0000 1.6 *************** *** 3,7 **** import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveEventBuilder; import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveRep; - import static net.hep.atlas.graphics.JiveEvent.GeometricModel.Evaluator.SCALE; // Generic Model --- 3,6 ---- *************** *** 61,64 **** --- 60,66 ---- * <pre> * $Log$ + * Revision 1.6 2007/10/16 10:12:58 hrivnac + * usable with java 1.5 + * * Revision 1.5 2007/10/08 19:42:38 hrivnac * moved to Java 1.6; fixed Track Index: STC.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/STC.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** STC.java 15 Oct 2007 15:45:42 -0000 1.4 --- STC.java 16 Oct 2007 10:12:58 -0000 1.5 *************** *** 3,7 **** import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveEventBuilder; import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveRep; - import static net.hep.atlas.graphics.JiveEvent.GeometricModel.Evaluator.SCALE; // Generic Model --- 3,6 ---- *************** *** 59,62 **** --- 58,64 ---- * <pre> * $Log$ + * Revision 1.5 2007/10/16 10:12:58 hrivnac + * usable with java 1.5 + * * Revision 1.4 2007/10/15 15:45:42 hrivnac * cleaning Index: Track.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Track.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Track.java 15 Oct 2007 15:45:42 -0000 1.4 --- Track.java 16 Oct 2007 10:12:58 -0000 1.5 *************** *** 3,7 **** import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveEventBuilder; import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveRep; - import static net.hep.atlas.graphics.JiveEvent.GeometricModel.Evaluator.SCALE; // Generic Model --- 3,6 ---- *************** *** 74,77 **** --- 73,79 ---- * <pre> * $Log$ + * Revision 1.5 2007/10/16 10:12:58 hrivnac + * usable with java 1.5 + * * Revision 1.4 2007/10/15 15:45:42 hrivnac * cleaning |
|
From: Julius H. <hr...@us...> - 2007-10-16 10:12:05
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12136 Modified Files: build.xml Log Message: SplashWindow added; usable with java 1.5 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/build.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** build.xml 9 Oct 2007 17:18:07 -0000 1.17 --- build.xml 16 Oct 2007 10:12:05 -0000 1.18 *************** *** 30,33 **** --- 30,47 ---- <pathelement path="${Java3D.vecmath}"/> <pathelement path="${Java3D.bool}"/> + <!-- Java 1.5 --> + <pathelement path="${JAXP-2.0.api}"/> + <pathelement path="${JAXB-2.0.api}"/> + <pathelement path="${JAXB-2.0.libs}"/> + <pathelement path="${JAXB-2.0.impl}"/> + <pathelement path="${JAXB-2.0.xjc}"/> + <pathelement path="${JWSDP.activation}"/> + <pathelement path="${JWSDP.namespace}"/> + <pathelement path="${JWSDP.relax}"/> + <pathelement path="${JWSDP.qname}"/> + <pathelement path="${JWSDP.jsr173}"/> + <pathelement path="${JWSDP.mail}"/> + <pathelement path="${JWSDP.xsd}"/> + <!-- --> <pathelement path="${AGDD.core}"/> <pathelement path="${GDML.core}"/> *************** *** 77,80 **** --- 91,108 ---- <fileset file="${Java3D.vecmath}"/> <fileset file="${Java3D.bool}"/> + <!-- Java 1.5 --> + <fileset file="${JAXP-2.0.api}"/> + <fileset file="${JAXB-2.0.api}"/> + <fileset file="${JAXB-2.0.libs}"/> + <fileset file="${JAXB-2.0.impl}"/> + <fileset file="${JAXB-2.0.xjc}"/> + <fileset file="${JWSDP.activation}"/> + <fileset file="${JWSDP.namespace}"/> + <fileset file="${JWSDP.relax}"/> + <fileset file="${JWSDP.qname}"/> + <fileset file="${JWSDP.jsr173}"/> + <fileset file="${JWSDP.mail}"/> + <fileset file="${JWSDP.xsd}"/> + <!-- --> <fileset file="${AGDD.core}"/> <fileset file="${GDML.core}"/> *************** *** 204,207 **** --- 232,238 ---- j3dutils.jar JiveEvent.jar + JiveGeometry.jar + AGDD.jar + GDML.jar jlfgr.jar log4j-1.2.8.jar *************** *** 209,212 **** --- 240,255 ---- xercesImpl.jar xml-apis.jar"/> + <!-- Java 1.5 --> + <fileset dir="${lib}" includes="jaxb-api.jar + jaxb-impl.jar + jaxb-libs.jar + jaxb-xjc.jar + jaxp-api.jar + jax-qname.jar + activation.jar + jsr173_1.0_api.jar + namespace.jar + relaxngDatatype.jar + xsdlib.jar"/> </copy> <copy todir="${atlantis.lib}/i386"> *************** *** 243,251 **** <include name="xercesImpl.jar"/> <include name="xml-apis.jar"/> </tarfileset> <tarfileset dir="${lib}/i386" prefix="lib/i386"> <include name="*.so"/> </tarfileset> ! <tarfileset dir="${lib}/amd64" prefix="lib/amd64"> <include name="*.so"/> </tarfileset> --- 286,307 ---- <include name="xercesImpl.jar"/> <include name="xml-apis.jar"/> + <!-- Java 1.5 --> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-libs.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxp-api.jar"/> + <include name="jax-qname.jar"/> + <include name="activation.jar"/> + <include name="jsr173_1.0_api.jar"/> + <include name="namespace.jar"/> + <include name="relaxngDatatype.jar"/> + <include name="xsdlib.jar"/> + <!-- --> </tarfileset> <tarfileset dir="${lib}/i386" prefix="lib/i386"> <include name="*.so"/> </tarfileset> ! <tarfileset dir="${lib}/amd64" prefix="lib/amd64"> <include name="*.so"/> </tarfileset> |
|
From: Julius H. <hr...@us...> - 2007-10-16 10:11:53
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12042/net/hep/graphics/GraXML/FrontEnd Modified Files: GraXML.java GraXMLThread.java Added Files: SplashWindow.java Log Message: SplashWindow added; usable with java 1.5 --- NEW FILE: SplashWindow.java --- package net.hep.graphics.GraXML.FrontEnd; import net.hep.graphics.GraXML.GUI.Components.Icons; // Swing import javax.swing.JWindow; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.ImageIcon; import javax.swing.UIManager; import javax.swing.plaf.ColorUIResource; // AWT import java.awt.BorderLayout; import java.awt.GridLayout; import java.awt.Toolkit; import java.awt.Dimension; import java.awt.Font; import java.awt.Color; /** <code>SplashWindow</code> show a splash * {@link JWindow} witrh short information about GraXML. * <p><font color="#880088"> * <pre> * $Log: SplashWindow.java,v $ * Revision 1.1 2007/10/16 10:11:51 hrivnac * SplashWindow added; usable with java 1.5 * * </pre> * </font></p> * @version $Id: SplashWindow.java,v 1.1 2007/10/16 10:11:51 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class SplashWindow extends JWindow implements Runnable { /** Create. */ public SplashWindow() { _thread = new Thread(this); _thread.start(); getContentPane().setLayout(new BorderLayout()); ImageIcon icon = new ImageIcon(Icons.graxml.getImage()); getContentPane().add(BorderLayout.CENTER, new JLabel(icon)); JLabel text = new JLabel("<html><center><h1><font color='#ffffff'>Welcome to</font> <font color='#ff0000' size='+4'>GraXML</font></h1>" + "<font color='#ffffff'>http://cern.ch/hrivnac/Activities/Packages/GraXML</font></center></html>", JLabel.CENTER); JPanel panel = new JPanel(); panel.setLayout(new GridLayout(2, 1)); panel.setBackground(Color.black); panel.add(text); getContentPane().add(BorderLayout.SOUTH, panel); pack(); setVisible(true); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); setLocation(((int)(screenSize.width ) - getWidth( )) / 2, ((int)(screenSize.height) - getHeight()) / 2); } public void run() { try { _thread.sleep(5000); } catch (Exception e) {} dispose(); } private Thread _thread; } Index: GraXML.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd/GraXML.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GraXML.java 14 Jan 2007 17:04:57 -0000 1.3 --- GraXML.java 16 Oct 2007 10:11:51 -0000 1.4 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.4 2007/10/16 10:11:51 hrivnac + * SplashWindow added; usable with java 1.5 + * * Revision 1.3 2007/01/14 17:04:57 hrivnac * embedded demos included *************** *** 80,83 **** --- 83,87 ---- public GraXML() { log.info("Starting GraXML " + GlobalOptions.report() + " ..."); + new SplashWindow(); init(); (new RootWindow(MasterBuilder.j3d())).open(); *************** *** 109,115 **** } - - - - - --- 113,114 ---- Index: GraXMLThread.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd/GraXMLThread.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GraXMLThread.java 11 Oct 2007 14:41:09 -0000 1.6 --- GraXMLThread.java 16 Oct 2007 10:11:51 -0000 1.7 *************** *** 20,23 **** --- 20,26 ---- * <pre> * $Log$ + * Revision 1.7 2007/10/16 10:11:51 hrivnac + * SplashWindow added; usable with java 1.5 + * * Revision 1.6 2007/10/11 14:41:09 hrivnac * connection to Atlantis improved *************** *** 49,52 **** --- 52,56 ---- super("GraXML"); log.info("Starting GraXMLThread " + GlobalOptions.report() + " ..."); + new SplashWindow(); init(); _root = new RootWindow(MasterBuilder.j3d()); |
|
From: Julius H. <hr...@us...> - 2007-10-16 10:11:51
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12042 Modified Files: GraXML.jnlp Log Message: SplashWindow added; usable with java 1.5 Index: GraXML.jnlp =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXML.jnlp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** GraXML.jnlp 9 Oct 2007 17:17:50 -0000 1.8 --- GraXML.jnlp 16 Oct 2007 10:11:51 -0000 1.9 *************** *** 15,19 **** </security> <resources> ! <j2se max-heap-size="536870912" version="1.6+"/> <jar href="jars/AGDD.jar"/> <jar href="jars/bool.jar"/> --- 15,19 ---- </security> <resources> ! <j2se max-heap-size="536870912" version="1.5+"/> <jar href="jars/AGDD.jar"/> <jar href="jars/bool.jar"/> *************** *** 32,35 **** --- 32,48 ---- <jar href="jars/xercesImpl.jar"/> <jar href="jars/xml-apis.jar"/> + <!-- Java 1.5 --> + <jar href="jaxb-api.jar"/> + <jar href="jaxb-impl.jar"/> + <jar href="jaxb-libs.jar"/> + <jar href="jaxb-xjc.jar"/> + <jar href="jaxp-api.jar"/> + <jar href="jax-qname.jar"/> + <jar href="activation.jar"/> + <jar href="jsr173_1.0_api.jar"/> + <jar href="namespace.jar"/> + <jar href="relaxngDatatype.jar"/> + <jar href="xsdlib.jar"/> + <!-- --> <extension href="http://download.java.net/media/java3d/webstart/release/java3d-1.5.1.jnlp"/> </resources> |
|
From: Julius H. <hr...@us...> - 2007-10-16 10:11:50
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12042/net/hep/graphics/GraXML/GUI/Components Modified Files: Icons.java Log Message: SplashWindow added; usable with java 1.5 Index: Icons.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components/Icons.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Icons.java 18 Jan 2007 16:04:59 -0000 1.2 --- Icons.java 16 Oct 2007 10:11:51 -0000 1.3 *************** *** 8,11 **** --- 8,14 ---- * <pre> * $Log$ + * Revision 1.3 2007/10/16 10:11:51 hrivnac + * SplashWindow added; usable with java 1.5 + * * Revision 1.2 2007/01/18 16:04:59 hrivnac * clean button added *************** *** 40,43 **** --- 43,50 ---- private static final ClassLoader myLoader = (new Icons()).getClass().getClassLoader(); + public static final ImageIcon graxml = new ImageIcon(myLoader.getResource("net/hep/graphics/GraXML/GUI/images/graxml.gif")); + + public static final ImageIcon logo = new ImageIcon(myLoader.getResource("net/hep/graphics/GraXML/GUI/images/logo.gif")); + public static final ImageIcon exit = new ImageIcon(myLoader.getResource("net/hep/graphics/GraXML/GUI/images/exit.gif")); |
|
From: Julius H. <hr...@us...> - 2007-10-16 10:11:50
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/images In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12042/net/hep/graphics/GraXML/GUI/images Added Files: graxml.gif Log Message: SplashWindow added; usable with java 1.5 --- NEW FILE: graxml.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Julius H. <hr...@us...> - 2007-10-15 15:46:55
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15893/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: ABarrelCalorimeter.java Log Message: cleaning Index: ABarrelCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelCalorimeter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ABarrelCalorimeter.java 24 Jan 2007 17:00:41 -0000 1.5 --- ABarrelCalorimeter.java 15 Oct 2007 15:46:54 -0000 1.6 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.6 2007/10/15 15:46:54 hrivnac + * cleaning + * * Revision 1.5 2007/01/24 17:00:41 hrivnac * migrated to JAXB 2.0, simplified *************** *** 83,86 **** --- 86,92 ---- double dEta = aBarrelCalorimeter.getDeta(); + // Register limits for JiveEvent + builder().register(name + "_" + sampling + "_" + region, rMin, rMax, zMin, zMax); + // Find dimensions double etaMax = eta0 + nEta * dEta; |
|
From: Julius H. <hr...@us...> - 2007-10-15 15:46:54
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15893 Modified Files: index.html Log Message: cleaning Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/index.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.html 24 Jan 2007 22:08:52 -0000 1.3 --- index.html 15 Oct 2007 15:46:54 -0000 1.4 *************** *** 19,23 **** <li><a href="Src">Source</a></li> <li><a href="UML">UML</a> (<a href="UML/index.gif">top-level</a>)</li> ! <li><a href="xsd/geometry">XSDDoc</a></li> <li><a href="Examples/AGeometry.xsd">Schema</a></li> <li><a href="build.gif">Ant Build Dependencies</a></li> --- 19,23 ---- <li><a href="Src">Source</a></li> <li><a href="UML">UML</a> (<a href="UML/index.gif">top-level</a>)</li> ! <li><a href="xsd/Ageometry">XSDDoc</a></li> <li><a href="Examples/AGeometry.xsd">Schema</a></li> <li><a href="build.gif">Ant Build Dependencies</a></li> |
|
From: Julius H. <hr...@us...> - 2007-10-15 15:46:52
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15893/net/hep/atlas/graphics/JiveGeometry/GeometricModel Modified Files: JiveGeometryBuilder.java Log Message: cleaning Index: JiveGeometryBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveGeometryBuilder.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JiveGeometryBuilder.java 23 Jan 2007 17:00:12 -0000 1.6 --- JiveGeometryBuilder.java 15 Oct 2007 15:46:54 -0000 1.7 *************** *** 14,17 **** --- 14,21 ---- import javax.xml.bind.Element; + // Java + import java.util.Map; + import java.util.TreeMap; + // Log4J import org.apache.log4j.Logger; *************** *** 22,25 **** --- 26,32 ---- * <pre> * $Log$ + * Revision 1.7 2007/10/15 15:46:54 hrivnac + * cleaning + * * Revision 1.6 2007/01/23 17:00:12 hrivnac * TRT and Silicons added *************** *** 87,91 **** return _norm; } ! private static String _schema = "AGeometry.xsd"; --- 94,133 ---- return _norm; } ! ! // TBD ! public void register(String name, double rMin, double rMax, double zMin, double zMax) { ! _rMin.put(name, rMin); ! _rMax.put(name, rMax); ! _zMin.put(name, zMin); ! _zMax.put(name, zMax); ! } ! ! // TBD ! public static double rMin(String name) { ! return _rMin.get(name); ! } ! ! // TBD ! public static double rMax(String name) { ! return _rMax.get(name); ! } ! // TBD ! public static double zMin(String name) { ! return _zMin.get(name); ! } ! ! // TBD ! public static double zMax(String name) { ! return _zMax.get(name); ! } ! ! private static Map<String, Double> _rMin = new TreeMap<String, Double>(); ! ! private static Map<String, Double> _rMax = new TreeMap<String, Double>(); ! ! private static Map<String, Double> _zMin = new TreeMap<String, Double>(); ! ! private static Map<String, Double> _zMax = new TreeMap<String, Double>(); ! private static String _schema = "AGeometry.xsd"; *************** *** 94,98 **** private static String _jaxb = "net.hep.atlas.graphics.JiveGeometry.JAXB"; ! private static double _norm = 1000.0; /** Logging . */ --- 136,140 ---- private static String _jaxb = "net.hep.atlas.graphics.JiveGeometry.JAXB"; ! private static double _norm = 100.0; /** Logging . */ |
![http://cern.ch/hrivnac/Activities/Packages/WebStart/GraXML.gif"/>](http://cern.ch/hrivnac/Activities/Packages/WebStart/GraXML.gif"/>){kind=link}