[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/treeview CameraTreeView.java, 1.5, 1.6

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25058/src/net/sourceforge/bprocessor/gui/treeview

Modified Files:
	CameraTreeView.java 
Log Message:
default cameras are allways drawn in top of the tree in the same order

Index: CameraTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/CameraTreeView.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CameraTreeView.java	6 Jul 2006 10:41:27 -0000	1.5
--- CameraTreeView.java	25 Jul 2006 13:14:55 -0000	1.6
***************
*** 50,54 ****
      root.removeAllChildren();
      Collection cameras = Project.getInstance().getCameras();
!     Iterator iter = cameras.iterator();
      while (iter.hasNext()) {
        Camera current = (Camera) iter.next();
--- 50,55 ----
      root.removeAllChildren();
      Collection cameras = Project.getInstance().getCameras();
!     Collection defaultCams = Project.getInstance().getDefaultCameras();
!     Iterator iter = defaultCams.iterator();
      while (iter.hasNext()) {
        Camera current = (Camera) iter.next();
***************
*** 60,63 ****
--- 61,76 ----
        root.add(cn);
      }
+     iter = cameras.iterator();
+     while (iter.hasNext()) {
+       Camera current = (Camera) iter.next();
+       if (!defaultCams.contains(current)) {
+         GenericTreeView.CameraNode cn = new GenericTreeView.CameraNode(current);
+         Iterator clipIt = current.getClipplanes().iterator();
+         while (clipIt.hasNext()) {
+           cn.add(new EntityNode((Entity)clipIt.next()));
+         }
+         root.add(cn);
+       }
+     }
      model.nodeStructureChanged(root);
      openPaths(paths);
***************
*** 177,186 ****
            if (target instanceof Camera && target != selected) {
              selected = (Camera)target;
!             if (Project.getInstance().getDefaultCameras().contains(target)) {
!               Project.getInstance().setCurrentCamera(new Camera(selected,
!                                                                 "default copy"));
!             } else {
!               Project.getInstance().setCurrentCamera(selected);
!             }
            }
          }
--- 190,195 ----
            if (target instanceof Camera && target != selected) {
              selected = (Camera)target;
!             Project.getInstance().setCurrentCamera(new Camera(selected,
!                                                               "Current Camera"));
            }
          }