[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Instance.java, 1.13, 1.14 Item.java, 1.4, 1.5

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

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

Modified Files:
	Instance.java Item.java 
Log Message:


Index: Item.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Item.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Item.java	12 Feb 2010 11:44:28 -0000	1.4
--- Item.java	12 Feb 2010 14:36:40 -0000	1.5
***************
*** 608,619 ****
      res.add(new Attribute("ID", getId() != null ? getId().toString() : "", false));
      res.add(new Attribute("Owner", getOwner(), false));
!     if (isConstructionSpace() || isFunctionalSpace()) {
!       if (isTransparent()) {
!         res.add(new Attribute("Transparent", Boolean.TRUE));
!       } else {
!         res.add(new Attribute("Transparent", Boolean.FALSE));
        }
      }
-     res.add(new Attribute("Material", new Reference(material(), materials)));
      res.add(new Attribute("Description", getDescription()));
      if (getModellor() != null) {
--- 608,621 ----
      res.add(new Attribute("ID", getId() != null ? getId().toString() : "", false));
      res.add(new Attribute("Owner", getOwner(), false));
!     if (!(isUnion() || isNet() || isInstance())) {
!       if (isConstructionSpace() || isFunctionalSpace()) {
!         if (isTransparent()) {
!           res.add(new Attribute("Transparent", Boolean.TRUE));
!         } else {
!           res.add(new Attribute("Transparent", Boolean.FALSE));
!         }
        }
+       res.add(new Attribute("Material", new Reference(material(), materials)));
      }
      res.add(new Attribute("Description", getDescription()));
      if (getModellor() != null) {
***************
*** 632,638 ****
    /** {@inheritDoc} */
    public String title() {
-     if (isInstance()) {
-       return "Instance";
-     }
      if (isUnion()) {
        return "Union";
--- 634,637 ----

Index: Instance.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Instance.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Instance.java	13 Jan 2010 10:58:34 -0000	1.13
--- Instance.java	12 Feb 2010 14:36:40 -0000	1.14
***************
*** 174,176 ****
--- 174,181 ----
    }
    
+   
+   /** {@inheritDoc} */
+   public String title() {
+     return proto.getName();
+   }
  }