update to bimserver 1.2beta

Author: hlg

ServerPlugin/src/org/bimserver/serializers/json/JSONModelFormat2Serializer.java

@@ -6,6 +6,7 @@
 import java.util.List;
 
 import org.bimserver.emf.IdEObject;
+import org.bimserver.emf.IfcModelInterface;
 import org.bimserver.models.ifc2x3tc1.IfcColumn;
 import org.bimserver.models.ifc2x3tc1.IfcDoor;
 import org.bimserver.models.ifc2x3tc1.IfcRoot;
@@ -14,15 +15,10 @@
 import org.bimserver.models.ifc2x3tc1.IfcWallStandardCase;
 import org.bimserver.models.ifc2x3tc1.IfcWindow;
 import org.bimserver.plugins.PluginManager;
-import org.bimserver.plugins.ifcengine.IfcEngine;
-import org.bimserver.plugins.ifcengine.IfcEngineException;
-import org.bimserver.plugins.ifcengine.IfcEngineGeometry;
-import org.bimserver.plugins.ifcengine.IfcEngineInstance;
-import org.bimserver.plugins.ifcengine.IfcEngineInstanceVisualisationProperties;
-import org.bimserver.plugins.ifcengine.IfcEngineModel;
+import org.bimserver.plugins.ifcengine.*;
 import org.bimserver.plugins.serializers.EmfSerializer;
-import org.bimserver.plugins.serializers.IfcModelInterface;
 import org.bimserver.plugins.serializers.ProjectInfo;
+import org.bimserver.plugins.serializers.Serializer;
 import org.bimserver.plugins.serializers.SerializerException;
 import org.eclipse.emf.ecore.EObject;
 import org.slf4j.Logger;
@@ -35,12 +31,12 @@ public class JSONModelFormat2Serializer extends EmfSerializer {
 	private IfcEngineModel ifcEngineModel;
 	private IfcEngineGeometry geometry;
 
-	public void init(IfcModelInterface model, ProjectInfo projectInfo, PluginManager pluginManager, IfcEngine ifcEngine) throws SerializerException {
-		super.init(model, projectInfo, pluginManager, ifcEngine);
+	public void init(IfcModelInterface model, ProjectInfo projectInfo, PluginManager pluginManager, IfcEnginePlugin ifcEnginPlugin, boolean oids) throws SerializerException {
+		super.init(model, projectInfo, pluginManager, ifcEnginPlugin, false);
 		try {
-			ifcEngine.init();
-            EmfSerializer serializer = getPluginManager().requireIfcStepSerializer();
-			serializer.init(model, getProjectInfo(), getPluginManager(), ifcEngine);
+			IfcEngine ifcEngine = ifcEnginPlugin.createIfcEngine();
+            Serializer serializer = getPluginManager().requireIfcStepSerializer();
+			serializer.init(model, getProjectInfo(), getPluginManager(), ifcEnginPlugin, false);
 			ifcEngineModel = ifcEngine.openModel(serializer.getBytes());
 			ifcEngineModel.setPostProcessing(true);
 			geometry = ifcEngineModel.finalizeModelling(ifcEngineModel.initializeModelling());
@@ -50,7 +46,7 @@ public void init(IfcModelInterface model, ProjectInfo projectInfo, PluginManager
 	}
 
 	@Override
-	protected void reset() {
+    public void reset() {
 		setMode(Mode.BODY);
 	}
 

ServerPlugin/src/org/bimserver/serializers/json/JSONModelFormat2SerializerPlugin.java

@@ -1,5 +1,6 @@
 package org.bimserver.serializers.json;
 
+import org.bimserver.models.store.ObjectDefinition;
 import org.bimserver.plugins.Plugin;
 import org.bimserver.plugins.PluginException;
 import org.bimserver.plugins.PluginManager;
@@ -21,27 +22,37 @@ public EmfSerializer createSerializer() {
 		return new JSONModelFormat2Serializer();
 	}
 
-	@Override
+    @Override
+    public boolean needsGeometry() {
+        return true;
+    }
+
+    @Override
 	public String getDescription() {
 		return "JSONModelFormat2Serializer"; // TODO: better names and descriptions
 	}
-	
-	@Override
+
+    @Override
 	public String getVersion() {
 		return "0.1";
 	}
 
-	@Override
+    @Override
+    public ObjectDefinition getSettingsDefinition() {
+        return null; // TODO: ???
+    }
+
+    @Override
 	public void init(PluginManager pluginManager) throws PluginException {
 		pluginManager.requireSchemaDefinition();
 		pluginManager.requireIfcEngine();
 		initialized = true;
 	}
 
-	@Override
-	public String getDefaultSerializerName() {
-		return "ThreeJs";
-	}
+    @Override
+    public String getDefaultName() {
+        return "ThreeJs";
+    }
 
 	@Override
 	public String getDefaultContentType() {