[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Instance.java, 1.5, 1.6 Space.java, 1.227, 1.228 Container.java, 1.6, 1.7

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

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

Modified Files:
	Instance.java Space.java Container.java 
Log Message:
hilite of instance and container

Index: Instance.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Instance.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Instance.java	13 Dec 2007 12:28:57 -0000	1.5
--- Instance.java	17 Dec 2007 11:21:09 -0000	1.6
***************
*** 8,12 ****
--- 8,15 ----
  package net.sourceforge.bprocessor.model;
  
+ import java.util.Collection;
  import java.util.HashSet;
+ import java.util.LinkedList;
+ import java.util.List;
  import java.util.Set;
  
***************
*** 105,108 ****
    }
    
!   
  }
--- 108,122 ----
    }
    
!   /**
!    * {@inheritDoc}
!    */
!   @Override
!   public Collection<Edge> hiliteEdges() {
!     Collection<Edge> interior = proto.hiliteEdges();
!     List<Edge> edges = new LinkedList();
!     for (Edge current : interior) {
!       edges.add(anchor.unTranslate(current));
!     }
!     return edges;
!   }
  }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.227
retrieving revision 1.228
diff -C2 -d -r1.227 -r1.228
*** Space.java	13 Dec 2007 12:39:36 -0000	1.227
--- Space.java	17 Dec 2007 11:21:09 -0000	1.228
***************
*** 8,11 ****
--- 8,12 ----
  
  import java.util.ArrayList;
+ import java.util.Collection;
  import java.util.Collections;
  import java.util.HashMap;
***************
*** 52,56 ****
    protected Description description; 
    /** The envelope (a set of surfaces) */
!   private Set<Surface> envelope;
    
    /** type of space */
--- 53,57 ----
    protected Description description; 
    /** The envelope (a set of surfaces) */
!   protected Set<Surface> envelope;
    
    /** type of space */
***************
*** 319,327 ****
    }
    
-   
-   
-   
-   
-   
    /**
     * Get the modellor
--- 320,323 ----
***************
*** 622,640 ****
    }
  
-    /**
-    * collects the set of vertices in this space
-    * @return the set of vertices
-    */  
-   @Override
-   public Set<Vertex> collect() {
-     Set<Vertex> result = new HashSet<Vertex>();
-     for (Surface s : envelope) {
-       result.addAll(s.collect());
-     }
-     if (container) {
-       result.addAll(collectInterior());
-     }
-     return result;
-   }
    
    /**
--- 618,621 ----
***************
*** 838,840 ****
--- 819,830 ----
      log.info(object);
    }
+   
+   /**
+    * Returns collection of edges to hilite for
+    * this space
+    * @return collection of edges
+    */
+   public Collection<Edge> hiliteEdges() {
+     return Collections.EMPTY_LIST;
+   }
  }

Index: Container.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Container.java	13 Dec 2007 12:39:36 -0000	1.6
--- Container.java	17 Dec 2007 11:21:10 -0000	1.7
***************
*** 1406,1408 ****
--- 1406,1439 ----
      nextSurfaceId = Entity.maxId(surfaces.values()) + 1;
    }
+   
+   /**
+    * collects the set of vertices in this space
+    * @return the set of vertices
+    */  
+   @Override
+   public Set<Vertex> collect() {
+     Set<Vertex> result = new HashSet<Vertex>();
+     for (Surface s : envelope) {
+       result.addAll(s.collect());
+     }
+     if (container) {
+       result.addAll(collectInterior());
+     }
+     return result;
+   }
+   
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public Collection<Edge> hiliteEdges() {
+     List<Edge> edges = new LinkedList();
+     edges.addAll(Surface.edges(envelope));
+     Set<Edge> interior = new HashSet();
+     for (Space current : getElements()) {
+       interior.addAll(current.hiliteEdges());
+     }
+     edges.addAll(interior);
+     return edges;
+   }
  }