[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java, 1.66, 1.67

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21939/src/net/sourceforge/bprocessor/model

Modified Files:
	Project.java 
Log Message:
default cameras are now kept in a list to keep their order

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** Project.java	24 Jul 2006 13:41:18 -0000	1.66
--- Project.java	26 Jul 2006 14:45:55 -0000	1.67
***************
*** 45,49 ****
  
    /** The default un-changeable cameras */
!   private HashMap defaultCams = new HashMap();
    
    /** The domain id */
--- 45,49 ----
  
    /** The default un-changeable cameras */
!   private LinkedList defaultCams = new LinkedList();
    
    /** The domain id */
***************
*** 194,210 ****
      cam0.setName("Main view");
      cameras.put(cam0.getId(), cam0);
!     defaultCams.put(cam0.getId(), cam0);
      Camera cam2 = Camera.create(Camera.VIEW_XY); // Reset to 2D position XY with ortho
      cam2.setId(new Long(cameraId++));
      cameras.put(cam2.getId(), cam2);
!     defaultCams.put(cam2.getId(), cam2);
      Camera cam3 = Camera.create(Camera.VIEW_XZ); // Reset to 2D position XZ with ortho
      cam3.setId(new Long(cameraId++));
      cameras.put(cam3.getId(), cam3);
!     defaultCams.put(cam3.getId(), cam3);
      Camera cam4 = Camera.create(Camera.VIEW_YZ); // Reset to 2D position YZ with ortho
      cam4.setId(new Long(cameraId++));
      cameras.put(cam4.getId(), cam4);
!     defaultCams.put(cam4.getId(), cam4);
      currentCamera = new Camera(cam0, "Current");
    }
--- 194,210 ----
      cam0.setName("Main view");
      cameras.put(cam0.getId(), cam0);
!     defaultCams.add(cam0);
      Camera cam2 = Camera.create(Camera.VIEW_XY); // Reset to 2D position XY with ortho
      cam2.setId(new Long(cameraId++));
      cameras.put(cam2.getId(), cam2);
!     defaultCams.add(cam2);
      Camera cam3 = Camera.create(Camera.VIEW_XZ); // Reset to 2D position XZ with ortho
      cam3.setId(new Long(cameraId++));
      cameras.put(cam3.getId(), cam3);
!     defaultCams.add(cam3);
      Camera cam4 = Camera.create(Camera.VIEW_YZ); // Reset to 2D position YZ with ortho
      cam4.setId(new Long(cameraId++));
      cameras.put(cam4.getId(), cam4);
!     defaultCams.add(cam4);
      currentCamera = new Camera(cam0, "Current");
    }
***************
*** 597,602 ****
     * @return The cameras
     */
!   public Collection getDefaultCameras() {
!     return new HashSet(defaultCams.values());
    }
  
--- 597,602 ----
     * @return The cameras
     */
!   public LinkedList getDefaultCameras() {
!     return defaultCams;
    }