[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.252, 1.253 CoordinateSystem.java, 1.78, 1.79 Entity.java, 1.24, 1.25 Command.java, 1.83, 1.84 Item.java, 1.6, 1.7 Project.java, 1.192, 1.193

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

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

Modified Files:
	Space.java CoordinateSystem.java Entity.java Command.java 
	Item.java Project.java 
Log Message:
Changed a lot of calls to changed()

Index: CoordinateSystem.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** CoordinateSystem.java	5 Feb 2010 13:32:50 -0000	1.78
--- CoordinateSystem.java	20 May 2010 10:58:45 -0000	1.79
***************
*** 68,72 ****
        }
        Project.getInstance().world().add(system);
!       Project.getInstance().changed(Project.getInstance().world());
      }
    }
--- 68,72 ----
        }
        Project.getInstance().world().add(system);
!       Project.getInstance().changed();
      }
    }

Index: Entity.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Entity.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Entity.java	25 Jun 2009 20:29:33 -0000	1.24
--- Entity.java	20 May 2010 10:58:45 -0000	1.25
***************
*** 126,136 ****
    
    /**
-    * Tell observers that this entity has changed
-    */
-   public void changed() {
-     Project.getInstance().changed(this);
-   }
-   
-   /**
     * Deletes this Entity from the model by removing
     * it from the owning object and clearing all
--- 126,129 ----

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.192
retrieving revision 1.193
diff -C2 -d -r1.192 -r1.193
*** Project.java	18 May 2010 14:32:37 -0000	1.192
--- Project.java	20 May 2010 10:58:46 -0000	1.193
***************
*** 81,84 ****
--- 81,86 ----
    private static Project instance;
    
+   private Set<Class> bunch;
+   
    /** */
    public static final boolean SENSE = false;
***************
*** 269,273 ****
                sensor.setMaterial(findMaterial("Green"));
              }
!             changed(sensor);
            }
          }
--- 271,275 ----
                sensor.setMaterial(findMaterial("Green"));
              }
!             changed();
            }
          }
***************
*** 493,496 ****
--- 495,499 ----
      
      observers = new LinkedList();
+     bunch = new HashSet();
      scheduledObservers = new LinkedList();
      
***************
*** 672,681 ****
   
    /**
     * Tell observers to update because an entity has changed
     * @param entity The changed entity
     */
    public void changed(Object entity) {
-     log.debug("-------Changed(" + entity + ")----------");
-     // FIXME: temporary hack. There should be better handling of the observers
      List allObservers = new LinkedList(observers);
      allObservers.addAll(staticObservers);
--- 675,689 ----
   
    /**
+    * 
+    */
+   public void changed() {
+     changed(this);
+   }
+   
+   /**
     * Tell observers to update because an entity has changed
     * @param entity The changed entity
     */
    public void changed(Object entity) {
      List allObservers = new LinkedList(observers);
      allObservers.addAll(staticObservers);
***************
*** 724,732 ****
          edges.addAll(current.getEdges());
        }
-       // THE CASE WHERE THERE ARE ONLY ONE I WOULD LIKE TO KNOW IT HAS CHANGED
-       if (vertices.size() == 1) {
-         Iterator it = vertices.iterator();
-         changed(it.next());
-       }
      }
      {
--- 732,735 ----
***************
*** 905,909 ****
    public void setCurrentCamera(Camera camera) {
      currentCamera.copyfrom(camera);
!     changed(this);
    }
    
--- 908,912 ----
    public void setCurrentCamera(Camera camera) {
      currentCamera.copyfrom(camera);
!     changed();
    }
    
***************
*** 1053,1057 ****
        }
      }
!     changed(this);
    }
  
--- 1056,1060 ----
        }
      }
!     changed();
    }
  
***************
*** 1179,1183 ****
        } 
      }
!     changed(this);
    }
    
--- 1182,1186 ----
        } 
      }
!     changed();
    }
    
***************
*** 2219,2223 ****
        stamp = System.currentTimeMillis();
        initialized = true;
!       Project.getInstance().changed(Project.getInstance());
      }
    }
--- 2222,2226 ----
        stamp = System.currentTimeMillis();
        initialized = true;
!       Project.getInstance().changed();
      }
    }
***************
*** 2357,2361 ****
      }
      
!     Project.getInstance().changed(Project.getInstance());
    }
  }
--- 2360,2364 ----
      }
      
!     Project.getInstance().changed();
    }
  }

Index: Item.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Item.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Item.java	9 Mar 2010 13:02:00 -0000	1.6
--- Item.java	20 May 2010 10:58:46 -0000	1.7
***************
*** 501,514 ****
    
    /**
-    * Notify that this Space has changed
-    * FIXME: Make the change-update mechanism general
-    */
-   @Override
-   public void changed() {
-     update(this);
-     super.changed();
-   }
-   
-   /**
     * Update this Space
     * @param entity Changed entity
--- 501,504 ----

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.252
retrieving revision 1.253
diff -C2 -d -r1.252 -r1.253
*** Space.java	18 May 2010 13:38:07 -0000	1.252
--- Space.java	20 May 2010 10:58:45 -0000	1.253
***************
*** 1465,1469 ****
        }
      }
!     Project.getInstance().changed(Project.getInstance());
    }
    
--- 1465,1469 ----
        }
      }
!     Project.getInstance().changed();
    }
    
***************
*** 1662,1666 ****
      Project.getInstance().setActiveSpace((Space) this);
      Selection.primary().clear();
!     Project.getInstance().changed(Project.getInstance());
    }
    
--- 1662,1666 ----
      Project.getInstance().setActiveSpace((Space) this);
      Selection.primary().clear();
!     Project.getInstance().changed();
    }
    

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** Command.java	19 May 2010 15:45:39 -0000	1.83
--- Command.java	20 May 2010 10:58:45 -0000	1.84
***************
*** 876,880 ****
        }
  
!       Project.getInstance().changed(Project.getInstance());
      }
    }
--- 876,880 ----
        }
  
!       Project.getInstance().changed();
      }
    }
***************
*** 1478,1482 ****
          current.update();
        }
!       Project.getInstance().changed(Project.getInstance());
      }
    }
--- 1478,1482 ----
          current.update();
        }
!       Project.getInstance().changed();
      }
    }
***************
*** 1524,1528 ****
          current.update();
        }
!       Project.getInstance().changed(Project.getInstance());
      }
    }
--- 1524,1528 ----
          current.update();
        }
!       Project.getInstance().changed();
      }
    }