Skip to content
Permalink
Browse files

Updated all code to IFC4 implementation

  • Loading branch information...
rubendel committed Jun 19, 2014
1 parent 80280da commit 3985a4ee7c29e6923e769f7bf4f40452eef4a658
Showing with 191 additions and 2,547 deletions.
  1. +1 −0 AdminGui/js/bimsurfer
  2. +5 −1 BimServer/src/org/bimserver/GeometryGenerator.java
  3. +6 −2 BimServer/src/org/bimserver/schemaconverter/AbstractSchemaConverter.java
  4. +0 −1 BimServer/www/js/bimserverapi.js
  5. +0 −1 IfcEngine/.classpath
  6. BIN IfcEngine/lib/64/ifcengine.dll
  7. +2 −51 MiscSerializers/src/org/bimserver/serializers/binarygeometry/BinaryGeometrySerializer.java
  8. +1 −0 Shared/src/org/bimserver/plugins/deserializers/Deserializer.java
  9. +23 −1 Shared/src/org/bimserver/plugins/deserializers/EmfDeserializer.java
  10. +10 −4 Tests/src/org/bimserver/test/AddFurniture.java
  11. +11 −5 Tests/src/org/bimserver/test/ExtractFurniture.java
  12. +1 −1 Tests/src/org/bimserver/test/ImportLargeProject.java
  13. +2 −2 Tests/src/org/bimserver/test/TestAddExtendedData.java
  14. +6 −2 Tests/src/org/bimserver/test/TestChangeWrappedValue.java
  15. +1 −1 Tests/src/org/bimserver/test/TestUploadDir.java
  16. +1 −1 Tests/src/org/bimserver/test/TestUploadSameModelALot.java
  17. +11 −3 Tests/src/org/bimserver/test/framework/RandomBimServerClientFactory.java
  18. +1 −1 Tests/src/org/bimserver/test/framework/actions/CheckinAction.java
  19. +10 −2 Tests/src/org/bimserver/test/framework/actions/DownloadModelLowLevel.java
  20. +0 −67 Tests/src/org/bimserver/tests/AddExtendedDataTest.java
  21. +0 −60 Tests/src/org/bimserver/tests/CityGmlTest.java
  22. +0 −136 Tests/src/org/bimserver/tests/CompareTest.java
  23. +0 −80 Tests/src/org/bimserver/tests/FileLoader.java
  24. +0 −159 Tests/src/org/bimserver/tests/GuidHighlighter.java
  25. +0 −111 Tests/src/org/bimserver/tests/GuidHighlighterTester.java
  26. +0 −148 Tests/src/org/bimserver/tests/IfcRioleringTest.java
  27. +0 −72 Tests/src/org/bimserver/tests/IfcXmlReadTest.java
  28. +0 −64 Tests/src/org/bimserver/tests/LargeFileTest.java
  29. +0 −87 Tests/src/org/bimserver/tests/ReadTest2.java
  30. +0 −61 Tests/src/org/bimserver/tests/RevisionMergeTest.java
  31. +0 −70 Tests/src/org/bimserver/tests/SimpleTest.java
  32. +0 −62 Tests/src/org/bimserver/tests/TestCityGML.java
  33. +0 −72 Tests/src/org/bimserver/tests/TestCollada.java
  34. +0 −73 Tests/src/org/bimserver/tests/TestColladaSerializer.java
  35. +0 −88 Tests/src/org/bimserver/tests/TestColor.java
  36. +0 −292 Tests/src/org/bimserver/tests/TestDatabase.java
  37. +0 −55 Tests/src/org/bimserver/tests/TestDeserializer.java
  38. +0 −237 Tests/src/org/bimserver/tests/TestIfcEngineEmbedded.java
  39. +0 −58 Tests/src/org/bimserver/tests/TestIfcFile.java
  40. +0 −71 Tests/src/org/bimserver/tests/TestKmz.java
  41. +0 −59 Tests/src/org/bimserver/tests/TestSize.java
  42. +0 −219 Tests/src/org/bimserver/tests/Visualise.java
  43. +9 −3 Tests/src/org/bimserver/unittests/PerformanceTestIfcStepSerializer.java
  44. +11 −5 Tests/src/org/bimserver/unittests/TestClientEmfModelLocal.java
  45. +23 −23 Tests/src/org/bimserver/unittests/TestIfcSerializeDeserialize.java
  46. +9 −3 Tests/src/org/bimserver/unittests/TestIfcStepDeserializer.java
  47. +9 −3 Tests/src/org/bimserver/unittests/TestIfcStepSerializer.java
  48. +8 −2 Tests/src/org/bimserver/unittests/TestLowLevelChanges.java
  49. +4 −2 Tests/test/org/bimserver/tests/emf/ContainedInStructure.java
  50. +1 −1 Tests/test/org/bimserver/tests/emf/CreateGuid.java
  51. +3 −3 Tests/test/org/bimserver/tests/emf/CreateProperties.java
  52. +2 −2 Tests/test/org/bimserver/tests/emf/DeleteObjects.java
  53. +2 −2 Tests/test/org/bimserver/tests/emf/ListWalls.java
  54. +3 −3 Tests/test/org/bimserver/tests/emf/LoadCompleteModel.java
  55. +2 −2 Tests/test/org/bimserver/tests/emf/MoveObject.java
  56. +2 −2 Tests/test/org/bimserver/tests/emf/ReadProperties.java
  57. +2 −2 Tests/test/org/bimserver/tests/emf/ReadTrim.java
  58. +2 −2 Tests/test/org/bimserver/tests/emf/RemoveReferenceList.java
  59. +1 −1 Tests/test/org/bimserver/tests/ifc/TestJapaneseChars.java
  60. +1 −1 Tests/test/org/bimserver/tests/lowlevel/MoveFurniture.java
  61. +1 −1 Tests/test/org/bimserver/tests/serviceinterface/MultiCheckinAndDownload.java
  62. +1 −1 Tests/test/org/bimserver/tests/serviceinterface/QueryJava.java
  63. +1 −1 Tests/test/org/bimserver/tests/serviceinterface/SingleCheckinAndDownload.java
  64. +1 −1 Tests/test/org/bimserver/tests/serviceinterface/SingleCheckinAndDownloadSimplified.java
  65. +1 −1 Tests/test/org/bimserver/tests/serviceinterface/SubProjects.java
Submodule bimsurfer added at 636c9f
@@ -157,12 +157,14 @@ public void generateGeometry(long uoid, PluginManager pluginManager, DatabaseSes
geometryData.setNormals(floatArrayToByteArray(geometry.getNormals()));

if (geometry.getMaterialIndices() != null && geometry.getMaterialIndices().length > 0) {
boolean hasMaterial = false;
float[] vertex_colors = new float[geometry.getVertices().length / 3 * 4];
for (int i = 0; i < geometry.getMaterialIndices().length; ++i) {
int c = geometry.getMaterialIndices()[i];
for (int j = 0; j < 3; ++j) {
int k = geometry.getIndices()[i * 3 + j];
if (c > -1) {
hasMaterial = true;
for (int l = 0; l < 4; ++l) {
vertex_colors[4 * k + l] = geometry.getMaterials()[4 * c + l];
}
@@ -174,7 +176,9 @@ public void generateGeometry(long uoid, PluginManager pluginManager, DatabaseSes
}
}
}
geometryData.setMaterials(floatArrayToByteArray(vertex_colors));
if (hasMaterial) {
geometryData.setMaterials(floatArrayToByteArray(vertex_colors));
}
}

float[] tranformationMatrix = new float[16];
@@ -70,9 +70,13 @@ protected IdEObject copy(IdEObject original) throws IfcModelInterfaceException {
if (eStructuralFeature.getEType() instanceof EEnum) {
EEnum targetEnum = (EEnum) targetFeature.getEType();
EEnumLiteral newLiteral = targetEnum.getEEnumLiteral(get.toString());
newObject.eSet(targetFeature, newLiteral.getInstance());
if (newLiteral != null) {
newObject.eSet(targetFeature, newLiteral.getInstance());
}
} else {
newObject.eSet(targetFeature, get);
if (targetFeature instanceof EAttribute) {
newObject.eSet(targetFeature, get);
}
}
}
} else if (eStructuralFeature instanceof EReference) {
@@ -681,7 +681,6 @@ function Model(bimServerApi, poid, roid, schema) {

othis.changes = 0;
othis.changeListeners = [];
othis.schema = "ifc2x3tc1";

othis.transactionSynchronizer = new Synchronizer(function(callback){
bimServerApi.call("Bimsie1LowLevelInterface", "startTransaction", {poid: othis.poid}, function(tid){
@@ -5,7 +5,6 @@
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="IfcEngine/lib/32"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="test"/>
<classpathentry exported="true" kind="lib" path="/BimServer/lib/commons/commons-io-1.4.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/BimServer/lib/jna.jar"/>
BIN -1.85 MB (34%) IfcEngine/lib/64/ifcengine.dll
Binary file not shown.
@@ -161,60 +161,11 @@ private void writeGeometries(OutputStream outputStream) throws IOException {
dataOutputStream.write(normalsBuffer.array());

// Only when materials are used we send them
if (geometryData.getMaterialIndices() != null) {
// ByteBuffer materialIndexByteBuffer = ByteBuffer.wrap(geometryData.getMaterialIndices());
// materialIndexByteBuffer.order(ByteOrder.LITTLE_ENDIAN);
// IntBuffer materialIndicesBuffer = materialIndexByteBuffer.asIntBuffer();
if (geometryData.getMaterials() != null) {
ByteBuffer materialsByteBuffer = ByteBuffer.wrap(geometryData.getMaterials());
materialsByteBuffer.order(ByteOrder.LITTLE_ENDIAN);
FloatBuffer materialsBuffer = materialsByteBuffer.asFloatBuffer();

dataOutputStream.writeInt(materialsBuffer.capacity() / 4);
dataOutputStream.writeInt(materialsByteBuffer.capacity() / 4);
dataOutputStream.write(materialsByteBuffer.array());
// for (int i=0; i<materialsBuffer.capacity(); i++) {
// dataOutputStream.writeFloat(materialsBuffer.get(i));
// }

// dataOutputStream.writeInt(materialIndicesBuffer.capacity() * 3);
// for (int i=0; i<materialIndicesBuffer.capacity(); i++) {
// int materialIndex = materialIndicesBuffer.get(i);
// if (materialIndex == -1) {
// ByteBuffer test = ByteBuffer.wrap(new byte[16]);
// test.order(ByteOrder.LITTLE_ENDIAN);
// FloatBuffer fl = test.asFloatBuffer();
// fl.put(1f);
// fl.put(0f);
// fl.put(0f);
// fl.put(1f);
// for (int j=0; j<3; j++) {
// dataOutputStream.write(test.array());
// }
// } else {
// float r = materialsBuffer.get(materialIndex * 4);
// float g = materialsBuffer.get(materialIndex * 4 + 1);
// float b = materialsBuffer.get(materialIndex * 4 + 2);
// float a = materialsBuffer.get(materialIndex * 4 + 3);
// ByteBuffer test = ByteBuffer.wrap(new byte[16]);
// test.order(ByteOrder.LITTLE_ENDIAN);
// FloatBuffer fl = test.asFloatBuffer();
// fl.put(r);
// fl.put(g);
// fl.put(b);
// fl.put(a);
// for (int j=0; j<3; j++) {
// dataOutputStream.write(test.array());
// }
// }
// }
// dataOutputStream.writeInt(materialIndicesBuffer.capacity() * 3);
// for (int i=0; i<materialIndicesBuffer.capacity(); i++) {
// int materialIndex = materialIndicesBuffer.get(i);
// if (materialIndex == -1) {
// sendMaterial(dataOutputStream, 0, 1, 0, 1);
// } else {
// sendMaterial(dataOutputStream, materialsBuffer.get(materialIndex), materialsBuffer.get(materialIndex + 1), materialsBuffer.get(materialIndex + 2), materialsBuffer.get(materialIndex + 3));
// }
// }
} else {
// No materials used
dataOutputStream.writeInt(0);
@@ -26,4 +26,5 @@
public interface Deserializer {
void init(PackageMetaData packageMetaData);
IfcModelInterface read(InputStream inputStream, String fileName, long fileSize) throws DeserializeException;
IfcModelInterface read(File file) throws DeserializeException;
}
@@ -17,6 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;

import org.bimserver.emf.IfcModelInterface;
@@ -37,5 +41,23 @@ public PackageMetaData getPackageMetaData() {
return packageMetaData;
}

public abstract IfcModelInterface read(InputStream in, String filename, long fileSize) throws DeserializeException;
public abstract IfcModelInterface read(InputStream in, String filename, long fileSize) throws DeserializeException;

public IfcModelInterface read(File file) throws DeserializeException {
FileInputStream fileInputStream;
try {
fileInputStream = new FileInputStream(file);
try {
return read(fileInputStream, file.getName(), file.length());
} finally {
try {
fileInputStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
} catch (FileNotFoundException e) {
throw new DeserializeException(e);
}
}
}
@@ -23,6 +23,8 @@
import org.bimserver.LocalDevPluginLoader;
import org.bimserver.emf.IfcModelInterface;
import org.bimserver.emf.IfcModelInterfaceException;
import org.bimserver.emf.MetaDataManager;
import org.bimserver.emf.PackageMetaData;
import org.bimserver.models.ifc2x3tc1.Ifc2x3tc1Package;
import org.bimserver.models.ifc2x3tc1.IfcAxis2Placement3D;
import org.bimserver.models.ifc2x3tc1.IfcBuildingStorey;
@@ -56,13 +58,17 @@ public static void main(String[] args) {
PluginManager pluginManager = LocalDevPluginLoader.createPluginManager(new File("home"));
DeserializerPlugin deserializerPlugin = pluginManager.getFirstDeserializer("ifc", true);

Deserializer deserializer = deserializerPlugin.createDeserializer(null);
deserializer.init(pluginManager.requireSchemaDefinition("ifc2x3tc1"));
Deserializer deserializer = deserializerPlugin.createDeserializer(null);

MetaDataManager metaDataManager = new MetaDataManager(pluginManager);
PackageMetaData packageMetaData = metaDataManager.getEPackage("ifc2x3tc1");

deserializer.init(packageMetaData);

IfcModelInterface model = deserializer.read(new File("../TestData/data/AC9R1-Haus-G-H-Ver2-2x3.ifc"));

deserializer = deserializerPlugin.createDeserializer(null);
deserializer.init(pluginManager.requireSchemaDefinition("ifc2x3tc1"));
deserializer.init(packageMetaData);
IfcModelInterface furnishingModel = deserializer.read(new File("test.ifc"));

model.fixOids(new IncrementingOidProvider());
@@ -143,7 +149,7 @@ public static void main(String[] args) {

SerializerPlugin serializerPlugin = pluginManager.getSerializerPlugin("org.bimserver.ifc.step.serializer.IfcStepSerializerPlugin", true);
Serializer serializer = serializerPlugin.createSerializer(null);
serializer.init(model, null, pluginManager, null, true);
serializer.init(model, null, pluginManager, null, packageMetaData, true);
serializer.writeToFile(new File("withfurn.ifc"));
} catch (PluginException e) {
e.printStackTrace();
@@ -18,10 +18,12 @@
*****************************************************************************/

import java.io.File;


import org.bimserver.LocalDevPluginLoader;
import org.bimserver.emf.IfcModelInterface;
import org.bimserver.emf.IfcModelInterfaceException;
import org.bimserver.emf.MetaDataManager;
import org.bimserver.emf.PackageMetaData;
import org.bimserver.ifc.IfcModel;
import org.bimserver.models.ifc2x3tc1.Ifc2x3tc1Package;
import org.bimserver.models.ifc2x3tc1.IfcFurnishingElement;
@@ -43,21 +45,25 @@ public static void main(String[] args) {
try {
PluginManager pluginManager = LocalDevPluginLoader.createPluginManager(new File("home"));
DeserializerPlugin deserializerPlugin = pluginManager.getFirstDeserializer("ifc", true);
Deserializer deserializer = deserializerPlugin.createDeserializer(null);
deserializer.init(pluginManager.requireSchemaDefinition("ifc2x3tc1"));
Deserializer deserializer = deserializerPlugin.createDeserializer(null);

MetaDataManager metaDataManager = new MetaDataManager(pluginManager);
PackageMetaData packageMetaData = metaDataManager.getEPackage("ifc2x3tc1");

deserializer.init(packageMetaData);
IfcModelInterface model = deserializer.read(new File("../TestData/data/ADT-FZK-Haus-2005-2006.ifc"));
model.fixOids(new IncrementingOidProvider());

IfcFurnishingElement picknick = (IfcFurnishingElement) model.getByName(Ifc2x3tc1Package.eINSTANCE.getIfcFurnishingElement(), "Picknik Bank");

IfcModelInterface newModel = new IfcModel();
IfcModelInterface newModel = new IfcModel(packageMetaData);
ModelHelper modelHelper = new ModelHelper(new HideAllInversesObjectIDM(CollectionUtils.singleSet(Ifc2x3tc1Package.eINSTANCE), pluginManager.requireSchemaDefinition("ifc2x3tc1")), newModel);

modelHelper.copy(picknick);

SerializerPlugin serializerPlugin = pluginManager.getSerializerPlugin("org.bimserver.ifc.step.serializer.IfcStepSerializerPlugin", true);
Serializer serializer = serializerPlugin.createSerializer(null);
serializer.init(newModel, null, pluginManager, null, true);
serializer.init(newModel, null, pluginManager, null, packageMetaData, true);
serializer.writeToFile(new File("test.ifc"));
} catch (PluginException e) {
e.printStackTrace();
@@ -56,7 +56,7 @@ public static void main(String[] args) {
SProject grid = serviceInterface.addProjectAsSubProject("Grid", mainProject.getOid(), "ifc2x3tc1");
SProject teklaHouseGrids = serviceInterface.addProjectAsSubProject("Tekla House Grids", grid.getOid(), "ifc2x3tc1");

SDeserializerPluginConfiguration deserializer = client.getBimsie1ServiceInterface().getSuggestedDeserializerForExtension("ifc");
SDeserializerPluginConfiguration deserializer = client.getBimsie1ServiceInterface().getSuggestedDeserializerForExtension("ifc", teklaHouseStructural.getOid());

client.checkin(teklaHouseStructural.getOid(), "Initial", deserializer.getOid(), false, true, new File(baseFolder, "Tekla House Structural.ifcZIP"));
client.checkin(teklaHouseGrids.getOid(), "Initial", deserializer.getOid(), false, true, new File(baseFolder, "Tekla House Grids.ifc"));
@@ -34,8 +34,8 @@ private void start() {

System.out.println(client.getServiceInterface().getFile(fileId));

SProject project = client.getBimsie1ServiceInterface().addProject("test23");
SDeserializerPluginConfiguration deserializerForExtension = client.getBimsie1ServiceInterface().getSuggestedDeserializerForExtension("ifc");
SProject project = client.getBimsie1ServiceInterface().addProject("test23", "ifc2x3tc1");
SDeserializerPluginConfiguration deserializerForExtension = client.getBimsie1ServiceInterface().getSuggestedDeserializerForExtension("ifc", project.getOid());
client.checkin(project.getOid(), "initial", deserializerForExtension.getOid(), false, true, new File("../TestData/data/AC11-FZK-Haus-IFC.ifc"));

project = client.getBimsie1ServiceInterface().getProjectByPoid(project.getOid());
@@ -21,6 +21,7 @@
import org.bimserver.client.ClientIfcModel;
import org.bimserver.client.json.JsonBimServerClientFactory;
import org.bimserver.emf.IfcModelInterfaceException;
import org.bimserver.interfaces.objects.SProject;
import org.bimserver.models.ifc2x3tc1.IfcLabel;
import org.bimserver.models.ifc2x3tc1.IfcPropertySingleValue;
import org.bimserver.plugins.services.BimServerClientException;
@@ -39,8 +40,11 @@ private void start() {
try {
BimServerClient client = factory.create(new UsernamePasswordAuthenticationInfo("admin@bimserver.org", "admin"));
long poid = 2686977;
long roid = 720899;
ClientIfcModel model = client.getModel(poid, roid, true);
long roid = 720899;

SProject project = client.getBimsie1ServiceInterface().getProjectByPoid(poid);

ClientIfcModel model = client.getModel(project, roid, true);

for (IfcPropertySingleValue prop : model.getAll(IfcPropertySingleValue.class)) {
// IfcValue value = ((IfcPropertySingleValue) prop).getNominalValue();
@@ -72,7 +72,7 @@ private void process(File directory, SProject parentProject) throws ServerExcept
} else {
String lowerCase = directory.getName().toLowerCase();
if (lowerCase.endsWith("ifc") || lowerCase.endsWith("ifcxml") || lowerCase.endsWith("ifczip")) {
SDeserializerPluginConfiguration deserializerForExtension = client.getBimsie1ServiceInterface().getSuggestedDeserializerForExtension(directory.getName().substring(directory.getName().lastIndexOf(".") + 1));
SDeserializerPluginConfiguration deserializerForExtension = client.getBimsie1ServiceInterface().getSuggestedDeserializerForExtension(directory.getName().substring(directory.getName().lastIndexOf(".") + 1), parentProject.getOid());
System.out.println("Checking in " + directory.getAbsolutePath() + " - " + Formatters.bytesToString(directory.length()));
try {
client.checkin(parentProject.getOid(), "", deserializerForExtension.getOid(), false, true, directory);
@@ -41,9 +41,9 @@ private void start() {
try {
client = factory.create(new UsernamePasswordAuthenticationInfo("admin@bimserver.org", "admin"));
client.getSettingsInterface().setGenerateGeometryOnCheckin(false);
SDeserializerPluginConfiguration deserializerForExtension = client.getBimsie1ServiceInterface().getSuggestedDeserializerForExtension("ifc");
for (int i=0; i<20; i++) {
SProject project = client.getBimsie1ServiceInterface().addProject("P" + i, "ifc4");
SDeserializerPluginConfiguration deserializerForExtension = client.getBimsie1ServiceInterface().getSuggestedDeserializerForExtension("ifc", project.getOid());
System.out.println(i);
client.checkin(project.getOid(), "C" + i, deserializerForExtension.getOid(), false, true, new File("../TestData/data/AC11-FZK-Haus-IFC.ifc"));
}
@@ -22,6 +22,7 @@
import org.bimserver.client.json.JsonSocketReflectorFactory;
import org.bimserver.client.protocolbuffers.ProtocolBuffersBimServerClientFactory;
import org.bimserver.client.soap.SoapBimServerClientFactory;
import org.bimserver.emf.MetaDataManager;
import org.bimserver.plugins.services.BimServerClientInterface;
import org.bimserver.shared.AuthenticationInfo;
import org.bimserver.shared.BimServerClientFactory;
@@ -53,8 +54,10 @@
private JsonBimServerClientFactory jsonBimServerClientFactory;
private ProtocolBuffersBimServerClientFactory protocolBuffersBimServerClientFactory;
private SoapBimServerClientFactory soapBimServerClientFactory;
private MetaDataManager metaDataManager;

public RandomBimServerClientFactory(TestFramework testFramework, Type... types) {
public RandomBimServerClientFactory(TestFramework testFramework, Type... types) {
metaDataManager = new MetaDataManager(null);
if (types.length == 0) {
this.types = Type.values();
} else {
@@ -66,11 +69,11 @@ public RandomBimServerClientFactory(TestFramework testFramework, Type... types)
FileBasedReflectorFactoryBuilder factoryBuilder = new FileBasedReflectorFactoryBuilder();
ReflectorFactory reflectorFactory = factoryBuilder.newReflectorFactory();

jsonBimServerClientFactory = new JsonBimServerClientFactory("http://localhost:8080", servicesMap, new JsonSocketReflectorFactory(servicesMap), reflectorFactory);
jsonBimServerClientFactory = new JsonBimServerClientFactory("http://localhost:8080", servicesMap, new JsonSocketReflectorFactory(servicesMap), reflectorFactory, metaDataManager);
ProtocolBuffersMetaData protocolBuffersMetaData = new ProtocolBuffersMetaData();
protocolBuffersMetaData.load(servicesMap, ProtocolBuffersBimServerClientFactory.class);
protocolBuffersBimServerClientFactory = new ProtocolBuffersBimServerClientFactory("localhost", 8020, 8080, protocolBuffersMetaData);
soapBimServerClientFactory = new SoapBimServerClientFactory("http://localhost:8080", servicesMap);
soapBimServerClientFactory = new SoapBimServerClientFactory("http://localhost:8080", servicesMap, metaDataManager);
}

public synchronized BimServerClientInterface create(AuthenticationInfo authenticationInfo) throws ServerException, UserException {
@@ -104,5 +107,10 @@ public synchronized BimServerClientInterface create(AuthenticationInfo authentic
@Override
public BimServerClient create() throws ServiceException, ChannelConnectionException {
return null;
}

@Override
public MetaDataManager getMetaDataManager() {
return metaDataManager;
}
}
@@ -45,7 +45,7 @@ public void execute(VirtualUser virtualUser) throws ServerException, UserExcepti
File randomFile = getTestFramework().getTestFile();
String fileName = randomFile.getName();
String extension = fileName.substring(fileName.lastIndexOf(".") + 1);
SDeserializerPluginConfiguration suggestedDeserializerForExtension = virtualUser.getBimServerClient().getBimsie1ServiceInterface().getSuggestedDeserializerForExtension(extension);
SDeserializerPluginConfiguration suggestedDeserializerForExtension = virtualUser.getBimServerClient().getBimsie1ServiceInterface().getSuggestedDeserializerForExtension(extension, project.getOid());

if (suggestedDeserializerForExtension == null) {
virtualUser.getActionResults().setText("No deserializer found for extension " + extension + " in file " + fileName);

0 comments on commit 3985a4e

Please sign in to comment.
You can’t perform that action at this time.