[Fmsystem-commits] [7301] BIM entity handling updated

[Petur Thorsteinsson]

Revision: 7301
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7301
Author:   peturbjorn
Date:     2011-05-25 21:14:14 +0000 (Wed, 25 May 2011)
Log Message:
-----------
BIM entity handling updated

Modified Paths:
--------------
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/jaxb/Decomposition.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/CommonLoader.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/IfcModelImpl.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Building.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/BuildingStorey.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Project.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Space.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/SpatialStructure.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Zone.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/BuildingServiceElement.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Covering.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Door.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Furnishing.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Window.java
    
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingStoreyTest.java
    
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingTest.java

Added Paths:
-----------
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/FacilityManagementEntity.java

Removed Paths:
-------------
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/BuildingStoreyLoader.java
    
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/CoveringLoader.java

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/jaxb/Decomposition.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/jaxb/Decomposition.java
    2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/jaxb/Decomposition.java
    2011-05-25 21:14:14 UTC (rev 7301)
@@ -64,11 +64,27 @@
        @Override
        public String toString() {
                StringBuilder sb = new StringBuilder();
+               sb.append("Project:\t"+this.project+"\n");
                sb.append("site:\t"+String.valueOf(this.site)+"\n");
-               sb.append("Buildings:\n");
-               for(String buildingId : this.buildings) {
-                       sb.append("\t"+buildingId+"\n");
+               if(this.buildings != null) {
+                       sb.append("Buildings:\n");
+                       for(String buildingId : this.buildings) {
+                               sb.append("\t"+buildingId+"\n");
+                       }
                }
+               if(this.buildingStoreys != null) {
+                       sb.append("Building Stories:\n");
+                       for(String buildingStoryId : this.buildingStoreys) {
+                               sb.append("\t"+buildingStoryId+"\n");
+                       }
+               }
+               if(this.spaces != null) {
+                       sb.append("Spaces:\n");
+                       for(String spaceId : this.spaces) {
+                               sb.append("\t"+spaceId+"\n");
+                       }
+               }
+               
                return sb.toString();
        }
 

Deleted: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/BuildingStoreyLoader.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/BuildingStoreyLoader.java
   2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/BuildingStoreyLoader.java
   2011-05-25 21:14:14 UTC (rev 7301)
@@ -1,32 +0,0 @@
-package no.bimconverter.ifc.loader;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import no.bimconverter.ifc.IfcSdaiException;
-import no.bimconverter.ifc.v2x3.object.BuildingStorey;
-
-import jsdai.SIfc2x3.EIfcbuildingstorey;
-import jsdai.lang.EEntity;
-import jsdai.lang.SdaiModel;
-
-
-public class BuildingStoreyLoader  extends CommonLoader {
-       public BuildingStoreyLoader() {
-       }
-               
-       public List<BuildingStorey> loadBuildingStoreys(SdaiModel model) {
-               List<BuildingStorey> buildingStoreys = new 
ArrayList<BuildingStorey>();
-               List<EEntity> buildingStoreyList = 
super.getEntitiesOfType(model, EIfcbuildingstorey.class);
-               if(buildingStoreyList.size() == 0) {
-                       throw new IfcSdaiException("Error: No buildings storeys 
found!");
-               } else {
-                       for(EEntity buildingStoreyEntity: buildingStoreyList) {
-                               BuildingStorey currentBuildingStorey = new 
BuildingStorey();
-                               
currentBuildingStorey.load((EIfcbuildingstorey)buildingStoreyEntity);
-                               buildingStoreys.add(currentBuildingStorey);
-                       }
-               }
-               return buildingStoreys;
-       }
-}

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/CommonLoader.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/CommonLoader.java
   2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/CommonLoader.java
   2011-05-25 21:14:14 UTC (rev 7301)
@@ -5,6 +5,7 @@
 
 import no.bimconverter.ifc.IfcSdaiException;
 import no.bimconverter.ifc.v2x3.object.CommonObject;
+import no.bimconverter.ifc.v2x3.object.FacilityManagementEntity;
 
 import jsdai.SIfc2x3.EIfcobject;
 import jsdai.lang.AEntity;
@@ -41,6 +42,10 @@
                }
                
        }
+       public List<? extends CommonObject> load(SdaiModel model, 
FacilityManagementEntity facilityManagementEntity) {
+               return this.load(model, 
facilityManagementEntity.getIfcEntityType(), 
facilityManagementEntity.getClass());
+       }
+       @Deprecated
        public List<? extends CommonObject> load(SdaiModel model, Class<? 
extends EEntity> IfcObjectType, Class<? extends CommonObject> objectClass) {
                List<EEntity> entityList = getEntitiesOfType(model, 
IfcObjectType);
                if(entityList.size() == 0) {

Deleted: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/CoveringLoader.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/CoveringLoader.java
 2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/CoveringLoader.java
 2011-05-25 21:14:14 UTC (rev 7301)
@@ -1,32 +0,0 @@
-package no.bimconverter.ifc.loader;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import no.bimconverter.ifc.IfcSdaiException;
-import no.bimconverter.ifc.v2x3.object.element.Covering;
-
-import jsdai.SIfc2x3.EIfccovering;
-import jsdai.lang.EEntity;
-import jsdai.lang.SdaiModel;
-
-
-public class CoveringLoader  extends CommonLoader {
-       public CoveringLoader() {
-       }
-               
-       public List<Covering> loadCoverings(SdaiModel model) {
-               List<Covering> coverings = new ArrayList<Covering>();
-               List<EEntity> coveringList = super.getEntitiesOfType(model, 
EIfccovering.class);
-               if(coveringList.size() == 0) {
-                       throw new IfcSdaiException("Error: No buildings storeys 
found!");
-               } else {
-                       for(EEntity coveringEntity: coveringList) {
-                               Covering currentCovering = new Covering();
-                               
currentCovering.load((EIfccovering)coveringEntity);
-                               coverings.add(currentCovering);
-                       }
-               }
-               return coverings;
-       }
-}

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/IfcModelImpl.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/IfcModelImpl.java
     2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/IfcModelImpl.java
     2011-05-25 21:14:14 UTC (rev 7301)
@@ -13,11 +13,6 @@
 import jsdai.SIfc2x3.EIfcdoor;
 import jsdai.SIfc2x3.EIfcfurnishingelement;
 import jsdai.SIfc2x3.EIfcobjectdefinition;
-import jsdai.SIfc2x3.EIfcownerhistory;
-import jsdai.SIfc2x3.EIfcproject;
-import jsdai.SIfc2x3.EIfcrelaggregates;
-import jsdai.SIfc2x3.EIfcsite;
-import jsdai.SIfc2x3.EIfcspace;
 import jsdai.SIfc2x3.EIfczone;
 import jsdai.lang.AEntity;
 import jsdai.lang.ASdaiRepository;
@@ -26,15 +21,11 @@
 import jsdai.lang.SdaiIterator;
 import jsdai.lang.SdaiModel;
 import jsdai.lang.SdaiRepository;
-import jsdai.util.LangUtils;
-
 import no.bimconverter.ifc.IfcModel;
 import no.bimconverter.ifc.IfcSdaiException;
 import no.bimconverter.ifc.RepositoriesImpl;
 import no.bimconverter.ifc.loader.BuildingLoader;
-import no.bimconverter.ifc.loader.BuildingStoreyLoader;
 import no.bimconverter.ifc.loader.CommonLoader;
-import no.bimconverter.ifc.loader.CoveringLoader;
 import no.bimconverter.ifc.loader.SiteLoader;
 import no.bimconverter.ifc.loader.WindowLoader;
 import no.bimconverter.ifc.v2x3.object.Building;
@@ -227,7 +218,7 @@
                try {
                        makeModelAvailable();
                        //this.project.loadModel(model);
-                       List<Project> pl = (List<Project>) (new 
CommonLoader()).load(model, EIfcproject.class, Project.class);
+                       List<Project> pl = (List<Project>) (new 
CommonLoader()).load(model, new Project());
                        
                        this.project = pl.get(0);
                        return this.project;
@@ -278,7 +269,8 @@
                try {
                        makeModelAvailable();
                        BuildingLoader buildingLoader = new BuildingLoader();
-                       this.buildings = buildingLoader.loadBuildings(model);
+                       //this.buildings = buildingLoader.loadBuildings(model);
+                       this.buildings = (List<Building>) (new 
CommonLoader()).load(model, (new Building()));
                        return this.buildings;
                } catch (SdaiException e) {
                        // TODO Auto-generated catch block
@@ -294,11 +286,11 @@
                super.openSdaiSession();
                try {
                        makeModelAvailable();
-                       BuildingStoreyLoader buildingStoreyLoader = new 
BuildingStoreyLoader();
                        
+                       
                        try {
-                               this.buildingStoreys = 
buildingStoreyLoader.loadBuildingStoreys(model);
-                               //this.buildingStoreys = 
(List<BuildingStorey>)(new CommonLoader())
+                               //this.buildingStoreys = 
buildingStoreyLoader.loadBuildingStoreys(model);
+                               this.buildingStoreys =  (List<BuildingStorey>) 
(new CommonLoader()).load(model, (new BuildingStorey()));
                                return this.buildingStoreys;
                        } catch ( IfcSdaiException e) {
                                return null;
@@ -317,7 +309,8 @@
                try {
                        makeModelAvailable();
                        try {
-                               this.spaces = (List<Space>) (new 
CommonLoader()).load(model, EIfcspace.class, Space.class);
+                               //this.spaces = (List<Space>) (new 
CommonLoader()).load(model, EIfcspace.class, Space.class);
+                               this.spaces = (List<Space>) (new 
CommonLoader()).load(model, (new Space()));
                                return this.spaces;
                        } catch ( IfcSdaiException e) {
                                return null;
@@ -335,9 +328,8 @@
                super.openSdaiSession();
                try {
                        makeModelAvailable();
-                       CoveringLoader coveringLoader = new CoveringLoader();
                        try {
-                               this.covering = 
coveringLoader.loadCoverings(model);
+                               this.covering = (List<Covering>) (new 
CommonLoader()).load(model, new Covering());
                                return this.covering;
                        } catch (IfcSdaiException e) {
                                
@@ -359,6 +351,7 @@
                        WindowLoader coveringLoader = new WindowLoader();
                        try {
                                this.windows = (List<Window>) 
coveringLoader.load(model);
+                               this.windows = (List<Window>) (new 
CommonLoader()).load(model, new Window());
                                return this.windows;
                        } catch (IfcSdaiException e) {
                                logger.info("No windows found");
@@ -382,7 +375,7 @@
                        makeModelAvailable();
                        
                        try {
-                               this.doors = (List<Door>) (new 
CommonLoader()).load(model, EIfcdoor.class, Door.class);
+                               this.doors = (List<Door>) (new 
CommonLoader()).load(model, new Door());
                                return this.doors;
                        } catch (IfcSdaiException e) {
                                logger.info("No doors found");
@@ -403,7 +396,7 @@
                        makeModelAvailable();
                        
                        try {
-                               this.zones = (List<Zone>) (new 
CommonLoader()).load(model, EIfczone.class, Zone.class);
+                               this.zones = (List<Zone>) (new 
CommonLoader()).load(model, new Zone());
                                return this.zones;
                        } catch (IfcSdaiException e) {
                                logger.info("No zones found");
@@ -424,7 +417,7 @@
                        makeModelAvailable();
                        
                        try {
-                               this.buildingServiceElements = 
(List<BuildingServiceElement>) (new CommonLoader()).load(model, 
EIfcdistributionelement.class, BuildingServiceElement.class);
+                               this.buildingServiceElements = 
(List<BuildingServiceElement>) (new CommonLoader()).load(model, new 
BuildingServiceElement());
                                return this.buildingServiceElements;
                        } catch (IfcSdaiException e) {
                                logger.info("No buildingServiceElements found");
@@ -452,7 +445,7 @@
                try {
                        makeModelAvailable();
                        try {
-                               this.furnishingElements = (List<Furnishing>) 
(new CommonLoader()).load(model, EIfcfurnishingelement.class, Furnishing.class);
+                               this.furnishingElements = (List<Furnishing>) 
(new CommonLoader()).load(model, new Furnishing());
                                return this.furnishingElements;
                        } catch (IfcSdaiException e) {
                                logger.info("No furnishing found");

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Building.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Building.java
  2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Building.java
  2011-05-25 21:14:14 UTC (rev 7301)
@@ -1,9 +1,6 @@
 package no.bimconverter.ifc.v2x3.object;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
 import javax.xml.bind.annotation.XmlRootElement;
 
 import no.bimconverter.ifc.IfcSdaiException;
@@ -11,6 +8,7 @@
 
 
 import jsdai.SIfc2x3.EIfcbuilding;
+import jsdai.SIfc2x3.EIfcbuildingstorey;
 import jsdai.SIfc2x3.EIfcobjectdefinition;
 import jsdai.SIfc2x3.EIfcpostaladdress;
 import jsdai.SIfc2x3.EIfcroot;
@@ -18,17 +16,24 @@
 import jsdai.lang.SdaiException;
 
 @XmlRootElement
-public class Building extends SpatialStructure {
+public class Building extends SpatialStructure implements 
FacilityManagementEntity{
        final private static String commonPropertyName = "Pset_BuildingCommon";
        private Address address;
+       final private Class<EIfcbuilding> ifcEntityType = EIfcbuilding.class;
        
        public Building() {
                super();
                
        }
+       @Override
+       public Class<? extends EIfcobjectdefinition> getIfcEntityType() {
+               return ifcEntityType;
+       }
        
-       public void load(EIfcbuilding buildingEntity) {
-               super.load(buildingEntity);
+       @Override
+       public void load(EIfcobjectdefinition objectEntity) {
+               super.load(objectEntity);
+               EIfcbuilding buildingEntity = (EIfcbuilding)objectEntity;
                try {
                        this.loadAttributes(buildingEntity);
                        this.loadAddress(buildingEntity);
@@ -43,7 +48,6 @@
        
        private void loadSpatialDecomposition(EIfcbuilding building) throws 
SdaiException {
                
-               
                List<EIfcobjectdefinition> siteIsDecomposedBy = 
this.getIsDecomposedBy(building);
                super.insertDecomposingIds(siteIsDecomposedBy, 
Building.SpatialDecomposition.STOREY.key);
                

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/BuildingStorey.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/BuildingStorey.java
    2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/BuildingStorey.java
    2011-05-25 21:14:14 UTC (rev 7301)
@@ -11,19 +11,26 @@
 import jsdai.SIfc2x3.EIfcbuildingstorey;
 import jsdai.SIfc2x3.EIfcobjectdefinition;
 import jsdai.SIfc2x3.EIfcroot;
+import jsdai.SIfc2x3.EIfczone;
 import jsdai.lang.EEntity;
 import jsdai.lang.SdaiException;
 
 @XmlRootElement
-public class BuildingStorey  extends SpatialStructure {
+public class BuildingStorey  extends SpatialStructure  implements 
FacilityManagementEntity{
+       final static private Class<EIfcbuildingstorey> ifcEntityType = 
EIfcbuildingstorey.class;
        final private static String commonPropertyName = 
"Pset_BuildingStoreyCommon";
        public BuildingStorey() {
                super();
-               
        }
        
-       public void load(EIfcbuildingstorey buildingStoreyEntity) {
-               super.load(buildingStoreyEntity);
+       @Override
+       public Class<? extends EIfcobjectdefinition> getIfcEntityType() {
+               return ifcEntityType;
+       }
+       @Override
+       public void load(EIfcobjectdefinition objectEntity) {
+               super.load(objectEntity);
+               EIfcbuildingstorey buildingStoreyEntity = 
(EIfcbuildingstorey)objectEntity;
                try {
                        this.loadAttributes(buildingStoreyEntity);
                        this.loadBaseQuantities(buildingStoreyEntity);

Added: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/FacilityManagementEntity.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/FacilityManagementEntity.java
                          (rev 0)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/FacilityManagementEntity.java
  2011-05-25 21:14:14 UTC (rev 7301)
@@ -0,0 +1,7 @@
+package no.bimconverter.ifc.v2x3.object;
+
+import jsdai.SIfc2x3.EIfcobjectdefinition;
+
+public interface FacilityManagementEntity extends CommonObject {
+       public Class<? extends EIfcobjectdefinition> getIfcEntityType();
+}

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Project.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Project.java
   2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Project.java
   2011-05-25 21:14:14 UTC (rev 7301)
@@ -33,6 +33,7 @@
 import jsdai.SIfc2x3.EIfcrelaggregates;
 import jsdai.SIfc2x3.EIfcsite;
 import jsdai.SIfc2x3.EIfcsiunitname;
+import jsdai.SIfc2x3.EIfcspace;
 import jsdai.SIfc2x3.EIfcunitassignment;
 import jsdai.SIfc2x3.EIfcunitenum;
 import jsdai.lang.AEntity;
@@ -45,48 +46,15 @@
  * there has to be exactly one project object in the exchange file
  */
 @XmlRootElement
-public class Project extends CommonObjectImpl{
-       
-       
-       /*final public static String ATTRIBUTE_KEY_PHASE = "Phase";
-       final public static String ATTRIBUTE_KEY_LONGNAME = "Long name";*/
-       
-       
-       
-       
-       //private Map<String, String> units = new HashMap<String, String>();
+public class Project extends CommonObjectImpl implements 
FacilityManagementEntity{
+       final private Class<EIfcproject> ifcEntityType = EIfcproject.class;
        private Units units = new Units();
        private Decomposition decomposition = new Decomposition();
        private EIfcnamedunit unit;
        
-       
-       
        public Project() {
        }
        
-       
-       /*
-       public void loadModel(SdaiModel model) {
-               List<EEntity> projectList = super.loadModel(model, 
EIfcproject.class);
-               int projectListSize = projectList.size();
-               if(projectListSize == 0) {
-                       throw new IfcSdaiException("No projects found!");
-               } else if (projectListSize > 1) {
-                       throw new IfcSdaiException("Too many projects found!");
-               } else {
-                       EIfcproject theProject = (EIfcproject) 
projectList.get(0);
-                       try {
-                               this.loadAttributes(theProject);
-                               this.loadUnits(theProject);
-                               this.loadDecomposition(theProject);
-                               //this.loadOwnerHistory(theProject);
-                       } catch (SdaiException e) {
-                               throw new IfcSdaiException("Sdai error!", e);
-                       }
-               }
-       }
-       */
-       
        @Override
        public void load(EIfcobjectdefinition object) {
                super.load(object);
@@ -100,6 +68,11 @@
                }
        }
        
+       @Override
+       public Class<? extends EIfcobjectdefinition> getIfcEntityType() {
+               return ifcEntityType;
+       }
+       
        /*
         * One site allowed, but optional
         * Building must be given if no site

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Space.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Space.java
     2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Space.java
     2011-05-25 21:14:14 UTC (rev 7301)
@@ -13,6 +13,7 @@
 import jsdai.SIfc2x3.AIfcproduct;
 import jsdai.SIfc2x3.AIfcrelcontainedinspatialstructure;
 import jsdai.SIfc2x3.AIfcrelspaceboundary;
+import jsdai.SIfc2x3.EIfcbuilding;
 import jsdai.SIfc2x3.EIfccovering;
 import jsdai.SIfc2x3.EIfcdoor;
 import jsdai.SIfc2x3.EIfcelement;
@@ -29,11 +30,16 @@
 import jsdai.lang.SdaiIterator;
 
 @XmlRootElement
-public class Space extends SpatialStructure{
+public class Space extends SpatialStructure implements 
FacilityManagementEntity{
        final private static String commonPropertyName = "Pset_SpaceCommon";
        private SpaceSpatialContainer spatialContainer = null;
+       final private Class<EIfcspace> ifcEntityType = EIfcspace.class;
        
        @Override
+       public Class<? extends EIfcobjectdefinition> getIfcEntityType() {
+               return ifcEntityType;
+       }
+       @Override
        public void load(EIfcobjectdefinition objectEntity) {
                super.load(objectEntity);
                EIfcspace spaceEntity = (EIfcspace)objectEntity;

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/SpatialStructure.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/SpatialStructure.java
  2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/SpatialStructure.java
  2011-05-25 21:14:14 UTC (rev 7301)
@@ -23,7 +23,6 @@
        @Override
        public void load(EIfcobjectdefinition object) {
                super.load(object);
-               
                try {
                        
                        
this.loadAttributes((EIfcspatialstructureelement)object);

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Zone.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Zone.java
      2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Zone.java
      2011-05-25 21:14:14 UTC (rev 7301)
@@ -15,10 +15,15 @@
 import jsdai.lang.SdaiException;
 import jsdai.lang.SdaiIterator;
 @XmlRootElement
-public class Zone extends CommonObjectImpl{
+public class Zone extends CommonObjectImpl implements FacilityManagementEntity{
+       final static private Class<EIfczone> ifcEntityType = EIfczone.class;
        private ZoneAssignment zoneAssignment = new ZoneAssignment();
        public Zone() {
        }
+       @Override
+       public Class<? extends EIfcobjectdefinition> getIfcEntityType() {
+               return ifcEntityType;
+       }
        
        @Override
        public void load(EIfcobjectdefinition object) {

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/BuildingServiceElement.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/BuildingServiceElement.java
    2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/BuildingServiceElement.java
    2011-05-25 21:14:14 UTC (rev 7301)
@@ -2,6 +2,7 @@
 
 import javax.xml.bind.annotation.XmlRootElement;
 
+import no.bimconverter.ifc.v2x3.object.FacilityManagementEntity;
 import no.bimconverter.ifc.v2x3.object.element.type.BuildingServiceElementType;
 import no.bimconverter.ifc.v2x3.object.element.type.WindowStyle;
 
@@ -9,6 +10,7 @@
 import jsdai.SIfc2x3.EIfcbuildingstorey;
 import jsdai.SIfc2x3.EIfcdistributionelement;
 import jsdai.SIfc2x3.EIfcdistributionelementtype;
+import jsdai.SIfc2x3.EIfcfurnishingelement;
 import jsdai.SIfc2x3.EIfcobjectdefinition;
 import jsdai.SIfc2x3.EIfctypeobject;
 import jsdai.SIfc2x3.EIfcwindow;
@@ -16,7 +18,8 @@
 import jsdai.lang.SdaiException;
 
 @XmlRootElement
-public class BuildingServiceElement extends CommonElement{
+public class BuildingServiceElement extends CommonElement implements 
FacilityManagementEntity{
+       final static private Class<EIfcdistributionelement> ifcEntityType = 
EIfcdistributionelement.class;
        private BuildingServiceElementType buildingServiceElemenType = null;
        
        
@@ -24,6 +27,10 @@
                super();
        }
        @Override
+       public Class<? extends EIfcobjectdefinition> getIfcEntityType() {
+               return ifcEntityType;
+       }
+       @Override
        public void load(EIfcobjectdefinition object) {
                super.load(object);
                EIfcdistributionelement entity = (EIfcdistributionelement) 
object;

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Covering.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Covering.java
  2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Covering.java
  2011-05-25 21:14:14 UTC (rev 7301)
@@ -2,6 +2,8 @@
 
 import javax.xml.bind.annotation.XmlRootElement;
 
+import no.bimconverter.ifc.jaxb.BaseQuantities;
+import no.bimconverter.ifc.v2x3.object.FacilityManagementEntity;
 import no.bimconverter.ifc.v2x3.object.element.type.CoveringType;
 
 
@@ -11,11 +13,13 @@
 import jsdai.SIfc2x3.EIfccoveringtypeenum;
 import jsdai.SIfc2x3.EIfcobject;
 import jsdai.SIfc2x3.EIfcobjectdefinition;
+import jsdai.SIfc2x3.EIfcproject;
 import jsdai.SIfc2x3.EIfcspace;
 import jsdai.SIfc2x3.EIfctypeobject;
 import jsdai.lang.SdaiException;
 @XmlRootElement
-public class Covering extends CommonElement {
+public class Covering extends CommonElement implements 
FacilityManagementEntity{
+       final static private Class<EIfccovering> ifcEntityType = 
EIfccovering.class;
        final public static String commonPropertyName = "Pset_CoveringCommon";
        private CoveringType coveringType = null;
        public Covering() {
@@ -33,6 +37,10 @@
                        e.printStackTrace();
                }
        }
+       @Override
+       public Class<? extends EIfcobjectdefinition> getIfcEntityType() {
+               return Covering.ifcEntityType;
+       }
 //     public void load(EIfccovering entity) {
 //             try {
 //                     this.loadAttributes(entity);

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Door.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Door.java
      2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Door.java
      2011-05-25 21:14:14 UTC (rev 7301)
@@ -2,25 +2,28 @@
 
 import javax.xml.bind.annotation.XmlRootElement;
 
+import no.bimconverter.ifc.v2x3.object.FacilityManagementEntity;
 import no.bimconverter.ifc.v2x3.object.element.type.DoorStyle;
 
 
-import jsdai.SIfc2x3.EIfcbuildingstorey;
 import jsdai.SIfc2x3.EIfcdoor;
 import jsdai.SIfc2x3.EIfcdoorstyle;
-import jsdai.SIfc2x3.EIfcobject;
 import jsdai.SIfc2x3.EIfcobjectdefinition;
 import jsdai.SIfc2x3.EIfcspace;
 import jsdai.SIfc2x3.EIfctypeobject;
-import jsdai.SIfc2x3.EIfcwindowstyle;
 import jsdai.lang.SdaiException;
 @XmlRootElement
-public class Door extends CommonElement{
+public class Door extends CommonElement implements FacilityManagementEntity{
+       final static private Class<EIfcdoor> ifcEntityType = EIfcdoor.class;
        private DoorStyle doorStyle = null;
        
        public DoorStyle getDoorStyle() {
                return doorStyle;
        }
+       @Override
+       public Class<? extends EIfcobjectdefinition> getIfcEntityType() {
+               return ifcEntityType;
+       }
 
        public void setDoorStyle(DoorStyle doorStyle) {
                this.doorStyle = doorStyle;

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Furnishing.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Furnishing.java
        2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Furnishing.java
        2011-05-25 21:14:14 UTC (rev 7301)
@@ -2,10 +2,12 @@
 
 import javax.xml.bind.annotation.XmlRootElement;
 
+import no.bimconverter.ifc.v2x3.object.FacilityManagementEntity;
 import no.bimconverter.ifc.v2x3.object.element.type.FurnishingType;
 
 
 import jsdai.SIfc2x3.EIfcbuildingstorey;
+import jsdai.SIfc2x3.EIfcdoor;
 import jsdai.SIfc2x3.EIfcelement;
 import jsdai.SIfc2x3.EIfcfurnishingelement;
 import jsdai.SIfc2x3.EIfcobjectdefinition;
@@ -14,7 +16,8 @@
 import jsdai.SIfc2x3.EIfcwindowstyle;
 import jsdai.lang.SdaiException;
 @XmlRootElement
-public class Furnishing  extends CommonElement{
+public class Furnishing  extends CommonElement implements 
FacilityManagementEntity{
+       final static private Class<EIfcfurnishingelement> ifcEntityType = 
EIfcfurnishingelement.class;
        private FurnishingType furnishingType = null;
        
        public Furnishing() {
@@ -22,6 +25,10 @@
                
        }
        @Override
+       public Class<? extends EIfcobjectdefinition> getIfcEntityType() {
+               return ifcEntityType;
+       }
+       @Override
        public void load(EIfcobjectdefinition object) {
                super.load(object);
                EIfcfurnishingelement element = (EIfcfurnishingelement)object;

Modified: 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Window.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Window.java
    2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Window.java
    2011-05-25 21:14:14 UTC (rev 7301)
@@ -2,9 +2,11 @@
 
 import javax.xml.bind.annotation.XmlRootElement;
 
+import no.bimconverter.ifc.v2x3.object.FacilityManagementEntity;
 import no.bimconverter.ifc.v2x3.object.element.type.WindowStyle;
 
 import jsdai.SIfc2x3.EIfcbuildingstorey;
+import jsdai.SIfc2x3.EIfccovering;
 import jsdai.SIfc2x3.EIfcobjectdefinition;
 import jsdai.SIfc2x3.EIfctypeobject;
 import jsdai.SIfc2x3.EIfcwindow;
@@ -12,7 +14,8 @@
 import jsdai.lang.SdaiException;
 
 @XmlRootElement
-public class Window extends CommonElement{
+public class Window extends CommonElement implements FacilityManagementEntity{
+       final static private Class<EIfcwindow> ifcEntityType = EIfcwindow.class;
        final public static String commonPropertyName = "Pset_WindowCommon";
        private WindowStyle windowStyle = null;
        
@@ -30,6 +33,10 @@
                        e.printStackTrace();
                }
        }
+       @Override
+       public Class<? extends EIfcobjectdefinition> getIfcEntityType() {
+               return ifcEntityType;
+       }
 
        private void loadSpatialContainer(EIfcwindow entity) throws 
SdaiException {
                this.loadParentItemsIntoSpatialContainer(entity, 
EIfcbuildingstorey.class);

Modified: 
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingStoreyTest.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingStoreyTest.java
        2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingStoreyTest.java
        2011-05-25 21:14:14 UTC (rev 7301)
@@ -58,7 +58,7 @@
        public void testFirstStorey() throws JAXBException {
                
                //this.testFirstStoreyAttributes();
-               //super.outputXmlToSystemOut(buildingStorey1);
+               super.outputXmlToSystemOut(buildingStorey1);
        }
        @Test
        public void testSecondStorey() throws JAXBException {

Modified: 
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingTest.java
===================================================================
--- 
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingTest.java
      2011-05-25 06:12:41 UTC (rev 7300)
+++ 
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingTest.java
      2011-05-25 21:14:14 UTC (rev 7301)
@@ -75,8 +75,9 @@
        @Test
        public void testSpatialDecomposition() {
                Decomposition spatialComposition = 
building.getSpatialDecomposition();
+               assertNotNull(spatialComposition);
                //String[] project = 
spatialComposition.get(BuildingStorey.SpatialDecomposition.PROJECT.key);
-               assertNotNull(spatialComposition.getProject());
+               
assertNotNull(spatialComposition.toString(),spatialComposition.getProject());
                assertEquals("3KFKb0sfrDJwSHalGIQFZT", 
spatialComposition.getProject() );
                //String[] site = 
spatialComposition.get(BuildingStorey.SpatialDecomposition.SITE.key);
                assertNotNull(spatialComposition.getSite());