[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Instance.java, 1.6, 1.7 Container.java, 1.7, 1.8

[rimestad <rim...@us...>]

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

Modified Files:
	Instance.java Container.java 
Log Message:
cahnged remove on container to be able to remove non containers from elements as well. Implemented delete on instance

Index: Instance.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Instance.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Instance.java	17 Dec 2007 11:21:09 -0000	1.6
--- Instance.java	19 Dec 2007 11:39:04 -0000	1.7
***************
*** 104,109 ****
    @Override
    public void delete() {
!     // TODO Auto-generated method stub
!     
    }
    
--- 104,110 ----
    @Override
    public void delete() {
!     if (this.getOwner() != null) {
!       this.getOwner().remove(this);
!     }
    }
    

Index: Container.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Container.java	17 Dec 2007 11:21:10 -0000	1.7
--- Container.java	19 Dec 2007 11:39:04 -0000	1.8
***************
*** 124,128 ****
     * @param element The space to remove as element
     */
!   public void remove(Container element) {
      if (container) {
        Set surfs = element.getEnvelope();
--- 124,128 ----
     * @param element The space to remove as element
     */
!   public void remove(Space element) {
      if (container) {
        Set surfs = element.getEnvelope();
***************
*** 143,149 ****
        }
        if (element != null) {
!         Container superSpace = findElement(element);
!         if (superSpace != null) {
!           superSpace.elements.remove(element.getId());
            element.setId(null);
          }
--- 143,149 ----
        }
        if (element != null) {
!         Space superSpace = findElement(element);
!         if (superSpace != null && superSpace instanceof Container) {
!           ((Container)superSpace).elements.remove(element.getId());
            element.setId(null);
          }
***************
*** 162,174 ****
     * is returned.
     */
!   protected Container findElement(Container element) {
      if (elements != null) { 
        if (elements.get(element.getId()) == element) {
!         return (Container) this;
        } else {
          Iterator it = elements.values().iterator();
          while (it.hasNext()) {
            Container space = (Container)it.next();
!           Container result = space.findElement(element);
            if (result != null) {
              return result;
--- 162,174 ----
     * is returned.
     */
!   protected Space findElement(Space element) {
      if (elements != null) { 
        if (elements.get(element.getId()) == element) {
!         return this;
        } else {
          Iterator it = elements.values().iterator();
          while (it.hasNext()) {
            Container space = (Container)it.next();
!           Space result = space.findElement(element);
            if (result != null) {
              return result;