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

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

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

Modified Files:
	NetFacadeModellor.java 
Log Message:


Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** NetFacadeModellor.java	5 Mar 2010 10:43:34 -0000	1.51
--- NetFacadeModellor.java	21 May 2010 06:42:54 -0000	1.52
***************
*** 41,48 ****
    private static final double FRAME_DEPTH = 0.05;   
    private static final String EXTERIOR = "-1.-80";
-   
    private static final String FRAME = "-1.-205.02.01.01";
    private static final String GLASS = "-1.-205.02.01.02";
!   private static final long serialVersionUID = 1L;
    private Space space;
    private Space frame;
--- 41,48 ----
    private static final double FRAME_DEPTH = 0.05;   
    private static final String EXTERIOR = "-1.-80";
    private static final String FRAME = "-1.-205.02.01.01";
    private static final String GLASS = "-1.-205.02.01.02";
!   
!   
    private Space space;
    private Space frame;
***************
*** 64,75 ****
     * {@inheritDoc}
     */
!   public void getSubContent(Map<String, Object> m) {
!     m.put("space", space);
!     m.put("net", net);
!     m.put("depth", new Double(depth));
!     m.put("frameWidth", new Double(frameWidth));
!     m.put("front", front);
!     m.put("single", Boolean.valueOf(single));
!     m.put("frame", frame);
    }
    
--- 64,77 ----
     * {@inheritDoc}
     */
!   public Map<String, Object> getContent() {
!     Map<String, Object> content = super.getContent();
!     content.put("space", space);
!     content.put("net", net);
!     content.put("depth", new Double(depth));
!     content.put("frameWidth", new Double(frameWidth));
!     content.put("front", front);
!     content.put("single", Boolean.valueOf(single));
!     content.put("frame", frame);
!     return content;
    }
    
***************
*** 77,88 ****
     * {@inheritDoc}
     */
!   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();
!     front = (Surface)m.get("front");
!     single = ((Boolean)m.get("single")).booleanValue();
!     frame = (Space)m.get("frame");
      Project.getInstance().addObserver(this);
    }
--- 79,91 ----
     * {@inheritDoc}
     */
!   public void setContent(Map<String, Object> map) {
!     super.setContent(map);
!     space = (Space)map.get("space");
!     net = (Space)map.get("net");
!     depth = ((Double)map.get("depth")).doubleValue();
!     frameWidth = ((Double)map.get("frameWidth")).doubleValue();
!     front = (Surface)map.get("front");
!     single = ((Boolean)map.get("single")).booleanValue();
!     frame = (Space)map.get("frame");
      Project.getInstance().addObserver(this);
    }