[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Instance.java, 1.4, 1.5 Space.java, 1.225, 1.226 Container.java, 1.4, 1.5

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

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

Modified Files:
	Instance.java Space.java Container.java 
Log Message:
moved a ton of functionality from space to container

Index: Instance.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Instance.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Instance.java	13 Dec 2007 12:00:30 -0000	1.4
--- Instance.java	13 Dec 2007 12:28:57 -0000	1.5
***************
*** 97,99 ****
--- 97,108 ----
      return result;
    }
+ 
+   /** {@inheritDoc} */
+   @Override
+   public void delete() {
+     // TODO Auto-generated method stub
+     
+   }
+   
+   
  }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.225
retrieving revision 1.226
diff -C2 -d -r1.225 -r1.226
*** Space.java	13 Dec 2007 12:15:40 -0000	1.225
--- Space.java	13 Dec 2007 12:28:57 -0000	1.226
***************
*** 8,14 ****
  
  import java.util.ArrayList;
- import java.util.Collection;
  import java.util.Collections;
- import java.util.Comparator;
  import java.util.HashMap;
  import java.util.HashSet;
--- 8,12 ----
***************
*** 87,108 ****
[...1155 lines suppressed...]
-             if (s1 != s2 && !(delete.contains(s1) || delete.contains(s2)) 
-                 && s1.getEdges().containsAll(s2.getEdges())) {
-               if (s1.id < s2.id) {
-                 delete.add(s2);
-               } else {
-                 delete.add(s1);
-               }
-             }
-           }
-         }
-         for (Surface s : delete) {
-           remove(s);
-         }
-       }
-     }
-     Project.getInstance().changed(Project.getInstance());
-   }
  
    /**
--- 876,880 ----

Index: Container.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Container.java	13 Dec 2007 12:15:41 -0000	1.4
--- Container.java	13 Dec 2007 12:28:57 -0000	1.5
***************
*** 8,16 ****
--- 8,21 ----
  package net.sourceforge.bprocessor.model;
  
+ import java.util.ArrayList;
  import java.util.Collection;
  import java.util.Collections;
+ import java.util.Comparator;
  import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Iterator;
[...1024 lines suppressed...]
+         for (Surface s1 : e.getSurfaces()) {
+           for (Surface s2 : e.getSurfaces()) {
+             if (s1 != s2 && !(delete.contains(s1) || delete.contains(s2)) 
+                 && s1.getEdges().containsAll(s2.getEdges())) {
+               if (s1.id < s2.id) {
+                 delete.add(s2);
+               } else {
+                 delete.add(s1);
+               }
+             }
+           }
+         }
+         for (Surface s : delete) {
+           remove(s);
+         }
+       }
+     }
+     Project.getInstance().changed(Project.getInstance());
+   }
  }