[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java, 1.213, 1.214

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11138/src/net/sourceforge/bprocessor/model

Modified Files:
	Project.java 
Log Message:
Cleaning up

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.213
retrieving revision 1.214
diff -C2 -d -r1.213 -r1.214
*** Project.java	18 May 2013 07:53:48 -0000	1.213
--- Project.java	31 May 2013 08:01:11 -0000	1.214
***************
*** 17,21 ****
  import java.util.ArrayList;
  import java.util.Collection;
- import java.util.Date;
  import java.util.HashMap;
  import java.util.HashSet;
--- 17,20 ----
***************
*** 28,33 ****
  import java.util.StringTokenizer;
  
- import javax.swing.SwingUtilities;
- 
  import net.sourceforge.bprocessor.model.plugin.CirclePackage;
  import net.sourceforge.bprocessor.model.plugin.FacadePackage;
--- 27,30 ----
***************
*** 54,58 ****
    private Tesselator tesselator;
    private Shell shell;
!   private List staticObservers;
    
    private static Classification constructionClas = null;  
--- 51,55 ----
    private Tesselator tesselator;
    private Shell shell;
!   private List<Observer> staticObservers;
    
    private static Classification constructionClas = null;  
***************
*** 102,189 ****
    private long nextMaterialId;
    
!   private List<Component> catalog;  
!   
!   private Space findIn(Item item, String name) {
!     if (item instanceof Space) {
!       Space space = (Space) item;
!       if (space.getName().equals(name)) {
!         return space;
!       } else {
!         for (Item current : space.getElements()) {
!           Space result = findIn(current, name);
!           if (result != null) {
!             return result;
!           }
!         }
!       }
!     }
!     return null;
!   }
!   
!   /**
!    * 
!    * @param name String
!    * @return space
!    */
!   public Space find(String name) {
!     return findIn(world, name);
!   }
!   
!   /**
!    * 
!    * @param name name
!    * @return material
!    */
!   public Material findMaterial(String name) {
!     for (Material current : getMaterials()) {
!       if (current.getName().equals(name)) {
!         return current;
!       }
!     }
!     return null;
!   }
!   
!   /**
!    * 
!    */
!   public void updateSensorData() {
!   }
!   
!   /**
!    * 
!    */
!   public void forward() {
!   }
!   
!   /**
!    * 
!    */
!   public void backward() {
!   }
!   
!   /**
!    * 
!    * @return date
!    */
!   public Date getDate() {
!     return new Date();
!   }
    
-   /**
-    * 
-    * @return boolean
-    */
-   public static boolean doDisplayGeometry() {
-     return Project.doDisplayGeometry;
-   }
    
    /**
!    * 
!    * @return boolean
     */
-   public static boolean useDisplayLists() {
-     return Project.useDisplayLists;
-   }
-   
    
    /**
--- 99,108 ----
    private long nextMaterialId;
    
!   private List<Component> catalog;
    
    
    /**
!    * Global application static methods
     */
    
    /**
***************
*** 225,228 ****
--- 144,176 ----
    }
    
+   
+   /**
+    * 
+    * @return boolean
+    */
+   public static boolean doDisplayGeometry() {
+     return Project.doDisplayGeometry;
+   }
+   
+   /**
+    * 
+    * @return boolean
+    */
+   public static boolean useDisplayLists() {
+     return Project.useDisplayLists;
+   }
+   
+   /**
+    * Global application methods
+    */
+   
+   /**
+    * Project control methods
+    */
+   
+   /**
+    * Project data methods
+    */
+   
    /**
     * Constructor for Project
***************
*** 240,243 ****
--- 188,210 ----
    /**
     * 
+    * @param name name
+    * @return material
+    */
+   public Material findMaterial(String name) {
+     for (Material current : getMaterials()) {
+       if (current.getName().equals(name)) {
+         return current;
+       }
+     }
+     return null;
+   }
+   
+   /**
+    * Unsorted methods
+    */
+   
+  
+   /**
+    * 
     */
    public void initialize() {