[GraXML-commit] DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps AGDD.java,1.1,1.2 Box.java,1.2,1.3 Cons.java,1.2,1.3 Para.java,1.2,1.3 Pcon.java,1.3,1.4 Phedra.java,1.3,1.4 Trap.java,1.3,1.4 Trd.java,1.2,1.3 Tubs.java,1.2,1.3

[Julius H. <hr...@us...>]

Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22390/src/net/hep/AGDD/GeometricModel/Reps

Modified Files:
	AGDD.java Box.java Cons.java Para.java Pcon.java Phedra.java 
	Trap.java Trd.java Tubs.java 
Log Message:
Colors introduced

Index: AGDD.java
===================================================================
RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/AGDD.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AGDD.java	30 Mar 2005 13:42:56 -0000	1.1
--- AGDD.java	7 Oct 2005 15:53:47 -0000	1.2
***************
*** 3,6 ****
--- 3,7 ----
  // Generic Model
  import net.hep.AGDD.JAXB.AGDDType;
+ import net.hep.AGDD.JAXB.SectionType;
  
  // GraXML
***************
*** 29,32 ****
--- 30,36 ----
    * <pre>
    * $Log$
+   * Revision 1.2  2005/10/07 15:53:47  hrivnac
+   * Colors introduced
+   *
    * Revision 1.1  2005/03/30 13:42:56  hrivnac
    * AGDD added
***************
*** 62,69 ****
      // Traverse all children and add their representations into branch
      BranchGroup branch = new BranchGroup();
!     // - Section
!     List sections = agdd.getSection();
      for (Object o : sections) {
!       if (o instanceof Element) {
          builder.traverse((Element)o, branch, _name);
          }
--- 66,74 ----
      // Traverse all children and add their representations into branch
      BranchGroup branch = new BranchGroup();
!     // - Section (others are used via their references)
!     List sections = agdd.getMaterialsOrColormapOrSection();
      for (Object o : sections) {
!       if (o instanceof Element &&
!           o instanceof SectionType) {
          builder.traverse((Element)o, branch, _name);
          }

Index: Trd.java
===================================================================
RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Trd.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Trd.java	6 Oct 2005 20:48:11 -0000	1.2
--- Trd.java	7 Oct 2005 15:53:47 -0000	1.3
***************
*** 29,32 ****
--- 29,35 ----
    * <pre>
    * $Log$
+   * Revision 1.3  2005/10/07 15:53:47  hrivnac
+   * Colors introduced
+   *
    * Revision 1.2  2005/10/06 20:48:11  hrivnac
    * Identifiers example added
***************
*** 71,74 ****
--- 74,78 ----
      String name0 = trd.getName();
      String name  = builder().name(name0);
+     setColor(trd);
  
      // Verify reuse
***************
*** 78,82 ****
  
      // Create Trapezod and use it
-     builder().setMaterial(trd.getMaterial().toString());
   	  use(new Trapezoid(xmpympz[0],
                        xmpympz[1],
--- 82,85 ----
***************
*** 86,90 ****
                        inclination[0],
                        inclination[1],
!                       builder.appearance(name0, builder().material())),
          name,
          parent,
--- 89,93 ----
                        inclination[0],
                        inclination[1],
!                       builder().appearance(name0, rgb(), transparency())),
          name,
          parent,

Index: Phedra.java
===================================================================
RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Phedra.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Phedra.java	6 Oct 2005 20:48:11 -0000	1.3
--- Phedra.java	7 Oct 2005 15:53:47 -0000	1.4
***************
*** 29,32 ****
--- 29,35 ----
    * <pre>
    * $Log$
+   * Revision 1.4  2005/10/07 15:53:47  hrivnac
+   * Colors introduced
+   *
    * Revision 1.3  2005/10/06 20:48:11  hrivnac
    * Identifiers example added
***************
*** 97,100 ****
--- 100,104 ----
        zsD[j] -= delz;
        } 
+     setColor(phedra);
  
      // Verify reuse
***************
*** 104,108 ****
  
      // Create Trapezod and use it
-     builder().setMaterial(phedra.getMaterial().toString());
   	  use(new PolyGoneSegment(risD,
                              rosD,
--- 108,111 ----
***************
*** 111,115 ****
                              profile[0] + profile[1],
                              (int)sides[0],
!                             builder.appearance(name0, builder().material())),
          name,
          parent,
--- 114,118 ----
                              profile[0] + profile[1],
                              (int)sides[0],
!                             builder().appearance(name0, rgb(), transparency())),
          name,
          parent,

Index: Pcon.java
===================================================================
RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Pcon.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Pcon.java	6 Oct 2005 20:48:11 -0000	1.3
--- Pcon.java	7 Oct 2005 15:53:47 -0000	1.4
***************
*** 33,36 ****
--- 33,39 ----
    * <pre>
    * $Log$
+   * Revision 1.4  2005/10/07 15:53:47  hrivnac
+   * Colors introduced
+   *
    * Revision 1.3  2005/10/06 20:48:11  hrivnac
    * Identifiers example added
***************
*** 96,99 ****
--- 99,103 ----
        z[j] -= delz;
        } 
+     setColor(pcon);
  
      // Verify reuse
***************
*** 103,107 ****
  
      // Create Trapezod and use it
-     builder().setMaterial(pcon.getMaterial().toString());
   	  use(new PolyConeSegment(ri,
                              ro,
--- 107,110 ----
***************
*** 110,114 ****
  			                      profile[0] + profile[1],
                              BuildOptions.granularity(),
!                             builder.appearance(name0, builder().material())),
          name,
          parent,
--- 113,117 ----
  			                      profile[0] + profile[1],
                              BuildOptions.granularity(),
!                             builder().appearance(name0, rgb(), transparency())),
          name,
          parent,

Index: Tubs.java
===================================================================
RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Tubs.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Tubs.java	6 Oct 2005 20:48:11 -0000	1.2
--- Tubs.java	7 Oct 2005 15:53:47 -0000	1.3
***************
*** 29,32 ****
--- 29,35 ----
    * <pre>
    * $Log$
+   * Revision 1.3  2005/10/07 15:53:47  hrivnac
+   * Colors introduced
+   *
    * Revision 1.2  2005/10/06 20:48:11  hrivnac
    * Identifiers example added
***************
*** 71,74 ****
--- 74,78 ----
      String name0 = tubs.getName();
      String name  = builder().name(name0);
+     setColor(tubs);
  
      // Verify reuse
***************
*** 78,82 ****
  
      // Create Trapezod and use it
-     builder().setMaterial(tubs.getMaterial().toString());
   	  use(new ConeSegment(rioz[0],
                          rioz[1],
--- 82,85 ----
***************
*** 85,89 ****
                          profile[0] + profile[1],
  			                  BuildOptions.granularity(),
!                         builder.appearance(name0, builder().material())),
          name,
          parent,
--- 88,92 ----
                          profile[0] + profile[1],
  			                  BuildOptions.granularity(),
!                         builder().appearance(name0, rgb(), transparency())),
          name,
          parent,

Index: Para.java
===================================================================
RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Para.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Para.java	6 Oct 2005 20:48:11 -0000	1.2
--- Para.java	7 Oct 2005 15:53:47 -0000	1.3
***************
*** 35,38 ****
--- 35,41 ----
    * <pre>
    * $Log$
+   * Revision 1.3  2005/10/07 15:53:47  hrivnac
+   * Colors introduced
+   *
    * Revision 1.2  2005/10/06 20:48:11  hrivnac
    * Identifiers example added
***************
*** 79,82 ****
--- 82,86 ----
      String name0 = para.getName();
      String name  = builder().name(name0);
+     setColor(para);
  
      // Verify reuse
***************
*** 86,90 ****
  
      // Create Trapezod and use it
-     builder().setMaterial(para.getMaterial().toString());
   	  use(new Trapezoid(xyz[0],
                        xyz[0],
--- 90,93 ----
***************
*** 98,102 ****
                        alpha[0],
                        alpha[0],
!                       builder.appearance(name0, builder().material())),
          name,
          parent,
--- 101,105 ----
                        alpha[0],
                        alpha[0],
!                       builder().appearance(name0, rgb(), transparency())),
          name,
          parent,

Index: Trap.java
===================================================================
RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Trap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Trap.java	6 Oct 2005 20:48:11 -0000	1.3
--- Trap.java	7 Oct 2005 15:53:47 -0000	1.4
***************
*** 29,32 ****
--- 29,35 ----
    * <pre>
    * $Log$
+   * Revision 1.4  2005/10/07 15:53:47  hrivnac
+   * Colors introduced
+   *
    * Revision 1.3  2005/10/06 20:48:11  hrivnac
    * Identifiers example added
***************
*** 75,78 ****
--- 78,82 ----
      String name0 = trap.getName();
      String name  = builder().name(name0);
+     setColor(trap);
  
      // Verify reuse
***************
*** 82,86 ****
  
      // Create Trapezod and use it
-     builder().setMaterial(trap.getMaterial().toString());
   	  use(new Trapezoid(xmumdpupdympz[0],
                        xmumdpupdympz[1],
--- 86,89 ----
***************
*** 94,98 ****
                        declination[0],
                        declination[1],
!                       builder.appearance(name0, builder().material())),
          name,
          parent,
--- 97,101 ----
                        declination[0],
                        declination[1],
!                       builder().appearance(name0, rgb(), transparency())),
          name,
          parent,

Index: Cons.java
===================================================================
RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Cons.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Cons.java	6 Oct 2005 20:48:11 -0000	1.2
--- Cons.java	7 Oct 2005 15:53:47 -0000	1.3
***************
*** 29,32 ****
--- 29,35 ----
    * <pre>
    * $Log$
+   * Revision 1.3  2005/10/07 15:53:47  hrivnac
+   * Colors introduced
+   *
    * Revision 1.2  2005/10/06 20:48:11  hrivnac
    * Identifiers example added
***************
*** 71,74 ****
--- 74,78 ----
      String name0 = cons.getName();
      String name  = builder().name(name0);
+     setColor(cons);
  
      // Verify reuse
***************
*** 78,82 ****
  
      // Create Trapezod and use it
-     builder().setMaterial(cons.getMaterial().toString());
   	  use(new ConeSegment(rio1rio2z[0],
                          rio1rio2z[1],
--- 82,85 ----
***************
*** 87,91 ****
                          profile[0] + profile[1],
                          BuildOptions.granularity(),
!                         builder.appearance(name0, builder().material())),
          name,
          parent,
--- 90,94 ----
                          profile[0] + profile[1],
                          BuildOptions.granularity(),
!                         builder().appearance(name0, rgb(), transparency())),
          name,
          parent,

Index: Box.java
===================================================================
RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Box.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Box.java	6 Oct 2005 20:48:11 -0000	1.2
--- Box.java	7 Oct 2005 15:53:47 -0000	1.3
***************
*** 34,37 ****
--- 34,40 ----
    * <pre>
    * $Log$
+   * Revision 1.3  2005/10/07 15:53:47  hrivnac
+   * Colors introduced
+   *
    * Revision 1.2  2005/10/06 20:48:11  hrivnac
    * Identifiers example added
***************
*** 78,81 ****
--- 81,85 ----
      String name0 = box.getName();
      String name  = builder().name(name0);
+     setColor(box);
  
      // Verify reuse
***************
*** 85,93 ****
  
      // Create Trapezod and use it
-     builder().setMaterial(box.getMaterial().toString());
   	  use(new Trapezoid(xyz[0],
                        xyz[1],
                        xyz[2],
!                       builder.appearance(name0, builder().material())),
          name,
          parent,
--- 89,96 ----
  
      // Create Trapezod and use it
   	  use(new Trapezoid(xyz[0],
                        xyz[1],
                        xyz[2],
!                       builder().appearance(name0, rgb(), transparency())),
          name,
          parent,