[Bprocessor-commit] facade/src/net/sourceforge/bprocessor/facade/modellor NetFacadeModellor.java, 1.37, 1.38

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

Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18085/src/net/sourceforge/bprocessor/facade/modellor

Modified Files:
	NetFacadeModellor.java 
Log Message:
Another step in ellimination Net

Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** NetFacadeModellor.java	22 Oct 2007 06:55:15 -0000	1.37
--- NetFacadeModellor.java	2 Nov 2007 11:17:22 -0000	1.38
***************
*** 71,75 ****
    
    /** The net for this facade */
!   private Net net;
    
    /** The framewidth of the facade */
--- 71,75 ----
    
    /** The net for this facade */
!   private Space net;
    
    /** The framewidth of the facade */
***************
*** 114,118 ****
    public void setSubContent(Map<String, Object> m) {
      space = (Space)m.get("space");
!     net = (Net)m.get("net");
      depth = ((Double)m.get("depth")).doubleValue();
      frameWidth = ((Double)m.get("frameWidth")).doubleValue();
--- 114,118 ----
    public void setSubContent(Map<String, Object> m) {
      space = (Space)m.get("space");
!     net = (Space)m.get("net");
      depth = ((Double)m.get("depth")).doubleValue();
      frameWidth = ((Double)m.get("frameWidth")).doubleValue();
***************
*** 287,291 ****
     * @return the net of this modellor
     */
!   public Net getNet() {
      return this.net;
    }
--- 287,291 ----
     * @return the net of this modellor
     */
!   public Space getNet() {
      return this.net;
    }
***************
*** 296,304 ****
     */
    public void setNet(Space net) {
!     if (net instanceof Net) {
        if (this.net != null) {
          space.remove(this.net);
        }
!       this.net = (Net)net;
        space.add(net);
      }
--- 296,304 ----
     */
    public void setNet(Space net) {
!     if (net.isNet()) {
        if (this.net != null) {
          space.remove(this.net);
        }
!       this.net = net;
        space.add(net);
      }
***************
*** 346,350 ****
     * @param n the net
     */
!   private void prepareNet(Net n) {
      Collection<Edge> edges = n.getEdges();
      for (Edge e : edges) {
--- 346,350 ----
     * @param n the net
     */
!   private void prepareNet(Space n) {
      Collection<Edge> edges = n.getEdges();
      for (Edge e : edges) {
***************
*** 390,394 ****
     * @param net the net
     */
!   private void createDoubleFacade(Net net) {
      if (frame == null) {
        frame = new Space("Frame", 
--- 390,394 ----
     * @param net the net
     */
!   private void createDoubleFacade(Space net) {
      if (frame == null) {
        frame = new Space("Frame", 
***************
*** 440,444 ****
     * @param net the net
     */
!   private void createSingleFacade(Net net) {
      if (frame == null) {
        frame = new Space("Frame", 
--- 440,444 ----
     * @param net the net
     */
!   private void createSingleFacade(Space net) {
      if (frame == null) {
        frame = new Space("Frame", 
***************
*** 571,575 ****
     * @return a list of connected edges making up the net outline
     */
!   private List<Edge> netOutline(Net net) {
      /*Find outer edges*/
      Set<Edge> outer = new HashSet<Edge>();
--- 571,575 ----
     * @return a list of connected edges making up the net outline
     */
!   private List<Edge> netOutline(Space net) {
      /*Find outer edges*/
      Set<Edge> outer = new HashSet<Edge>();
***************
*** 623,628 ****
     * @return a new net
     */
!   private  Net createNet(Surface front) {
!     Net n = new Net("Facade net");
      if (front != null) { 
        front.copy(n);
--- 623,628 ----
     * @return a new net
     */
!   private  Space createNet(Surface front) {
!     Space n = new Net("Facade net");
      if (front != null) { 
        front.copy(n);