[GraXML-commit] Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter ConnectionsDB.java, 1.3, 1.4 DetachableConnection.java, 1.2, 1.3 ViewerTreeFactory.java, 1.1, 1.2

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

Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21835/net/hep/graphics/GraXML/Disconnecter

Modified Files:
	ConnectionsDB.java DetachableConnection.java 
	ViewerTreeFactory.java 
Log Message:
multiple loading possible

Index: ViewerTreeFactory.java
===================================================================
RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ViewerTreeFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ViewerTreeFactory.java	18 Jan 2007 15:29:22 -0000	1.1
--- ViewerTreeFactory.java	18 Jan 2007 15:33:12 -0000	1.2
***************
*** 13,16 ****
--- 13,19 ----
    * <pre>
    * $Log$
+   * Revision 1.2  2007/01/18 15:33:12  hrivnac
+   * multiple loading possible
+   *
    * Revision 1.1  2007/01/18 15:29:22  hrivnac
    * multiple loading possible
***************
*** 59,62 ****
--- 62,66 ----
      * processed. */
    private static final void assembleTree(DetachableConnection connection) {
+     // Loop over aall children, recursive
      for (DetachableConnection child : connection.children()) {
        // Don't add already present trees

Index: ConnectionsDB.java
===================================================================
RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ConnectionsDB.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConnectionsDB.java	18 Jan 2007 15:29:22 -0000	1.3
--- ConnectionsDB.java	18 Jan 2007 15:33:12 -0000	1.4
***************
*** 18,21 ****
--- 18,24 ----
    * <pre>
    * $Log$
+   * Revision 1.4  2007/01/18 15:33:12  hrivnac
+   * multiple loading possible
+   *
    * Revision 1.3  2007/01/18 15:29:22  hrivnac
    * multiple loading possible
***************
*** 55,67 ****
      }
  
!   /** Builds full tree from included connections. TBD
      * Connection without parent is assigned as the root
      * connection. */
    public final void buildTree() {
      if (_root == null) {
        _root = new DetachableConnection("GraXML", null, new BranchGroup(), new BranchGroup(), null);
        addConnection(_root);
        }
      for (DetachableConnection connection : _connections.values()) {
        if (! "GraXML".equals(connection.name())) {
          // Set parent (from its stored name)
--- 58,73 ----
      }
  
!   /** Builds full tree from included connections.
      * Connection without parent is assigned as the root
      * connection. */
    public final void buildTree() {
+     // Create new root DetachableConnection if it doesn't exist
      if (_root == null) {
        _root = new DetachableConnection("GraXML", null, new BranchGroup(), new BranchGroup(), null);
        addConnection(_root);
        }
+     // Process all DetachableConnections
      for (DetachableConnection connection : _connections.values()) {
+       // Skip top-level
        if (! "GraXML".equals(connection.name())) {
          // Set parent (from its stored name)

Index: DetachableConnection.java
===================================================================
RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/DetachableConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DetachableConnection.java	18 Jan 2007 15:29:22 -0000	1.2
--- DetachableConnection.java	18 Jan 2007 15:33:12 -0000	1.3
***************
*** 35,38 ****
--- 35,41 ----
    * <pre>
    * $Log$
+   * Revision 1.3  2007/01/18 15:33:12  hrivnac
+   * multiple loading possible
+   *
    * Revision 1.2  2007/01/18 15:29:22  hrivnac
    * multiple loading possible
***************
*** 194,198 ****
      }
  
!   // TBD
    public final void defineParent(String parentName) {
      _parentName = parentName;
--- 197,203 ----
      }
  
!   /** Set the parent name.
!     * It should already exist in the {@link ConnectionsDB}. 
!     * @param parentName The name of the parent. */
    public final void defineParent(String parentName) {
      _parentName = parentName;